X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=049233063efa4777820869fed69a005509cf05c3;hb=eedb94442ee85c048fb15414941ee7c092cc36c8;hp=6b3ec94dcb6ad6b5cfcd63cd5dacb22454aadb40;hpb=a171035f1d13d83e518a89750ee959278d918356;p=koha_fer diff --git a/circ/circulation.pl b/circ/circulation.pl index 6b3ec94dcb..049233063e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -26,14 +26,16 @@ use strict; use CGI; use C4::Output; use C4::Print; -use C4::Auth; -use C4::Date; +use C4::Auth qw/:DEFAULT get_session/; +use C4::Dates qw/format_date/; use C4::Branch; # GetBranches use C4::Koha; # GetPrinter use C4::Circulation; use C4::Members; use C4::Biblio; use C4::Reserves; +use C4::Context; +use CGI::Session; use Date::Calc qw( Today @@ -49,6 +51,31 @@ use Date::Calc qw( # my $query = new CGI; +# new op dev the branch and the printer are now defined by the userenv +# but first we have to check if someone has tried to change them + +my $branch = $query->param('branch'); +if ($branch){ + # update our session so the userenv is updated + my $dbh=C4::Context->dbh; + my $sessionID = $query->cookie("CGISESSID") ; + my $session = get_session($sessionID); + $session->param('branch',$branch); + my $branchname = GetBranchName($branch); + $session->param('branchname',$branchname); +} + +my $printer = $query->param('printer'); +if ($printer){ + # update our session so the userenv is updated + my $dbh=C4::Context->dbh; + my $sessionID = $query->cookie("CGISESSID") ; + my $session = get_session($sessionID); + $session->param('branchprinter',$printer); + +} + + my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( { template_name => 'circ/circulation.tmpl', @@ -61,16 +88,19 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( my $branches = GetBranches(); my $printers = GetPrinters(); -my $printer = GetPrinter($query, $printers); + +my @failedrenews = $query->param('failedrenew'); +my @renew_failed; +for (@failedrenews) { $renew_failed[$_] = 1; } my $findborrower = $query->param('findborrower'); $findborrower =~ s|,| |g; #$findborrower =~ s|'| |g; my $borrowernumber = $query->param('borrowernumber'); -# new op dev the branch and the printer are now defined by the userenv -my $branch = C4::Context->userenv->{'branch'}; -my $printer = C4::Context->userenv->{'branchprinter'}; +$branch = C4::Context->userenv->{'branch'}; +$printer = C4::Context->userenv->{'branchprinter'}; + # If Autolocated is not activated, we show the Circulation Parameters to chage settings of librarian if (C4::Context->preference("AutoLocation") ne 1) @@ -81,14 +111,20 @@ my $printer = C4::Context->userenv->{'branchprinter'}; } my $barcode = $query->param('barcode') || ''; + +# strip whitespace +$barcode =~ s/\s*//g; + my $year = $query->param('year'); my $month = $query->param('month'); my $day = $query->param('day'); my $stickyduedate = $query->param('stickyduedate'); +my $duedatespec = $query->param('duedatespec'); my $issueconfirmed = $query->param('issueconfirmed'); my $cancelreserve = $query->param('cancelreserve'); my $organisation = $query->param('organisations'); my $print = $query->param('print'); +my $newexpiry = $query->param('dateexpiry'); #set up cookie..... # my $branchcookie; @@ -99,8 +135,19 @@ my $print = $query->param('print'); # } # +my ($datedue,$invalidduedate); +if ($duedatespec) { + $datedue = C4::Dates->new($duedatespec); + $invalidduedate=1 unless $datedue; +} + +#if (defined($year)) { +# $duedatespec = "$year-$month-$day"; +#} else { +# ($year, $month, $day) = ($duedatespec) ? split /-/, $duedatespec : (0,0,0); +#} -my @datearr = localtime( time() ); +my @datearr = localtime(); # FIXME - Could just use POSIX::strftime("%Y%m%d", localtime); my $todaysdate = @@ -113,12 +160,7 @@ if ( $barcode eq '' && $print eq 'maybe' ) { $print = 'yes'; } -my $inprocess = $query->param('inprocess'); -if ( $barcode eq '' ) { - $inprocess = ''; -} -else { -} +my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess'); if ( $barcode eq '' && $query->param('charges') eq 'yes' ) { $template->param( @@ -160,7 +202,6 @@ if ($findborrower) { # get the borrower information..... my $borrower; my @lines; - if ($borrowernumber) { $borrower = GetMemberDetails( $borrowernumber, 0 ); my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber ); @@ -169,30 +210,34 @@ if ($borrowernumber) { my ( $today_year, $today_month, $today_day ) = Today(); my ( $warning_year, $warning_month, $warning_day ) = split /-/, $borrower->{'dateexpiry'}; - + my ( $enrol_year, $enrol_month, $enrol_day ) = split /-/, + $borrower->{'dateenrolled'}; # Renew day is calculated by adding the enrolment period to today my ( $renew_year, $renew_month, $renew_day ) = - Add_Delta_YM( $today_year, $today_month, $today_day, - $borrower->{'enrolmentperiod'}, 0 ); - # if the expiry date is before today - if ( Date_to_Days( $today_year, $today_month, $today_day ) > - Date_to_Days( $warning_year, $warning_month, $warning_day ) ) + Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day, + 0 , $borrower->{'enrolmentperiod'}) if ($enrol_year*$enrol_month*$enrol_day>0); + # if the expiry date is before today ie they have expired + if ( $warning_year*$warning_month*$warning_day==0 + || Date_to_Days( $today_year, $today_month, $today_day ) + > Date_to_Days( $warning_year, $warning_month, $warning_day ) ) { - - #borrowercard expired or nearly expired, warn the librarian + #borrowercard expired, no issues $template->param( - flagged => "1", - warndeparture => "1", - renewaldate => "$renew_year-$renew_month-$renew_day" + flagged => "1", + noissues => "1", + expired => format_date($borrower->{dateexpiry}), + renewaldate => format_date("$renew_year-$renew_month-$renew_day") ); } # check for NotifyBorrowerDeparture - if (C4::Context->preference('NotifyBorrowerDeparture') && - Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) < - Date_to_Days( $today_year, $today_month, $today_day ) ) - { - $template->param("warndeparture" => 1); - } + elsif ( C4::Context->preference('NotifyBorrowerDeparture') && + Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) < + Date_to_Days( $today_year, $today_month, $today_day ) ) + { + # borrower card soon to expire warn librarian + $template->param("warndeparture" => format_date($borrower->{dateexpiry}), + flagged => "1",); + } $template->param( overduecount => $od, issuecount => $issue, @@ -206,20 +251,19 @@ if ($borrowernumber) { # if ($barcode) { - $barcode = cuecatbarcodedecode($barcode); - my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day ); - if ($issueconfirmed) { + # $barcode = cuecatbarcodedecode($barcode); + + if ($issueconfirmed) { AddIssue( $borrower, $barcode, $datedue, $cancelreserve ); $inprocess = 1; } else { my ( $error, $question ) = - CanBookBeIssued( $borrower, $barcode, $year, $month, $day, - $inprocess ); + CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess ); my $noerror = 1; my $noquestion = 1; # Get the item title for more information - my $getmessageiteminfo = GetBiblioFromItemNumber( undef, $barcode ); + my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode); foreach my $impossible ( keys %$error ) { $template->param( @@ -237,9 +281,8 @@ if ($barcode) { $noquestion = 0; } $template->param( - day => $day, - month => $month, - year => $year + itemhomebranch => $getmessageiteminfo->{'homebranch'} , + duedatespec => $duedatespec, ); if ( $noerror && ( $noquestion || $issueconfirmed ) ) { AddIssue( $borrower, $barcode, $datedue ); @@ -266,7 +309,7 @@ if ($borrowernumber) { # new op dev # now we show the status of the borrower's reservations - my @borrowerreserv = GetReservesFromBorrowernumber$borrowernumber ); + my @borrowerreserv = GetReservesFromBorrowernumber($borrowernumber ); my @reservloop; my @WaitingReserveLoop; @@ -274,7 +317,7 @@ if ($borrowernumber) { my %getreserv; my %getWaitingReserveInfo; my $getiteminfo = GetBiblioFromItemNumber( $num_res->{'itemnumber'} ); - my $itemtypeinfo = getitemtypeinfo( $getiteminfo->{'itemtype'} ); + my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itype')) ? $getiteminfo->{'itype'} : $getiteminfo->{'itemtype'} ); my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers( $num_res->{'itemnumber'} ); @@ -283,12 +326,12 @@ if ($borrowernumber) { $getreserv{nottransfered} = 0; $getreserv{reservedate} = format_date( $num_res->{'reservedate'} ); - $getreserv{biblionumber} = $getiteminfo->{'biblionumber'}; $getreserv{title} = $getiteminfo->{'title'}; $getreserv{itemtype} = $itemtypeinfo->{'description'}; $getreserv{author} = $getiteminfo->{'author'}; $getreserv{barcodereserv} = $getiteminfo->{'barcode'}; $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'}; + $getreserv{biblionumber} = $getiteminfo->{'biblionumber'}; # check if we have a waiting status for reservations if ( $num_res->{'found'} eq 'W' ) { @@ -296,6 +339,7 @@ if ($borrowernumber) { $getreserv{waiting} = 1; # genarate information displaying only waiting reserves $getWaitingReserveInfo{title} = $getiteminfo->{'title'}; + $getWaitingReserveInfo{biblionumber} = $getiteminfo->{'biblionumber'}; $getWaitingReserveInfo{itemtype} = $itemtypeinfo->{'description'}; $getWaitingReserveInfo{author} = $getiteminfo->{'author'}; $getWaitingReserveInfo{reservedate} = format_date( $num_res->{'reservedate'} ); @@ -322,8 +366,8 @@ if ($borrowernumber) { # if we don't have a reserv on item, we put the biblio infos and the waiting position if ( $getiteminfo->{'title'} eq '' ) { - my $getbibinfo = GetBiblioItemData( $num_res->{'biblionumber'} ); - my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} ); + my $getbibinfo = GetBiblioData( $num_res->{'biblionumber'} ); + my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} ); # fixme - we should have item-level reserves here ? $getreserv{color} = 'inwait'; $getreserv{title} = $getbibinfo->{'title'}; $getreserv{waitingposition} = $num_res->{'priority'}; @@ -331,7 +375,7 @@ if ($borrowernumber) { $getreserv{itemtype} = $getbibtype->{'description'}; $getreserv{author} = $getbibinfo->{'author'}; $getreserv{itemcallnumber} = '----------'; - + $getreserv{biblionumber} = $num_res->{'biblionumber'}; } push( @reservloop, \%getreserv ); @@ -353,8 +397,8 @@ if ($borrowernumber) { # make the issued books table. my $todaysissues = ''; my $previssues = ''; -my @realtodayissues; -my @realprevissues; +my @todaysissues; +my @previousissues; my $allowborrow; ## ADDED BY JF: new itemtype issuingrules counter stuff my $issued_itemtypes_loop; @@ -362,152 +406,63 @@ my $issued_itemtypes_count; my $issued_itemtypes_allowed_count; # hashref with total allowed by itemtype my $issued_itemtypes_remaining; # hashref with remaining my $issued_itemtypes_flags; #hashref that stores flags +my @issued_itemtypes_count_loop; if ($borrower) { # get each issue of the borrower & separate them in todayissues & previous issues - my @todaysissues; - my @previousissues; my ($countissues,$issueslist) = GetPendingIssues($borrower->{'borrowernumber'}); # split in 2 arrays for today & previous - my $dbh = C4::Context->dbh; foreach my $it ( @$issueslist ) { - my $issuedate = $it->{'timestamp'}; + my $issuedate = $it->{'issuedate'}; $issuedate =~ s/-//g; $issuedate = substr( $issuedate, 0, 8 ); - - # to let perl sort this correctly - $it->{'timestamp'} =~ s/(-|\:| )//g; + ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges( + $it->{'itemnumber'}, $borrower->{'borrowernumber'} + ); + $it->{'charge'} = sprintf("%.2f", $it->{'charge'}); + ($it->{'can_renew'}, $it->{'can_renew_error'}) = CanBookBeRenewed( + $borrower->{'borrowernumber'},$it->{'itemnumber'} + ); + my ($restype, $reserves) = CheckReserves($it->{'itemnumber'}); + ($restype) and $it->{'can_renew'} = 0; + + $it->{'dd'} = format_date($it->{'date_due'}); + my $datedue = $it->{'date_due'}; + $datedue =~ s/-//g; + $it->{'od'} = ($datedue < $todaysdate) ? 1 : 0 ; + ($it->{'author'} eq '') and $it->{'author'} = ' '; + $it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}]; + # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY + $issued_itemtypes_count->{ $it->{'itemtype'} }++; if ( $todaysdate == $issuedate ) { - ( - $it->{'charge'}, - $it->{'itemtype_charge'} - ) - = GetIssuingCharges( - $it->{'itemnumber'}, - $borrower->{'borrowernumber'} - ); - $it->{'charge'} = - sprintf( "%.2f", $it->{'charge'} ); - ( - $it->{'can_renew'}, - $it->{'can_renew_error'} - ) - = CanBookBeRenewed( - $borrower->{'borrowernumber'}, - $it->{'itemnumber'} - ); - my ( $restype, $reserves ) = - CheckReserves( $it->{'itemnumber'} ); - if ($restype) { - $it->{'can_renew'} = 0; - } push @todaysissues, $it; - } - else { - ( - $it->{'charge'}, - $it->{'itemtype_charge'} - ) - = GetIssuingCharges( - $it->{'itemnumber'}, - $borrower->{'borrowernumber'} - ); - $it->{'charge'} = - sprintf( "%.2f", $it->{'charge'} ); - ( - $it->{'can_renew'}, - $it->{'can_renew_error'} - ) - = CanBookBeRenewed( - $borrower->{'borrowernumber'}, - $it->{'itemnumber'} - ); - my ( $restype, $reserves ) = - CheckReserves( $it->{'itemnumber'} ); - if ($restype) { - $it->{'can_renew'} = 0; - } + } else { push @previousissues, $it; } } - my $od; # overdues - my $i = 0; - my $togglecolor; - - # parses today & build Template array - foreach my $book ( sort { $b->{'timestamp'} <=> $a->{'timestamp'} } - @todaysissues ) - { - #warn "TIMESTAMP".$book->{'timestamp'}; - # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY - $issued_itemtypes_count->{ $book->{'itemtype'} }++; - - my $dd = $book->{'date_due'}; - my $datedue = $book->{'date_due'}; - - #$dd=format_date($dd); - $datedue =~ s/-//g; - if ( $datedue < $todaysdate ) { - $od = 1; - } - else { - $od = 0; - } - if ( $i % 2 ) { - $togglecolor = 0; - } - else { - $togglecolor = 1; - } - $book->{'togglecolor'} = $togglecolor; - $book->{'od'} = format_date($od); - $book->{'dd'} = format_date($dd); - if ( $book->{'author'} eq '' ) { - $book->{'author'} = ' '; - } - push @realtodayissues, $book; - $i++; + if (C4::Context->preference("todaysIssuesDefaultSortOrder") eq 'asc'){ + @todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues; + } + else { + @todaysissues = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues; + } + if (C4::Context->preference("previousIssuesDefaultSortOrder") eq 'asc'){ + @previousissues = sort { $a->{'date_due' } cmp $b->{'date_due' } } @previousissues; + } + else { + @previousissues = sort { $b->{'date_due' } cmp $a->{'date_due' } } @previousissues; + } + my $i = 1; + foreach my $book (@todaysissues) { + $book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ; + warn $book->{'timestamp'}; } - - # parses previous & build Template array - $i = 0; - foreach my $book ( sort { $a->{'date_due'} cmp $b->{'date_due'} } - @previousissues ) - { - - # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY - $issued_itemtypes_count->{ $book->{'itemtype'} }++; - - my $dd = format_date($book->{'date_due'}); - my $datedue = format_date($book->{'date_due'}); - - #$dd=format_date($dd); - my $pcolor = ''; - my $od = ''; - $datedue =~ s/-//g; - if ( $datedue < $todaysdate ) { - $od = 1; - } - else { - $od = 0; - } - if ( $i % 2 ) { - $togglecolor = 0; - } - else { - $togglecolor = 1; - } - $book->{'togglecolor'} = $togglecolor; - $book->{'dd'} = $dd; - $book->{'od'} = $od; - if ( $book->{'author'} eq '' ) { - $book->{'author'} = ' '; - } - push @realprevissues, $book; - $i++; + $i = 1; + foreach my $book (@previousissues) { + $book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ; } } @@ -523,12 +478,13 @@ FROM issuingrules LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype) WHERE categorycode=? " ); -my @issued_itemtypes_count; +#my @issued_itemtypes_count; # huh? $issueqty_sth->execute("*"); + while ( my $data = $issueqty_sth->fetchrow_hashref() ) { # subtract how many of each this borrower has - $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} }; + $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} }; $data->{'left'} = ( $data->{'maxissueqty'} - $issued_itemtypes_count->{ $data->{'description'} } ); @@ -540,10 +496,10 @@ while ( my $data = $issueqty_sth->fetchrow_hashref() ) { || ( $data->{'itemtype'} eq "*" ) || ( $data->{'itemtype'} eq "CIRC" ) ) { - push @issued_itemtypes_count, $data; + push @issued_itemtypes_count_loop, $data; } } -$issued_itemtypes_loop = \@issued_itemtypes_count; +$issued_itemtypes_loop = \@issued_itemtypes_count_loop; #### / JF @@ -553,9 +509,9 @@ my $CGIselectborrower; if ($borrowerslist) { foreach ( sort { - $a->{'surname'} - . $a->{'firstname'} cmp $b->{'surname'} - . $b->{'firstname'} + lc $a->{'surname'} + . lc $a->{'firstname'} cmp lc $b->{'surname'} + . lc $b->{'firstname'} } @$borrowerslist ) { @@ -565,6 +521,8 @@ if ($borrowerslist) { } $CGIselectborrower = CGI::scrolling_list( -name => 'borrowernumber', + -class => 'focus', + -id => 'borrowernumber', -values => \@values, -labels => \%labels, -size => 7, @@ -677,6 +635,10 @@ if ( C4::Context->preference("memberofinstitution") ) { $amountold = $temp[1]; +my $borrowercategory = GetBorrowercategory( $borrower->{'categorycode'} ); +my $category_type = $borrowercategory->{'category_type'}; +( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); + $template->param( issued_itemtypes_count_loop => $issued_itemtypes_loop, findborrower => $findborrower, @@ -687,36 +649,36 @@ $template->param( printername => $printer, firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, + dateexpiry => format_date($newexpiry), expiry => $borrower->{'dateexpiry'}, #format_date($borrower->{'dateexpiry'}), categorycode => $borrower->{'categorycode'}, - streetaddress => $borrower->{'address'}, - emailaddress => $borrower->{'emailaddress'}, + address => $borrower->{'address'}, + address2 => $borrower->{'address2'}, + email => $borrower->{'email'}, + emailpro => $borrower->{'emailpro'}, borrowernotes => $borrower->{'borrowernotes'}, city => $borrower->{'city'}, - phone => $borrower->{'phone'}, + phone => $borrower->{'phone'} || $borrower->{'mobile'}, cardnumber => $borrower->{'cardnumber'}, amountold => $amountold, barcode => $barcode, stickyduedate => $stickyduedate, message => $message, CGIselectborrower => $CGIselectborrower, - todayissues => \@realtodayissues, - previssues => \@realprevissues, + todayissues => \@todaysissues, + previssues => \@previousissues, inprocess => $inprocess, memberofinstution => $member_of_institution, CGIorganisations => $CGIorganisations, + circview => 1, + ); # set return date if stickyduedate if ($stickyduedate) { - my $t_year = "year" . $year; - my $t_month = "month" . $month; - my $t_day = "day" . $day; $template->param( - $t_year => 1, - $t_month => 1, - $t_day => 1, + duedatespec => $duedatespec, ); } @@ -725,6 +687,8 @@ if ($stickyduedate) { #} $template->param( - SpecifyDueDate => C4::Context->preference("SpecifyDueDate") + SpecifyDueDate => C4::Context->preference("SpecifyDueDate"), + CircAutocompl => C4::Context->preference("CircAutocompl") , + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $query, $cookie, $template->output;