X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Freserveratios.pl;h=56c84d8f9b3c0fa690033d5816ae1b030d87e503;hb=b20ba023b1573f6d34dbb2fd42271a6f1f412b62;hp=96756742b39bd5d373a30f82a22cdcbd9ca74309;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha.git

diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index 96756742b3..56c84d8f9b 100755
--- a/circ/reserveratios.pl
+++ b/circ/reserveratios.pl
@@ -27,10 +27,10 @@ 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;
 
 my $input = new CGI;
 my $startdate       = $input->param('from');
@@ -55,22 +55,17 @@ if ($booksellerid && $basketno) {
      $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));
+$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;
 
-#		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);
-}
 if (!defined($ratio)) {
-	$ratio = 3;
+    $ratio = 3;
 }
 # Force to be a number
 $ratio += 0;
@@ -80,16 +75,23 @@ if ($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 =
+  C4::Context->preference('AcqCreateItem') eq 'receiving'
+  ? '+ COALESCE(aqorders.quantity, 0) - COALESCE(aqorders.quantityreceived, 0)'
+  : q{};
+
+my $include_aqorders_qty_join =
+  C4::Context->preference('AcqCreateItem') eq 'receiving'
+  ? 'LEFT JOIN aqorders ON reserves.biblionumber=aqorders.biblionumber'
+  : q{};
 
 my $nfl_comparison = $include_ordered ? '<=' : '=';
 my $strsth =
@@ -101,24 +103,25 @@ 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
@@ -146,7 +149,7 @@ while ( my $data = $sth->fetchrow_hashref ) {
     push(
         @reservedata,
         {
-            reservedate        => format_date( $data->{reservedate} ),
+            reservedate        => $data->{reservedate},
             priority           => $data->{priority},
             name               => $data->{borrower},
             title              => $data->{title},
@@ -155,18 +158,18 @@ while ( my $data = $sth->fetchrow_hashref ) {
             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})]
         }
     );
 }
@@ -178,7 +181,7 @@ for my $rd ( @reservedata ) {
 
 $template->param(
     ratio_atleast1  => $ratio_atleast1,
-    todaysdate      => format_date($todaysdate),
+    todaysdate      => $todaysdate,
     from            => $startdate,
     to              => $enddate,
     ratio           => $ratio,