[Koha-cvs] CVS: koha/reports borrowers_stats.pl,1.7.2.2,1.7.2.3 issues_stats.pl,1.7.2.3,1.7.2.4

[Henri-Damien LAURENT]

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

Modified Files:
      Tag: rel_2_2
	borrowers_stats.pl issues_stats.pl 
Log Message:
Adding branchcode to borrowers_stats
Bug Fixing on reportswcal.inc


Index: borrowers_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_stats.pl,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -r1.7.2.2 -r1.7.2.3
*** borrowers_stats.pl	7 Apr 2005 12:18:43 -0000	1.7.2.2
--- borrowers_stats.pl	27 Sep 2005 16:19:37 -0000	1.7.2.3
***************
*** 28,31 ****
--- 28,32 ----
  use C4::Output;
  use C4::Koha;
+ use C4::Acquisition;
  use C4::Interface::CGI::Output;
  use C4::Circulation::Circ2;
***************
*** 122,125 ****
--- 123,142 ----
  				-multiple => 0 );
  	
+ 	my @branches;
+ 	my @select_branch;
+ 	my %select_branches;
+ 	my ($count2, at branches)=branches();
+ 	push @select_branch,"";
+ 	$select_branches{''}='';
+ 	for (my $i=0;$i<$count2;$i++){
+ 			push @select_branch, $branches[$i]->{'branchcode'};#
+ 			$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
+ 	}
+ 	my $CGIbranch=CGI::scrolling_list( -name     => 'pickup',
+ 							-values   => \@select_branch,
+ 							-labels   => \%select_branches,
+ 							-size     => 1,
+ 							-multiple => 0 );
+ 	
  	$req = $dbh->prepare( "select distinctrow sort1 from borrowers order by sort1");
  	$req->execute;
***************
*** 181,185 ****
  					hassort2 => $hassort2,
  					CGIextChoice => $CGIextChoice,
! 					CGIsepChoice => $CGIsepChoice
  					);
  
--- 198,203 ----
  					hassort2 => $hassort2,
  					CGIextChoice => $CGIextChoice,
! 					CGIsepChoice => $CGIsepChoice,
! 					CGIBranch => $CGIbranch
  					);
  
***************
*** 210,221 ****
   	$linefilter = @$filters[0] if ($line =~ /categorycode/ )  ;
   	$linefilter = @$filters[1] if ($line =~ /zipcode/ )  ;
!  	$linefilter = @$filters[2] if ($line =~ /sort1/ ) ;
!  	$linefilter = @$filters[3] if ($line =~ /sort2/ ) ;
  # 
   	my $colfilter = "";
   	$colfilter = @$filters[0] if ($column =~ /categorycode/);
   	$colfilter = @$filters[1] if ($column =~ /zipcode/);
!  	$colfilter = @$filters[2] if ($column =~ /sort1/);
!  	$colfilter = @$filters[3] if ($column =~ /sort2/);
  
  	my @loopfilter;
--- 228,241 ----
   	$linefilter = @$filters[0] if ($line =~ /categorycode/ )  ;
   	$linefilter = @$filters[1] if ($line =~ /zipcode/ )  ;
!  	$linefilter = @$filters[2] if ($line =~ /branccode/ ) ;
!  	$linefilter = @$filters[3] if ($line =~ /sort1/ ) ;
!  	$linefilter = @$filters[4] if ($line =~ /sort2/ ) ;
  # 
   	my $colfilter = "";
   	$colfilter = @$filters[0] if ($column =~ /categorycode/);
   	$colfilter = @$filters[1] if ($column =~ /zipcode/);
!  	$colfilter = @$filters[2] if ($column =~ /branchcode/);
!  	$colfilter = @$filters[3] if ($column =~ /sort1/);
!  	$colfilter = @$filters[4] if ($column =~ /sort2/);
  
  	my @loopfilter;
***************
*** 226,231 ****
  			$cell{crit} .="Cat Code " if ($i==0);
  			$cell{crit} .="Zip Code" if ($i==1);
! 			$cell{crit} .="Sort1" if ($i==2);
! 			$cell{crit} .="Sort2" if ($i==3);
  			push @loopfilter, \%cell;
  		}
--- 246,252 ----
  			$cell{crit} .="Cat Code " if ($i==0);
  			$cell{crit} .="Zip Code" if ($i==1);
! 			$cell{crit} .="Branchcode" if ($i==2);
! 			$cell{crit} .="Sort1" if ($i==3);
! 			$cell{crit} .="Sort2" if ($i==4);
  			push @loopfilter, \%cell;
  		}

Index: issues_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -C2 -r1.7.2.3 -r1.7.2.4
*** issues_stats.pl	9 Sep 2005 08:50:21 -0000	1.7.2.3
--- issues_stats.pl	27 Sep 2005 16:19:37 -0000	1.7.2.4
***************
*** 454,458 ****
  		$rqbookcount->execute;
  		my ($bookcount) = $rqbookcount->fetchrow;
! 		$strcalc .= "100*(COUNT(itemnumber))/ $bookcount " ;
  	}
  	$strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) ";
--- 454,458 ----
  		$rqbookcount->execute;
  		my ($bookcount) = $rqbookcount->fetchrow;
! 		$strcalc .= "100*(COUNT(DISTINCT itemnumber))/ $bookcount " ;
  	}
  	$strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) ";