From 28771ad8b724f28065fc412b9a8a317c0c0850a2 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 7 Dec 2021 22:14:07 +0000
Subject: [PATCH] Bug 27868: Add expiration date to holds awaiting pickup

To test:
1. Have some holds awaiting pickup, also have some holds that have been waiting longer than the ReservesMaxPickUpDelay is set to.
2. Go to /cgi-bin/koha/circ/waitingreserves.pl
3. There is no expiration date
4. Apply patch and restart_all
5. Now there should be a Expiration date column, make sure you can see it in both Holds waiting and Holds waiting over X days
6. Make sure all the columns Waiting Since, Date hold placed, and expiration date still sort correctly
6. Go to Table settings, and make sure all the columns hide correctly for both of the  holds_awaiting_pickup tables ( holdst & holdso )

Note: This patch also corrects 2 other small problems

1. Corrects a problem where the table settings did not account for the checkbox column at the beginnning of each table
2. Removes the title-string class and uses data-order to sort Waiting Since, Date hold placed, and expiration date ( see Bug 27934 )

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 admin/columns_settings.yml                           | 12 ++++++++++++
 .../intranet-tmpl/prog/en/includes/waiting_holds.inc | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 56bec9ea04..9b0982d264 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1276,10 +1276,16 @@ modules:
     holds_awaiting_pickup:
       holdst:
         columns:
+            -
+              columnname: checkbox
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
             -
               columnname: waiting_since
             -
               columnname: date_hold_placed
+            -
+              columnname: expiration_date
             -
               columnname: title
             -
@@ -1301,10 +1307,16 @@ modules:
 
       holdso:
         columns:
+            -
+              columnname: checkbox
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
             -
               columnname: waiting_since
             -
               columnname: date_hold_placed
+            -
+              columnname: expiration_date
             -
               columnname: title
             -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
index 27e7fb7724..4738e44b5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
@@ -6,8 +6,9 @@
             [% IF select_column %]
             <th class="NoSort"><input type="checkbox" class="select_hold_all"/></th>
             [% END %]
-            <th class="title-string">Waiting since</th>
-            <th class="title-string">Date hold placed</th>
+            <th>Waiting since</th>
+            <th>Date hold placed</th>
+            <th>Expiration date</th>
             <th class="anti-the">Title</th>
             <th>Patron</th>
             <th>Home library</th>
@@ -25,8 +26,9 @@
                 [% IF select_column %]
                 <th><input type="checkbox" class="select_hold" data-id="[% reserveloo.reserve_id | html %]"/></th>
                 [% END %]
-                <td><span title="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
-                <td><span title="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
+                <td><span data-order="[% reserveloo.waitingdate | html %]">[% reserveloo.waitingdate | $KohaDates %]</span></td>
+                <td><span data-order="[% reserveloo.reservedate | html %]">[% reserveloo.reservedate | $KohaDates %]</span></td>
+                <td><span data-order="[% reserveloo.expirationdate | html %]">[% reserveloo.expirationdate | $KohaDates %]</span></td>
                 <td>
                     [% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %]
                         [% UNLESS ( item_level_itypes ) %]
-- 
2.39.5