From 580a89ed429b553f592eb73daf0fbd4a8b630156 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 29 Apr 2024 09:38:02 +0100 Subject: [PATCH] Bug 36341: (follow-up) Fix missing Date_from_syspref It appears this bug introduces the first actual use of this function in the OPAC and thus exposes that bug 31261 didn't fully port the Date_from_syspref from the intranet. Signed-off-by: Katrin Fischer (cherry picked from commit 04d3cf07a858a5efc129b2f78e62d8dd8148b742) Signed-off-by: Fridolin Somers (cherry picked from commit ab7a3ff196459e419230794d1a50cfa8f1e4efcd) Signed-off-by: Lucas Gass --- .../bootstrap/en/includes/calendar.inc | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc index 2a486d2b21..8191e01489 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc @@ -136,6 +136,28 @@ } } + 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 = {}; -- 2.39.5