From e64c760059b53818b38c9e9786e7b303b7a9abec Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 17 Mar 2021 18:01:17 +0000
Subject: [PATCH] Bug 27974: Replace obsolete title-string sorting: Circulation
 templates

This patch modifies several circulation templates to replace the use of
the "title-string" DataTables sorting method with the newer
"data-order" attribute.

To test, apply the patch and view the following pages to confirm that
columns containing dates sort correctly when using any setting of the
"dateformat" system preference:

- Circulation -> Checkout notes
  - To populate the table, enable the "AllowCheckoutNotes" system
    preference enabled, log in to the OPAC as a user with checkouts.
    From the "Your summary" page use the "Report a problem" fields to
    submit notes.
- Circulation -> On-site checkouts
  - Requires the "OnSiteCheckouts" system preference to be enabled and
    and for some items to be checked out as on-site checkouts.
- Circulation -> Overdues
- Circulation -> Holds to pull
- Circulation -> Transfers to send
  - Requires the "StockRotation" preference to be enabled, some rotas
    to be set up, and for the stockrotation cron job to be executed.
- Circulation -> Transfers to receive
- Circulation -> Holds queue

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/circ/checkout-notes.tt    |  5 ++---
 .../prog/en/modules/circ/on-site_checkouts.tt | 19 +++----------------
 .../prog/en/modules/circ/overdue.tt           |  4 ++--
 .../prog/en/modules/circ/pendingreserves.tt   |  6 +++---
 .../prog/en/modules/circ/transfers_to_send.tt |  9 +++++----
 .../en/modules/circ/transferstoreceive.tt     |  7 +++----
 .../prog/en/modules/circ/view_holdsqueue.tt   |  4 ++--
 7 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
index 49381da500..1484b9cc7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
@@ -78,7 +78,7 @@
                                 <th class="NoSort">&nbsp;</th>
                                 <th class="anti-the">Title</th>
                                 <th>Note</th>
-                                <th class="title-string">Date</th>
+                                <th>Date</th>
                                 <th>Set by</th>
                                 <th>Status</th>
                                 <th class="NoSort noExport">Actions</th>
@@ -90,7 +90,7 @@
                                     <td><input type="checkbox" name="issue_ids" value="[% note.issue_id | html %]"></td>
                                     <td>[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber | uri %]">[% note.item.barcode | html %]</a>)</td>
                                     <td>[% note.note | html %]</td>
-                                    <td><span title="[% note.notedate | html %]">[% note.notedate | $KohaDates %]</span></td>
+                                    <td data-order="[% note.notedate | html %]">[% note.notedate | $KohaDates %]</td>
                                     <td>[% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %]</td>
                                     <td class="seen[% note.noteseen | html %]">
                                         [% IF ( note.noteseen == 0 ) %]
@@ -142,7 +142,6 @@
                 "order": [[ 1, "asc" ]],
                 "aoColumnDefs": [
                     { "orderable": false, "searchable": false, 'targets': [ 'NoSort' ] },
-                    { "type": "title-string", "targets" : [ "title-string" ] },
                     { "type": "anti-the", "targets": [ "anti-the" ] }
                 ],
                 "pagingType": "full"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
index 924d43b6e7..fa43a2fc01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
@@ -53,9 +53,9 @@
             <tbody>
               [% FOREACH item IN pending_onsite_checkouts %]
                 <tr>
-                  <td>
+                  <td data-order="[% item.date_due | html %]">
                     [% IF item.is_overdue %]<span class="overdue">[% END %]
-                    <span title="[% item.date_due | html %]">[% item.date_due | $KohaDates %]</span>
+                    [% item.date_due | $KohaDates %]
                     [% IF item.is_overdue %]</span>[% END %]
                   </td>
                   <td>
@@ -97,20 +97,7 @@
     <script>
         $(document).ready(function(){
             if ( $("#pending_onsite_checkout").length ) {
-                $("#pending_onsite_checkout").dataTable($.extend(true, {}, dataTablesDefaults, {
-                    "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
-                    "aoColumns": [
-                        { "sType": "title-string" },
-                        { "sType": "html" },
-                        { "sType": "html" },
-                        null,
-                        { "sType": "html" },
-                        null,
-                        null,
-                    ],
-                    'bAutoWidth': false,
-                    "sPaginationType": "full"
-                }));
+                $("#pending_onsite_checkout").dataTable($.extend(true, {}, dataTablesDefaults));
             }
         });
     </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 2a754ac24a..2ee9d47a32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -65,7 +65,7 @@
     <table id="overduest">
       <thead>
         <tr>
-          <th class="title-string">Due date</th>
+          <th>Due date</th>
           <th>Patron</th>
           <th>Patron category</th>
           <th>Patron library</th>
@@ -83,7 +83,7 @@
       <tbody>
       [% FOREACH overdueloo IN overdueloop %]
         <tr>
-          <td><span title="[% overdueloo.duedate | html %]">[% overdueloo.duedate | $KohaDates %]</span></td>
+          <td data-order="[% overdueloo.duedate | html %]">[% overdueloo.duedate | $KohaDates %]</td>
           <td>
             [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 %]
             [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 77367bd3b0..49945b996e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -77,7 +77,7 @@
         <th>Available enumeration</th>
         <th class="string-sort">Available item types</th>
         <th class="string-sort">Available locations</th>
-        <th class="title-string">Earliest hold date</th>
+        <th>Earliest hold date</th>
         <th>Action</th>
         </tr>
     </thead>
@@ -174,8 +174,8 @@
             [% END %]
             </ul>
         </td>
-        <td>
-            <span title="[% hold.reservedate | html %]">[% hold.reservedate | $KohaDates %] in [% Branches.GetName ( hold.branchcode ) | html %]</span>
+        <td data-order="[% hold.reservedate | html %]">
+            [% hold.reservedate | $KohaDates %] in [% Branches.GetName ( hold.branchcode ) | html %]
         </td>
         <td>
             <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
index 7f9472bdea..c2b7763d68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt
@@ -52,7 +52,7 @@
                                     <caption>Sending to [% library.branchname | html %]</caption>
                                     <thead>
                                         <tr>
-                                            <th class="title-string">Date of request</th>
+                                            <th>Date of request</th>
                                             <th class="anti-the">Title</th>
                                             <th>Reason</th>
                                             <th>On loan</th>
@@ -65,7 +65,9 @@
                                         [% FOREACH transfer IN library.inbound_transfers %]
                                             [% UNLESS transfer.datesent %]
                                             <tr>
-                                                <td><p><span title="[% transfer.daterequested | html %]">[% transfer.daterequested | $KohaDates %]</span></p></td>
+                                                <td data-order="[% transfer.daterequested | html %]">
+                                                    [% transfer.daterequested | $KohaDates %]
+                                                </td>
                                                 <td>
                                                     [% INCLUDE 'biblio-title.inc' biblio = transfer.item.biblio link = 1 %][% IF ( transfer.item.biblio.author ) %] by [% transfer.item.biblio.author | html %][% END %]
                                                     [% IF ( transfer.item.effective_itemtype ) %] (<b>[% ItemTypes.GetDescription( transfer.item.effective_itemtype ) | html %]</b>)[% END %]
@@ -115,8 +117,7 @@
             $("#transferst[% library.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
                     { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
-                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
                 ],
                 "sDom": 't',
                 "bPaginate": false
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index cfa8bf00d4..ed7f228cfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -51,7 +51,7 @@
             <table style="width: 100%" id="transferst[% branchesloo.branchcode | html %]">
             <caption>Coming from [% branchesloo.branchname | html %]</caption>
             <thead><tr>
-                <th class="title-string">Date of transfer</th>
+                <th>Date of transfer</th>
                 <th class="anti-the">Title</th>
                 <th>On hold for</th>
                 <th>Home library</th>
@@ -64,7 +64,7 @@
                 [% ELSE %]
                 <tr>
                 [% END %]
-                    <td><p><span title="[% reser.datetransfer | html %]">[% reser.datetransfer | $KohaDates %]</span></p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff | html %] days late</span>[% END %]</td>
+                    <td data-order="[% reser.datetransfer | html %]"><p>[% reser.datetransfer | $KohaDates %]</p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff | html %] days late</span>[% END %]</td>
                     <td>
                         [% INCLUDE 'biblio-title.inc' biblio=reser link = 1 %] [% IF ( reser.author ) %]by [% reser.author | html %][% END %]
                             [% IF ( reser.itemtype ) %] (<strong>[% reser.itemtype | html %]</strong>)[% END %]
@@ -121,8 +121,7 @@
             $("#transferst[% branchesloo.branchcode | html %]").dataTable($.extend(true, {}, dataTablesDefaults, {
                 "aoColumnDefs": [
                     { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
-                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
+                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
                 ],
                 "sDom": 't',
                 "bPaginate": false
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 12605d6858..10c36a1e9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -82,7 +82,7 @@
         <th class="hq-barcode">Barcode</th>
         <th class="hq-patron">Patron</th>
         <th class="hq-sendto">Send to</th>
-        <th class="hq-date title-string">Date</th>
+        <th class="hq-date">Date</th>
         <th class="hq-notes">Notes</th>
     </tr>
     <tr>
@@ -191,7 +191,7 @@
               [% END %]
             </td>
             <td class="hq-sendto">[% Branches.GetName( itemsloo.pickbranch ) | html %]</td>
-            <td class="hq-date"><span title="[% itemsloo.reservedate | html %]">[% itemsloo.reservedate | $KohaDates %]</span></td>
+            <td class="hq-date" data-order="[% itemsloo.reservedate | html %]">[% itemsloo.reservedate | $KohaDates %]</td>
             <td class="hq-notes">[% itemsloo.notes | html %]</td>
         </tr>
     [% END %]</tbody>
-- 
2.39.5