From 1ff3d65c7073e5d93502d329b917d886a3665e0b Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 30 Apr 2024 16:13:25 +0100
Subject: [PATCH] Bug 35977: (follow-up) Cleaner working approach

This patch removes the Date_from_syspref recently added and replaces it
with the correct parseDate call as per bug 35559. We also clean up the
code around setting the input value in the first place and use iso which
is what the rest of flatpickr expects and now is handled correctly in
futuredate pickers.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../bootstrap/en/includes/calendar.inc        | 24 +------------------
 .../bootstrap/en/modules/opac-reserve.tt      |  2 +-
 opac/opac-reserve.pl                          |  1 -
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 103e03264f..cb8ec7804e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -157,28 +157,6 @@
         }
     }
 
-    function Date_from_syspref(dstring) {
-        var dateX = dstring.split(/[-/.]/);
-        if (debug > 1 && sentmsg < 1) {
-            sentmsg++;
-            alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));
-        }
-        if (dateformat_pref === "iso") {
-            return new Date(dateX[0], (dateX[1] - 1), dateX[2]); // YYYY-MM-DD to (YYYY,m(0-11),d)
-        } else if (dateformat_pref === "us") {
-            return new Date(dateX[2], (dateX[0] - 1), dateX[1]); // MM/DD/YYYY to (YYYY,m(0-11),d)
-        } else if (dateformat_pref === "metric") {
-            return new Date(dateX[2], (dateX[1] - 1), dateX[0]); // DD/MM/YYYY to (YYYY,m(0-11),d)
-        } else if (dateformat_pref === "dmydot") {
-            return new Date(dateX[2], (dateX[1] - 1), dateX[0]); // DD.MM.YYYY to (YYYY,m(0-11),d)
-        } else {
-            if (debug > 0) {
-                alert("KOHA ERROR - Unrecognized date format: " + dateformat_pref);
-            }
-            return 0;
-        }
-    }
-
         $(document).ready(function(){
             $(".flatpickr").each(function(){
                 let options = {};
@@ -189,7 +167,7 @@
                  || $(this).data("flatpickr-futuredate") === true ) {
                     let original_date = $(this).val();
                     if ( original_date ) {
-                        original_date = Date_from_syspref( original_date ).getTime();
+                        original_date = flatpickr.parseDate(original_date, 'Y-m-d').getTime();
                         let tomorrow = new Date().fp_incr(1).getTime();
 
                         options['enable'] = [function(date){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 34d1f4ff5b..7a736184c0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -288,7 +288,7 @@
                                                 [% IF ( reserve_in_future ) %]
                                                     <li>
                                                         <label for="from[% bibitemloo.biblionumber | html %]">Hold starts on date:</label>
-                                                        <input type="text" name="reserve_date_[% bibitemloo.biblionumber | html %]" id="from[% bibitemloo.biblionumber | html %]" data-start_for="to[% bibitemloo.biblionumber | html %]" data-flatpickr-futureinclusive="true" size="10" class="flatpickr holddatefrom" value="[% today | $raw %]" />
+                                                        <input type="text" name="reserve_date_[% bibitemloo.biblionumber | html %]" id="from[% bibitemloo.biblionumber | html %]" data-start_for="to[% bibitemloo.biblionumber | html %]" data-flatpickr-futureinclusive="true" size="10" class="flatpickr holddatefrom" value="[% KohaDates.datetime_from_string | $KohaDates dateformat => 'iso' %]" />
                                                         <span class="date-format from" data-biblionumber="[% bibitemloo.biblionumber | html %]">[% INCLUDE 'date-format.inc' %]</span>
                                                         <div class="required_label" style="display:none;">Required</div>
                                                     </li>
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index fe1d38fbe9..bbc016cb79 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -624,7 +624,6 @@ if (   C4::Context->preference('AllowHoldDateInFuture')
 {
     $template->param(
         reserve_in_future => 1,
-        today             => dt_from_string,
     );
 }
 
-- 
2.39.2