X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Fborrowers_stats.pl;h=b225fdbbbc3c474dff17ea6af8243a29a4bce054;hb=f33e65499b0d00637dc7627c6ead4f6849cc2a96;hp=283ed2b5428227803caafecf5385e0e91ce8db6c;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha.git

diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index 283ed2b542..b225fdbbbc 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -24,8 +23,10 @@ use C4::Auth;
 use C4::Context;
 use C4::Branch; # GetBranches
 use C4::Koha;
+use C4::Dates;
 use C4::Acquisition;
 use C4::Output;
+use C4::Reports;
 use C4::Circulation;
 use Date::Calc qw(
   Today
@@ -55,7 +56,11 @@ my $borstat1 = $input->param("activity");
 my $output = $input->param("output");
 my $basename = $input->param("basename");
 my $mime = $input->param("MIME");
-my $del = $input->param("sep");
+our $sep     = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
+my $selected_branch; # = $input->param("?");
+
+our $branches = GetBranches;
 
 my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
@@ -71,16 +76,13 @@ if ($do_it) {
 	if ($output eq "screen"){
 		$template->param(mainloop => $results);
 		output_html_with_http_headers $input, $cookie, $template->output;
-		exit(1);
 	} else {
 		print $input->header(-type => 'application/vnd.sun.xml.calc',
-                                     -encoding    => 'utf-8',
-                                     -name=>"$basename.csv",
-                                     -attachment=>"$basename.csv");
+                         -encoding => 'utf-8',
+                             -name => "$basename.csv",
+                       -attachment => "$basename.csv");
 		my $cols = @$results[0]->{loopcol};
 		my $lines = @$results[0]->{looprow};
-		my $sep;
-		$sep =C4::Context->preference("delimiter");
 		print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
 		foreach my $col ( @$cols ) {
 			print $col->{coltitle}.$sep;
@@ -101,148 +103,61 @@ if ($do_it) {
 			print $sep.$col->{totalcol};
 		}
 		print $sep.@$results[0]->{total};
-		exit(1);
 	}
+	exit(1);	# exit after do_it, regardless
 } else {
 	my $dbh = C4::Context->dbh;
-	my @values;
-	my %labels;
 	my $req;
-	$req = $dbh->prepare( "select categorycode, description from categories order by description");
-	$req->execute;
-	my %select_catcode;
-	my @select_catcode;
-	push @select_catcode,"";
-	$select_catcode{""} ="";
- 	while (my ($catcode, $description) =$req->fetchrow) {
- 		push @select_catcode, $catcode;
- 		$select_catcode{$catcode} = $description;
- 	}
- 	my $CGICatCode=CGI::scrolling_list( -name     => 'Filter',
- 				-id => 'catcode',
- 				-values   => \@select_catcode,
- 				-labels   => \%select_catcode,
- 				-size     => 1,
- 				-multiple => 0 );
-
-	
-my $branches = GetBranches;
-my @branchloop;
-my @select_branch;
-#my %select_branches;
-push @select_branch,"";
-#$select_branches{""}="";
-foreach my $thisbranch (sort keys %$branches) {
-	push @select_branch,$thisbranch;
-   # my $selected = 1 if $thisbranch eq $branch;
-    my %row =(value => $thisbranch,
-#                selected => $selected,
-                branchname => $branches->{$thisbranch}->{'branchname'},
-            );
-    push @branchloop, \%row;
-}
-    my $CGIBranch=CGI::scrolling_list( -name     => 'Filter',
-                             -id => 'branch',
-                             -values   => \@select_branch,
-#                             -labels   => \%select_branches,
-                             -size     => 1,
-                             -multiple => 0 );
-
-
- 	$req = $dbh->prepare( "select distinctrow zipcode from borrowers order by zipcode");
+	$template->param(  CAT_LOOP => &catcode_aref);
+	my @branchloop;
+	foreach (sort {$branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}} keys %$branches) {
+		my $line = {branchcode => $_, branchname => $branches->{$_}->{branchname} || 'UNKNOWN'};
+		$line->{selected} = 'selected' if ($selected_branch and $selected_branch eq $_);
+		push @branchloop, $line;
+	}
+	$template->param(BRANCH_LOOP => \@branchloop);
+ 	$req = $dbh->prepare("SELECT DISTINCTROW zipcode FROM borrowers WHERE zipcode IS NOT NULL AND zipcode <> '' ORDER BY zipcode");
  	$req->execute;
- 	my @select_zipcode;
- 	push @select_zipcode,"";
- 	while (my ($value) =$req->fetchrow) {
- 		if ($value) {
- 			push @select_zipcode, $value;
- 		}
- 	}
-# 
- 	my $CGIZipCode=CGI::scrolling_list( -name     => 'Filter',
- 				-id => 'zipcode',
- 				-values   => \@select_zipcode,
- 				-size     => 1,
- 				-multiple => 0 );
-
-
-	$req = $dbh->prepare( "SELECT authorised_value,lib FROM authorised_values WHERE category='Bsort1' order by lib");
+	$template->param(   ZIP_LOOP => $req->fetchall_arrayref({}));
+	$req = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category='Bsort1' ORDER BY lib");
  	$req->execute;
- 	my @select_sort1;
-	my %select_sort1;
- 	push @select_sort1,"";
-	$select_sort1{""}="";
- 	my $hassort1;
- 	while (my ($auth_value,$lib) =$req->fetchrow) {
- 		if ($auth_value) {
- 			$hassort1=1;
- 			push @select_sort1, $auth_value;
-			$select_sort1{$auth_value}=$lib
- 		}
- 	}
-# 
- 	my $CGIsort1=CGI::scrolling_list( -name     => 'Filter',
- 				-id => 'sort1',
- 				-values   => \@select_sort1,
-				-labels	=>\%select_sort1,
- 				-size     => 1,
- 				-multiple => 0 );
-	
-	$req = $dbh->prepare( "select distinctrow sort2 from borrowers order by sort2");
+	$template->param( SORT1_LOOP => $req->fetchall_arrayref({}));
+	$req = $dbh->prepare("SELECT DISTINCTROW sort2 AS value FROM borrowers WHERE sort2 IS NOT NULL AND sort2 <> '' ORDER BY sort2 LIMIT 200");
+		# More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destory DB performance.
 	$req->execute;
-	my @select_sort2;
-	push @select_sort2,"";
-	my $hassort2;
-	while (my ($value) =$req->fetchrow) {
-		if ($value) {
-			$hassort2 = 1;
-			push @select_sort2, $value;
-		}
-	}
-	my $CGIsort2=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'sort2',
-				-values   => \@select_sort2,
-				-size     => 1,
-				-multiple => 0 );
+	$template->param( SORT2_LOOP => $req->fetchall_arrayref({}));
 	
 	my @mime = ( C4::Context->preference("MIME") );
-	foreach my $mime (@mime){
-		warn "".$mime;
-	}
-	
+	# warn 'MIME(s): ' . join ' ', @mime;
 	my $CGIextChoice=CGI::scrolling_list(
 				-name => 'MIME',
 				-id => 'MIME',
 				-values   => \@mime,
 				-size     => 1,
 				-multiple => 0 );
-	
-	my @dels = ( C4::Context->preference("delimiter") );
-	my $CGIsepChoice=CGI::scrolling_list(
-				-name => 'sep',
-				-id => 'sep',
-				-values   => \@dels,
-				-size     => 1,
-				-multiple => 0 );
-
-	$template->param(		CGICatCode => $CGICatCode,
-					CGIZipCode => $CGIZipCode,
-#					CGIBranch => $CGIBranch,
-					CGISort1 => $CGIsort1,
-					hassort1 => $hassort1,
-					CGISort2 => $CGIsort2,
-					hassort2 => $hassort2,
-					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					CGIBranch => $CGIBranch
-#					CGIBranch => \@branchloop
-                        DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
-                    );
+	my $CGIsepChoice=GetDelimiterChoices;
+	$template->param(
+		CGIextChoice => $CGIextChoice,
+		CGIsepChoice => $CGIsepChoice,
+		DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    );
 
 }
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
+sub catcode_aref() {
+	my $req = C4::Context->dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description");
+	$req->execute;
+	return $req->fetchall_arrayref({});
+}
+sub catcodes_hash() {
+	my %cathash;
+	my $catcodes = &catcode_aref;
+	foreach (@$catcodes) {
+		$cathash{$_->{categorycode}} = ($_->{description} || 'NO_DESCRIPTION') . " ($_->{categorycode})";
+	}
+	return %cathash;
+}
 
 sub calculate {
 	my ($line, $column, $digits, $status, $activity, $filters) = @_;
@@ -263,22 +178,23 @@ sub calculate {
 #	warn "filtres ".@filters[5];
 #	warn "filtres ".@filters[6];
 
-	
  	$linefilter = @$filters[0] if ($line =~ /categorycode/ )  ;
  	$linefilter = @$filters[1] if ($line =~ /zipcode/ )  ;
  	$linefilter = @$filters[2] if ($line =~ /branchcode/ ) ;
- 	$linefilter = @$filters[5] if ($line =~ /sort1/ ) ;
- 	$linefilter = @$filters[6] if ($line =~ /sort2/ ) ;
+ 	$linefilter = @$filters[5] if ($line =~ /sex/);
+ 	$linefilter = @$filters[6] if ($line =~ /sort1/ ) ;
+    $linefilter = @$filters[7] 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[5] if ($column =~ /sort1/);
- 	$colfilter = @$filters[6] if ($column =~ /sort2/);
+    $colfilter = @$filters[5] if ($column =~ /sex/);
+    $colfilter = @$filters[6] if ($column =~ /sort1/);
+ 	$colfilter = @$filters[7] if ($column =~ /sort2/);
 
 	my @loopfilter;
-	for (my $i=0;$i<=6;$i++) {
+	for (my $i=0;$i<=7;$i++) {
 		my %cell;
 		if ( @$filters[$i] ) {
 			$cell{filter} .= @$filters[$i];
@@ -287,22 +203,19 @@ sub calculate {
 			$cell{crit} .="Branchcode" if ($i==2);
 			$cell{crit} .="Date of Birth" if ($i==3);
 			$cell{crit} .="Date of Birth" if ($i==4);
-			$cell{crit} .="Sort1" if ($i==5);
-			$cell{crit} .="Sort2" if ($i==6);
+            $cell{crit} .="Sex" if ($i==5);
+			$cell{crit} .="Sort1" if ($i==6);
+			$cell{crit} .="Sort2" if ($i==7);
 			push @loopfilter, \%cell;
 		}
 	}
-	if ($status) {
-		push @loopfilter,{crit=>"Status",filter=>$status}
-	}
-		
-	if ($activity) {
-		push @loopfilter,{crit=>"Activity",filter=>$activity};
-	}
+	($status  ) and push @loopfilter,{crit=>"Status",  filter=>$status  };
+	($activity) and push @loopfilter,{crit=>"Activity",filter=>$activity};
+	push @loopfilter,{debug=>1, crit=>"Branches",filter=>join(" ", sort keys %$branches)};
+	push @loopfilter,{debug=>1, crit=>"(line, column)", filter=>"($line,$column)"};
 # year of activity
 	my ( $period_year, $period_month, $period_day )=Add_Delta_YM( Today(),-$period, 0);
 	my $newperioddate=$period_year."-".$period_month."-".$period_day;
-#	warn "PERIOD".$period;
 # 1st, loop rows.
 	my $linefield;
 	if (($line =~/zipcode/) and ($digits)) {
@@ -310,29 +223,31 @@ sub calculate {
 	} else{
 		$linefield .= $line;
 	}
-	
-	my $strsth;
-	$strsth .= "select distinctrow $linefield from borrowers where $line is not null ";
+
+	my %cathash = ($line eq 'categorycode' or $column eq 'categorycode') ? &catcodes_hash : ();
+	push @loopfilter, {debug=>1, crit=>"\%cathash", filter=>join(", ", map {$cathash{$_}} sort keys %cathash)};
+
+	my $strsth = "SELECT distinctrow $linefield FROM borrowers WHERE $line IS NOT NULL ";
 	$linefilter =~ s/\*/%/g;
 	if ( $linefilter ) {
-		$strsth .= " and $linefield LIKE ? " ;
+		$strsth .= " AND $linefield LIKE ? " ;
 	}
-	$strsth .= " and $status='1' " if ($status);
+	$strsth .= " AND $status='1' " if ($status);
 	$strsth .=" order by $linefield";
-#	warn "". $strsth;
 	
-	my $sth = $dbh->prepare( $strsth );
+	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth};
+	my $sth = $dbh->prepare($strsth);
 	if ( $linefilter ) {
 		$sth->execute($linefilter);
 	} else {
 		$sth->execute;
 	}
- 	while ( my ($celvalue) = $sth->fetchrow) {
+ 	while (my ($celvalue) = $sth->fetchrow) {
  		my %cell;
 		if ($celvalue) {
 			$cell{rowtitle} = $celvalue;
-#		} else {
-#			$cell{rowtitle} = "";
+			# $cell{rowtitle_display} = ($linefield eq 'branchcode') ? $branches->{$celvalue}->{branchname} : $celvalue;
+			$cell{rowtitle_display} = ($cathash{$celvalue} || "$celvalue\*") if ($line eq 'categorycode');
 		}
  		$cell{totalrow} = 0;
 		push @loopline, \%cell;
@@ -341,20 +256,19 @@ sub calculate {
 # 2nd, loop cols.
 	my $colfield;
 	if (($column =~/zipcode/) and ($digits)) {
-		$colfield .= "left($column,$digits)";
-	} else{
-		$colfield .= $column;
+		$colfield = "left($column,$digits)";
+	} else {
+		$colfield = $column;
 	}
-	my $strsth2;
-	$colfilter =~ s/\*/%/g;
-	$strsth2 .= "select distinctrow $colfield from borrowers where $column is not null";
-	if ( $colfilter ) {
-		$strsth2 .= " and $colfield LIKE ? ";
+	my $strsth2 = "select distinctrow $colfield from borrowers where $column is not null";
+	if ($colfilter) {
+		$colfilter =~ s/\*/%/g;
+		$strsth2 .= " AND $colfield LIKE ? ";
 	}
-	$strsth2 .= " and $status='1' " if ($status);
+	$strsth2 .= " AND $status='1' " if ($status);
 	$strsth2 .= " order by $colfield";
-#	warn "". $strsth2;
-	my $sth2 = $dbh->prepare( $strsth2 );
+	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth2};
+	my $sth2 = $dbh->prepare($strsth2);
 	if ($colfilter) {
 		$sth2->execute($colfilter);
 	} else {
@@ -362,27 +276,25 @@ sub calculate {
 	}
  	while (my ($celvalue) = $sth2->fetchrow) {
  		my %cell;
-		my %ft;
 		if ($celvalue) {
 			$cell{coltitle} = $celvalue;
+			# $cell{coltitle_display} = ($colfield eq 'branchcode') ? $branches->{$celvalue}->{branchname} : $celvalue;
+			$cell{coltitle_display} = $cathash{$celvalue} if ($column eq 'categorycode');
 		}
 		push @loopcol, \%cell;
  	}
-	
 
 	my $i=0;
-	my @totalcol;
-	my $hilighted=-1;
-	
 	#Initialization of cell values.....
 	my %table;
 #	warn "init table";
-	foreach my $row ( @loopline ) {
+	foreach my $row (@loopline) {
 		foreach my $col ( @loopcol ) {
 #			warn " init table : $row->{rowtitle} / $col->{coltitle} ";
 			$table{$row->{rowtitle}}->{$col->{coltitle}}=0;
 		}
 		$table{$row->{rowtitle}}->{totalrow}=0;
+		$table{$row->{rowtitle}}->{rowtitle_display} = $row->{rowtitle_display};
 	}
 
 # preparing calculation
@@ -397,25 +309,26 @@ sub calculate {
 	$strcalc .= " AND dateofbirth > '" . @$filters[3] ."'" if ( @$filters[3] );
 	@$filters[4]=~ s/\*/%/g if (@$filters[4]);
 	$strcalc .= " AND dateofbirth < '" . @$filters[4] ."'" if ( @$filters[4] );
-	@$filters[5]=~ s/\*/%/g if (@$filters[5]);
-	$strcalc .= " AND sort1 like '" . @$filters[5] ."'" if ( @$filters[5] );
-	@$filters[6]=~ s/\*/%/g if (@$filters[6]);
-	$strcalc .= " AND sort2 like '" . @$filters[6] ."'" if ( @$filters[6] );
-	$strcalc .= " AND borrowernumber in (select distinct(borrowernumber) from issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'active');
-	$strcalc .= " AND borrowernumber not in (select distinct(borrowernumber) from issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'nonactive');
+    @$filters[5]=~ s/\*/%/g if (@$filters[5]);
+    $strcalc .= " AND sex like '" . @$filters[5] ."'" if ( @$filters[5] );
+    @$filters[6]=~ s/\*/%/g if (@$filters[6]);
+	$strcalc .= " AND sort1 like '" . @$filters[6] ."'" if ( @$filters[6] );
+	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
+	$strcalc .= " AND sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
+	$strcalc .= " AND borrowernumber in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'active');
+	$strcalc .= " AND borrowernumber not in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'nonactive');
 	$strcalc .= " AND $status='1' " if ($status);
 	$strcalc .= " group by $linefield, $colfield";
-#	warn "". $strcalc;
+	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strcalc};
 	my $dbcalc = $dbh->prepare($strcalc);
 	$dbcalc->execute;
-#	warn "filling table";
 	
 	my $emptycol; 
 	while (my ($row, $col, $value) = $dbcalc->fetchrow) {
 #		warn "filling table $row / $col / $value ";
-		$emptycol = 1 if ($col eq undef);
-		$col = "zzEMPTY" if ($col eq undef);
-		$row = "zzEMPTY" if ($row eq undef);
+		$emptycol = 1 if (!defined($col));
+		$col = "zzEMPTY" if (!defined($col));
+		$row = "zzEMPTY" if (!defined($row));
 		
 		$table{$row}->{$col}+=$value;
 		$table{$row}->{totalrow}+=$value;
@@ -424,20 +337,20 @@ sub calculate {
 	
  	push @loopcol,{coltitle => "NULL"} if ($emptycol);
 	
-	foreach my $row ( sort keys %table ) {
+	foreach my $row (sort keys %table) {
 		my @loopcell;
 		#@loopcol ensures the order for columns is common with column titles
 		# and the number matches the number of columns
 		foreach my $col ( @loopcol ) {
 			my $value =$table{$row}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
-			push @loopcell, {value => $value  } ;
+			push @loopcell, {value => $value};
 		}
-		push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
-						'loopcell' => \@loopcell,
-						'hilighted' => ($hilighted >0),
-						'totalrow' => $table{$row}->{totalrow}
-					};
-		$hilighted = -$hilighted;
+		push @looprow,{
+			'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
+			'rowtitle_display' => $table{$row}->{rowtitle_display} || $row,
+			'loopcell' => \@loopcell,
+			'totalrow' => $table{$row}->{totalrow}
+		};
 	}
 	
 	foreach my $col ( @loopcol ) {