[Koha-cvs] CVS: koha/reports borrowers_out.pl,1.1.2.1,1.1.2.2

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14354/reports

Modified Files:
      Tag: rel_2_2
	borrowers_out.pl 
Log Message:
Adding Without issues since feature.

Index: borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** borrowers_out.pl	7 Apr 2005 12:06:05 -0000	1.1.2.1
--- borrowers_out.pl	26 May 2005 10:27:08 -0000	1.1.2.2
***************
*** 160,164 ****
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=6;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
--- 160,164 ----
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=2;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
***************
*** 168,171 ****
--- 168,172 ----
  			$cell{filter} .= @$filters[$i];
  			$cell{crit} .="Bor Cat" if ($i==0);
+ 			$cell{crit} .="Without issues since" if ($i==1);
  			push @loopfilter, \%cell;
  		}
***************
*** 232,239 ****
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
- 	
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);
--- 233,245 ----
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN ";
! 	if (@$filters[1]){
! 		$strcalc .= " (SELECT * FROM issues where issues.timestamp>" . $dbh->quote(@$filters[1]).")" ;
! 	} else {
! 		$strcalc .= "issues";
! 	} 
! 	$strcalc .= " AS filtered_issues ON  filtered_issues.borrowernumber=borrowers.borrowernumber WHERE filtered_issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);