# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+use Modern::Perl;
use CGI qw ( -utf8 );
use Date::Calc qw/Today Add_Delta_YM/;
use C4::Context;
use C4::Output;
use C4::Auth;
-use C4::Dates qw/format_date format_date_in_iso/;
use C4::Debug;
use C4::Biblio qw/GetMarcBiblio GetRecordValue GetFrameworkCode/;
use C4::Acquisition qw/GetOrdersByBiblionumber/;
+use Koha::DateUtils;
+use Koha::Acquisition::Baskets;
my $input = new CGI;
my $startdate = $input->param('from');
$template->param( booksellerid => $booksellerid, basketno => $basketno );
}
-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
-# Check if null, should string match, if so set start and end date to yesterday
-if (!defined($startdate) or $startdate !~ s/^\s*(\S+)\s*$/$1/) { # strip spaces, remove Taint
- $startdate = format_date($datelastyear);
-}
-if (!defined($enddate) or $enddate !~ s/^\s*(\S+)\s*$/$1/) { # strip spaces, remove Taint
- $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');
+ }
}
+
+$startdate = eval { dt_from_string( $startdate ) } if $startdate;
+$enddate = eval { dt_from_string( $enddate ) } if $enddate;
+
+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;
+ $ratio = 3;
}
# Force to be a number
$ratio += 0;
my $dbh = C4::Context->dbh;
my $sqldatewhere = "";
-$debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate);
+$debug and warn output_pref({ dt => $startdate, dateformat => 'iso', dateonly => 1 }) . "\n" . output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
my @query_params = ();
-if ($startdate) {
- $sqldatewhere .= " AND reservedate >= ?";
- push @query_params, format_date_in_iso($startdate);
-}
-if ($enddate) {
- $sqldatewhere .= " AND reservedate <= ?";
- push @query_params, format_date_in_iso($enddate);
-}
+
+$sqldatewhere .= " AND reservedate >= ?";
+push @query_params, output_pref({ dt => $startdate, dateformat => 'iso' }) ;
+$sqldatewhere .= " AND reservedate <= ?";
+push @query_params, output_pref({ dt => $enddate, dateformat => 'iso' });
+
+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 $strsth =
items.itemcallnumber,
items.itemnumber,
GROUP_CONCAT(DISTINCT items.itemcallnumber
- ORDER BY items.itemnumber SEPARATOR '<br/>') as listcall,
+ ORDER BY items.itemnumber SEPARATOR '|') as listcall,
GROUP_CONCAT(DISTINCT homebranch
- ORDER BY items.itemnumber SEPARATOR '<br/>') as homebranch_list,
+ ORDER BY items.itemnumber SEPARATOR '|') as homebranch_list,
GROUP_CONCAT(DISTINCT holdingbranch
- ORDER BY items.itemnumber SEPARATOR '<br/>') as holdingbranch_list,
+ ORDER BY items.itemnumber SEPARATOR '|') as holdingbranch_list,
GROUP_CONCAT(DISTINCT items.location
- ORDER BY items.itemnumber SEPARATOR '<br/>') as l_location,
+ ORDER BY items.itemnumber SEPARATOR '|') as l_location,
GROUP_CONCAT(DISTINCT items.itype
- ORDER BY items.itemnumber SEPARATOR '<br/>') as l_itype,
+ ORDER BY items.itemnumber SEPARATOR '|') as l_itype,
reserves.found,
biblio.title,
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
+ $include_aqorders_qty_join
WHERE
notforloan $nfl_comparison 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
$sqldatewhere
my $thisratio = $data->{reservecount} / $data->{itemcount};
my $ratiocalc = ($thisratio / $ratio);
($thisratio / $ratio) >= 1 or next; # TODO: tighter targeting -- get ratio limit into SQL using HAVING clause
- my $record = GetMarcBiblio($data->{biblionumber});
+ my $record = GetMarcBiblio({ biblionumber => $data->{biblionumber} });
$data->{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($data->{biblionumber}));
push(
@reservedata,
{
- reservedate => format_date( $data->{reservedate} ),
+ reservedate => $data->{reservedate},
priority => $data->{priority},
name => $data->{borrower},
title => $data->{title},
itemnum => $data->{itemnumber},
biblionumber => $data->{biblionumber},
holdingbranch => $data->{holdingbranch},
- homebranch_list => $data->{homebranch_list},
- holdingbranch_list => $data->{holdingbranch_list},
+ homebranch_list => [split('\|', $data->{homebranch_list})],
+ holdingbranch_list => [split('\|', $data->{holdingbranch_list})],
branch => $data->{branch},
itemcallnumber => $data->{itemcallnumber},
- location => $data->{l_location},
- itype => $data->{l_itype},
+ location => [split('\|', $data->{l_location})],
+ itype => [split('\|', $data->{l_itype})],
reservecount => $data->{reservecount},
itemcount => $data->{itemcount},
ratiocalc => sprintf( "%.0d", $ratio_atleast1 ? ( $thisratio / $ratio ) : $thisratio ),
thisratio => sprintf( "%.2f", $thisratio ),
thisratio_atleast1 => ( $thisratio >= 1 ) ? 1 : 0,
- listcall => $data->{listcall}
+ listcall => [split('\|', $data->{listcall})]
}
);
}
$template->param(
ratio_atleast1 => $ratio_atleast1,
- todaysdate => format_date($todaysdate),
+ todaysdate => $todaysdate,
from => $startdate,
to => $enddate,
ratio => $ratio,
projects / koha.git / blobdiff