From 0e22f34106b307c0e831e018bd9455b14e60ea73 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 4 Apr 2022 18:23:00 +0000
Subject: [PATCH] Bug 30454: Convert holds awaiting pickup tabs to Bootstrap

This patch updates the holds awaiting pickup page to replace jQueryUI
tabs with Bootstrap tabs. A minor JavaScript change is required to work
with the new HTML structure.

To test you should have multiple holds for one library: Some which are
waiting for less than the number of days specified in
ReservesMaxPickUpDelay, some which are waiting longer.

- Apply the patch and go to Circulation -> Holds awaiting pickup.
- You should see two tabs: "Holds waiting" and "Holds waiting over..."
- Confirm that the tabs look correct and work correctly.
- Confirm that the "Cancel selected" buttons work correctly under each
  tab.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/modules/circ/waitingreserves.tt     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 227653ad03..f9aeb48443 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -81,15 +81,16 @@
             </div>
         [% END %]
         <div id="resultlist" class="toptabs">
-            <ul>
-                <li><a href="#holdswaiting">Holds waiting: [% reservecount | html %]</a></li>
-                <li>
-                    <a href="#holdsover">
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount | html %]</a></li>
+                <li role="presentation">
+                    <a href="#holdsover" aria-controls="holdsover" role="tab" data-toggle="tab">
                         Holds waiting over [% Koha.Preference('ReservesMaxPickUpDelay') | html %] days: [% overcount | html %]
                     </a>
                 </li>
             </ul>
-            <div id="holdswaiting">
+            <div class="tab-content">
+            <div role="tabpanel" class="tab-pane active" id="holdswaiting">
         [% IF ( reserveloop ) %]
             <div id="toolbar" class="btn-toolbar">
                 <button class="cancel_selected_holds" data-bulk="true"></button>
@@ -99,7 +100,7 @@
             <div class="dialog message">No holds found.</div>
         [% END %]
         </div>
-        <div id="holdsover">
+        <div role="tabpanel" class="tab-pane" id="holdsover">
             [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>[% END %]
             [% IF ( overloop ) %]
                 <span id="holdsover-cancel-all">
@@ -194,8 +195,6 @@
                 "order": [[1, 'asc']]
             }, holdso_table_settings);
 
-            $('#resultlist').tabs();
-
             let cancel_link;
 
             $("#cancelModalConfirmBtn").on("click",function(e) {
@@ -228,7 +227,7 @@
 
             $('.holds_table').each(function() {
               var table = $(this);
-              var parent = table.parents('.ui-tabs-panel');
+              var parent = table.parents('.tab-pane');
 
               $('.holds_table .select_hold_all', parent).each(function() {
                   var count = $('.select_hold:not(:checked)', table).length;
-- 
2.39.5