From 15f37aadeff678d56cc6ae9a919738385da0740f Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 21 Apr 2022 12:26:04 +0000
Subject: [PATCH] Bug 30579: Group next available hold options, and disable
 when item is chosen

This patch rearranges options that only apply to next available holds
and disables them when an item is checked. This is intended to make it
more obvious which parts of the form apply to this selection

To test:
1 - Apply patches
2 - Confirm you can successfully place single or multiple items on hold
3 - Confirm that when placing a single hold the next available options are grouped
4 - Confirm pickup location, specific item type, and number of holds all work for next available
5 - Confirm item level holds save pickup location correctly

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Rebecca Coert <rcoert@arlingtonva.us>
---
 .../prog/en/modules/reserve/request.tt        | 94 ++++++++++---------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index cbef1ec10f..c0acbf807b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -465,53 +465,13 @@
                                 <label for="holdnotes">Notes:</label>
                                 <textarea id="holdnotes" name="notes" cols="30" rows="1"></textarea>
                             </li>
-                            <li>
-                                <label for="pickup">Pickup at:</label>
-                                <select name="pickup" id="pickup"
-                                        data-biblio-id="[% biblio.biblionumber | html %]"
-                                        data-patron-id="[% patron.borrowernumber | html %]"
-                                        data-pickup-location-source="biblio">
-                                    [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
-                                </select>
-                            </li>
-                            [% IF Koha.Preference('AllowHoldItemTypeSelection') %]
-                                <li>
-                                    <label for="itemtype">Request specific item type:</label>
-                                    <select name="itemtype" id="itemtype">
-                                        <option value="">Any item type</option>
-                                        [%- FOREACH itemtype IN available_itemtypes %]
-                                            <option value="[% itemtype | html %]">[% ItemTypes.GetDescription( itemtype ) | html %]</option>
-                                        [%- END %]
-                                    </select>
-                                </li>
-                            [% END %]
                             [% IF ( reserve_in_future ) %]
                                 <li>
                                     <label for="from">Hold starts on date:</label>
                                     <input id="reserve_date" name="reserve_date" id="from" size="10" type="text" data-date_to="expiration_date" class="flatpickr" data-flatpickr-futuredate="true" />
                                 </li>
                             [% END %]
-                                <li>
-                                    <label for="requestany">Hold next available item </label>
-                                    [% IF force_hold_level == 'item' %]
-                                        <input type="checkbox" id="requestany" name="request" disabled="true" />
-                                    [% ELSIF force_hold_level == 'record' %]
-                                        <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
-                                        <input type="hidden" name="request" value="Any"/>
-                                    [% ELSE %]
-                                        <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
-                                    [% END %]
-                                    <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
-                                </li>
 
-                                [% IF remaining_holds_for_record > 1 %]
-                                    <li>
-                                        <label for="holds_to_place_count">Holds to place (count)</label>
-                                        <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" />
-                                    </li>
-                                [% ELSE %]
-                                    <input type="hidden" name="holds_to_place_count" value="1" />
-                                [% END %]
 
                             <li>
                                 <label for="to">Hold expires on date:</label>
@@ -522,6 +482,52 @@
                                 <input name="non_priority" id="non_priority" type="checkbox" />
                                 <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span>
                             </li>
+                            <fieldset>
+                                <legend>
+                                    <label for="requestany">
+                                        Hold next available item
+                                        [% IF force_hold_level == 'item' %]
+                                            <input type="checkbox" id="requestany" name="request" disabled="true" />
+                                        [% ELSIF force_hold_level == 'record' %]
+                                            <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
+                                            <input type="hidden" name="request" value="Any"/>
+                                        [% ELSE %]
+                                            <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
+                                        [% END %]
+                                        <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
+                                    </label>
+                                </legend>
+                                <ol>
+                                    <li>
+                                        <label for="pickup">Pickup at:</label>
+                                        <select name="pickup" id="pickup"
+                                                data-biblio-id="[% biblio.biblionumber | html %]"
+                                                data-patron-id="[% patron.borrowernumber | html %]"
+                                                data-pickup-location-source="biblio">
+                                            [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
+                                        </select>
+                                    </li>
+                                    [% IF Koha.Preference('AllowHoldItemTypeSelection') %]
+                                        <li>
+                                            <label for="itemtype">Request specific item type:</label>
+                                            <select name="itemtype" id="itemtype">
+                                                <option value="">Any item type</option>
+                                                [%- FOREACH itemtype IN available_itemtypes %]
+                                                    <option value="[% itemtype | html %]">[% ItemTypes.GetDescription( itemtype ) | html %]</option>
+                                                [%- END %]
+                                            </select>
+                                        </li>
+                                    [% END %]
+                                    [% IF remaining_holds_for_record > 1 %]
+                                        <li>
+                                            <label for="holds_to_place_count">Holds to place (count)</label>
+                                            <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" />
+                                        </li>
+                                    [% ELSE %]
+                                        <input type="hidden" name="holds_to_place_count" value="1" />
+                                    [% END %]
+                                </ol>
+                            </fieldset>
                         </ol>
                         <fieldset class="action">
                             [% IF ( patron.borrowernumber ) %]
@@ -1246,9 +1252,9 @@
             });
             function ToggleHoldsToPlace() {
                 if ( $("#requestany").prop('checked') ) {
-                    $("#holds_to_place_count").prop('disabled', false);
+                    $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', false);
                 } else {
-                    $("#holds_to_place_count").prop('disabled', true);
+                    $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', true);
                 }
             }
             ToggleHoldsToPlace();
@@ -1488,10 +1494,10 @@
                 });
                 if(onechecked == 1){
                     $("#requestany").prop("checked", false);
-                    $("#holds_to_place_count").prop('disabled', true);
+                    $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', true);
                 } else {
                     $("#requestany").prop("checked",true);
-                    $("#holds_to_place_count").prop('disabled', false);
+                    $("#holds_to_place_count,#pickup,#itemtype").prop('disabled', false);
                 }
             });
             var prev_rank_request;
-- 
2.30.2