X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fwaitingreserves.pl;h=0183f19472a93338b83918dade54c6cdd9f3c7e8;hb=07b9125861c2d57f787f3bd3d598dcbd652b030b;hp=9c7705f29caf7f5a4a1cb881c9a6c4c649308798;hpb=e7ee95f75417bdaebb4a591bed797f1486f6e196;p=koha_gimpoz diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 9c7705f29c..0183f19472 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -14,11 +13,12 @@ # 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; use CGI; use C4::Context; use C4::Output; @@ -42,53 +42,38 @@ my $input = new CGI; my $item = $input->param('itemnumber'); my $borrowernumber = $input->param('borrowernumber'); -my $fbr = $input->param('fbr'); -my $tbr = $input->param('tbr'); +my $fbr = $input->param('fbr') || ''; +my $tbr = $input->param('tbr') || ''; +my $all_branches = $input->param('allbranches') || ''; my $cancel; -my $theme = $input->param('theme'); # only used if allowthemeoverride is set - my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "circ/waitingreserves.tmpl", query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { circulate => 1 }, + flagsrequired => { circulate => "circulate_remaining_permissions" }, debug => 1, } ); my $default = C4::Context->userenv->{'branch'}; -my @datearr = localtime( time() ); -my $todaysdate = - ( 1900 + $datearr[5] ) . '-' - . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-' - . sprintf( "%0.2d", $datearr[3] ); - # if we have a return from the form we launch the subroutine CancelReserve if ($item) { - my $messages; - my $nextreservinfo; - my $waiting; - ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber ); - - # if we have a result + my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber ); + # if we have a result if ($nextreservinfo) { my $borrowerinfo = GetMemberDetails( $nextreservinfo ); my $iteminfo = GetBiblioFromItemNumber($item); if ( $messages->{'transfert'} ) { - my $branchname = GetBranchName( $messages->{'transfert'} ); $template->param( messagetransfert => $messages->{'transfert'}, - branchname => $branchname, + branchname => GetBranchName($messages->{'transfert'}), ); } - if ( $messages->{'waiting'} ) { - $waiting = 1; - } $template->param( message => 1, @@ -97,74 +82,81 @@ if ($item) { nextreservfirstname => $borrowerinfo->{'firstname'}, nextreservitem => $item, nextreservtitle => $iteminfo->{'title'}, - waiting => $waiting + waiting => ($messages->{'waiting'}) ? 1 : 0, ); } -# if the document is not in his homebranch location and there is not reservation after, we transfer it - if ( ( $fbr ne $tbr ) and ( not $nextreservinfo ) ) { +# if the document is not in his homebranch location and there is not reservation after, we transfer it + if ($fbr ne $tbr and not $nextreservinfo) { ModItemTransfer( $item, $fbr, $tbr ); } } +if ( C4::Context->preference('IndependantBranches') ) { + undef $all_branches; +} else { + $template->param( all_branches_link => $input->url . '?allbranches=1&' . $input->query_string ) + unless $all_branches; +} -my @reservloop; +my (@reservloop, @overloop); +my ($reservcount, $overcount); +my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch($default); +# get reserves for the branch we are logged into, or for all branches -my @getreserves; -if (C4::Context->preference('IndependantBranches')){ - # get reserves for the branch we are logged into - @getreserves = GetReservesForBranch($default); -} -else { - # get all reserves waiting - @getreserves = GetReservesForBranch(); -} - +my $today = Date_to_Days(&Today); foreach my $num (@getreserves) { + next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00'); my %getreserv; my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} ); # fix up item type for display $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'}; my $getborrower = GetMemberDetails( $num->{'borrowernumber'} ); - my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} ); + my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} ); # using the fixed up itype/itemtype $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} ); - next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00'); - my ( $waiting_year, $waiting_month, $waiting_day ) = split /-/, - $num->{'waitingdate'}; + my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'}); ( $waiting_year, $waiting_month, $waiting_day ) = Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day, C4::Context->preference('ReservesMaxPickUpDelay')); my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day ); - my $today = Date_to_Days(&Today); - my $warning = ( $today > $calcDate ); - if ( $warning > 0 ) { - $getreserv{'messcompa'} = 1; - } - $getreserv{'title'} = $gettitle->{'title'}; - $getreserv{'itemnumber'} = $gettitle->{'itemnumber'}; - $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; - $getreserv{'barcode'} = $gettitle->{'barcode'}; - $getreserv{'itemtype'} = $itemtypeinfo->{'description'}; - $getreserv{'homebranch'} = $gettitle->{'homebranch'}; - $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; + $getreserv{'itemtype'} = $itemtypeinfo->{'description'}; + $getreserv{'title'} = $gettitle->{'title'}; + $getreserv{'itemnumber'} = $gettitle->{'itemnumber'}; + $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; + $getreserv{'barcode'} = $gettitle->{'barcode'}; + $getreserv{'homebranch'} = GetBranchName($gettitle->{'homebranch'}); + $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; + $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) { $getreserv{'dotransfer'} = 1; } - $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; $getreserv{'borrowernum'} = $getborrower->{'borrowernumber'}; $getreserv{'borrowername'} = $getborrower->{'surname'}; $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'}; + $getreserv{'borrowerphone'} = $getborrower->{'phone'}; if ( $getborrower->{'emailaddress'} ) { - $getreserv{'borrowermail'} = $getborrower->{'emailaddress'}; + $getreserv{'borrowermail'} = $getborrower->{'emailaddress'}; + } + + if ($today > $calcDate) { + push @overloop, \%getreserv; + $overcount++; + }else{ + push @reservloop, \%getreserv; + $reservcount++; } - $getreserv{'borrowerphone'} = $getborrower->{'phone'}; - push( @reservloop, \%getreserv ); + } $template->param( reserveloop => \@reservloop, - show_date => format_date($todaysdate), + reservecount => $reservcount, + overloop => \@overloop, + overcount => $overcount, + show_date => format_date(C4::Dates->today('iso')), + dateformat => C4::Context->preference("dateformat"), + ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay') ); output_html_with_http_headers $input, $cookie, $template->output;