From 37530b445fe3abad2861c02cc191bb6095f218c0 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 4 Jan 2023 10:59:55 +0000
Subject: [PATCH] Bug 32503: Use first cancellation for date ordering

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/includes/waiting_holds.inc         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

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 8440476f68..e6caa50f4a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
@@ -8,7 +8,7 @@
             <th>Waiting since</th>
             <th>Date hold placed</th>
           [% IF table_name == 'holdscr' %]
-            <th data-type="@data-sort">Date cancellation requested</th>
+            <th>Date cancellation requested</th>
           [% END %]
             <th>Expiration date</th>
             <th class="anti-the">Title</th>
@@ -29,11 +29,19 @@
                 <td data-order="[% reserveloo.waitingdate | html %]"><span>[% reserveloo.waitingdate | $KohaDates %]</span></td>
                 <td data-order="[% reserveloo.reservedate | html %]"><span>[% reserveloo.reservedate | $KohaDates %]</span></td>
               [% IF table_name == 'holdscr' %]
-                <td>
-                [% FOREACH cancellation_request IN reserveloo.cancellation_requests %]
-                    <span data-order="[% cancellation_request.creation_date | html %]">[% cancellation_request.creation_date | $KohaDates %]</span>
+                [% IF reserveloo.cancellation_requests.count %]
+                  [% FOREACH cancellation_request IN reserveloo.cancellation_requests %]
+                    [% IF loop.first %]
+                      <td data-order="[% cancellation_request.creation_date | html %]">
+                    [% END %]
+                        <span>[% cancellation_request.creation_date | $KohaDates %]</span>
+                    [% IF loop.last %]
+                      </td>
+                    [% END %]
+                  [% END %]
+                [% ELSE %]
+                  <td></td>
                 [% END %]
-                </td>
               [% END %]
                 <td data-order="[% reserveloo.expirationdate | html %]"><span>[% reserveloo.expirationdate | $KohaDates %]</span></td>
                 <td>
-- 
2.39.5