#!/usr/bin/perl
-
# Copyright 2000-2002 Katipo Communications
#
# 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 <http://www.gnu.org/licenses>.
-# 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 Modern::Perl;
+
+use constant PULL_INTERVAL => 2;
-use strict;
use C4::Context;
use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth;
-use C4::Dates qw/format_date format_date_in_iso/;
+use Koha::Biblios;
use C4::Debug;
-use Date::Calc qw/Today Add_Delta_YMD/;
+use Koha::DateUtils;
+use DateTime::Duration;
my $input = new CGI;
-my $order = $input->param('order');
-my $startdate=$input->param('from');
-my $enddate=$input->param('to');
+my $startdate = $input->param('from');
+my $enddate = $input->param('to');
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,
}
);
-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 $today = dt_from_string;
-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));
-# Find 10 years ago for the default shelf pull start and end dates
-# A default of the prior day's holds is a reasonable way to pull holds
-my $pastdate = sprintf("%-04.4d-%-02.2d-%02.2d", Add_Delta_YMD($year, $month, $day, -10, 0, 0));
+if ( $startdate ) {
+ $startdate =~ s/^\s+//;
+ $startdate =~ s/\s+$//;
+ $startdate = eval{dt_from_string( $startdate )};
+}
+unless ( $startdate ){
+ # 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.
+ $startdate = $today - DateTime::Duration->new( days => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL );
+}
-# 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);
+if ( $enddate ) {
+ $enddate =~ s/^\s+//;
+ $enddate =~ s/\s+$//;
+ $enddate = eval{dt_from_string( $enddate )};
}
-if (!defined($enddate) or $enddate eq "") {
- $enddate = format_date($yesterdaysdate);
+unless ( $enddate ) {
+ #similarly: calculate end date with ConfirmFutureHolds (days)
+ $enddate = $today + DateTime::Duration->new( days => C4::Context->preference('ConfirmFutureHolds') || 0 );
}
+my @reservedata;
+my $dbh = C4::Context->dbh;
+my $sqldatewhere = "";
+my $startdate_iso = output_pref({ dt => $startdate, dateformat => 'iso', dateonly => 1 });
+my $enddate_iso = output_pref({ dt => $enddate, dateformat => 'iso', dateonly => 1 });
-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) ;
+$debug and warn $startdate_iso. "\n" . $enddate_iso;
+my @query_params = ();
-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 ";
+if ($startdate_iso) {
+ $sqldatewhere .= " AND reservedate >= ?";
+ push @query_params, $startdate_iso;
+}
+if ($enddate_iso) {
+ $sqldatewhere .= " AND reservedate <= ?";
+ push @query_params, $enddate_iso;
}
-my $strsth =
-"SELECT min(reservedate) as l_reservedate,
- reserves.borrowernumber as borrowernumber,
- GROUP_CONCAT(DISTINCT items.holdingbranch
- ORDER BY items.itemnumber SEPARATOR '<br>') 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 '<br>') l_itype,
- GROUP_CONCAT(DISTINCT items.location
- ORDER BY items.itemnumber SEPARATOR '<br>') l_location,
- GROUP_CONCAT(DISTINCT items.itemcallnumber
- ORDER BY items.itemnumber SEPARATOR '<br>') 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
- WHERE
-reserves.found IS NULL
- $sqldatewhere
-AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
-AND items.itemnumber NOT IN (SELECT itemnumber FROM issues)
-AND reserves.priority <> 0
-AND reserves.itemnumber is NULL
-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=? ";
+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 as l_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 '<br/>') l_itemcallnumber,
+ GROUP_CONCAT(DISTINCT items.enumchron
+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
+ GROUP_CONCAT(DISTINCT items.copynumber
+ ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
+ biblio.title,
+ biblio.author,
+ count(DISTINCT items.itemnumber) as icount,
+ count(DISTINCT reserves.borrowernumber) as rcount,
+ borrowers.firstname,
+ borrowers.surname
+ 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
+ LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber
+ 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 IS NOT NULL)
+ 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 " . $sqlorderby;
+$strsth .= " GROUP BY reserves.biblionumber ORDER BY biblio.title ";
+
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;
-my $previous;
-my $this;
while ( my $data = $sth->fetchrow_hashref ) {
- $this=$data->{biblionumber}.":".$data->{borrowernumber};
- my @itemlist;
+ my $record = Koha::Biblios->find($data->{biblionumber});
+ if ($record){
+ $data->{subtitle} = [ $record->subtitles ];
+ }
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}
+ @reservedata, {
+ reservedate => $data->{l_reservedate},
+ firstname => $data->{firstname} || '',
+ surname => $data->{surname},
+ title => $data->{title},
+ subtitle => $data->{subtitle},
+ author => $data->{author},
+ borrowernumber => $data->{borrowernumber},
+ biblionumber => $data->{biblionumber},
+ holdingbranches => [split('\|', $data->{l_holdingbranch})],
+ branch => $data->{l_branch},
+ itemcallnumber => $data->{l_itemcallnumber},
+ enumchron => $data->{l_enumchron},
+ copyno => $data->{l_copynumber},
+ count => $data->{icount},
+ rcount => $data->{rcount},
+ pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
+ itypes => [split('\|', $data->{l_itype})],
+ locations => [split('\|', $data->{l_location})],
}
);
- $previous=$this;
}
-
$sth->finish;
-# *** 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 => $today,
+ from => $startdate,
+ to => $enddate,
+ reserveloop => \@reservedata,
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+ HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
+ HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds') || 0,
);
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha.git / blobdiff