X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Freserveratios.pl;h=51ee09647b3eab82a13a0bc11e266697b0fdbe8d;hb=f41f272ff087d65ed11d760e6c7c58818c3a24d4;hp=d7fecbe9430a217638f2c34801e0bbfb3b10c217;hpb=a2c59f25e268a2028eef763faacdde3ea394fb57;p=koha-ffzg.git diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl index d7fecbe943..51ee09647b 100755 --- a/circ/reserveratios.pl +++ b/circ/reserveratios.pl @@ -5,113 +5,99 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY 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, see . -use strict; -use C4::Context; -use C4::Output; -use CGI; -use C4::Auth; -use C4::Dates qw/format_date format_date_in_iso/; -use Date::Calc qw/Today Add_Delta_YM/; - -use vars qw($debug); - -BEGIN { - $debug = $ENV{DEBUG} || 0; -} +use Modern::Perl; -my $input = new CGI; -my $order = $input->param('order'); -my $startdate=$input->param('from'); -my $enddate=$input->param('to'); -my $ratio=$input->param('ratio'); +use CGI qw ( -utf8 ); +use POSIX qw( ceil ); -my $theme = $input->param('theme'); # only used if allowthemeoverride is set +use C4::Context; +use C4::Output qw( output_html_with_http_headers ); +use C4::Auth qw( get_template_and_user ); +use C4::Acquisition qw/GetOrdersByBiblionumber/; +use Koha::DateUtils qw( dt_from_string ); +use Koha::Acquisition::Baskets; + +my $input = CGI->new; +my $startdate = $input->param('from'); +my $enddate = $input->param('to'); +my $ratio = $input->param('ratio'); +my $include_ordered = $input->param('include_ordered'); +my $include_suspended = $input->param('include_suspended'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "circ/reserveratios.tmpl", + template_name => "circ/reserveratios.tt", query => $input, type => "intranet", - authnotrequired => 0, - flagsrequired => { circulate => 1 }, - debug => 1, + flagsrequired => { circulate => "circulate_remaining_permissions" }, } ); -my $duedate; -my $borrowernumber; -my $itemnum; -my $data1; -my $data2; -my $data3; -my $name; -my $phone; -my $email; -my $biblionumber; -my $title; -my $author; - -my ( $year, $month, $day ) = Today(); -my $todaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", $year, $month, $day); -# Find yesterday for the default shelf pull start and end dates -# A default of the prior years's holds is a reasonable way to pull holds -my $datelastyear = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YM($year, $month, $day, -1, 0)); - -# Predefine the start and end dates if they are not already defined -$startdate =~ s/^\s+//; -$startdate =~ s/\s+$//; -$enddate =~ s/^\s+//; -$enddate =~ s/\s+$//; -# Check if null, should string match, if so set start and end date to yesterday -if (!defined($startdate) or $startdate eq "") { - $startdate = format_date($datelastyear); +my $booksellerid = $input->param('booksellerid') // ''; +my $basketno = $input->param('basketno') // ''; +if ($booksellerid && $basketno) { + $template->param( booksellerid => $booksellerid, basketno => $basketno ); } -if (!defined($enddate) or $enddate eq "") { - $enddate = format_date($todaysdate); + +my $effective_create_items = q{}; +if ( $basketno ){ + my $basket = Koha::Acquisition::Baskets->find( $basketno ); + if ($basket){ + $effective_create_items = $basket->effective_create_items; + } else { + $effective_create_items = C4::Context->preference('AcqCreateItem'); + } } -if (!defined($ratio) or $ratio eq "" or $ratio !~ /^\s*\d+\s*$/ ) { - $ratio = 3; + +my $todaysdate = dt_from_string; + +# A default of the prior years's holds is a reasonable way to pull holds +$enddate = $todaysdate unless $enddate; +$startdate = $todaysdate->clone->subtract( years => 1 ) unless $startdate; + +if (!defined($ratio)) { + $ratio = 3; } -if ($ratio == 0) { +# Force to be a number +$ratio += 0; +if ($ratio <= 0) { $ratio = 1; # prevent division by zero } my $dbh = C4::Context->dbh; -my ($sqlorderby, $sqldatewhere) = ("",""); -$debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate); -$sqldatewhere .= " AND reservedate >= " . $dbh->quote(format_date_in_iso($startdate)) if ($startdate) ; -$sqldatewhere .= " AND reservedate <= " . $dbh->quote(format_date_in_iso($enddate)) if ($enddate) ; - -if ($order eq "biblio") { - $sqlorderby = " order by biblio.title, holdingbranch, listcall, l_location "; -} elsif ($order eq "callnumber") { - $sqlorderby = " order by listcall, holdingbranch, l_location "; -} elsif ($order eq "itemcount") { - $sqlorderby = " order by itemcount, reservecount "; -} elsif ($order eq "itype") { - $sqlorderby = " order by l_itype, holdingbranch, listcall "; -} elsif ($order eq "location") { - $sqlorderby = " order by l_location, holdingbranch, listcall "; -} elsif ($order eq "reservecount") { - $sqlorderby = " order by reservecount DESC "; -} elsif ($order eq "branch") { - $sqlorderby = " order by holdingbranch, l_location, listcall "; -} else { - $sqlorderby = " order by reservecount DESC "; -} +my $sqldatewhere = ""; +my @query_params = (); + +$sqldatewhere .= " AND reservedate >= ?"; +push @query_params, $startdate; +$sqldatewhere .= " AND reservedate <= ?"; +push @query_params, $enddate; + +my $include_aqorders_qty = + $effective_create_items eq 'receiving' + ? '+ COALESCE(aqorders.quantity, 0) - COALESCE(aqorders.quantityreceived, 0)' + : q{}; + +my $include_aqorders_qty_join = + $effective_create_items eq 'receiving' + ? 'LEFT JOIN aqorders ON reserves.biblionumber=aqorders.biblionumber' + : q{}; + +my $nfl_comparison = $include_ordered ? '<=' : '='; +my $sus_comparison = $include_suspended ? '<=' : '<'; my $strsth = "SELECT reservedate, reserves.borrowernumber as borrowernumber, @@ -121,81 +107,111 @@ my $strsth = items.itemcallnumber, items.itemnumber, GROUP_CONCAT(DISTINCT items.itemcallnumber - ORDER BY items.itemnumber SEPARATOR '
') as listcall, + ORDER BY items.itemnumber SEPARATOR '|') as listcall, + GROUP_CONCAT(DISTINCT homebranch + ORDER BY items.itemnumber SEPARATOR '|') as homebranch_list, GROUP_CONCAT(DISTINCT holdingbranch - ORDER BY items.itemnumber SEPARATOR '
') as listbranch, + ORDER BY items.itemnumber SEPARATOR '|') as holdingbranch_list, GROUP_CONCAT(DISTINCT items.location - ORDER BY items.itemnumber SEPARATOR '
') as l_location, + ORDER BY items.itemnumber SEPARATOR '|') as l_location, GROUP_CONCAT(DISTINCT items.itype - ORDER BY items.itemnumber SEPARATOR '
') as l_itype, - notes, + ORDER BY items.itemnumber SEPARATOR '|') as l_itype, + reserves.found, biblio.title, + biblio.subtitle, + biblio.medium, + biblio.part_number, + biblio.part_name, biblio.author, count(DISTINCT reserves.borrowernumber) as reservecount, - count(DISTINCT items.itemnumber) as itemcount + count(DISTINCT items.itemnumber) $include_aqorders_qty as itemcount FROM reserves LEFT JOIN items ON items.biblionumber=reserves.biblionumber LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber - WHERE -notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 0 + $include_aqorders_qty_join + WHERE + notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0 + AND suspend $sus_comparison 1 $sqldatewhere "; - -if (C4::Context->preference('IndependantBranches')){ - $strsth .= " AND items.holdingbranch=? "; +if (C4::Context->preference('IndependentBranches')){ + $strsth .= " AND items.holdingbranch=? "; + push @query_params, C4::Context->userenv->{'branch'}; } -$strsth .= " GROUP BY reserves.biblionumber " . $sqlorderby; + +$strsth .= " GROUP BY reserves.biblionumber ORDER BY reservecount DESC"; + +$template->param(sql => $strsth); my $sth = $dbh->prepare($strsth); +$sth->execute(@query_params); -if (C4::Context->preference('IndependantBranches')){ - $sth->execute(C4::Context->userenv->{'branch'}); -} -else { - $sth->execute(); -} my @reservedata; while ( my $data = $sth->fetchrow_hashref ) { - my @itemlist; - my $ratiocalc = int(10 * $data->{reservecount} / $data->{itemcount} / $ratio )/10; + my $thisratio = $data->{reservecount} / $data->{itemcount}; + my $copies_to_buy = ceil($data->{reservecount}/$ratio - $data->{itemcount}); + $thisratio >= $ratio or next; # TODO: tighter targeting -- get ratio limit into SQL using HAVING clause push( @reservedata, { - reservedate => format_date( $data->{reservedate} ), - priority => $data->{priority}, - name => $data->{borrower}, - title => $data->{title}, - author => $data->{author}, - notes => $data->{notes}, - itemnum => $data->{itemnumber}, - biblionumber => $data->{biblionumber}, - holdingbranch => $data->{holdingbranch}, - listbranch => $data->{listbranch}, - branch => $data->{branch}, - itemcallnumber => $data->{itemcallnumber}, - location => $data->{l_location}, - itype => $data->{l_itype}, - reservecount => $data->{reservecount}, - itemcount => $data->{itemcount}, - ratiocalc => $ratiocalc, - ratio_ge_one => $ratiocalc ge 1.0 ? 1 : "", - listcall => $data->{listcall} + reservedate => $data->{reservedate}, + priority => $data->{priority}, + name => $data->{borrower}, + title => $data->{title}, + subtitle => $data->{subtitle}, + medium => $data->{medium}, + part_number => $data->{part_number}, + part_name => $data->{part_name}, + author => $data->{author}, + itemnum => $data->{itemnumber}, + biblionumber => $data->{biblionumber}, + holdingbranch => $data->{holdingbranch}, + homebranch_list => [split('\|', $data->{homebranch_list})], + holdingbranch_list => [split('\|', $data->{holdingbranch_list})], + branch => $data->{branch}, + itemcallnumber => $data->{itemcallnumber}, + location => [split('\|', $data->{l_location})], + itype => [split('\|', $data->{l_itype})], + reservecount => $data->{reservecount}, + itemcount => $data->{itemcount}, + copies_to_buy => sprintf( "%d", $copies_to_buy ), + thisratio => sprintf( "%.2f", $thisratio ), + thisratio_atleast1 => ( $thisratio >= 1 ) ? 1 : 0, + listcall => [split('\|', $data->{listcall})] } ); } - -$sth->finish; +for my $rd ( @reservedata ) { + next unless $rd->{biblionumber}; + $rd->{pendingorders} = CountPendingOrdersByBiblionumber( $rd->{biblionumber} ); +} $template->param( - todaysdate => format_date($todaysdate), + todaysdate => $todaysdate, from => $startdate, to => $enddate, ratio => $ratio, + include_ordered => $include_ordered, + include_suspended => $include_suspended, reserveloop => \@reservedata, - "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $input, $cookie, $template->output; + +sub CountPendingOrdersByBiblionumber { + my $biblionumber = shift; + my @orders = GetOrdersByBiblionumber( $biblionumber ); + my $cnt = 0; + if (scalar(@orders)) { + for my $order ( @orders ) { + next if $order->{datecancellationprinted}; + my $onum = $order->{quantity} // 0; + my $rnum = $order->{quantityreceived} // 0; + next if $rnum >= $onum; + $cnt += ($onum - $rnum); + } + } + return $cnt; +}