X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fpendingreserves.pl;h=cf71094830dc7cdb90dd16bf6043042960db0cfc;hb=4acfba5bdb066dca2b6ad177d65b9eb069b7b79c;hp=7ce7015f59b47b2db6800d5c54ffcbc02aaaaa0a;hpb=86ee8ee38450e7561e76d30d2efad630c90edc2f;p=koha.git
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 7ce7015f59..cf71094830 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -14,46 +14,47 @@
# 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 C4::Context;
use C4::Output;
use CGI;
use C4::Auth;
use C4::Dates qw/format_date format_date_in_iso/;
-
-use vars qw($debug);
-
-BEGIN {
- $debug = $ENV{DEBUG} || 0;
-}
+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 $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my $op = $input->param('op');
-my $biblionumber = $input->param('biblionumber');
-my $borrowernumber = $input->param('borrowernumber');
+my $startdate=$input->param('from');
+my $enddate=$input->param('to');
+my $run_report=$input->param('run_report');
+my $report_page=$input->param('report_page');
-my $tmpl_name = ($op eq 'slip') ? "circ/hold-transfer-slip.tmpl" : "circ/pendingreserves.tmpl" ;
+my $theme = $input->param('theme'); # only used if allowthemeoverride is set
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => $tmpl_name,
+ template_name => "circ/pendingreserves.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { circulate => 1 },
+ flagsrequired => { circulate => "circulate_remaining_permissions" },
debug => 1,
}
);
my $duedate;
+my $borrowernumber;
my $itemnum;
my $data1;
my $data2;
@@ -61,159 +62,233 @@ my $data3;
my $name;
my $phone;
my $email;
+my $biblionumber;
my $title;
my $author;
-warn $op;
-warn $biblionumber;
-warn $borrowernumber;
-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, $sqlwhowhere) = ("","","");
-$debug and warn format_date_in_iso($startdate) . "\n" . format_date_in_iso($enddate);
-if ($op eq 'slip') {
- $sqlwhowhere .= " && reserves.borrowernumber = " . $dbh->quote($borrowernumber) ;
- $sqlwhowhere .= " && reserves.biblionumber = " . $dbh->quote($biblionumber) ;
-} else {
- $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 "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);
+my $yesterdaysdate = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, -1));
+#changed from delivered range of 10 years-yesterday to 2 days ago-today
+# Find two days ago for the default shelf pull start and end dates
+my $pastdate = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, 0, 0, -2));
+
+# 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($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
- LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
- LEFT JOIN biblio ON reserves.biblionumber=biblio.biblionumber
- WHERE reserves.found is NULL
- $sqlwhowhere
- $sqldatewhere
- AND items.itemnumber NOT IN (SELECT itemnumber FROM issues)
- AND reserves.itemnumber is NULL";
-
-if (C4::Context->preference('IndependantBranches')){
- $strsth .= " AND items.holdingbranch=? ";
+if (!defined($enddate) or $enddate eq "") {
+ $enddate = format_date($todaysdate);
}
-$strsth .= $sqlorderby;
-warn $strsth;
-my $sth = $dbh->prepare($strsth);
-if (C4::Context->preference('IndependantBranches')){
- $sth->execute(C4::Context->userenv->{'branch'});
-}
-else {
- $sth->execute();
-}
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;
-}
+my ($prev_results, $next_results, $next_or_previous) = (0,0,0);
+if ( $run_report ) {
+ my $dbh = C4::Context->dbh;
+ my ($sqlorderby, $sqldatewhere, $sqllimitoffset) = ("","","");
+ $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);
+ }
-$sth->finish;
-$strsth=~ s/AND reserves.itemnumber is NULL/AND reserves.itemnumber is NOT NULL/;
-$strsth=~ s/LEFT JOIN items ON items.biblionumber=reserves.biblionumber/LEFT JOIN items ON items.biblionumber=reserves.itemnumber/;
-$sth = $dbh->prepare($strsth);
-if (C4::Context->preference('IndependantBranches')){
- $sth->execute(C4::Context->userenv->{'branch'});
-}
-else {
- $sth->execute();
-}
-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},
- thisitemonly => 1,
- }
- );
- $previous=$this;
-}
+ $sqllimitoffset = " LIMIT 251";
+ if ($report_page) {
+ $sqllimitoffset .= " OFFSET=?";
+ push @query_params, ($report_page * 250);
+ }
-$sth->finish;
+ if ($order eq "biblio") {
+ $sqlorderby = " ORDER BY biblio.title ";
+ } elsif ($order eq "itype") {
+ $sqlorderby = " ORDER BY l_itype, location, l_itemcallnumber ";
+ } elsif ($order eq "location") {
+ $sqlorderby = " ORDER BY location, l_itemcallnumber, holdingbranch ";
+ } elsif ($order eq "date") {
+ $sqlorderby = " ORDER BY l_reservedate, location, l_itemcallnumber ";
+ } elsif ($order eq "library") {
+ $sqlorderby = " ORDER BY holdingbranch, l_itemcallnumber, location ";
+ } elsif ($order eq "call") {
+ $sqlorderby = " ORDER BY l_itemcallnumber, holdingbranch, location ";
+ } else {
+ $sqlorderby = " ORDER BY biblio.title ";
+ }
+ 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,
+ items.itemcallnumber,
+ 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,
+ items.itemnumber,
+ notes,
+ 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 items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
+ AND issues.itemnumber IS NULL
+ AND reserves.priority <> 0
+ AND notforloan = 0 AND damaged = 0 AND itemlost = 0 AND wthdrawn = 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('IndependantBranches')){
+ $strsth .= " AND items.holdingbranch=? ";
+ push @query_params, C4::Context->userenv->{'branch'};
+ }
+ $strsth .= " GROUP BY reserves.biblionumber " . $sqlorderby;
+
+ my $sth = $dbh->prepare($strsth);
+ $sth->execute(@query_params);
+
+ my $previous;
+ my $this;
+ while ( my $data = $sth->fetchrow_hashref ) {
+ $this=$data->{biblionumber}.":".$data->{borrowernumber};
+ my @itemlist;
+ push(
+ @reservedata,
+ {
+ reservedate => format_date( $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},
+ notes => $data->{notes},
+ 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}
+ }
+ );
+ $previous=$this;
+ }
+
+ $sth->finish;
+
+ # Next Page?
+ if ($report_page > 0) {
+ $prev_results = $report_page - 1;
+ }
+ if ( scalar(@reservedata) > 250 ) {
+ $next_results = $report_page + 1;
+ pop(@reservedata); # .. we retrieved 251 results
+ }
+ if ($prev_results || $next_results) {
+ $next_or_previous = 1;
+ }
+
+ # *** I doubt any of this is needed now with the above fixes *** -d.u.
+
+ #$strsth=~ s/AND reserves.itemnumber is NULL/AND reserves.itemnumber is NOT NULL/;
+ #$strsth=~ s/LEFT JOIN items ON items.biblionumber=reserves.biblionumber/LEFT JOIN items ON items.biblionumber=reserves.itemnumber/;
+ #$sth = $dbh->prepare($strsth);
+ #if (C4::Context->preference('IndependantBranches')){
+ # $sth->execute(C4::Context->userenv->{'branch'});
+ #}
+ #else {
+ # $sth->execute();
+ #}
+ #while ( my $data = $sth->fetchrow_hashref ) {
+ # $this=$data->{biblionumber}.":".$data->{borrowernumber};
+ # my @itemlist;
+ # push(
+ # @reservedata,
+ # {
+ # reservedate => format_date( $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},
+ # notes => $data->{notes},
+ # 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},
+ # thisitemonly => 1,
+ #
+ # }
+ # );
+ # $previous=$this;
+ #}
+ #$sth->finish;
+}
$template->param(
- todaysdate => format_date($todaysdate),
- from => $startdate,
- to => $enddate,
- reserveloop => \@reservedata,
+ todaysdate => format_date($todaysdate),
+ from => $startdate,
+ to => $enddate,
+ run_report => $run_report,
+ report_page => $report_page,
+ prev_results => $prev_results,
+ next_results => $next_results,
+ next_or_previous => $next_or_previous,
+ reserveloop => \@reservedata,
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+ dateformat => C4::Context->preference("dateformat"),
);
output_html_with_http_headers $input, $cookie, $template->output;