From 662ef346cc95ceb5b84295ae455f886cff98c1c1 Mon Sep 17 00:00:00 2001 From: Nicolas Legrand Date: Mon, 13 Jan 2020 17:56:41 +0100 Subject: [PATCH] Bug 24412: Attach waiting reserve to desk When an item is checked in and marked 'Waiting' or already 'Waiting' and there is a desk attached to the session, the item is marked waiting at the current desk of the current library. The information is displayed on the OPAC and on the intranet. The patron can then know at which desk he can retrieve his document. Desk Management (Bug 13881) is now useful. Test plan : 1. apply Bug 13881 and then Bug 24201 2. $KOHA_PATH/installer/data/mysql/updatedatabase.pl 3. Check out some document to someone 4. make another one reserve this document 5. check in the document 6. you can see the document is attach to the current library 7. create some desks and attach one to your session (see Bug 13881 and Bug 24201) 8. cancel the preceding reserve and redo steps 3 to 5 9. you should see the document is waiting at the current library and current desk on: a. the intranet document request page b. the intranet borrower holds tab c. the item list where the document is listed on the bibliographic details d. the borrower's OPAC holds tab. --- C4/Reserves.pm | 6 +++--- Koha/Hold.pm | 19 ++++++++++++++++++- Koha/Template/Plugin/Desks.pm | 4 ++-- circ/returns.pl | 5 +++-- .../intranet-tmpl/prog/en/includes/holds_table.inc | 3 ++- .../intranet-tmpl/prog/en/includes/waiting_holds.inc | 3 ++- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 ++- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/holds.js | 8 +++++++- .../opac-tmpl/bootstrap/en/includes/holds-table.inc | 3 ++- reserve/request.pl | 1 + svc/holds | 1 + 12 files changed, 45 insertions(+), 15 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 8e6dca8..f59d7e7 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -1075,7 +1075,7 @@ sub ModReserveStatus { =head2 ModReserveAffect - &ModReserveAffect($itemnumber,$borrowernumber,$diffBranchSend,$reserve_id); + &ModReserveAffect($itemnumber,$borrowernumber,$diffBranchSend,$reserve_id, $desk); This function affect an item and a status for a given reserve, either fetched directly by record_id, or by borrowernumber and itemnumber or biblionumber. If only biblionumber @@ -1089,7 +1089,7 @@ take care of the waiting status =cut sub ModReserveAffect { - my ( $itemnumber, $borrowernumber, $transferToDo, $reserve_id ) = @_; + my ( $itemnumber, $borrowernumber, $transferToDo, $reserve_id, $desk_id ) = @_; my $dbh = C4::Context->dbh; # we want to attach $itemnumber to $borrowernumber, find the biblionumber @@ -1114,7 +1114,7 @@ sub ModReserveAffect { my $already_on_shelf = $hold->found && $hold->found eq 'W'; $hold->itemnumber($itemnumber); - $hold->set_waiting($transferToDo); + $hold->set_waiting($transferToDo, $desk_id); _koha_notify_reserve( $hold->reserve_id ) if ( !$transferToDo && !$already_on_shelf ); diff --git a/Koha/Hold.pm b/Koha/Hold.pm index e2308db..a4392ae 100644 --- a/Koha/Hold.pm +++ b/Koha/Hold.pm @@ -156,7 +156,7 @@ sub delete { =cut sub set_waiting { - my ( $self, $transferToDo ) = @_; + my ( $self, $transferToDo, $desk_id ) = @_; $self->priority(0); @@ -169,8 +169,11 @@ sub set_waiting { my $values = { found => 'W', waitingdate => $today->ymd, + desk_id => $desk_id, }; + if (defined $desk_id) { $values->{'desk_id'} = $desk_id }; + my $requested_expiration; if ($self->expirationdate) { $requested_expiration = dt_from_string($self->expirationdate); @@ -310,6 +313,20 @@ sub branch { return $self->{_branch}; } +=head3 desk + +Returns the related Koha::Library object for this Hold + +=cut + +sub desk { + my ($self) = @_; + + $self->{_desk} ||= Koha::Desks->find( $self->desk_id() ); + + return $self->{_desk}; +} + =head3 borrower Returns the related Koha::Patron object for this Hold diff --git a/Koha/Template/Plugin/Desks.pm b/Koha/Template/Plugin/Desks.pm index 99fe232..e9a2585 100644 --- a/Koha/Template/Plugin/Desks.pm +++ b/Koha/Template/Plugin/Desks.pm @@ -47,8 +47,8 @@ return desk name or empty string sub GetName { my ( $self, $desk_id ) = @_; - my $d = Koha::Desks->search( { desk_id => $desk_id} )->unblessed; - return @$d ? $d->{'desk_name'} : q{}; + my $d = Koha::Desks->find( $desk_id ); + return (defined $d) ? $d->unblessed->{'desk_name'} : q{}; } =head3 GetLoggedInDeskId diff --git a/circ/returns.pl b/circ/returns.pl index a9e2bc2..29781df 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -75,6 +75,7 @@ if ($session->param('branch') eq 'NO_LIBRARY_SET'){ print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); exit; } +my $desk_id = C4::Context->userenv->{"desk_id"} || ''; # Print a reserve slip on this page if ( $query->param('print_slip') ) { @@ -166,7 +167,7 @@ if ( $query->param('reserve_id') ) { my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef; # diffBranchSend tells ModReserveAffect whether document is expected in this library or not, # i.e., whether to apply waiting status - ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id ); + ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id, $desk_id ); } # check if we have other reserves for this document, if we have a return send the message of transfer my ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber); @@ -423,7 +424,7 @@ if ( $messages->{'ResFound'}) { my $biblio = $item->biblio; my $diffBranchSend = !$branchCheck ? $reserve->{branchcode} : undef; - ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id} ); + ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id}, $desk_id ); my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber}); my $patron = Koha::Patrons->find( $nextreservinfo ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index bb3cf7c..ee89d95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE Desks %] [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] @@ -119,7 +120,7 @@ [% IF ( hold.found ) %] [% IF ( hold.atdestination ) %] [% IF ( hold.found ) %] - Item waiting at [% hold.wbrname | html %] since [% hold.waiting_date | $KohaDates %] + Item waiting at [% hold.wbrname | html %][% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %] [% ELSE %] Waiting to be pulled [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 3ec275f..31cc245 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -1,4 +1,5 @@ [% USE ItemTypes %] +[% USE Desks %] [% USE AuthorisedValues %]
@@ -38,7 +39,7 @@ [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 05a6cb5..4478cd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -4,6 +4,7 @@ [% USE KohaDates %] [% USE AuthorisedValues %] [% USE Branches %] +[% USE Desks %] [% USE Biblio %] [% USE ColumnsSettings %] [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %] @@ -380,7 +381,7 @@ Note that permanent location is a code, and location may be an authval. [% SET hold = item.first_hold %] [% IF hold %] [% IF hold.waitingdate %] - Waiting at [% Branches.GetName( hold.branchcode ) | html %] since [% hold.waitingdate | $KohaDates %]. + Waiting at [% Branches.GetName( hold.branchcode ) | html %][% IF ( hold.desk_id ) %], [% Desks.GetName ( hold.desk_id ) | html %][% END %] since [% hold.waitingdate | $KohaDates %]. [% ELSIF hold.priority == 1 %] Item-level hold (placed [% hold.reservedate | $KohaDates %]) for delivery at [% Branches.GetName( hold.branchcode ) | html %]. [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 2981888..9c9d8d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE KohaDates %] [% USE Branches %] +[% USE Desks %] [% USE Koha %] [% USE Borrowers %] [% USE ItemTypes %] @@ -468,8 +469,7 @@
[% Branches.GetName( reserveloo.item.homebranch ) | html %][% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% IF (reserveloo.desk_id ) %], [% Desks.GetName (reserveloo.desk_id) | html %][% END %] [% AuthorisedValues.GetByCode('LOC', reserveloo.item.location) | html %] [% reserveloo.item.itemcallnumber | html %] [% reserveloo.item.copynumber | html %]