Bug 30706: Fix space in check for dateformat preference

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / includes / calendar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 8360890..47a3f76 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -5,24 +5,19 @@
 [% FILTER collapse %]
 <script>
     var debug    = "[% debug | html %]";
-    var dateformat_pref = "[% Koha.Preference('dateformat ') | html %]";
-    var dateformat_string = "";
+    var dateformat_pref = "[% Koha.Preference('dateformat') | html %]";
     var flatpickr_dateformat_string = "";
     switch ( dateformat_pref ){
         case "us":
-            dateformat_string = "mm/dd/yy";
             flatpickr_dateformat_string = "m/d/Y";
             break;
         case "metric":
-            dateformat_string = "dd/mm/yy";
             flatpickr_dateformat_string = "d/m/Y";
             break;
         case "dmydot":
-            dateformat_string = "dd.mm.yy";
             flatpickr_dateformat_string = "d.m.Y";
             break;
         default:
-            dateformat_string = "yy-mm-dd";
             flatpickr_dateformat_string = "Y-m-d";
     }
     var sentmsg = 0;
@@ -127,6 +122,7 @@
         $(".flatpickr").each(function(){
             let options = {};
             let refresh_max_date = 0;
+            let disable_buttons = [];
 
             if( $(this).data("flatpickr-futuredate") === true ) {
                 let original_date = $(this).val();
@@ -143,13 +139,18 @@
                 else {
                     options['minDate'] = new Date().fp_incr(1);
                 }
+                disable_buttons.push(0); /* Yesterday */
+                disable_buttons.push(1); /* Today */
             }
             if( $(this).data("flatpickr-pastinclusive") === true ) {
                 options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
                 refresh_max_date = 1;
+                disable_buttons.push(2); /* Tomorrow */
             }
             if( $(this).data("flatpickr-pastdate") === true ) {
                 options['maxDate'] = new Date().fp_incr(-1);
+                disable_buttons.push(1); /* Today */
+                disable_buttons.push(2); /* Tomorrow */
             }
             if ( $(this).data('flatpickr-enable-time') === true ) {
                 options['enableTime'] = true;
@@ -157,6 +158,11 @@
             }
 
             let fp = $(this).flatpickr(options);
+
+            $(disable_buttons).each(function(index, value){
+                $(fp.calendarContainer).find(".shortcut-buttons-flatpickr-button[data-index='"+value+"']").prop("disabled", "disabled");
+            });
+
             if ( refresh_max_date ) {
                 /* Refresh the maxDate every 30 secondes to make sure the user will not
                    be stuck with the minute passed.