Attachment 166037 Details for Bug 30579 – Bug 30579: (follow-up) Add fieldsets and style disabled elements

[patch] Bug 30579: (follow-up) Add fieldsets and style disabled elements

Bug-30579-follow-up-Add-fieldsets-and-style-disabl.patch (text/plain), 55.31 KB, created by Martin Renvoize (ashimema) on 2024-05-02 09:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-05-02 09:39:46 UTC

Size: 55.31 KB

patch

obsolete

>From d51b32abddb8a332ea656b23ff331b6160d27283 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Mon, 28 Aug 2023 14:42:49 +0000
>Subject: [PATCH] Bug 30579: (follow-up) Add fieldsets and style disabled
> elements
>
>This patch surrounds each section with a fieldset which allow enabling/disabling
>all the elements in one go. CSS is added to make it clear which fields are disabled.
>
>Button for item specific is moved form the multi-hold section
>
>Javascript is simplified to use the new fieldsets
>
>To test:
>1 - Repeate test plan on earlier commit
>2 - Additionally, search and select multiple records and place hold
>3 - Confirm multi-hold placing works :-)
>
>Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/reserve/request.tt        | 555 +++++++++---------
> 1 file changed, 277 insertions(+), 278 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 6ac1d36ad36..6fc1542a984 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -95,6 +95,9 @@
>         .icon-set-lowest::before {
>             content: "\f04e";
>         }
>+        :disabled{
>+            opacity:0.5
>+        }
>     </style>
> [% END %]
> </head>
>@@ -569,50 +572,52 @@
>                                     [% END %]
>                                 </legend>
>                                 <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
>-                                <ol>
>+                                <fieldset class="enable_request_any disable_request_group disable_request_specific">
>+                                    <ol>
> 
>-                                    <li>
>-                                        <label for="pickup">Pickup at:</label>
>-                                        <select name="pickup" id="pickup-next-avail"
>-                                                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 %]
>+                                            <label for="pickup">Pickup at:</label>
>+                                            <select name="pickup" id="pickup-next-avail"
>+                                                    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>
>-                                    [% 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>
>+
>+                                        [% 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 class="action">
>-                                [% IF ( patron.borrowernumber ) %]
>-                                    [% IF ( override_required ) %]
>-                                        <button type="submit" id="hold_any_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
>-                                    [% ELSIF ( none_available ) %]
>-                                        <button type="submit" id="hold_any_btn" disabled="disabled" class="btn btn-primary btn-disabled">Place hold</button>
>-                                    [% ELSE %]
>-                                        <button type="submit" id="hold_any_btn" class="btn btn-primary">Place hold</button>
>+                                <fieldset class="action">
>+                                    [% IF ( patron.borrowernumber ) %]
>+                                        [% IF ( override_required ) %]
>+                                            <button type="submit" id="hold_any_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
>+                                        [% ELSIF ( none_available ) %]
>+                                            <button type="submit" id="hold_any_btn" disabled="disabled" class="btn btn-primary btn-disabled">Place hold</button>
>+                                        [% ELSE %]
>+                                            <button type="submit" id="hold_any_btn" class="btn btn-primary">Place hold</button>
>+                                        [% END %]
>                                     [% END %]
>-                                [% END %]
>+                                </fieldset>
>                             </fieldset>
>                         </fieldset>
> 
>@@ -636,6 +641,7 @@
>                                 [% END %]
>                             </legend>
> 
>+                            <fieldset class="enable_request_group disable_request_any disable_request_specific">
>                             [% IF force_hold_level == 'record' # Patron has placed a record level hold previously for this record %]
>                                 <span class="error">
>                                     <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>@@ -701,7 +707,10 @@
>                                     </li>
>                                 </ul>
>                             [% END %]
>-                            <button type="submit" id="hold_grp_btn" class="btn btn-primary warning">Place hold</button>
>+                                <fieldset class="action">
>+                                    <button type="submit" id="hold_grp_btn" class="btn btn-primary warning">Place hold</button>
>+                                </fieldset>
>+                            </fieldset>
>                         </fieldset>
>                         [% END %]
>                         
>@@ -721,241 +730,247 @@
>                                      <input type="radio" id="requestspecificitem" name="request" class="requestspecific"/>
>                                 [% END %]
>                             </legend>
>+                            <fieldset class="enable_request_specific disable_request_any disable_request_group">
>+                                <ol>
>+                                    [% UNLESS Koha.Preference('item-level_itypes') %]
>+                                        <li>
>+                                            <span class="label">Item type:</span>
>+                                            [% biblio.itemtype.translated_description | html %]
>+                                        </li>
>+                                    [% END %]
> 
>-                            <ol>
>-                                [% UNLESS Koha.Preference('item-level_itypes') %]
>-                                    <li>
>-                                        <span class="label">Item type:</span>
>-                                        [% biblio_info.itemtype.translated_description | html %]
>-                                    </li>
>-                                [% END %]
>-
>-                                [% IF ( biblio_info.biblioitem.publicationyear ) %]
>-                                    <li>
>-                                        <span class="label">Publication year:</span>
>-                                        [% biblio_info.biblioitem.publicationyear | html %]
>-                                    </li>
>-                                [% END %]
>-                            </ol>
>+                                    [% IF ( biblio.biblioitem.publicationyear ) %]
>+                                        <li>
>+                                            <span class="label">Publication year:</span>
>+                                            [% biblio.biblioitem.publicationyear | html %]
>+                                        </li>
>+                                    [% END %]
>+                                </ol>
> 
>-                            <table id="requestspecific">
>-                                <thead>
>-                                    <tr>
>-                                        <th>Hold</th>
>-                                        <th>Allowed pickup locations</th>
>-                                        [% IF Koha.Preference('item-level_itypes') %]
>-                                            <th>Item type</th>
>-                                        [% END %]
>-                                        <th>Barcode</th>
>-                                        [% IF Koha.Preference('EnableItemGroupHolds') && biblio_info.object.item_groups.count %]
>-                                            <th>Item group</th>
>-                                        [% END %]
>-                                        <th>Home library</th>
>-                                        <th>Last location</th>
>-                                        [% IF itemdata_ccode %]
>-                                            <th>Collection</th>
>-                                        [% END %]
>-                                        <th>Call number</th>
>-                                        <th>Copy number</th>
>-                                        [% IF itemdata_enumchron %]
>-                                            <th>Vol no.</th>
>-                                        [% END %]
>-                                        <th>Information</th>
>-                                    </tr>
>-                                </thead>
>-                                <tbody>
>-                                    [% SET selected = 0 %]
>-                                    [% FOREACH itemloo IN biblio_info.itemloop %]
>-                                        [% UNLESS ( itemloo.hide ) %]
>-                                            <tr class="[% itemloo.backgroundcolor | html %]">
>-                                                <td>
>-                                                    [% IF force_hold_level == 'record' # Patron has placed a record level hold previously for this record %]
>-                                                        <span class="error">
>-                                                            <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>-                                                            Hold must be record level
>-                                                        </span>
>-                                                    [% ELSIF force_hold_level == 'item_group' %]
>-                                                        <span class="error">
>-                                                            <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>-                                                            Hold must be item group level
>-                                                        </span>
>-                                                    [% ELSIF ( itemloo.available ) %]
>-                                                        <input type="radio" name="checkitem" class="requestspecific" value="[% itemloo.itemnumber | html %]" />
>-                                                    [% ELSIF ( itemloo.override ) %]
>-                                                        <input type="radio" name="checkitem" class="needsoverride requestspecific" value="[% itemloo.itemnumber | html %]" />
>-                                                        <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" title="Requires override of hold policy"/></i>
>-                                                    [% ELSE %]
>-                                                        <span class="error">
>-                                                            <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>-                                                            [% IF itemloo.not_holdable %]
>-                                                                [% IF itemloo.not_holdable == 'damaged' %]
>-                                                                    <span>Item damaged</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'ageRestricted' %]
>-                                                                    <span>Age restricted</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'tooManyHoldsForThisRecord' %]
>-                                                                    <span>Exceeded max holds per record</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'tooManyReservesToday' %]
>-                                                                    <span>Daily hold limit reached for patron</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'tooManyReserves' %]
>-                                                                    <span>Too many holds</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'notReservable' %]
>-                                                                    <span>Not holdable</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'cannotReserveFromOtherBranches' %]
>-                                                                    <span>Patron is from different library</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'branchNotInHoldGroup' %]
>-                                                                    <span>Cannot place hold from patron's library</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'itemAlreadyOnHold' %]
>-                                                                    <span>Patron already has hold for this item</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'cannotBeTransferred' %]
>-                                                                    <span>Cannot be transferred to pickup library</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %]
>-                                                                    <span>Only pickup locations within the same hold group are allowed</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %]
>-                                                                    <span>No holds are allowed on this item</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %]
>-                                                                    <span>Library is not a pickup location</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %]
>-                                                                    <span>No valid pickup location</span>
>-                                                                [% ELSIF itemloo.not_holdable == 'notforloan' %]
>-                                                                    <span>Not for loan</span>
>-                                                                [% ELSE %]
>-                                                                    <span>[% itemloo.not_holdable | html %]</span>
>+                                <table id="requestspecific">
>+                                    <thead>
>+                                        <tr>
>+                                            <th>Hold</th>
>+                                            <th>Allowed pickup locations</th>
>+                                            [% IF Koha.Preference('item-level_itypes') %]
>+                                                <th>Item type</th>
>+                                            [% END %]
>+                                            <th>Barcode</th>
>+                                            [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %]
>+                                                <th>Item group</th>
>+                                            [% END %]
>+                                            <th>Home library</th>
>+                                            <th>Last location</th>
>+                                            [% IF itemdata_ccode %]
>+                                                <th>Collection</th>
>+                                            [% END %]
>+                                            <th>Call number</th>
>+                                            <th>Copy number</th>
>+                                            [% IF itemdata_enumchron %]
>+                                                <th>Vol no.</th>
>+                                            [% END %]
>+                                            <th>Information</th>
>+                                        </tr>
>+                                    </thead>
>+                                    <tbody>
>+                                        [% SET selected = 0 %]
>+                                        [% FOREACH itemloo IN biblio.itemloop %]
>+                                            [% UNLESS ( itemloo.hide ) %]
>+                                                <tr class="[% itemloo.backgroundcolor | html %]">
>+                                                    <td>
>+                                                        [% IF force_hold_level == 'record' # Patron has placed a record level hold previously for this record %]
>+                                                            <span class="error">
>+                                                                <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>+                                                                Hold must be record level
>+                                                            </span>
>+                                                        [% ELSIF force_hold_level == 'item_group' %]
>+                                                            <span class="error">
>+                                                                <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>+                                                                Hold must be item group level
>+                                                            </span>
>+                                                        [% ELSIF ( itemloo.available ) %]
>+                                                            <input type="radio" name="checkitem" class="requestspecific" value="[% itemloo.itemnumber | html %]" />
>+                                                        [% ELSIF ( itemloo.override ) %]
>+                                                            <input type="radio" name="checkitem" class="needsoverride requestspecific" value="[% itemloo.itemnumber | html %]" />
>+                                                            <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" title="Requires override of hold policy"/></i>
>+                                                        [% ELSE %]
>+                                                            <span class="error">
>+                                                                <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i>
>+                                                                [% IF itemloo.not_holdable %]
>+                                                                    [% IF itemloo.not_holdable == 'damaged' %]
>+                                                                        <span>Item damaged</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'ageRestricted' %]
>+                                                                        <span>Age restricted</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'tooManyHoldsForThisRecord' %]
>+                                                                        <span>Exceeded max holds per record</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'tooManyReservesToday' %]
>+                                                                        <span>Daily hold limit reached for patron</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'tooManyReserves' %]
>+                                                                        <span>Too many holds</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'notReservable' %]
>+                                                                        <span>Not holdable</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'cannotReserveFromOtherBranches' %]
>+                                                                        <span>Patron is from different library</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'branchNotInHoldGroup' %]
>+                                                                        <span>Cannot place hold from patron's library</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'itemAlreadyOnHold' %]
>+                                                                        <span>Patron already has hold for this item</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'cannotBeTransferred' %]
>+                                                                        <span>Cannot be transferred to pickup library</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %]
>+                                                                        <span>Only pickup locations within the same hold group are allowed</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %]
>+                                                                        <span>No holds are allowed on this item</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %]
>+                                                                        <span>Library is not a pickup location</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %]
>+                                                                        <span>No valid pickup location</span>
>+                                                                    [% ELSIF itemloo.not_holdable == 'notforloan' %]
>+                                                                        <span>Not for loan</span>
>+                                                                    [% ELSE %]
>+                                                                        <span>[% itemloo.not_holdable | html %]</span>
>+                                                                    [% END %]
>                                                                 [% END %]
>+                                                            </span>
>+                                                        [% END # /IF force_hold_level %]
>+                                                    </td>
>+                                                    <td>
>+                                                    [% IF (itemloo.pickup_locations_count > 0) || Koha.Preference('AllowHoldPolicyOverride') %]
>+                                                        <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations requestspecific" style="width:100%;"
>+                                                                data-item-id="[% itemloo.itemnumber | html %]"
>+                                                                data-patron-id="[% patron.borrowernumber | html %]"
>+                                                                data-pickup-location-source="item">
>+                                                        [% IF (itemloo.default_pickup_location) %]
>+                                                            <option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
>+                                                        [% END %]
>+                                                        </select>
>+                                                    [% END %]
>+                                                    </td>
>+                                                    [% IF Koha.Preference('item-level_itypes') %]
>+                                                        <td>
>+                                                            [% UNLESS ( noItemTypeImages ) %]
>+                                                                [% IF ( itemloo.itemtype.image_location) %]<img src="[% itemloo.itemtype.image_location | html %]" alt="" /> <br /> [% END %]
>                                                             [% END %]
>-                                                        </span>
>-                                                    [% END # /IF force_hold_level %]
>-                                                </td>
>-                                                <td>
>-<<<<<<< HEAD
>-                                                [% IF (itemloo.pickup_locations_count > 0) || Koha.Preference('AllowHoldPolicyOverride') %]
>-                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
>-=======
>-                                                [% IF (itemloo.pickup_locations_count > 0) || itemloo.override %]
>-                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations requestspecific" style="width:100%;"
>->>>>>>> Bug 30579: Disentangle multi-hold and single bib forms
>-                                                            data-item-id="[% itemloo.itemnumber | html %]"
>-                                                            data-patron-id="[% patron.borrowernumber | html %]"
>-                                                            data-pickup-location-source="item">
>-                                                    [% IF (itemloo.default_pickup_location) %]
>-                                                        <option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
>+                                                            <span class="itypetext">[% itemloo.itemtype.translated_description | html %]</span>
>+                                                        </td>
>                                                     [% END %]
>-                                                    </select>
>-                                                [% END %]
>-                                                </td>
>-                                                [% IF Koha.Preference('item-level_itypes') %]
>                                                     <td>
>-                                                        [% UNLESS ( noItemTypeImages ) %]
>-                                                            [% IF ( itemloo.itemtype.image_location) %]<img src="[% itemloo.itemtype.image_location | html %]" alt="" /> <br /> [% END %]
>-                                                        [% END %]
>-                                                        <span class="itypetext">[% itemloo.itemtype.translated_description | html %]</span>
>+                                                        [% itemloo.barcode | html %]
>                                                     </td>
>-                                                [% END %]
>-                                                <td>
>-                                                    [% itemloo.barcode | html %]
>-                                                </td>
>-                                                [% IF Koha.Preference('EnableItemGroupHolds') && biblio_info.object.item_groups.count %]
>+                                                    [% IF Koha.Preference('EnableItemGroupHolds') && biblio.object.item_groups.count %]
>+                                                        <td>
>+                                                            [% itemloo.object.item_group.description | html %]
>+                                                        </td>
>+                                                    [% END %]
>                                                     <td>
>-                                                        [% itemloo.object.item_group.description | html %]
>+                                                        [% Branches.GetName( itemloo.homebranch ) | html %]
>                                                     </td>
>-                                                [% END %]
>-                                                <td>
>-                                                    [% Branches.GetName( itemloo.homebranch ) | html %]
>-                                                </td>
>-                                                <td>
>-                                                    [% Branches.GetName( itemloo.holdingbranch ) | html %]
>-                                                </td>
>-                                                [% IF itemdata_ccode %]
>                                                     <td>
>-                                                        [% IF ( itemloo.ccode ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemloo.ccode ) | html %][% END %]
>+                                                        [% Branches.GetName( itemloo.holdingbranch ) | html %]
>                                                     </td>
>-                                                [% END %]
>-                                                <td>
>-                                                    [% itemloo.itemcallnumber | html %]
>-                                                </td>
>-                                                <td>
>-                                                    [% IF ( itemloo.copynumber ) %][% itemloo.copynumber | html %][% ELSE %]&nbsp;[% END %]
>-                                                </td>
>-                                                [% IF itemdata_enumchron %]
>+                                                    [% IF itemdata_ccode %]
>+                                                        <td>
>+                                                            [% IF ( itemloo.ccode ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemloo.ccode ) | html %][% END %]
>+                                                        </td>
>+                                                    [% END %]
>                                                     <td>
>-                                                        [% itemloo.enumchron | html %]
>+                                                        [% itemloo.itemcallnumber | html %]
>                                                     </td>
>-                                                [% END %]
>-                                                [% IF ( itemloo.onloan ) %]
>-                                                    <td data-order="[% itemloo.date_due | html %]">
>-                                                        <span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
>-                                                [% ELSE %]
>                                                     <td>
>-                                                        [% IF ( itemloo.transfertwhen ) %]
>-                                                            <span>In transit from [% Branches.GetName( itemloo.transfertfrom ) | html %],
>-                                                            to [% Branches.GetName( itemloo.transfertto ) | html %], since [% itemloo.transfertwhen | $KohaDates %]</span>
>-                                                        [% END %]
>-                                                [% END %]
>+                                                        [% IF ( itemloo.copynumber ) %][% itemloo.copynumber | html %][% ELSE %]&nbsp;[% END %]
>+                                                    </td>
>+                                                    [% IF itemdata_enumchron %]
>+                                                        <td>
>+                                                            [% itemloo.enumchron | html %]
>+                                                        </td>
>+                                                    [% END %]
>+                                                    [% IF ( itemloo.onloan ) %]
>+                                                        <td data-order="[% itemloo.date_due | html %]">
>+                                                            <span class="checkedout">Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]</span>
>+                                                    [% ELSE %]
>+                                                        <td>
>+                                                            [% IF ( itemloo.transfertwhen ) %]
>+                                                                <span>In transit from [% Branches.GetName( itemloo.transfertfrom ) | html %],
>+                                                                to [% Branches.GetName( itemloo.transfertto ) | html %], since [% itemloo.transfertwhen | $KohaDates %]</span>
>+                                                            [% END %]
>+                                                    [% END %]
> 
>-                                                    [% IF ( itemloo.reservedate ) %]
>-                                                        [% IF ( itemloo.nocancel ) %]
>-                                                                <span>Can't be cancelled when item is in transit</span>
>-                                                        [% ELSE %]
>-                                                            [% IF ( itemloo.waitingdate ) %]
>-                                                                [% IF ( itemloo.canreservefromotherbranches ) %]
>-                                                                    <span>Waiting for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
>-                                                                [% ELSE %]
>-                                                                    <span>Waiting at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
>-                                                                [% END %]
>+                                                        [% IF ( itemloo.reservedate ) %]
>+                                                            [% IF ( itemloo.nocancel ) %]
>+                                                                    <span>Can't be cancelled when item is in transit</span>
>                                                             [% ELSE %]
>-                                                                [% IF ( itemloo.canreservefromotherbranches ) %]
>-                                                                    [% IF itemloo.reservedate %]
>-                                                                        <span>On hold for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since</span>
>+                                                                [% IF ( itemloo.waitingdate ) %]
>+                                                                    [% IF ( itemloo.canreservefromotherbranches ) %]
>+                                                                        <span>Waiting for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
>                                                                     [% ELSE %]
>-                                                                        <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
>+                                                                        <span>Waiting at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.waitingdate | $KohaDates %]</span>
>                                                                     [% END %]
>-                                                                [% ELSIF itemloo.reservedate %]
>-                                                                    <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.reservedate | $KohaDates %]</span>
>                                                                 [% ELSE %]
>-                                                                    <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
>+                                                                    [% IF ( itemloo.canreservefromotherbranches ) %]
>+                                                                        [% IF itemloo.reservedate %]
>+                                                                            <span>On hold for [% INCLUDE 'patron-title.inc' patron=itemloo.ReservedFor %] expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since</span>
>+                                                                        [% ELSE %]
>+                                                                            <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
>+                                                                        [% END %]
>+                                                                    [% ELSIF itemloo.reservedate %]
>+                                                                        <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] since [% itemloo.reservedate | $KohaDates %]</span>
>+                                                                    [% ELSE %]
>+                                                                        <span>On hold expected at [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %]</span>
>+                                                                    [% END %]
>                                                                 [% END %]
>-                                                            [% END %]
>-                                                        [% END # /IF itemloo.nocancel %]
>-                                                    [% ELSE %]
>-                                                        Not on hold
>-                                                    [% END # /IF itemloo.reservedate %]
>+                                                            [% END # /IF itemloo.nocancel %]
>+                                                        [% ELSE %]
>+                                                            Not on hold
>+                                                        [% END # /IF itemloo.reservedate %]
> 
>-                                                    [% IF itemloo.item_level_holds == "N" %]
>-                                                        <br/>Item level hold not allowed from OPAC
>-                                                    [% ELSIF itemloo.item_level_holds == "F" %]
>-                                                        <br/>Item level hold forced from OPAC
>-                                                    [% END %]
>+                                                        [% IF itemloo.item_level_holds == "N" %]
>+                                                            <br/>Item level hold not allowed from OPAC
>+                                                        [% ELSIF itemloo.item_level_holds == "F" %]
>+                                                            <br/>Item level hold forced from OPAC
>+                                                        [% END %]
> 
>-                                                    [% IF ( itemloo.itemlost ) %]
>-                                                       <span class="lost">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => itemloo.itemlost ) | html %]</span>
>-                                                    [% END %]
>+                                                        [% IF ( itemloo.itemlost ) %]
>+                                                           <span class="lost">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => itemloo.itemlost ) | html %]</span>
>+                                                        [% END %]
> 
>-                                                    [% IF ( itemloo.damaged ) %]
>-                                                        <span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => itemloo.damaged ) | html %]</span>
>-                                                    [% END %]
>+                                                        [% IF ( itemloo.damaged ) %]
>+                                                            <span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => itemloo.damaged ) | html %]</span>
>+                                                        [% END %]
> 
>-                                                    [% IF ( itemloo.withdrawn ) %]
>-                                                       <span class="wdn">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => itemloo.withdrawn ) | html %]</span>
>-                                                    [% END %]
>+                                                        [% IF ( itemloo.withdrawn ) %]
>+                                                           <span class="wdn">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => itemloo.withdrawn ) | html %]</span>
>+                                                        [% END %]
> 
>-                                                    [% IF ( itemloo.notforloan ) %]
>-                                                       <span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
>-                                                    [% ELSIF ( itemloo.notforloanitype ) %]
>-                                                       <span class="nfl">Not for loan (Itemtype not for loan)</span>
>-                                                    [% END %]
>-                                                </td>
>-                                            </tr>
>-                                        [% END # / UNLESS itemloo.hide %]
>-                                    [% END # /FOREACH itemloo %]
>-                                </tbody>
>-                            </table> 
>+                                                        [% IF ( itemloo.notforloan ) %]
>+                                                           <span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
>+                                                        [% ELSIF ( itemloo.notforloanitype ) %]
>+                                                           <span class="nfl">Not for loan (Itemtype not for loan)</span>
>+                                                        [% END %]
>+                                                    </td>
>+                                                </tr>
>+                                            [% END # / UNLESS itemloo.hide %]
>+                                        [% END # /FOREACH itemloo %]
>+                                    </tbody>
>+                                </table> 
> 
>-                            [% IF hiddencount %]
>+                                [% IF hiddencount %]
>                                 <form method="get">
>                                     <p class="hiddencount">
>-                                        <a href="request.pl?biblionumber=[% biblio_info.biblionumber | uri %]&amp;borrowernumber=[% borrowernumber | uri %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
>+                                        <a href="request.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;borrowernumber=[% borrowernumber | uri %]&amp;showallitems=1">Show all items ([% hiddencount | html %] hidden)</a>
>                                     </p>
>                                 </form>
>-                            [% END # /IF hiddencount %]
>+                                [% END # /IF hiddencount %]
>+                                <fieldset class="action">
>+                                    [% IF ( override_required ) %]
>+                                        <button type="submit" id="hold_item_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
>+                                    [% ELSIF ( none_available ) %]
>+                                        <button type="submit" id="hold_item_btn" class="btn btn-primary btn-disabled" disabled="disabled">Place hold</button>
>+                                    [% ELSE %]
>+                                        <button type="submit" id="hold_item_btn" class="btn btn-primary">Place hold</button>
>+                                    [% END %]
>+                                </fieldset> 
>+                            </fieldset>
>+                        </fieldset class="rows">
> 
>                         [% ELSE # /UNLESS multi_hold %]
>                             <fieldset class="rows">
>@@ -1064,32 +1079,22 @@
>                                     [% END # /FOREACH biblioloo %]
>                                 </table> 
>                             </fieldset>
>+                            <fieldset class="action">
>+                                [% IF ( patron AND patron.borrowernumber ) %]
>+                                        [% IF ( override_required ) %]
>+                                            <button type="submit" id="hold_multi_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
>+                                        [% ELSIF ( no_bibs_available ) %]
>+                                            <button type="submit" id="hold_multi_btn" class="btn btn-primary btn-disabled" disabled="disabled">Place holds</button>
>+                                        [% ELSIF ( none_available ) %]
>+                                            <button type="submit" id="hold_multi_btn" class="btn btn-primary">Place holds</button>
>+                                        [% ELSE %]
>+                                            <button type="submit" id="hold_multi_btn" class="btn btn-primary" id="multi_hold_submit">Place holds</button>
>+                                        [% END %]
>+                                [% END # /IF patron %]
>+                            </fieldset> 
> 
>                         [% END # /UNLESS multi_hold %]
> 
>-                        <fieldset class="action">
>-                            [% IF ( patron AND patron.borrowernumber ) %]
>-                                [% IF ( multi_hold ) %]
>-                                    [% IF ( override_required ) %]
>-                                        <button type="submit" id="hold_multi_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
>-                                    [% ELSIF ( no_bibs_available ) %]
>-                                        <button type="submit" id="hold_multi_btn" class="btn btn-primary btn-disabled" disabled="disabled">Place holds</button>
>-                                    [% ELSIF ( none_available ) %]
>-                                        <button type="submit" id="hold_multi_btn" class="btn btn-primary">Place holds</button>
>-                                    [% ELSE %]
>-                                        <button type="submit" id="hold_multi_btn" class="btn btn-primary" id="multi_hold_submit">Place holds</button>
>-                                    [% END %]
>-                                [% ELSE %]
>-                                    [% IF ( override_required ) %]
>-                                        <button type="submit" id="hold_item_btn" class="btn btn-primary warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
>-                                    [% ELSIF ( none_available ) %]
>-                                        <button type="submit" id="hold_item_btn" class="btn btn-primary btn-disabled" disabled="disabled">Place hold</button>
>-                                    [% ELSE %]
>-                                        <button type="submit" id="hold_item_btn" class="btn btn-primary">Place hold</button>
>-                                    [% END %]
>-                                [% END %]
>-                            [% END # /IF patron %]
>-                        </fieldset> 
>                     </fieldset> 
>                 </form> 
>             [% END %]
>@@ -1555,22 +1560,16 @@
> 
>         function ToggleHoldsToPlace() {
>             if ( $("#requestany").prop('checked') ) {
>-                $("#holds_to_place_count, #pickup-next-avail, #itemtype, #hold_any_btn").prop('disabled', false);
>+                $(".disable_request_any").prop('disabled',true);
>+                $(".enable_request_any").prop('disabled',false);
>                 $(".requestspecific,.requestgrp").prop('checked', false);
>-                $(".requestspecific","#requestspecific").prop('disabled',true);
>-                $("#hold_item_btn, #hold_grp_btn, #pickup-item-group").prop("disabled", true );
>-                $("#hold_any_btn").prop("disabled", false );
>             } else if( $(".requestspecific").prop('checked') ) {
>-                $(".requestspecific","#requestspecific").prop('disabled',false);
>-                $("#holds_to_place_count, #pickup-item-group, #pickup-next-avail #itemtype, #hold_any_btn").prop('disabled', true);
>-                $("#hold_item_btn").prop("disabled", false );
>-                $("#hold_any_btn,#hold_grp_btn").prop("disabled", true );
>+                $(".disable_request_specific").prop('disabled',true);
>+                $(".enable_request_specific").prop('disabled',false);
>                 $("#requestany,.requestgrp").prop('checked', false);
>             } else {
>-                $("#holds_to_place_count, #pickup-next-avail, #itemtype, #hold_any_btn").prop('disabled', true);
>-                $("#hold_grp_btn, #pickup-item-group").prop("disabled", false );
>-                $(".requestspecific","#requestspecific").prop('disabled',true);
>-                $("#hold_any_btn,#hold_item_btn").prop("disabled", true );
>+                $(".disable_request_group").prop('disabled',true);
>+                $(".enable_request_group").prop('disabled',false);
>                 $("#requestany,.requestspecific").prop('checked', false);
>             }
>         }
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 30579: 133549 | 133550 | 133574 | 133575 | 133689 | 133690 | 134270 | 134468 | 134469 | 134491 | 134492 | 134493 | 134893 | 134894 | 140951 | 140952 | 140953 | 140954 | 148835 | 148898 | 149271 | 150767 | 150786 | 151483 | 151493 | 151558 | 154881 | 154882 | 154883 | 154886 | 157787 | 157788 | 157789 | 157790 | 157791 | 157792 | 157937 | 157938 | 157939 | 157940 | 157941 | 157942 | 157943 | 163260 | 163261 | 163262 | 163263 | 163264 | 163265 | 163266 | 163267 | 166012 | 166013 | 166014 | 166015 | 166016 | 166017 | 166018 | 166019 | 166034 | 166035 | 166036 | 166037 | 166038 | 166039 | 166040 | 166041 | 166074 | 166075 | 166076 | 166077 | 166078 | 166079 | 166080 | 166081 | 166082 | 166264 | 166265 | 166266 | 166267 | 166268 | 166269 | 166270 | 166271 | 166272 | 166273 | 166274 | 166275