From 6b285cf44d969ccfddf7c208803b1cd679185915 Mon Sep 17 00:00:00 2001
From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Tue, 1 Mar 2011 21:55:38 +0100
Subject: [PATCH] (bug #5157) fix borrowers top issues

this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../en/modules/reports/bor_issues_top.tmpl    | 14 +-------
 reports/bor_issues_top.pl                     | 33 +++----------------
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index b20a2f713a..9fd5fcdbe6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -204,19 +204,6 @@ function Dopop(link) {
      <!--/TMPL_LOOP --> 
     </select>
 			</li>
-			<li>
-				<label for="day">Day: </label>
-				<input type="text" name="Filter" id="day" value="" />
-			</li>
-			<li>
-				<label for="month">Month: </label>
-				<input type="text" name="Filter" id="month" value="" />
-			</li>
-			<li>
-				<label for="year">Year: </label>
-				<input type="text" name="Filter" id="year" value="" />
-			</li>
-
 		</ol>
 	</fieldset>
 	
@@ -227,6 +214,7 @@ function Dopop(link) {
 						<option value ="10">10</option>
 						<option value ="15">15</option>
 						<option value ="20">20</option>
+                        <option value ="">No Limit</option>
 	<!--					<option value ="25">25</option>
 						<option value ="40">40</option>
 						<option value ="50">50</option>
diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 2e93eef6a4..95fc28766f 100755
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -151,7 +151,8 @@ output_html_with_http_headers $input, $cookie, $template->output;
 
 
 sub calculate {
-    my ($line, $column, $filters) = @_;
+    my ($limit, $column, $filters) = @_;
+
     my @loopcol;
     my @loopline;
     my @looprow;
@@ -209,11 +210,6 @@ sub calculate {
 		} elsif ($column =~ /sort2/   ) {
 			# $colfilter[0] = @$filters[11];
 		}
-        # $colfilter[0] = @$filters[7] if ($column =~ /timestamp/ ) ; FIXME This can't be right.
-        # $colfilter[0] = @$filters[8] if ($column =~ /timestamp/ ) ; FIXME 
-        # $colfilter[0] = @$filters[9] if ($column =~ /timestamp/ ) ; FIXME Only this line would have effect.
-
-    #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
                                                 
     # loop cols.
         if ($column eq "Day") {
@@ -281,15 +277,6 @@ sub calculate {
         $columns{''} = 1;
     }
 
-    #Initialization of cell values.....
-    my @table;
-    for (my $i=1;$i<=$line;$i++) {
-        foreach (keys %columns) {
-#			warn " init table : $row->{rowtitle} / $_ ";
-            $table[$i]->{ $_ || "total" }->{'name'}=0;
-        }
-    }
-
     my $strcalc ;
 
 # Processing average loanperiods
@@ -302,17 +289,13 @@ sub calculate {
                   WHERE old_issues.borrowernumber IS NOT NULL
                   ";
 	my @filterterms = (
-		'old_issues.timestamp  >',
-		'old_issues.timestamp  <',
+		'old_issues.issuedate >',
+		'old_issues.issuedate <',
 		'old_issues.returndate >',
 		'old_issues.returndate <',
 		'old_issues.branchcode  like',
 		'biblioitems.itemtype   like',
 		'borrowers.categorycode like',
-		'dayname(old_issues.timestamp) like',
-		'monthname(old_issues.timestamp) like',
-		'monthname(old_issues.timestamp) like',
-		'year(old_issues.timestamp) like',
 	);
     foreach ((@$filters)[0..9]) {
 		my $term = shift @filterterms;	# go through both arrays in step
@@ -320,16 +303,11 @@ sub calculate {
 		s/\*/%/g;
 		$strcalc .= " AND $term '$_' ";
 	}
-    
     $strcalc .= " GROUP BY borrowers.borrowernumber";
     $strcalc .= ", $colfield" if ($column);
     $strcalc .= " ORDER BY RANK DESC";
     $strcalc .= ",$colfield " if ($colfield);
-# 	my $max;
-# 	if (@loopcol) {
-# 		$max = $line*@loopcol;
-# 	} else { $max=$line;}
-# 	$strcalc .= " LIMIT 0,$max";
+    $strcalc .= " LIMIT $limit" if ($limit);
 
     $debug and print DEBUG "(old_issues) SQL : $strcalc\n";
     my $dbcalc = $dbh->prepare($strcalc);
@@ -414,7 +392,6 @@ sub calculate {
  	# the foot (totals by borrower type)
     $globalline{loopfooter} = [];
     $globalline{total}= $grantotal;		# FIXME: useless
-    $globalline{line} = $line;
     $globalline{column} = $column;
     return [\%globalline];	# reference to a 1 element array: that element is a hashref
 }
-- 
2.39.5