[Koha-patches] [PATCH 1/2] Bug #2162: Step 1, prevent running of report upon entry to page. Add name run_report to submit button and checks in template.
Chris Cormack
chrisc at catalyst.net.nz
Sun Feb 14 21:31:07 CET 2010
From: Will Stokes <will at catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
circ/pendingreserves.pl | 324 ++++++++++----------
.../prog/en/modules/circ/pendingreserves.tmpl | 6 +-
2 files changed, 168 insertions(+), 162 deletions(-)
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 74cd4df..ea4d61b 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -36,6 +36,7 @@ my $input = new CGI;
my $order = $input->param('order');
my $startdate=$input->param('from');
my $enddate=$input->param('to');
+my $run_report=$input->param('run_report');
my $theme = $input->param('theme'); # only used if allowthemeoverride is set
@@ -84,178 +85,181 @@ if (!defined($enddate) or $enddate eq "") {
}
-my $dbh = C4::Context->dbh;
-my ($sqlorderby, $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 @reservedata;
+if ( $run_report ) {
+ my $dbh = C4::Context->dbh;
+ my ($sqlorderby, $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);
+ }
-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 '<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
- 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 ($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 '<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
+ 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;
+ 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 $sth = $dbh->prepare($strsth);
+ $sth->execute(@query_params);
-my @reservedata;
-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;
-}
+ 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;
+ $sth->finish;
-# *** I doubt any of this is needed now with the above fixes *** -d.u.
+ # *** 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;
+ #$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,
+ from => $startdate,
to => $enddate,
+ run_report => $run_report,
reserveloop => \@reservedata,
"BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 0876ae7..6e1145c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -42,7 +42,8 @@ $.tablesorter.addParser({
<div id="yui-main">
<div class="yui-b">
-<h2>Pending holds placed between <!-- TMPL_VAR NAME="from" --> and <!-- TMPL_VAR NAME="to" --></h2>
+<h2>Pending holds<!-- TMPL_IF NAME="run_report" --> placed between <!-- TMPL_VAR NAME="from" --> and <!-- TMPL_VAR NAME="to" --><!-- /TMPL_IF --></h2>
+<!-- TMPL_IF NAME="run_report" -->
<h3>Reported on <!-- TMPL_VAR NAME="todaysdate" --></h3>
<p>The following holds have not been filled. Please retrieve them and check them in.</p>
<div class="searchresults">
@@ -130,6 +131,7 @@ $.tablesorter.addParser({
<b>No items found.</b>
<!-- /TMPL_IF -->
</div>
+<!-- /TMPL_IF -->
</div>
</div>
@@ -206,7 +208,7 @@ Calendar.setup(
</script></li>
</ol>
<p><i>(Inclusive, default is two days ago to today, set other date ranges as needed. )</i></p>
-<fieldset class="action"><input type="submit" value="Submit" class="submit"/></fieldset>
+<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
</fieldset>
</form>
--
1.6.3.3
More information about the Koha-patches
mailing list