X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-reserve.pl;h=6d5d46fd93a6c8dd936556211ab42b743180e69b;hb=6310c992bf23d164f013ead7c0b2182226279454;hp=b720842e44e2d1a7cf7fa274b1b3ffcc6867e897;hpb=b67e1304f6833fb1b2637a1fd78be124dff7649f;p=koha_fer diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index b720842e44..6d5d46fd93 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -1,5 +1,8 @@ #!/usr/bin/perl +# Copyright Katipo Communications 2002 +# Copyright Koha Development team 2012 +# # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the @@ -11,9 +14,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; use warnings; @@ -31,6 +34,7 @@ use C4::Members; use C4::Branch; # GetBranches use C4::Overdues; use C4::Debug; +use Koha::DateUtils; # use Data::Dumper; my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves"); @@ -46,8 +50,14 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( debug => 1, } ); -my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0; -sub get_out ($$$) { + +my ($show_holds_count, $show_priority); +for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { + m/holds/o and $show_holds_count = 1; + m/priority/ and $show_priority = 1; +} + +sub get_out { output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output; exit; } @@ -98,8 +108,7 @@ my $branch = $query->param('branch') || $borr->{'branchcode'} || C4::Context->us $template->param( branch => $branch ); # make branch selection options... -my $CGIbranchloop = GetBranchesLoop($branch); -$template->param( CGIbranch => $CGIbranchloop ); +my $branchloop = GetBranchesLoop($branch); # Is the person allowed to choose their branch my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0; @@ -112,12 +121,8 @@ $template->param( choose_branch => $OPACChooseBranch); # # -# Hash of biblionumber to biblio/biblioitems record. -my %biblioDataHash; - -# Hash of itemnumber to item info. -my %itemInfoHash; - +my %biblioDataHash; # Hash of biblionumber to biblio/biblioitems record. +my %itemInfoHash; # Hash of itemnumber to item info. foreach my $biblioNumber (@biblionumbers) { my $biblioData = GetBiblioData($biblioNumber); @@ -127,16 +132,14 @@ foreach my $biblioNumber (@biblionumbers) { my $marcrecord= GetMarcBiblio($biblioNumber); - # flag indicating existence of at least one item linked via a host record - my $hostitemsflag; - # adding items linked via host biblios - my @hostitemInfos = GetHostItemsInfo($marcrecord); - if (@hostitemInfos){ - $hostitemsflag =1; - push (@itemInfos,@hostitemInfos); - } - - + # flag indicating existence of at least one item linked via a host record + my $hostitemsflag; + # adding items linked via host biblios + my @hostitemInfos = GetHostItemsInfo($marcrecord); + if (@hostitemInfos){ + $hostitemsflag =1; + push (@itemInfos,@hostitemInfos); + } $biblioData->{itemInfos} = \@itemInfos; foreach my $itemInfo (@itemInfos) { @@ -144,16 +147,19 @@ foreach my $biblioNumber (@biblionumbers) { } # Compute the priority rank. - my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1); - $biblioData->{reservecount} = $rank; - foreach my $res (@$reserves) { - my $found = $res->{'found'}; - if ( $found && ($found eq 'W') ) { + my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblioNumber, all_dates => 1 }); + my $rank = scalar( @$reserves ); + $biblioData->{reservecount} = 1; # new reserve + foreach my $res (@{$reserves}) { + my $found = $res->{found}; + if ( $found && $found eq 'W' ) { $rank--; } + else { + $biblioData->{reservecount}++; + } } - $rank++; - $biblioData->{rank} = $rank; + $biblioData->{rank} = $rank + 1; } # @@ -164,8 +170,10 @@ foreach my $biblioNumber (@biblionumbers) { # # if ( $query->param('place_reserve') ) { - my $notes = $query->param('notes'); - my $canreserve=0; + my $reserve_cnt = 0; + if ($MAXIMUM_NUMBER_OF_RESERVES) { + $reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber ); + } # List is composed of alternating biblio/item/branch my $selectedItems = $query->param('selecteditems'); @@ -196,55 +204,75 @@ if ( $query->param('place_reserve') ) { while (@selectedItems) { my $biblioNum = shift(@selectedItems); my $itemNum = shift(@selectedItems); - my $branch = shift(@selectedItems); # i.e., branch code, not name + my $branch = shift(@selectedItems); # i.e., branch code, not name + + my $canreserve = 0; my $singleBranchMode = C4::Context->preference("singleBranchMode"); - if ($singleBranchMode || ! $OPACChooseBranch) { # single branch mode or disabled user choosing + if ( $singleBranchMode || !$OPACChooseBranch ) + { # single branch mode or disabled user choosing $branch = $borr->{'branchcode'}; } - #item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber - if ($itemNum ne '') { - my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum); - if ($hostbiblioNum ne $biblioNum) { - $biblioNum = $hostbiblioNum; - } - } +#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber + if ( $itemNum ne '' ) { + my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum); + if ( $hostbiblioNum ne $biblioNum ) { + $biblioNum = $hostbiblioNum; + } + } my $biblioData = $biblioDataHash{$biblioNum}; my $found; - # Check for user supplied reserve date - my $startdate; - if ( - C4::Context->preference( 'AllowHoldDateInFuture' ) && - C4::Context->preference( 'OPACAllowHoldDateInFuture' ) - ) { - $startdate = $query->param("reserve_date_$biblioNum"); - } - - my $expiration_date = $query->param("expiration_date_$biblioNum"); + # Check for user supplied reserve date + my $startdate; + if ( C4::Context->preference('AllowHoldDateInFuture') + && C4::Context->preference('OPACAllowHoldDateInFuture') ) + { + $startdate = $query->param("reserve_date_$biblioNum"); + } + + my $expiration_date = $query->param("expiration_date_$biblioNum"); - # If a specific item was selected and the pickup branch is the same as the - # holdingbranch, force the value $rank and $found. + # If a specific item was selected and the pickup branch is the same as the + # holdingbranch, force the value $rank and $found. my $rank = $biblioData->{rank}; - if ($itemNum ne ''){ - $canreserve = 1 if CanItemBeReserved($borrowernumber,$itemNum); + if ( $itemNum ne '' ) { + $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum ); $rank = '0' unless C4::Context->preference('ReservesNeedReturns'); my $item = GetItem($itemNum); - if ( $item->{'holdingbranch'} eq $branch ){ - $found = 'W' unless C4::Context->preference('ReservesNeedReturns'); + if ( $item->{'holdingbranch'} eq $branch ) { + $found = 'W' + unless C4::Context->preference('ReservesNeedReturns'); } } else { - $canreserve = 1 if CanBookBeReserved($borrowernumber,$biblioNum); + $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum ); + # Inserts a null into the 'itemnumber' field of 'reserves' table. $itemNum = undef; } + my $notes = $query->param('notes_'.$biblioNum)||''; + + if ( $MAXIMUM_NUMBER_OF_RESERVES + && $reserve_cnt >= $MAXIMUM_NUMBER_OF_RESERVES ) + { + $canreserve = 0; + } # Here we actually do the reserveration. Stage 3. - AddReserve($branch, $borrowernumber, $biblioNum, 'a', [$biblioNum], $rank, $startdate, $expiration_date, $notes, - $biblioData->{'title'}, $itemNum, $found) if ($canreserve); + if ($canreserve) { + AddReserve( + $branch, $borrowernumber, + $biblioNum, 'a', + [$biblioNum], $rank, + $startdate, $expiration_date, + $notes, $biblioData->{title}, + $itemNum, $found + ); + ++$reserve_cnt; + } } print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds"); @@ -265,21 +293,21 @@ if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstan $noreserves = 1; $template->param( too_much_oweing => $amount ); } -if ( $borr->{gonenoaddress} && ($borr->{gonenoaddress} eq 1) ) { +if ( $borr->{gonenoaddress} && ($borr->{gonenoaddress} == 1) ) { $noreserves = 1; $template->param( message => 1, GNA => 1 ); } -if ( $borr->{lost} && ($borr->{lost} eq 1) ) { +if ( $borr->{lost} && ($borr->{lost} == 1) ) { $noreserves = 1; $template->param( message => 1, lost => 1 ); } -if ( CheckBorrowerDebarred($borrowernumber) ) { +if ( $borr->{'debarred'} ) { $noreserves = 1; $template->param( message => 1, @@ -321,7 +349,7 @@ my $notforloan_label_of = get_notforloan_label_of(); my $biblioLoop = []; my $numBibsAvailable = 0; my $itemdata_enumchron = 0; -my $anyholdable; +my $anyholdable = 0; my $itemLevelTypes = C4::Context->preference('item-level_itypes'); $template->param('item_level_itypes' => $itemLevelTypes); @@ -329,7 +357,7 @@ foreach my $biblioNum (@biblionumbers) { my $record = GetMarcBiblio($biblioNum); # Init the bib item with the choices for branch pickup - my %biblioLoopIter = ( branchChoicesLoop => $CGIbranchloop ); + my %biblioLoopIter = ( branchloop => $branchloop ); # Get relevant biblio data. my $biblioData = $biblioDataHash{$biblioNum}; @@ -345,6 +373,7 @@ foreach my $biblioNum (@biblionumbers) { $biblioLoopIter{rank} = $biblioData->{rank}; $biblioLoopIter{reservecount} = $biblioData->{reservecount}; $biblioLoopIter{already_reserved} = $biblioData->{already_reserved}; + $biblioLoopIter{mandatorynotes}=0; #FIXME: For future use if (!$itemLevelTypes && $biblioData->{itemtype}) { $biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description}; @@ -397,18 +426,18 @@ foreach my $biblioNum (@biblionumbers) { # change the background color. my $issues= GetItemIssue($itemNum); if ( $issues->{'date_due'} ) { - $itemLoopIter->{dateDue} = format_date($issues->{'date_due'}); + $itemLoopIter->{dateDue} = format_sqlduedatetime($issues->{date_due}); $itemLoopIter->{backgroundcolor} = 'onloan'; } # checking reserve - my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemNum); + my ($reservedate,$reservedfor,$expectedAt,undef,$wait) = GetReservesFromItemnumber($itemNum); my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0); - # the item could be reserved for this borrower vi a host record, flag this - if ($reservedfor eq $borrowernumber){ - $itemLoopIter->{already_reserved} = 1; - } + # the item could be reserved for this borrower vi a host record, flag this + if ($reservedfor eq $borrowernumber){ + $itemLoopIter->{already_reserved} = 1; + } if ( defined $reservedate ) { $itemLoopIter->{backgroundcolor} = 'reserved'; @@ -417,6 +446,8 @@ foreach my $biblioNum (@biblionumbers) { $itemLoopIter->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; $itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; $itemLoopIter->{ExpectedAtLibrary} = $expectedAt; + #waiting status + $itemLoopIter->{waitingdate} = $wait; } $itemLoopIter->{notforloan} = $itemInfo->{notforloan}; @@ -461,7 +492,7 @@ foreach my $biblioNum (@biblionumbers) { # If there is no loan, return and transfer, we show a checkbox. $itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0; - my $branch = C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr); + my $branch = GetReservesControlBranch( $itemInfo, $borr ); my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} ); my $policy_holdallowed = 1; @@ -476,14 +507,7 @@ foreach my $biblioNum (@biblionumbers) { $numCopiesAvailable++; } - # 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'"); - $sth2->execute($itemLoopIter->{ReservedForBorrowernumber}, $itemNum); - while (my $wait_hashref = $sth2->fetchrow_hashref) { - $itemLoopIter->{waitingdate} = format_date($wait_hashref->{waitingdate}); - } - $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} ); + $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} ); # Show serial enumeration when needed if ($itemLoopIter->{enumchron}) { @@ -498,36 +522,44 @@ foreach my $biblioNum (@biblionumbers) { $numBibsAvailable++; $biblioLoopIter{bib_available} = 1; $biblioLoopIter{holdable} = 1; - $anyholdable = 1; } if ($biblioLoopIter{already_reserved}) { $biblioLoopIter{holdable} = undef; - $anyholdable = undef; } if(not CanBookBeReserved($borrowernumber,$biblioNum)){ $biblioLoopIter{holdable} = undef; - $anyholdable = undef; } + if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) { + $biblioLoopIter{holdable} = undef; + $biblioLoopIter{already_patron_possession} = 1; + } + + if( $biblioLoopIter{holdable} ){ $anyholdable++; } push @$biblioLoop, \%biblioLoopIter; } -if ( $numBibsAvailable == 0 || !$anyholdable) { +if ( $numBibsAvailable == 0 || $anyholdable == 0) { $template->param( none_available => 1 ); } -my $itemTableColspan = 7; +my $itemTableColspan = 9; if (! $template->{VARS}->{'OPACItemHolds'}) { $itemTableColspan--; } if (! $template->{VARS}->{'singleBranchMode'}) { $itemTableColspan--; } +$itemTableColspan-- if !$show_holds_count && !$show_priority; +my $show_notes=C4::Context->preference('OpacHoldNotes'); +$template->param(OpacHoldNotes=>$show_notes); +$itemTableColspan-- if !$show_notes; $template->param(itemtable_colspan => $itemTableColspan); # display infos $template->param(bibitemloop => $biblioLoop); -$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority; +$template->param( showholds=>$show_holds_count); +$template->param( showpriority=>$show_priority); # can set reserve date in future if ( C4::Context->preference( 'AllowHoldDateInFuture' ) && @@ -538,7 +570,5 @@ if ( ); } -$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); - output_html_with_http_headers $query, $cookie, $template->output;