Attachment 91279 Details for Bug 22284 – Bug 22284: (follow-up) Filter pickup on specific item click

[patch] Bug 22284: (follow-up) Filter pickup on specific item click

Bug-22284-follow-up-Filter-pickup-on-specific-item.patch (text/plain), 4.07 KB, created by Josef Moravec on 2019-07-04 05:29:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-07-04 05:29:19 UTC

Size: 4.07 KB

patch

obsolete

>From da678ed2e8accc6656adcdeff23d5157ee7f1ddf Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Wed, 12 Jun 2019 00:06:27 -0300
>Subject: [PATCH] Bug 22284: (follow-up) Filter pickup on specific item click
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> .../prog/en/modules/reserve/request.tt             |  5 +++--
> koha-tmpl/intranet-tmpl/prog/js/request.js         | 23 ++++++++++++++++++++++
> reserve/request.pl                                 |  2 ++
> 3 files changed, 28 insertions(+), 2 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/js/request.js
>
>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 f319eec271..9d85da339b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -333,9 +333,9 @@
>                         Hold must be record level
>                     </span>
>                 [% ELSIF ( itemloo.available ) %]
>-                    <input type="radio" name="checkitem" value="[% itemloo.itemnumber | html %]" />
>+                    <input type="radio" name="checkitem" data-pickup-locations="[% itemloo.pickup_locations_code | html %]" value="[% itemloo.itemnumber | html %]" />
>                 [% ELSIF ( itemloo.override ) %]
>-                    <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber | html %]" />
>+                    <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber | html %]" data-pickup-locations="[% itemloo.pickup_locations_code | html %]" />
>                     <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" title="Requires override of hold policy"/></i>
>                 [% ELSE %]
>                     <span class="error">
>@@ -699,6 +699,7 @@
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>     [% Asset.js("js/circ-patron-search-results.js") | $raw %]
>+    [% Asset.js("js/request.js") | $raw %]
>     <script>
>         var biblionumber = "[% biblionumber | $raw %]";
>         var borrowernumber = "[% patron.borrowernumber | $raw %]";
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/request.js b/koha-tmpl/intranet-tmpl/prog/js/request.js
>new file mode 100644
>index 0000000000..9c45e7ec50
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/js/request.js
>@@ -0,0 +1,23 @@
>+$(document).ready(function() {
>+    $('input[name="checkitem"]').click(function() {
>+        var pl = $(this).data('pickup-locations');
>+        var select = $('select[name="pickup"]');
>+        var options = $('option', select);
>+        if(pl == 'all') {
>+            options.removeClass('hide');
>+        } else {
>+            pl = pl.split(',');
>+            options.each(function() {
>+                var value = $(this).val();
>+                if($.inArray(value, pl) == -1) {
>+                    $(this).addClass('hide');
>+                    if(select.val() == value) {
>+                        select.val(pl[0]);
>+                    }
>+                } else {
>+                    $(this).removeClass('hide');
>+                }
>+            });
>+        }
>+    });
>+});
>diff --git a/reserve/request.pl b/reserve/request.pl
>index 068c7adfe4..8641ecc9e4 100755
>--- a/reserve/request.pl
>+++ b/reserve/request.pl
>@@ -505,8 +505,10 @@ foreach my $biblionumber (@biblionumbers) {
>                     $num_available++;
>                     if($branchitemrule->{'hold_fulfillment_policy'} eq 'any' ) {
>                         $item->{pickup_locations} = 'Any library';
>+                        $item->{pickup_locations_code} = 'all';
>                     } else {
>                         $item->{pickup_locations} = join (', ', map { $_->{branchname} } Koha::Items->find($itemnumber)->pickup_locations({ patron => $patron }));
>+                        $item->{pickup_locations_code} = join (',', map { $_->{branchcode} } Koha::Items->find($itemnumber)->pickup_locations({ patron => $patron }));
>                     }
> 
>                     push( @available_itemtypes, $item->{itype} );
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22284: 88138 | 88139 | 88140 | 88141 | 88142 | 88143 | 88144 | 88145 | 88369 | 88561 | 88793 | 88794 | 88795 | 88796 | 88797 | 88798 | 88799 | 88800 | 88801 | 88802 | 88939 | 88940 | 88941 | 88942 | 88943 | 88944 | 88945 | 88946 | 88947 | 88948 | 88949 | 88955 | 88956 | 88957 | 88958 | 88959 | 88960 | 88961 | 88962 | 88963 | 88964 | 88965 | 89060 | 89061 | 89062 | 89063 | 89064 | 89065 | 89066 | 89067 | 89068 | 89069 | 89070 | 89071 | 89072 | 89073 | 89074 | 89075 | 89076 | 89077 | 89078 | 89079 | 89080 | 89081 | 89082 | 89083 | 89084 | 89085 | 89122 | 89123 | 89124 | 89125 | 89126 | 89127 | 89128 | 89129 | 89130 | 89131 | 89132 | 89133 | 89134 | 89135 | 89523 | 89836 | 89837 | 89838 | 89839 | 89840 | 89841 | 89842 | 89843 | 89844 | 89845 | 89846 | 89847 | 89848 | 89849 | 90133 | 90134 | 90197 | 90198 | 90199 | 90200 | 90201 | 90469 | 90525 | 91261 | 91262 | 91263 | 91264 | 91265 | 91266 | 91267 | 91268 | 91269 | 91270 | 91271 | 91272 | 91273 | 91274 | 91275 | 91276 | 91277 | 91278 | 91279 | 91280 | 91282 | 91701 | 91702 | 91703 | 91704 | 91705 | 91706 | 91707 | 91708 | 91709 | 91710 | 91711 | 91712 | 91713 | 91714 | 91715 | 91716 | 91717 | 91718 | 91719 | 91720 | 91721 | 91750 | 91751 | 91752 | 91753 | 91754 | 91755 | 91756 | 91757 | 91758 | 92554 | 92555 | 92556 | 92557 | 92558 | 92559 | 92560 | 92561 | 92562 | 92563 | 92564 | 92565 | 92566 | 92567 | 92568 | 92569 | 92570 | 92571 | 92572 | 92573 | 92574 | 92752 | 92753 | 92754 | 92755 | 92756 | 92757 | 92758 | 92759 | 92760 | 92761 | 92762 | 92763 | 92764 | 92849 | 92850 | 92851 | 92852 | 92853 | 92854 | 92855 | 92856 | 92857 | 92858 | 92859 | 92860 | 92861 | 94483 | 94484 | 94485 | 94486 | 94487 | 94488 | 94489 | 94490 | 94491 | 94492 | 94493 | 94494 | 94495 | 96437 | 96438 | 96439 | 96440 | 96441 | 96442 | 96443 | 96444 | 96445 | 96446 | 96447 | 96448 | 96449 | 96450 | 96544 | 96545 | 96546 | 96547 | 96548 | 96549 | 96550 | 96551 | 96552 | 96553 | 96554 | 96555 | 96556 | 96557 | 96558 | 115202