From fb040a330fc968c1bf297c70a7e28f866cac06e2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 May 2023 12:16:41 +0200 Subject: [PATCH] Bug 33804: Add as_due_date option to $date Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc index 7a54fa773a..640fa5c90c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc @@ -38,6 +38,7 @@ * or JS Date, the function will return a date string formatted as per the koha instance config. * Optionally accepts a dateformat parameter to allow override of the configured output format * as well as a 'withtime' boolean denoting whether to include time or not in the output string. + * 'as_due_date' can be passed to format a date time as a due date: The time part will not be displayed if 23:59. */ window.$date = function(value, options) { if(!value) return ''; @@ -54,6 +55,10 @@ var timeformat = (options&&options.timeformat)||def_time_format; var date_pattern = get_date_pattern(dateformat); + let as_due_date = (options&&options.as_due_date); + if (as_due_date) { + withtime = !( m.hour() == 23 && m.minute() == 59 ); + } var time_pattern = !withtime?'':' '+get_time_pattern(timeformat); return m.format(date_pattern+time_pattern); -- 2.39.5