@@ -, +, @@
tt files
- flatpickr-futuredate
- flatpickr-pastdate
- flatpickr-enable-time
- flatpickr-on-close-focus
---
.../prog/en/includes/borrower_debarments.inc | 2 +-
.../prog/en/includes/calendar.inc | 13 ++++++++--
.../prog/en/includes/holds_table.inc | 4 +--
.../prog/en/modules/circ/circulation.tt | 2 +-
.../circ/circulation_batch_checkouts.tt | 14 ++++-------
.../prog/en/modules/circ/renew.tt | 25 ++++++-------------
.../prog/en/modules/circ/returns.tt | 11 +-------
.../prog/en/modules/ill/ill-requests.tt | 7 +-----
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/reports/borrowers_out.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 9 +------
.../prog/en/modules/tools/scheduler.tt | 2 +-
12 files changed, 33 insertions(+), 60 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -62,7 +62,7 @@
Comment:
Expiration:
-
+
Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -78,19 +78,28 @@
var endPicker = document.querySelector("#"+thisInput.dataset.date_to)._flatpickr;
endPicker.set('minDate', selectedDates[0]);
}
+
+ let = on_close_focus = $(thisInput).data('flatpickr-on-close-focus');
+ if ( on_close_focus ) {
+ $(on_close_focus).focus();
+ }
},
});
$(document).ready(function(){
$(".flatpickr").each(function(){
let options = {};
- if( $(this).hasClass("futuredate") ) {
+ if( $(this).data("flatpickr-futuredate") === true ) {
options['minDate'] = new Date().fp_incr(1);
options['allowInvalidPreload'] = true;
}
- if( $(this).hasClass("pastdate") ) {
+ if( $(this).data("flatpickr-pastdate") === true ) {
options['maxDate'] = new Date().fp_incr(-1);
}
+ if ( $(this).data('flatpickr-enable-time') === true ) {
+ options['enableTime'] = true;
+ }
+
$(this).flatpickr(options);
});
});
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -114,7 +114,7 @@
[% END %]
-
+
[%- IF ( hold.found ) -%]
@@ -211,7 +211,7 @@
[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
[% IF ( hold.suspend ) %] on [% ELSE %] until [% END %]
-
+
[%- ELSE -%]
[%- END -%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -875,7 +875,7 @@
[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
until
-
+
Specify date on which to resume [% INCLUDE 'date-format.inc' %]:
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -112,7 +112,11 @@
Due date:
Hard due date [% INCLUDE 'date-format.inc' %]:
-
+ [% IF Koha.Preference('SpecifyDueDate') %]
+
+ [% ELSE %]
+
+ [% END %]
[% END %]
@@ -357,14 +361,6 @@
],
"bPaginate": false
}));
-
- [% IF Koha.Preference('SpecifyDueDate') %]
- $("#duedatespec").flatpickr({
- enableTime: true,
- dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
- defaultDate: new Date().setHours(23, 59, 0, 0) /* Today a 11:59PM */
- });
- [% END %]
});
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -147,7 +147,8 @@
- Renewal due date:
+ Renewal due date:
+
Override and renew
@@ -170,7 +171,11 @@
[% END %]
@@ -251,22 +256,6 @@
});
[% END %]
-
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -808,7 +808,7 @@
Specify return date [% INCLUDE 'date-format.inc' %]:
-
+
[% IF ( return_date_override_remember ) %]
@@ -1038,15 +1038,6 @@
"dom": 'B<"clearfix">t',
}, columns_settings);
- $("#return_date_override").flatpickr({
- enableTime: true,
- dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
- maxDate: "today",
- onClose: function() {
- $("#barcode").focus();
- }
- });
-
$("#exemptcheck").change(function () {
if (this.checked == true) {
$("#barcode").addClass("input-warning");
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -248,7 +248,7 @@
Due date:
- [% INCLUDE 'date-format.inc' %]
+ [% INCLUDE 'date-format.inc' %]
If you do not specify a due date, it will be set according to circulation rules
@@ -840,11 +840,6 @@
// Set column settings
var columns_settings = [% TablesSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
- $("#ill_checkout_duedate_input").flatpickr({
- enableTime: true,
- dateFormat: flatpickr_dateformat_string + " " + flatpickr_timeformat_string,
- });
-
[% IF services_json.length > 0 %]
var services = [% services_json | $raw %];
[% ELSE %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -812,7 +812,7 @@
[% IF Koha.Preference('AutoResumeSuspendedHolds') %]
until
-
+
Specify date on which to resume [% INCLUDE 'date-format.inc' %]:
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
@@ -68,7 +68,7 @@
[% END %]
-
Not checked out since:
+ Not checked out since:
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -518,7 +518,7 @@
[% IF ( reserve_in_future ) %]
Hold starts on date:
-
+
[% END %]
@@ -1209,13 +1209,6 @@
});
[% END %]
- [% IF AutoResumeSuspendedHolds %]
- $(".suspend_until_datepicker").flatpickr({
- minDate: new Date().fp_incr(1) /* Require that "until date" be in the future */
- });
- [% END %]
-
-
var my_table = $("#requestspecific").dataTable($.extend(true, {}, dataTablesDefaults, {
'bPaginate': false,
"sDom": '<"top pager"ilf>t',
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt
@@ -46,7 +46,7 @@
Date:
-
+
[% INCLUDE 'date-format.inc' %]
Report:
--