From 38100395788577f7feca2525d754c6469d2a0204 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 27 Sep 2023 21:22:43 +0000 Subject: [PATCH] Bug 34939: Set hour:minute to 23:59 when inputing dates unless explicitly set 1. Find some places in the staff interface where data-flatpickr-enable-time is set to true. Examples: renew.tt or circulation.tt 2. Directly input a date in whatever date format you have specified in DateFormat but omit the hour/minute. Example: 12/12/2023 3. See that the hour/minute default to 00:00 if your TimeFormat is 24hr and 12:00 AM if your time format is 12hr 4. Apply patch, clear browser cache. 5. Try step again, setting a date like '12/12/2023'. The hour:minute should be added as 23:59. 6. With TimeFormat set to 24hr try entering a date with the hour:minute like '12/12/2023 11:22'. The hour:minute should be set to 11:22. 7. With TimeFormat set to 12hr try entering a date with the hour:minute like '12/12/2023 11:22 AM'. The hour:minute should be set to 11:22 AM. 8. Play with this in as many TimeFormat and DateFormat combonatinons as you can. Signed-off-by: Kristi Krueger Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ff00e77f466bb217ed6235cec16047da5a620c75) Signed-off-by: Fridolin Somers (cherry picked from commit b6cc786dfd5f11bbf896117660c5a82f1994c215) Signed-off-by: Matt Blenkinsop --- koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 5acbac789b..95ada9bc07 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -70,6 +70,12 @@ } }); }, + onChange: function( selectedDates, dateText, instance) { + let parsedDate = flatpickr.parseDate(dateText, instance.config.dateFormat); + if ( !parsedDate.getHours() ) { + instance.setDate(selectedDates[0].setHours(23, 59, 0, 0)); + } + }, onClose: function( selectedDates, dateText, instance) { validate_date( dateText, instance ); var thisInput = instance.input; -- 2.39.5