From 3d1b7f41bc674a047d4d39dbe57dd5b5c69eb821 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 May 2023 12:16:55 +0200 Subject: [PATCH] Bug 33804: Use as_due_date to display due dates --- .../prog/en/includes/js-date-format.inc | 5 +++-- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 17 +++++++++-------- svc/checkouts | 12 ------------ 5 files changed, 14 insertions(+), 23 deletions(-) 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 640fa5c90c2..06fdcb67f1a 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 @@ -42,9 +42,10 @@ */ window.$date = function(value, options) { if(!value) return ''; - var tz = (options&&options.tz)||def_tz; + let tz = (options&&options.tz)||def_tz; + let no_tz_adjust = (options&&options.no_tz_adjust)||false; var m = dayjs(value); - if ( ! value.match(/^\d{4}-\d{2}-\d{2}$/ ) ) { + if ( !no_tz_adjust && ! value.match(/^\d{4}-\d{2}-\d{2}$/ ) ) { m = m.tz(tz); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 351a48aa317..c543cc34494 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -2385,7 +2385,7 @@ } } nodes += ': '; - nodes += _("due %s").format($date(row.checkout.due_date)); [%# FIXME Missing due date formatting here, $date do not have as_due_date option %] + nodes += _("due %s").format($date(row.checkout.due_date, { as_due_date: true })); nodes += "" } else if ( row.transfer ) { if ( row.transfer.datesent ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 6fc4e740c57..4877d6d1e18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1036,6 +1036,7 @@ [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% PROCESS 'modal-claims.inc' %] [% PROCESS 'modal-claims-js' %] + [% INCLUDE 'js-date-format.inc' %]