From af848f16568b26fa0fc84892b361893127cf8593 Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Mon, 19 Dec 2005 10:27:48 +0000
Subject: [PATCH] Adding selection list for bor cat.

---
 .../default/en/reports/borrowers_out.tmpl     | 10 ++++-
 reports/borrowers_out.pl                      | 38 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
index 2aa1fa7d11..c4556a33f6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
@@ -70,7 +70,15 @@
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 				<td>Borrower Category</td>
-				<td><input type="text" name="Filter" value=""></td>
+				<td>
+					<select name="Filter">
+						<option value="">All Borrower Categories</option>
+						<!-- TMPL_LOOP name="borcatloop" -->
+							<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+	="description" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				</td>
 			</tr>
 			<tr class="hilighted">
 				<td>&nbsp;</td>
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 66cfc82669..7876135577 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -133,9 +133,22 @@ if ($do_it) {
 				-size     => 1,
 				-multiple => 0 );
 	
+	my ($codes,$labels) = borrowercategories;
+	my @borcatloop;
+	foreach my $thisborcat (sort keys %$labels) {
+ # 			my $selected = 1 if $thisbranch eq $branch;
+ 			my %row =(value => $thisborcat,
+ # 									selected => $selected,
+									description => $labels->{$thisborcat},
+							);
+			push @borcatloop, \%row;
+	}
+	
+	
 	$template->param(
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice
+					CGIsepChoice => $CGIsepChoice,
+					borcatloop =>\@borcatloop,
 					);
 output_html_with_http_headers $input, $cookie, $template->output;
 }
@@ -237,17 +250,22 @@ sub calculate {
 	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
 	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
 	if (@$filters[1]){
-		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp>?");
-		$queryfilter->execute(@$filters[1]);
-		while (my ($bornum)=$queryfilter->fetchrow){
-			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
-		}
+		my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] ";
+		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] ");
+		$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
+		
+# 		$queryfilter->execute(@$filters[1]);
+# 		while (my ($bornum)=$queryfilter->fetchrow){
+# 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
+# 		}
 	} else {
+		my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues ";
 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
 		$queryfilter->execute;
-		while (my ($bornum)=$queryfilter->fetchrow){
-			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
-		}
+		$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
+# 		while (my ($bornum)=$queryfilter->fetchrow){
+# 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
+# 		}
 	}
 	$strcalc .= " group by borrowers.borrowernumber";
 	$strcalc .= ", $colfield" if ($column);
@@ -276,7 +294,7 @@ sub calculate {
 	
 	push @loopcol,{coltitle => "Global"} if not($column);
 	
-	my $max =(($line)?$line:@table);
+	my $max =(($line)?$line:@table -1);
  	for ($i=1; $i<=$max;$i++) {
  		my @loopcell;
  		#@loopcol ensures the order for columns is common with column titles
-- 
2.39.5