Bugzilla – Attachment 18320 Details for
Bug 7710
multiple holds per title
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Signed off patch with small bug fixed
0001-SIGNED-OFF-PATCH-Bug-7710-multiple-holds-per-title.patch (text/plain), 14.42 KB, created by
Maxime Pelletier
on 2013-05-22 19:35:19 UTC
(
hide
)
Description:
Signed off patch with small bug fixed
Filename:
MIME Type:
Creator:
Maxime Pelletier
Created:
2013-05-22 19:35:19 UTC
Size:
14.42 KB
patch
obsolete
>From 562967fa5df191879e97ec687f729a9e4a226b71 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 22 May 2013 14:56:31 -0400 >Subject: [PATCH] [SIGNED-OFF] [PATCH] Bug 7710 - multiple holds per title > >Adds the ability to allow multiple holds >on the same record for the same borrower. > >Adds new system preference MaxHoldsPerRecord, >which controls how many holds one person can >have on items for the same record. > >Test Plan: >1) Apply patch for Bug 9394 >2) Apply this patch >3) Run updatedatabase.pl >4) Attempt to place 2 holds for the same patron on the same record, > you should not be able to ( default is 1 per record ) >5) Set MaxHoldsPerRecord to 3 >6) Attempt to place multiple holds for one patron on one record, > you should be able to place 3 holds for one patron on a given > record. A 4th hold should result in a message stating the > patron has placed the max number of holds allowed on this record. > >Signed-off-by: Maxime Pelletier <maxime.pelletier@libeo.com> >--- > C4/Reserves.pm | 59 ++++++++++++-------- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++ > .../en/modules/admin/preferences/circulation.pref | 7 ++- > .../prog/en/modules/reserve/request.tt | 4 +- > .../opac-tmpl/prog/en/modules/opac-reserve.tt | 6 +- > opac/opac-reserve.pl | 29 ++++++---- > reserve/request.pl | 9 ++- > 8 files changed, 82 insertions(+), 40 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 813b1cc..aa6186d 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -373,36 +373,47 @@ sub GetReservesFromItemnumber { > > =head2 GetReservesFromBorrowernumber > >- $borrowerreserv = GetReservesFromBorrowernumber($borrowernumber,$tatus); >- >-TODO :: Descritpion >+ $borrowerreserv = GetReservesFromBorrowernumber($borrowernumber[,$status][,$biblionumber][,$itemnumber]); > > =cut > > sub GetReservesFromBorrowernumber { >- my ( $borrowernumber, $status ) = @_; >- my $dbh = C4::Context->dbh; >- my $sth; >- if ($status) { >- $sth = $dbh->prepare(" >- SELECT * >- FROM reserves >- WHERE borrowernumber=? >- AND found =? >- ORDER BY reservedate >- "); >- $sth->execute($borrowernumber,$status); >- } else { >- $sth = $dbh->prepare(" >- SELECT * >- FROM reserves >- WHERE borrowernumber=? >- ORDER BY reservedate >- "); >- $sth->execute($borrowernumber); >+ my ( $borrowernumber, $found, $biblionumber, $itemnumber ) = @_; >+ >+ my @params; >+ >+ my $sql = "SELECT * FROM reserves WHERE borrowernumber = ?"; >+ push( @params, $borrowernumber ); >+ >+ if ( $biblionumber ) { >+ $sql .= " AND biblionumber = ? "; >+ push( @params, $biblionumber ); >+ } >+ >+ if ( $itemnumber ) { >+ $sql .= " AND itemnumber = ? "; >+ push( @params, $itemnumber ); >+ } >+ >+ if ( $found ) { >+ $sql .= " AND found = ? "; >+ push( @params, $found ); > } >+ >+ $sql .= " ORDER BY reservedate "; >+ >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare( $sql ); >+ >+ $sth->execute( @params ); >+ > my $data = $sth->fetchall_arrayref({}); >- return @$data; >+ >+ if ( scalar @$data ) { >+ return @$data; >+ } else { >+ return (); >+ } > } > #------------------------------------------------------------------------------------- > =head2 CanBookBeReserved >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 817b9f8..ab524da 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -425,3 +425,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( > INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free'); > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); >+INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('MaxHoldsPerRecord', '1', 'The maximum number of holds allowed per bibliographic record per borrower', NULL, NULL); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index b41e88b..037af4e 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6949,6 +6949,13 @@ if ( CheckVersion($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = "3.13.00.XXX"; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('MaxHoldsPerRecord', '1', 'The maximum number of holds allowed per bibliographic record per borrower', NULL, NULL)"); >+ print "Upgrade to $DBversion done (Add syspref MaxHoldsPerRecord)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 243b8e4..3dd1611 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -404,7 +404,12 @@ Circulation: > - Patrons can only have > - pref: maxreserves > class: integer >- - holds at once. >+ - total holds at a time. >+ - >+ - Patrons can only place >+ - pref: MaxHoldsPerRecord >+ class: integer >+ - holds on a single record at a time. > - > - pref: emailLibrarianWhenHoldIsPlaced > choices: >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 f42bd29..67f5a69 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -55,7 +55,7 @@ function check() { > } > > if (alreadyreserved > "0"){ >- msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n"); >+ msg += (_("This patron has already placed the maximum number of holds for this record.") + "\n\n" + _("Please cancel a previous hold first.") + "\n"); > } > > if (msg == "") return(true); >@@ -208,7 +208,7 @@ function checkMultiHold() { > <li><strong>Too Many Holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li> > [% END %] > [% IF ( alreadyreserved ) %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>has already placed the maximum allowed number of holds</strong> on this record</li> > [% END %] > [% IF ( none_available ) %] > <li> <strong>No copies are available</strong> to be placed on hold</li> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >index 85f1c30..df28839 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >@@ -296,7 +296,11 @@ > [% IF ( bibitemloo.already_patron_possession ) %] > <div class="bibmessage">This title cannot be requested because it's already in your possession.</div> > [% ELSE %] >- <div class="bibmessage">This title cannot be requested.</div> >+ [% IF bibitemloo.max_holds %] >+ <div class="bibmessage">This title cannot be requested. You have already placed the maximum number of requests allowed for this title.</div> >+ [% ELSE %] >+ <div class="bibmessage">This title cannot be requested.</div> >+ [% END %] > [% END %] > [% END %] > [% END %] >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index d0da2c5..5361fa1 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -37,7 +37,8 @@ use C4::Debug; > use Koha::DateUtils; > # use Data::Dumper; > >-my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves"); >+my $maxreserves = C4::Context->preference("maxreserves"); >+my $max_holds_per_record = C4::Context->preference('MaxHoldsPerRecord'); > > my $query = new CGI; > my ( $template, $borrowernumber, $cookie ) = get_template_and_user( >@@ -172,7 +173,7 @@ foreach my $biblioNumber (@biblionumbers) { > if ( $query->param('place_reserve') ) { > my $notes = $query->param('notes'); > my $reserve_cnt = 0; >- if ($MAXIMUM_NUMBER_OF_RESERVES) { >+ if ($maxreserves) { > $reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber ); > } > >@@ -255,8 +256,8 @@ if ( $query->param('place_reserve') ) { > $itemNum = undef; > } > >- if ( $MAXIMUM_NUMBER_OF_RESERVES >- && $reserve_cnt >= $MAXIMUM_NUMBER_OF_RESERVES ) >+ if ( $maxreserves >+ && $reserve_cnt >= $maxreserves ) > { > $canreserve = 0; > } >@@ -317,7 +318,7 @@ if ( CheckBorrowerDebarred($borrowernumber) ) { > > my @reserves = GetReservesFromBorrowernumber( $borrowernumber ); > $template->param( RESERVES => \@reserves ); >-if ( $MAXIMUM_NUMBER_OF_RESERVES && (scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES) ) { >+if ( $maxreserves && (scalar(@reserves) >= $maxreserves) ) { > $template->param( message => 1 ); > $noreserves = 1; > $template->param( too_many_reserves => scalar(@reserves)); >@@ -325,12 +326,10 @@ if ( $MAXIMUM_NUMBER_OF_RESERVES && (scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RES > foreach my $res (@reserves) { > foreach my $biblionumber (@biblionumbers) { > if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) { >-# $template->param( message => 1 ); >-# $noreserves = 1; >-# $template->param( already_reserved => 1 ); >- $biblioDataHash{$biblionumber}->{already_reserved} = 1; >+ $biblioDataHash{$biblionumber}->{holds_count}++; > } > } >+ > } > > unless ($noreserves) { >@@ -372,7 +371,7 @@ foreach my $biblioNum (@biblionumbers) { > $biblioLoopIter{author} = $biblioData->{author}; > $biblioLoopIter{rank} = $biblioData->{rank}; > $biblioLoopIter{reservecount} = $biblioData->{reservecount}; >- $biblioLoopIter{already_reserved} = $biblioData->{already_reserved}; >+ $biblioLoopIter{holds_count} = $biblioData->{holds_count}; > > if (!$itemLevelTypes && $biblioData->{itemtype}) { > $biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description}; >@@ -499,11 +498,14 @@ foreach my $biblioNum (@biblionumbers) { > $policy_holdallowed = 0; > } > >- if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) { >+ if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{holds_count} < $max_holds_per_record )) { > $itemLoopIter->{available} = 1; > $numCopiesAvailable++; > } > >+ # Don't allow multiple item level holds on the same item if borrowers can place multiple holds on one bib >+ $itemLoopIter->{available} = 0 if ( GetReservesFromBorrowernumber( $borrowernumber, undef, undef, $itemNum ) ); >+ > # FIXME: move this to a pm > my $dbh = C4::Context->dbh; > my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W'"); >@@ -530,6 +532,11 @@ foreach my $biblioNum (@biblionumbers) { > if ($biblioLoopIter{already_reserved}) { > $biblioLoopIter{holdable} = undef; > } >+ if ($biblioLoopIter{holds_count} >= $max_holds_per_record) { >+ $biblioLoopIter{holdable} = undef; >+ $anyholdable = undef; >+ $biblioLoopIter{max_holds} = 1; >+ } > if(not CanBookBeReserved($borrowernumber,$biblioNum)){ > $biblioLoopIter{holdable} = undef; > } >diff --git a/reserve/request.pl b/reserve/request.pl >index 703131d..8273fa0 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -209,6 +209,7 @@ if ($borrowerslist) { > > # FIXME launch another time GetMember perhaps until > my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold ); >+my $max_holds_per_record = C4::Context->preference('MaxHoldsPerRecord'); > > my @biblionumbers = (); > my $biblionumbers = $input->param('biblionumbers'); >@@ -254,7 +255,7 @@ foreach my $biblionumber (@biblionumbers) { > } > } > >- if ( $holds_count ) { >+ if ( $holds_count >= $max_holds_per_record ) { > $alreadyreserved = 1; > $warnings = 1; > $biblioloopiter{warn} = 1; >@@ -482,6 +483,12 @@ foreach my $biblionumber (@biblionumbers) { > $itemdata_enumchron = 1; > } > >+ # Don't allow multiple item level holds on the same item if borrowers can place multiple holds on one bib >+ if ( GetReservesFromBorrowernumber( $borrowerinfo->{borrowernumber}, undef, undef, $itemnumber) ) { >+ $item->{available} = 0; >+ $item->{override} = 0; >+ } >+ > push @{ $biblioitem->{itemloop} }, $item; > } > >-- >1.7.10.4 >
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 7710
:
8598
|
8599
|
8600
|
8601
|
8602
|
8603
|
10091
|
10098
|
10099
|
10100
|
10101
|
10102
|
10818
|
10897
|
12620
|
14083
|
14600
|
14602
|
14603
|
15252
|
15253
|
15295
|
15731
|
15732
|
17448
|
18217
|
18320
|
18321
|
19117
|
27429
|
30218
|
35397
|
35518