X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fpendingreserves.pl;h=2deb67b68bc1dcd158e9d3c171ab7105c41b8332;hb=9b01fd97ea323b00629709d04f50cdd27e45dfa5;hp=4952afa052f04c14f9651f9ba353b2fdffab8257;hpb=5ff7fcffa4b1e34c06cdb171503516b11c2350d4;p=koha.git
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 4952afa052..2deb67b68b 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
-# $Id$
# Copyright 2000-2002 Katipo Communications
#
@@ -15,31 +14,43 @@
# 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.
+
+# Modification by D.Ulm, actually works (as long as indep. branches not turned on)
+# Someone let me know what indep. branches is supposed to do and I'll make that part work too
+#
+# The reserve pull lists *works* as long as not for indepencdant branches, I can fix!
use strict;
+#use warnings; FIXME - Bug 2505
+
+use constant TWO_DAYS => 2;
+use constant TWO_DAYS_AGO => -2;
+
use C4::Context;
use C4::Output;
use CGI;
use C4::Auth;
-use C4::Date;
+use C4::Dates qw/format_date format_date_in_iso/;
+use C4::Debug;
+use Date::Calc qw/Today Add_Delta_YMD/;
my $input = new CGI;
-my $order = $input->param('order');
my $startdate=$input->param('from');
my $enddate=$input->param('to');
+my $run_report = ( not defined $input->param('run_report') ) ? 1 : $input->param('run_report');
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "circ/pendingreserves.tmpl",
+ template_name => "circ/pendingreserves.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { circulate => 1 },
+ flagsrequired => { circulate => "circulate_remaining_permissions" },
debug => 1,
}
);
@@ -57,105 +68,142 @@ my $biblionumber;
my $title;
my $author;
-my @datearr = localtime( time() );
-my $todaysdate =
- ( 1900 + $datearr[5] ) . '-'
- . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
- . sprintf( "%0.2d", $datearr[3] );
-
-my $dbh = C4::Context->dbh;
-my ($sqlorderby, $sqldatewhere) = ("","");
-
-$sqldatewhere .= " && reservedate >= " . $dbh->quote($startdate) if ($startdate) ;
-$sqldatewhere .= " && reservedate <= " . $dbh->quote($enddate) if ($enddate) ;
-
-if ($order eq "borrower") {
- $sqlorderby = " order by borrower, reservedate";
-} elsif ($order eq "biblio") {
- $sqlorderby = " order by biblio.title, priority,reservedate";
-} elsif ($order eq "priority") {
- $sqlorderby = "order by priority DESC";
-} else {
- $sqlorderby = " order by reservedate, borrower";
+my ( $year, $month, $day ) = Today();
+my $todaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", $year, $month, $day);
+$startdate =~ s/^\s+//;
+$startdate =~ s/\s+$//;
+$enddate =~ s/^\s+//;
+$enddate =~ s/\s+$//;
+
+if (!defined($startdate) or $startdate eq "") {
+ # changed from delivered range of 10 years-yesterday to 2 days ago-today
+ # Find two days ago for the default shelf pull start date, unless HoldsToPullStartDate sys pref is set.
+ my $pastdate= sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, -C4::Context->preference('HoldsToPullStartDate')||TWO_DAYS_AGO ));
+ $startdate = format_date($pastdate);
}
-my $strsth =
-"SELECT reservedate,
- reserves.borrowernumber as borrowernumber,
- concat(firstname,' ',surname) as borrower,
- borrowers.phone,
- borrowers.email,
- reserves.biblionumber,
- reserves.branchcode as branch,
- items.holdingbranch,
- items.itemcallnumber,
- items.itemnumber,
- notes,
- notificationdate,
- reminderdate,
- priority,
- reserves.found,
- biblio.title,
- biblio.author
- FROM reserves
- LEFT JOIN items ON items.biblionumber=reserves.biblionumber,
- borrowers,biblio
- WHERE isnull(cancellationdate)
- && reserves.borrowernumber=borrowers.borrowernumber
- && reserves.biblionumber=biblio.biblionumber
- && reserves.found is NULL
- && items.holdingbranch=?
- ";
-
-$strsth .= $sqlorderby;
-
-my $sth = $dbh->prepare($strsth);
-
-$sth->execute(C4::Context->userenv->{'branch'});
-my @reservedata;
-my $previous;
-my $this;
-while ( my $data = $sth->fetchrow_hashref ) {
- $this=$data->{biblionumber}.":".$data->{borrowernumber};
- my @itemlist;
- push(
- @reservedata,
- {
- reservedate => $previous eq $this?"":format_date( $data->{reservedate} ),
- priority => $previous eq $this?"":$data->{priority},
- name => $previous eq $this?"":$data->{borrower},
- title => $previous eq $this?"":$data->{title},
- author => $previous eq $this?"":$data->{author},
- borrowernumber => $previous eq $this?"":$data->{borrowernumber},
- itemnum => $previous eq $this?"":$data->{itemnumber},
- phone => $previous eq $this?"":$data->{phone},
- email => $previous eq $this?"":$data->{email},
- biblionumber => $previous eq $this?"":$data->{biblionumber},
- statusw => ( $data->{found} eq "w" ),
- statusf => ( $data->{found} eq "f" ),
- holdingbranch => $data->{holdingbranch},
- branch => $previous eq $this?"":$data->{branch},
- itemcallnumber => $data->{itemcallnumber},
- notes => $previous eq $this?"":$data->{notes},
- notificationdate => $previous eq $this?"":$data->{notificationdate},
- reminderdate => $previous eq $this?"":$data->{reminderdate}
- }
- );
- $previous=$this;
+if (!defined($enddate) or $enddate eq "") {
+ #similarly: calculate end date with ConfirmFutureHolds (days)
+ my $d=sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, C4::Context->preference('ConfirmFutureHolds')||0 ));
+ $enddate = format_date($d);
}
-$sth->finish;
+my @reservedata;
+if ( $run_report ) {
+ my $dbh = C4::Context->dbh;
+ my $sqldatewhere = "";
+ $debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate);
+ 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);
+ }
+
+ my $strsth =
+ "SELECT min(reservedate) as l_reservedate,
+ reserves.borrowernumber as borrowernumber,
+ GROUP_CONCAT(DISTINCT items.holdingbranch
+ ORDER BY items.itemnumber SEPARATOR '
') l_holdingbranch,
+ reserves.biblionumber,
+ reserves.branchcode,
+ GROUP_CONCAT(DISTINCT reserves.branchcode
+ ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
+ items.holdingbranch as branch,
+ GROUP_CONCAT(DISTINCT items.itype
+ ORDER BY items.itemnumber SEPARATOR '
') l_itype,
+ GROUP_CONCAT(DISTINCT items.location
+ ORDER BY items.itemnumber SEPARATOR '
') l_location,
+ GROUP_CONCAT(DISTINCT items.itemcallnumber
+ ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber,
+ GROUP_CONCAT(DISTINCT items.enumchron
+ ORDER BY items.itemnumber SEPARATOR '
') l_enumchron,
+ GROUP_CONCAT(DISTINCT items.copynumber
+ ORDER BY items.itemnumber SEPARATOR '
') l_copynumber,
+ items.itemnumber,
+ notificationdate,
+ reminderdate,
+ max(priority) as priority,
+ reserves.found,
+ biblio.title,
+ biblio.author,
+ count(DISTINCT items.itemnumber) as icount,
+ count(DISTINCT reserves.borrowernumber) as rcount
+ FROM reserves
+ LEFT JOIN items ON items.biblionumber=reserves.biblionumber
+ LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
+ LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber
+ LEFT JOIN issues ON items.itemnumber=issues.itemnumber
+ WHERE
+ reserves.found IS NULL
+ $sqldatewhere
+ AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
+ AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
+ AND items.itemnumber NOT IN (select itemnumber FROM reserves where found='W')
+ AND issues.itemnumber IS NULL
+ AND reserves.priority <> 0
+ AND reserves.suspend = 0
+ AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND withdrawn = 0
+ ";
+ # GROUP BY reserves.biblionumber allows only items that are not checked out, else multiples occur when
+ # multiple patrons have a hold on an item
+
+
+ if (C4::Context->preference('IndependentBranches')){
+ $strsth .= " AND items.holdingbranch=? ";
+ push @query_params, C4::Context->userenv->{'branch'};
+ }
+ $strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";
+
+ my $sth = $dbh->prepare($strsth);
+ $sth->execute(@query_params);
+
+ while ( my $data = $sth->fetchrow_hashref ) {
+ push(
+ @reservedata,
+ {
+ reservedate => $data->{l_reservedate},
+ priority => $data->{priority},
+ name => $data->{l_patron},
+ title => $data->{title},
+ author => $data->{author},
+ borrowernumber => $data->{borrowernumber},
+ itemnum => $data->{itemnumber},
+ phone => $data->{phone},
+ email => $data->{email},
+ biblionumber => $data->{biblionumber},
+ statusw => ( $data->{found} eq "W" ),
+ statusf => ( $data->{found} eq "F" ),
+ holdingbranch => $data->{l_holdingbranch},
+ branch => $data->{l_branch},
+ itemcallnumber => $data->{l_itemcallnumber},
+ enumchron => $data->{l_enumchron},
+ copyno => $data->{l_copynumber},
+ notificationdate=> $data->{notificationdate},
+ reminderdate => $data->{reminderdate},
+ count => $data->{icount},
+ rcount => $data->{rcount},
+ pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
+ itype => $data->{l_itype},
+ location => $data->{l_location},
+ }
+ );
+ }
+ $sth->finish;
+}
$template->param(
- todaysdate => format_date($todaysdate),
- from => $startdate,
- to => $enddate,
- reserveloop => \@reservedata,
- intranetcolorstylesheet =>
- C4::Context->preference("intranetcolorstylesheet"),
- intranetstylesheet => C4::Context->preference("intranetstylesheet"),
- IntranetNav => C4::Context->preference("IntranetNav"),
+ todaysdate => $todaysdate,
+ from => $startdate,
+ to => $enddate,
+ run_report => $run_report,
+ reserveloop => \@reservedata,
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+ HoldsToPullStartDate=> C4::Context->preference('HoldsToPullStartDate')||TWO_DAYS,
+ HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds')||0,
);
output_html_with_http_headers $input, $cookie, $template->output;