From fea69c86079fddcbd4f339c87a03356a9ab4551d Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 12 Dec 2023 22:48:22 +0000
Subject: [PATCH] Bug 35360: Make HTML/buttons consistent on waitingreserves.tt

To test:
0. Turn on hold cancellation requests in Administration -> Circulation rules.
1. Have some holds that are waiting, waiting over expiration date, and cancelled waiting holds. In order to create holds waiting over expiration date, if you are in ktd, you can use SQL to update the expirationdate in reserves: UPDATE reserves SET expirationdate="2022-01-01" WHERE reserve_id=1; (make sure it's the correct reserve_id!)
1a. If you are not using ktd, you will need to set ReservesMaxPickUpDelay to 0 days, then return the reserved item and then wait one day before it will be marked as over expiration date.
1b. In order to create cancelled waiting holds, you will need to send a cancel request over the OPAC, that is, reserve something after logging in to the OPAC, return it in the staff interface, and then go to the OPAC -> Your Account -> Holds -> click Cancel on the waiting hold.
2. Notice the differences between the 3 tables and their related buttons:
-Holds waiting
-Holds waiting past their expiration date
-Holds with cancellation requests

-Holds waiting includes a 'Canceled selected' button at the top of the table. It is with in a #toolbar.

-Holds waiting past their expiration date includes a 'Cancel selected' and a 'Cancel all' button. None are within a #toolbar. The 'Cancel selected' here lacks a Bootstrap .btn class. The 'Cancel all' button does have a .btn class.

-Holds with cancellation requests has neither a 'Cancel selected' or a 'Cancel all' button.

3. APPLY PATCH
4. Look again and the tables/buttons should be more consistent.
5. The 'Holds with cancellation requests: X' tab should now include a 'Cancel selected (X)' button. Make sure is works.
6. Make sure TransferWhenCancelAllWaitingHolds is set to "Don't transfer" and make sure the hint displays well in the Holds over table.

Signed-off-by: Philip Orr <philip.orr@lmscloud.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/modules/circ/waitingreserves.tt   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 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 ea2954970b..874f44ec4a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -110,7 +110,7 @@
                                     [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %]
                                         [% IF ( reserveloop ) %]
                                             <div id="toolbar" class="btn-toolbar">
-                                                <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button>
+                                                <button class="btn cancel_selected_holds" data-bulk="true"></button>
                                             </div>
                                             [% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %]
                                         [% ELSE %]
@@ -120,22 +120,24 @@
 
                                     [% WRAPPER tab_panel tabname="holdsover" %]
                                         [% IF ( overloop ) %]
-                                            <span id="holdsover-cancel-all">
-                                                <button class="cancel_selected_holds" data-bulk="true"></button>
-                                                <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
-                                                    <input type="hidden" name="cancelall" value="1" />
-                                                    <input type="hidden" name="allbranches" value="[% allbranches | html %]" />
-                                                    <input type="hidden" name="tab" value="holdsover">
-                                                    [% IF TransferWhenCancelAllWaitingHolds %]
-                                                        <input type="submit" class="btn btn-primary" value="Cancel and transfer all" />
-                                                    [% ELSE %]
-                                                        <input type="submit" class="btn btn-primary" value="Cancel all" />
-                                                    [% END %]
-                                                </form>
-                                                [% UNLESS TransferWhenCancelAllWaitingHolds %]
-                                                    Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
-                                                [% END %]
-                                            </span>
+                                            <div id="toolbar" class="btn-toolbar">
+                                                <button class="btn cancel_selected_holds" data-bulk="true"></button>
+                                                <div class="btn-group">
+                                                    <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
+                                                        <input type="hidden" name="cancelall" value="1" />
+                                                        <input type="hidden" name="allbranches" value="[% allbranches | html %]" />
+                                                        <input type="hidden" name="tab" value="holdsover">
+                                                        [% IF TransferWhenCancelAllWaitingHolds %]
+                                                            <input type="submit" class="btn btn-primary" value="Cancel and transfer all" />
+                                                        [% ELSE %]
+                                                            <input type="submit" class="btn btn-primary" value="Cancel all" />
+                                                        [% END %]
+                                                    </form>
+                                                </div>
+                                            </div>
+                                            [% UNLESS TransferWhenCancelAllWaitingHolds %]
+                                                <div class="hint">Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)</div>
+                                            [% END %]
                                             [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %]
                                         [% ELSE %]
                                             <div class="dialog message">No holds found.</div>
@@ -144,6 +146,9 @@
 
                                     [% WRAPPER tab_panel tabname="holdscancelled" %]
                                         [% IF cancel_reqs_count %]
+                                            <div id="toolbar" class="btn-toolbar">
+                                                <button class="btn cancel_selected_holds" data-bulk="true"></button>
+                                            </div>
                                             [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %]
                                         [% ELSE %]
                                             <div class="dialog message">No holds found.</div>
-- 
2.39.2