From 1000ab402b86ea9cafefbea698e9b05f62105353 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 23 May 2023 12:16:55 +0200
Subject: [PATCH] Bug 33804: Use as_due_date to display due dates

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/includes/js-date-format.inc         |  5 +++--
 .../prog/en/modules/circ/circulation.tt         |  1 +
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js    | 17 +++++++++--------
 svc/checkouts                                   | 12 ------------
 4 files changed, 13 insertions(+), 22 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 640fa5c90c..06fdcb67f1 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/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index e2fec123ee..4150426c37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -870,6 +870,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' %]
 
     <script>
         /* Set some variable needed in circulation.js */
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 1ba842f16d..4920eccb9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -308,10 +308,10 @@ $(document).ready(function() {
                 {
                     "iDataSort": 2, // Sort on hidden unformatted date due column
                     "mDataProp": function( oObj ) {
-                        var due = oObj.date_due_formatted;
-                        if ( oObj.date_due_overdue ) {
-                            due = "<span class='overdue'>" + due + "</span>";
-                        }
+                        let date_due_formatted = $datetime(oObj.date_due, { as_due_date: true, no_tz_adjust: true });
+                        var due = oObj.date_due_overdue
+                            ? "<span class='overdue'>" + date_due_formatted + "</span>"
+                            : date_due_formatted;
 
                         due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";
 
@@ -426,7 +426,7 @@ $(document).ready(function() {
                 },
                 {
                     "iDataSort": 10, // Sort on hidden unformatted issuedate column
-                    "mDataProp": "issuedate_formatted",
+                    "mDataProp": "issuedate",
                 },
                 {
                     "mDataProp": function ( oObj ) {
@@ -729,10 +729,11 @@ $(document).ready(function() {
                         "mDataProp": function( oObj ) {
                             var today = new Date();
                             var due = new Date( oObj.date_due );
+                            let date_due_formatted = $datetime(oObj.date_due, { as_due_date: true, no_tz_adjust: true });
                             if ( today > due ) {
-                                return "<span class='overdue'>" + oObj.date_due_formatted + "</span>";
+                                return "<span class='overdue'>" + date_due_formatted + "</span>";
                             } else {
-                                return oObj.date_due_formatted;
+                                return date_due_formatted;
                             }
                         }
                     },
@@ -822,7 +823,7 @@ $(document).ready(function() {
                     },
                     {
                         "iDataSort": 7, // Sort on hidden unformatted issuedate column
-                        "mDataProp": "issuedate_formatted",
+                        "mDataProp": "issuedate",
                     },
                     {
                         "mDataProp": function ( oObj ) {
diff --git a/svc/checkouts b/svc/checkouts
index 12c021f01e..20b1a34460 100755
--- a/svc/checkouts
+++ b/svc/checkouts
@@ -288,18 +288,6 @@ while ( my $c = $sth->fetchrow_hashref() ) {
         return_claim_created_on_formatted => $c->{return_claim_created_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_created_on} ) }) : undef,
         return_claim_updated_on_formatted => $c->{return_claim_updated_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_updated_on} ) }) : undef,
 
-        issuedate_formatted => output_pref(
-            {
-                dt          => dt_from_string( $c->{issuedate} ),
-                as_due_date => 1
-            }
-        ),
-        date_due_formatted => output_pref(
-            {
-                dt          => dt_from_string( $c->{date_due} ),
-                as_due_date => 1
-            }
-        ),
         lost    => $lost,
         claims_returned => $claims_returned,
         damaged => $damaged,
-- 
2.39.5