Bugzilla – Attachment 138596 Details for
Bug 15516
Allow to place a hold on first available item from a group of titles
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15516: Add ability to create and view hold groups from OPAC
Bug-15516-Add-ability-to-create-and-view-hold-grou.patch (text/plain), 8.09 KB, created by
Aleisha Amohia
on 2022-08-04 04:48:02 UTC
(
hide
)
Description:
Bug 15516: Add ability to create and view hold groups from OPAC
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2022-08-04 04:48:02 UTC
Size:
8.09 KB
patch
obsolete
>From 4efa874d2a7e2bd08d594f811414d59f51e8c72c Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Fri, 18 Jun 2021 07:32:25 +0000 >Subject: [PATCH] Bug 15516: Add ability to create and view hold groups from > OPAC > >This patch adds a "Treat as hold group" to opac-reserve.pl, >which lets OPAC users create a hold group which can include >1+ bibs and either bib-level holds, or item-level holds, or both. > >This patch shows the item-level and bib-level holds in a hold group >for the user's holds in the OPAC. This includes both the opac-user.pl >page and the self-checkout hold display. > >Signed-off-by: Michal Denar <black23@gmail.com> >--- > .../opac-tmpl/bootstrap/en/includes/holds-table.inc | 16 ++++++++++++++++ > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 10 ++++++++++ > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 ++- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/js/holds.js | 5 +++++ > opac/opac-reserve.pl | 9 +++++++++ > opac/opac-user.pl | 1 + > 7 files changed, 44 insertions(+), 2 deletions(-) > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/holds.js > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc >index 70b6901034..cf81668d1b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc >@@ -59,6 +59,22 @@ > [% IF HOLD.item_level_hold %] > <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p> > [% END %] >+ [% IF HOLD.hold_group_id %] >+ <div class="group_hold"> >+ <span class="hint">(part of a hold group)</span> >+ <div class="group_hold_list" style="display:none"> >+ [% group_holds = HOLD.hold_group.holds %] >+ [% IF ( group_holds.count ) %] >+ <span class="hint">Containing the following:</span> >+ <ul> >+ [% FOREACH hg_member IN group_holds %] >+ <li>[% INCLUDE 'biblio-title.inc' biblio=hg_member.biblio link=>1 %]</li> >+ [% END %] >+ </ul> >+ [% END %] >+ </div> >+ </div> >+ [% END %] > </td> > <td class="reservedate" data-order="[% HOLD.reservedate | html %]"> > <span class="tdlabel">Hold date:</span> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index e16095740e..9a12be1170 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -159,6 +159,16 @@ > > <form action="/cgi-bin/koha/opac-reserve.pl" method="post" id="hold-request-form"> > <legend class="sr-only">Hold requests</legend> >+ <div id="hold_group"> >+ <fieldset class="rows"> >+ <ul> >+ <li> >+ <label for="add_to_hold_group_control">Treat as hold group (next available item fulfills all holds):</label> >+ <input type="checkbox" id="add_to_hold_group_control" name="add_to_hold_group" value="add_to_hold_group"/> >+ </li> >+ </ul> >+ </fieldset> >+ </div> > <input type="hidden" name="place_reserve" value="1"/> > <!-- These values are set dynamically by js --> > <input type="hidden" name="biblionumbers" id="biblionumbers"/> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 11275fab5f..8e55022b79 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -242,7 +242,7 @@ > > [% IF ( RESERVES.count ) %] > <li class="nav-item" role="presentation"> >- <a class="nav-link" id="opac-user-holds-tab" data-toggle="tab" role="tab" aria-controls="opac-user-holds" aria-selected="false" href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a> >+ <a class="nav-link" id="opac-user-holds-tab" data-toggle="tab" role="tab" aria-controls="opac-user-holds" aria-selected="false" href="#opac-user-holds">Holds ([% reserves_count | html %])</a> > </li> > [% END %] > [% IF Koha.Preference('UseRecalls') && RECALLS.count %] >@@ -1393,4 +1393,5 @@ > }); > </script> > [% END %] >+ [% Asset.js("js/holds.js") | $raw %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 7feec7e2fc..6eefa057a0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -535,6 +535,6 @@ > }); > > </script> >- >+ [% Asset.js("js/holds.js") | $raw %] > [% IF ( Koha.Preference('SCOUserJS') ) %]<script>[% Koha.Preference('SCOUserJS') | $raw %]</script>[% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/holds.js b/koha-tmpl/opac-tmpl/bootstrap/js/holds.js >new file mode 100644 >index 0000000000..734c544adf >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/holds.js >@@ -0,0 +1,5 @@ >+$(document).ready(function(){ >+ $("div.group_hold").click(function(){ >+ $(this).find("div.group_hold_list").toggle(); >+ }); >+}); >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 68f8026873..6e6bfdff6b 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -191,6 +191,7 @@ foreach my $biblioNumber (@biblionumbers) { > # > # > if ( $query->param('place_reserve') ) { >+ my $add_to_hold_group = $query->param('add_to_hold_group'); > my $reserve_cnt = 0; > if ($maxreserves) { > $reserve_cnt = $patron->holds->count_holds; >@@ -224,6 +225,7 @@ if ( $query->param('place_reserve') ) { > } > > my $failed_holds = 0; >+ my $hold_group; > while (@selectedItems) { > my $biblioNum = shift(@selectedItems); > my $itemNum = shift(@selectedItems); >@@ -308,6 +310,12 @@ if ( $query->param('place_reserve') ) { > > # Here we actually do the reserveration. Stage 3. > if ($canreserve) { >+ if ($add_to_hold_group){ >+ #NOTE: We wait to create a hold group until we know that we can actually place a hold/reserve >+ if ( ! $hold_group ){ >+ $hold_group = Koha::HoldGroup->new->store; >+ } >+ } > my $reserve_id = AddReserve( > { > branchcode => $branch, >@@ -321,6 +329,7 @@ if ( $query->param('place_reserve') ) { > itemnumber => $itemNum, > found => $found, > itemtype => $itemtype, >+ hold_group_id => $hold_group ? $hold_group->id : undef, > } > ); > $failed_holds++ unless $reserve_id; >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index ba45ddd237..555f700d6a 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -330,6 +330,7 @@ my $reserves = $patron->holds->filter_out_has_cancellation_requests; > > $template->param( > RESERVES => $reserves, >+ reserves_count => $reserves->count_holds, > showpriority => $show_priority, > ); > >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15516
:
46392
|
47498
|
47570
|
47961
|
47962
|
47963
|
48097
|
48098
|
48448
|
48449
|
50094
|
50095
|
50096
|
53742
|
53743
|
53744
|
53770
|
53771
|
53772
|
53774
|
53775
|
53776
|
54977
|
55300
|
55304
|
55305
|
55306
|
55307
|
55308
|
55768
|
55769
|
55770
|
55771
|
55772
|
58799
|
58800
|
58801
|
58802
|
58803
|
59314
|
59315
|
59316
|
59317
|
59318
|
69902
|
69903
|
69904
|
69905
|
69906
|
72485
|
72486
|
72487
|
72488
|
72489
|
72491
|
79077
|
79078
|
79080
|
79081
|
79082
|
79083
|
79213
|
79214
|
79215
|
79216
|
79217
|
79218
|
79219
|
79220
|
79221
|
79222
|
81453
|
81454
|
81455
|
81456
|
81457
|
81458
|
81459
|
81460
|
81461
|
81462
|
81463
|
84554
|
84555
|
84556
|
84557
|
84558
|
84559
|
84560
|
84561
|
84562
|
84563
|
84564
|
87828
|
87829
|
87830
|
87831
|
87832
|
87833
|
87834
|
87835
|
87836
|
87837
|
87838
|
88038
|
88039
|
88125
|
88173
|
88174
|
88175
|
88176
|
88177
|
88178
|
88179
|
88180
|
88181
|
88182
|
88183
|
88184
|
88185
|
88186
|
90289
|
90290
|
90291
|
90292
|
90293
|
90294
|
90295
|
90296
|
90297
|
90298
|
90299
|
90300
|
90301
|
90302
|
90303
|
90829
|
90830
|
90831
|
90832
|
90833
|
90834
|
90835
|
90836
|
90837
|
90838
|
90839
|
90840
|
90841
|
90842
|
90843
|
90844
|
92783
|
92784
|
92785
|
92786
|
92787
|
92788
|
92789
|
92790
|
92791
|
92792
|
92793
|
92794
|
92795
|
92796
|
92797
|
92798
|
114513
|
114514
|
114515
|
114516
|
114517
|
114518
|
114585
|
114586
|
114603
|
114624
|
114625
|
114626
|
114627
|
114628
|
114629
|
114630
|
114631
|
114632
|
114633
|
114634
|
114635
|
114636
|
114637
|
114638
|
114639
|
114640
|
114641
|
114642
|
114643
|
114644
|
114645
|
114647
|
114648
|
114649
|
114650
|
114651
|
114652
|
114653
|
114654
|
114655
|
114656
|
114657
|
114658
|
114659
|
117423
|
117424
|
117425
|
117426
|
118281
|
118282
|
118283
|
118284
|
118285
|
118286
|
118350
|
118351
|
118352
|
118353
|
118354
|
118355
|
120368
|
120369
|
120370
|
120371
|
120372
|
120373
|
120574
|
120643
|
120644
|
120645
|
120646
|
120647
|
120648
|
120649
|
120650
|
120651
|
121523
|
121623
|
122097
|
122102
|
122627
|
128189
|
128190
|
128191
|
128192
|
128193
|
128194
|
128195
|
128196
|
128197
|
128198
|
128199
|
128200
|
128201
|
128202
|
128255
|
128256
|
128257
|
128258
|
128259
|
128260
|
128261
|
128262
|
128263
|
128264
|
128265
|
128266
|
128267
|
128268
|
128269
|
128285
|
128286
|
128287
|
128288
|
128289
|
128290
|
128291
|
128292
|
128293
|
128294
|
128295
|
128296
|
128297
|
128298
|
128299
|
138576
|
138577
|
138578
|
138579
|
138580
|
138581
|
138582
|
138583
|
138584
|
138585
|
138586
|
138587
|
138588
|
138589
|
138593
|
138594
|
138595
|
138596
|
138597
|
138738
|
138739
|
138740
|
138741
|
138742
|
138772
|
138868
|
138869
|
162076
|
162077
|
162078
|
162079
|
162080
|
162081
|
162082
|
162083
|
162084