Attachment 133572 Details for Bug 30577 – Bug 30577: Move item specific pickup locations to the left

[patch] Bug 30577: Move item specific pickup locations to the left

Bug-30577-Move-item-specific-pickup-locations-to-t.patch (text/plain), 10.10 KB, created by Andrew Fuerste-Henry on 2022-04-21 15:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Fuerste-Henry

Created: 2022-04-21 15:00:26 UTC

Size: 10.10 KB

patch

obsolete

>From 05c777ae87fc00736fcab623a339e1a55b9c377a Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Thu, 21 Apr 2022 11:02:54 +0000
>Subject: [PATCH] Bug 30577: Move item specific pickup locations to the left
>
>When placing holds, staff will set the pickup location at the top,
>choose an item, then place the hold.
>It is easy not to notice the item specific locations dropdown.
>
>This patch moves it in line with the other selction areas on the request screen.
>
>To test:
> 1 - Find a record on staff client, place hold
> 2 - Select a patron to load the request screen
> 3 - Note the location dropdown for next available hold
> 4 - Note the item specific locations on the far right
> 5 - Apply patch
> 6 - Reload the page
> 7 - Note the item specific location dropdowns are now moved to the left
> 8 - Place the hold, verify it works with the dropdowns
> 9 - Verify title levelholds still work as expected
>10 - Verify multi-holds still work
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>---
> circ/ysearch.pl                               |  2 +-
> .../prog/en/modules/reserve/request.tt        | 56 +++++++++----------
> 2 files changed, 29 insertions(+), 29 deletions(-)
>
>diff --git a/circ/ysearch.pl b/circ/ysearch.pl
>index 3f2650cbeb..096e630620 100755
>--- a/circ/ysearch.pl
>+++ b/circ/ysearch.pl
>@@ -74,7 +74,7 @@ my $borrowers_rs = Koha::Patrons->search_limited(
>         # Get the first 10 results
>         page     => 1,
>         rows     => 10,
>-        order_by => [ 'surname', 'firstname' ],
>+        order_by => [ 'surname', 'preferred_name', 'firstname' ],
>         prefetch => 'branchcode',
>     },
> );
>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 f0b7fd16f0..1c12176bad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -595,6 +595,7 @@
>                                 <thead>
>                                     <tr>
>                                         <th>Hold</th>
>+                                        <th>Allowed pickup locations</th>
>                                         [% IF Koha.Preference('item-level_itypes') %]
>                                             <th>Item type</th>
>                                         [% END %]
>@@ -610,7 +611,6 @@
>                                             <th>Vol no.</th>
>                                         [% END %]
>                                         <th>Information</th>
>-                                        <th>Allowed pickup locations</th>
>                                     </tr>
>                                 </thead>
>                                 <tbody>
>@@ -668,6 +668,18 @@
>                                                         </span>
>                                                     [% END # /IF force_hold_level %]
>                                                 </td>
>+                                                <td>
>+                                                [% IF (itemloo.pickup_locations_count > 0) %]
>+                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" 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 ) %]
>@@ -757,18 +769,6 @@
>                                                        <span class="nfl">Not for loan ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => itemloo.notforloan ) | html %])</span>
>                                                     [% END %]
>                                                 </td>
>-                                                <td>
>-                                                [% IF (itemloo.pickup_locations_count > 0) %]
>-                                                    <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" 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>
>                                             </tr>
>                                         [% END # / UNLESS itemloo.hide %]
>                                     [% END # /FOREACH itemloo %]
>@@ -788,13 +788,13 @@
>                             <table id="requesttitles">
>                                 <tr>
>                                     <th>&nbsp;</th>
>+                                    <th>Pickup location</th>
>                                     <th>Title</th>
>                                     [% UNLESS Koha.Preference('item-level_itypes') %]
>                                         <th>Item type</th>
>                                     [% END %]
>                                     <th>Priority</th>
>                                     <th>Information</th>
>-                                    <th>Pickup location</th>
>                                 </tr>
>                                 [% FOREACH biblioloo IN biblioloop %]
>                                     [% IF ( biblioloo.warn ) %]
>@@ -807,6 +807,20 @@
>                                                     <input class="multi_hold_item_checkbox" type="checkbox" checked="checked" title="[% biblioloo.biblionumber | html %]"/>
>                                                 </td>
>                                             [% END %]
>+                                        <td>
>+                                            [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
>+                                                <select name="pickup_[% biblioloo.biblionumber | html %]"
>+                                                        class="multi_pickup_select"
>+                                                        data-biblio-id="[% biblioloo.biblionumber | html %]"
>+                                                        data-patron-id="[% patron.borrowernumber | html %]"
>+                                                        data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
>+                                                    <option value=""></option>
>+                                                    [% FOREACH pickup_location IN biblioloo.pickup_locations %]
>+                                                        <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
>+                                                    [% END %]
>+                                                </select>
>+                                            [% END %]
>+                                        </td>
>                                         <td>
>                                             <ul>
>                                                 <li>
>@@ -859,20 +873,6 @@
>                                                 [% END %]
>                                             [% END %]
>                                         </td>
>-                                        <td>
>-                                            [% UNLESS ( biblioloo.none_avail || biblioloo.noitems ) %]
>-                                                <select name="pickup_[% biblioloo.biblionumber | html %]"
>-                                                        class="multi_pickup_select"
>-                                                        data-biblio-id="[% biblioloo.biblionumber | html %]"
>-                                                        data-patron-id="[% patron.borrowernumber | html %]"
>-                                                        data-pickup-locations='[% biblioloo.pickup_locations_codes.json | $raw %]'>
>-                                                    <option value=""></option>
>-                                                    [% FOREACH pickup_location IN biblioloo.pickup_locations %]
>-                                                        <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
>-                                                    [% END %]
>-                                                </select>
>-                                            [% END %]
>-                                        </td>
>                                     </tr>
>                                 [% END # /FOREACH biblioloo %]
>                             </table> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30577: 133539 | 133540 | 133572 | 133573 | 133687 | 133688 | 133896 | 133897 | 135017