#!/usr/bin/perl
-# $Id$
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
-use C4::Auth;
+#use warnings; FIXME - Bug 2505
use CGI;
-use C4::Context;
-use HTML::Template;
-use C4::Search;
+use C4::Auth;
use C4::Output;
+use C4::Context;
+use C4::Branch; # GetBranches
use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Circulation::Circ2;
-use Date::Manip;
+use C4::Circulation;
+use C4::Members;
+use C4::Reports;
+use C4::Debug;
+use C4::Dates qw(format_date format_date_in_iso);
=head1 NAME
=head1 DESCRIPTION
-
-=over2
+=over 2
=cut
+$debug = 1;
+$debug and open DEBUG, ">/tmp/bor_issues_top.debug.log";
+
my $input = new CGI;
-my $do_it=$input->param('do_it');
my $fullreportname = "reports/bor_issues_top.tmpl";
-my $limit = $input->param("Limit");
-my $column = $input->param("Criteria");
+my $do_it = $input->param('do_it');
+my $limit = $input->param("Limit");
+my $column = $input->param("Criteria");
my @filters = $input->param("Filter");
-my $output = $input->param("output");
+foreach ( @filters[0..3] ) {
+ $_ and $_ = format_date_in_iso($_);
+}
+my $output = $input->param("output");
my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
-#warn "calcul : ".$calc;
my ($template, $borrowernumber, $cookie)
- = get_template_and_user({template_name => $fullreportname,
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {editcatalogue => 1},
- debug => 1,
- });
-$template->param(do_it => $do_it);
+ = get_template_and_user({template_name => $fullreportname,
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {reports => '*'},
+ debug => 1,
+ });
+our $sep = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
+$template->param(do_it => $do_it,
+ );
if ($do_it) {
# Displaying results
- my $results = calculate($limit, $column, \@filters);
- if ($output eq "screen"){
+ my $results = calculate($limit, $column, \@filters);
+ if ($output eq "screen"){
# Printing results to screen
- $template->param(mainloop => $results);
- output_html_with_http_headers $input, $cookie, $template->output;
- exit(1);
- } else {
+ $template->param(mainloop => $results, limit=>$limit);
+ output_html_with_http_headers $input, $cookie, $template->output;
+ } else {
# Printing to a csv file
- print $input->header(-type => 'application/vnd.sun.xml.calc',
- -attachment=>"$basename.csv",
- -filename=>"$basename.csv" );
- my $cols = @$results[0]->{loopcol};
- my $lines = @$results[0]->{looprow};
- my $sep;
- $sep =C4::Context->preference("delimiter");
+ print $input->header(-type => 'application/vnd.sun.xml.calc',
+ -encoding => 'utf-8',
+ -attachment=>"$basename.csv",
+ -filename=>"$basename.csv" );
+ my $cols = @$results[0]->{loopcol};
+ my $lines = @$results[0]->{looprow};
# header top-right
- print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
+ print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
# Other header
- foreach my $col ( @$cols ) {
- print $col->{coltitle}.$sep;
- }
- print "Total\n";
+ print join($sep, map {$_->{coltitle}} @$cols);
+ print $sep . "Total\n";
# Table
- foreach my $line ( @$lines ) {
- my $x = $line->{loopcell};
- print $line->{rowtitle}.$sep;
- foreach my $cell (@$x) {
- print $cell->{value}.$sep;
- }
- print $line->{totalrow};
- print "\n";
- }
+ foreach my $line ( @$lines ) {
+ my $x = $line->{loopcell};
+ print $line->{rowtitle}.$sep;
+ print join($sep, map {$_->{value}} @$x);
+ print $sep,$line->{totalrow};
+ print "\n";
+ }
# footer
- print "TOTAL";
- $cols = @$results[0]->{loopfooter};
- foreach my $col ( @$cols ) {
- print $sep.$col->{totalcol};
- }
- print $sep.@$results[0]->{total};
- exit(1);
- }
-# Displaying choices
-} else {
- my $dbh = C4::Context->dbh;
- my @values;
- my %labels;
- my %select;
- my $req;
-
- my @mime = ( C4::Context->preference("MIME") );
-# foreach my $mime (@mime){
-# warn "".$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(
- CGIextChoice => $CGIextChoice,
- CGIsepChoice => $CGIsepChoice
- );
-output_html_with_http_headers $input, $cookie, $template->output;
+ print "TOTAL";
+ $cols = @$results[0]->{loopfooter};
+ print join($sep, map {$_->{totalcol}} @$cols);
+ print $sep.@$results[0]->{total};
+ }
+ exit;
}
+my $dbh = C4::Context->dbh;
+my @values;
+# here each element returned by map is a hashref, get it?
+my @mime = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
+my $delims = GetDelimiterChoices;
+my $branches = GetBranches;
+my @branchloop;
+foreach (sort keys %$branches) {
+# my $selected = 1 if $thisbranch eq $branch;
+ my %row = ( value => $_,
+# selected => $selected,
+ branchname => $branches->{$_}->{branchname},
+ );
+ push @branchloop, \%row;
+}
+
+my $itemtypes = GetItemTypes;
+my @itemtypeloop;
+foreach (sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{description}} keys %$itemtypes) {
+ my %row = (value => $_,
+ description => $itemtypes->{$_}->{description},
+ );
+ push @itemtypeloop, \%row;
+}
+
+my ($codes,$labels) = GetborCatFromCatType(undef,undef);
+my @borcatloop;
+foreach (sort keys %$labels) {
+ my %row =(value => $_,
+ description => $labels->{$_},
+ );
+ push @borcatloop, \%row;
+}
+
+$template->param(
+ mimeloop => \@mime,
+ CGIseplist => $delims,
+ branchloop => \@branchloop,
+ itemtypeloop => \@itemtypeloop,
+ borcatloop => \@borcatloop,
+);
+output_html_with_http_headers $input, $cookie, $template->output;
sub calculate {
- my ($line, $column, $filters) = @_;
- my @mainloop;
- my @loopfooter;
- my @loopcol;
- my @loopline;
- my @looprow;
- my %globalline;
- my $grantotal =0;
-# extract parameters
- my $dbh = C4::Context->dbh;
+ my ($limit, $column, $filters) = @_;
+
+ my @loopcol;
+ my @loopline;
+ my @looprow;
+ my %globalline;
+ my %columns;
+ my $grantotal =0;
+ my $dbh = C4::Context->dbh;
-# Filters
# Checking filters
-#
- my @loopfilter;
- for (my $i=0;$i<=6;$i++) {
- my %cell;
- if ( @$filters[$i] ) {
- if (($i==1) and (@$filters[$i-1])) {
- $cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
- }
- $cell{filter} .= @$filters[$i];
- $cell{crit} .="Issue From" if ($i==0);
- $cell{crit} .="Issue To" if ($i==1);
- $cell{crit} .="Return From" if ($i==2);
- $cell{crit} .="Return To" if ($i==3);
- $cell{crit} .="Branch" if ($i==4);
- $cell{crit} .="Doc Type" if ($i==5);
- $cell{crit} .="Bor Cat" if ($i==6);
- $cell{crit} .="Day" if ($i==7);
- $cell{crit} .="Month" if ($i==8);
- $cell{crit} .="Year" if ($i==9);
- push @loopfilter, \%cell;
- }
- }
- my $colfield;
- my $colorder;
- if ($column){
- $column = "issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/));
- $column = "biblioitems.".$column if $column=~/itemtype/;
- $column = "borrowers.".$column if $column=~/categorycode/;
- my @colfilter ;
- $colfilter[0] = @$filters[0] if ($column =~ /timestamp/ ) ;
- $colfilter[1] = @$filters[1] if ($column =~ /timestamp/ ) ;
- $colfilter[0] = @$filters[2] if ($column =~ /returndate/ ) ;
- $colfilter[1] = @$filters[3] if ($column =~ /returndate/ ) ;
- $colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ;
- $colfilter[0] = @$filters[5] if ($column =~ /itemtype/ ) ;
- $colfilter[0] = @$filters[6] if ($column =~ /category/ ) ;
- # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
- $colfilter[0] = @$filters[7] if ($column =~ /timestamp/ ) ;
- $colfilter[0] = @$filters[8] if ($column =~ /timestamp/ ) ;
- $colfilter[0] = @$filters[9] if ($column =~ /timestamp/ ) ;
- #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
-
- # loop cols.
- if ($column eq "Day") {
- #Display by day
- $column = "issues.timestamp";
- $colfield .="dayname($column)";
- $colorder .="weekday($column)";
- } elsif ($column eq "Month") {
- #Display by Month
- $column = "issues.timestamp";
- $colfield .="monthname($column)";
- $colorder .="month($column)";
- } elsif ($column eq "Year") {
- #Display by Year
- $column = "issues.timestamp";
- $colfield .="Year($column)";
- $colorder .= $column;
- } else {
- $colfield .= $column;
- $colorder .= $column;
- }
-
- my $strsth2;
- $strsth2 .= "select distinctrow $colfield FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
- if (($column=~/timestamp/) or ($column=~/returndate/)){
- if ($colfilter[1] and ($colfilter[0])){
- $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ;
- } elsif ($colfilter[1]) {
- $strsth2 .= " and $column < '$colfilter[1]' " ;
- } elsif ($colfilter[0]) {
- $strsth2 .= " and $column > '$colfilter[0]' " ;
- }
- } elsif ($colfilter[0]) {
- $colfilter[0] =~ s/\*/%/g;
- $strsth2 .= " and $column LIKE '$colfilter[0]' " ;
- }
- $strsth2 .=" group by $colfield";
- $strsth2 .=" order by $colorder";
- warn "". $strsth2;
-
- my $sth2 = $dbh->prepare( $strsth2 );
- if (( @colfilter ) and ($colfilter[1])){
- $sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
- } elsif ($colfilter[0]) {
- $sth2->execute($colfilter[0]);
- } else {
- $sth2->execute;
- }
-
-
- while (my ($celvalue) = $sth2->fetchrow) {
- my %cell;
- # my %ft;
- # warn "coltitle :".$celvalue;
- $cell{coltitle} = $celvalue;
- # $ft{totalcol} = 0;
- push @loopcol, \%cell;
+ my @loopfilter;
+ my @cellmap = (
+ "Issue From",
+ "Issue To",
+ "Return From",
+ "Return To",
+ "Branch",
+ "Doc Type",
+ "Bor Cat",
+ "Day",
+ "Month",
+ "Year"
+ );
+ for (my $i=0;$i<=6;$i++) {
+ my %cell;
+ if ( @$filters[$i] ) {
+ if (($i==1) and (@$filters[$i-1])) {
+ $cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
+ }
+ # format the dates filters, otherwise just fill as is
+ $cell{filter} .= ($i>=4) ? @$filters[$i] : format_date(@$filters[$i]);
+ defined ($cellmap[$i]) and
+ $cell{crit} .= $cellmap[$i];
+ push @loopfilter, \%cell;
+ }
+ }
+ my $colfield;
+ my $colorder;
+ if ($column){
+ $column = "old_issues." .$column if (($column=~/branchcode/) or ($column=~/timestamp/));
+ $column = "biblioitems.".$column if $column=~/itemtype/;
+ $column = "borrowers." .$column if $column=~/categorycode/;
+ my @colfilter ;
+ if ($column =~ /timestamp/) {
+ $colfilter[0] = @$filters[0];
+ $colfilter[1] = @$filters[1];
+ } elsif ($column =~ /returndate/) {
+ $colfilter[0] = @$filters[2];
+ $colfilter[1] = @$filters[3];
+ } elsif ($column =~ /branchcode/) {
+ $colfilter[0] = @$filters[4];
+ } elsif ($column =~ /itemtype/) {
+ $colfilter[0] = @$filters[5];
+ } elsif ($column =~ /category/) {
+ $colfilter[0] = @$filters[6];
+ } elsif ($column =~ /sort2/ ) {
+ # $colfilter[0] = @$filters[11];
}
- # warn "fin des titres colonnes";
+
+ # loop cols.
+ if ($column eq "Day") {
+ #Display by day
+ $column = "old_issues.timestamp";
+ $colfield .="dayname($column)";
+ $colorder .="weekday($column)";
+ } elsif ($column eq "Month") {
+ #Display by Month
+ $column = "old_issues.timestamp";
+ $colfield .="monthname($column)";
+ $colorder .="month($column)";
+ } elsif ($column eq "Year") {
+ #Display by Year
+ $column = "old_issues.timestamp";
+ $colfield .="Year($column)";
+ $colorder .= $column;
+ } else {
+ $colfield .= $column;
+ $colorder .= $column;
+ }
+
+ my $strsth2;
+ $strsth2 .= "SELECT DISTINCTROW $colfield
+ FROM `old_issues`
+ LEFT JOIN borrowers ON old_issues.borrowernumber=borrowers.borrowernumber
+ LEFT JOIN items ON old_issues.itemnumber=items.itemnumber
+ LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
+ WHERE 1";
+ if (($column=~/timestamp/) or ($column=~/returndate/)){
+ if ($colfilter[1] and $colfilter[0]){
+ $strsth2 .= " AND $column between '$colfilter[0]' AND '$colfilter[1]' " ;
+ } elsif ($colfilter[1]) {
+ $strsth2 .= " AND $column < '$colfilter[1]' " ;
+ } elsif ($colfilter[0]) {
+ $strsth2 .= " AND $column > '$colfilter[0]' " ;
+ }
+ } elsif ($colfilter[0]) {
+ $colfilter[0] =~ s/\*/%/g;
+ $strsth2 .= " AND $column LIKE '$colfilter[0]' " ;
+ }
+ $strsth2 .=" GROUP BY $colfield";
+ $strsth2 .=" ORDER BY $colorder";
+
+ $debug and print DEBUG "bor_issues_top (old_issues) SQL: $strsth2\n";
+ my $sth2 = $dbh->prepare($strsth2);
+ $sth2->execute;
+ print DEBUG "rows: ", $sth2->rows, "\n";
+ while (my @row = $sth2->fetchrow) {
+ $columns{($row[0] ||'NULL')}++;
+ push @loopcol, { coltitle => $row[0] || 'NULL' };
+ }
+
+ $strsth2 =~ s/old_issues/issues/g;
+ $debug and print DEBUG "bor_issues_top (issues) SQL: $strsth2\n";
+ $sth2 = $dbh->prepare($strsth2);
+ $sth2->execute;
+ $debug and print DEBUG "rows: ", $sth2->rows, "\n";
+ while (my @row = $sth2->fetchrow) {
+ $columns{($row[0] ||'NULL')}++;
+ push @loopcol, { coltitle => $row[0] || 'NULL' };
+ }
+ $debug and print DEBUG "full array: ", Dumper(\%columns), "\n";
+ }else{
+ $columns{''} = 1;
+ }
+
+ my $strcalc ;
+
+# Processing average loanperiods
+ $strcalc .= "SELECT CONCAT(borrowers.surname , \",\\t\",borrowers.firstname), COUNT(*) AS RANK, borrowers.borrowernumber AS ID";
+ $strcalc .= " , $colfield " if ($colfield);
+ $strcalc .= " FROM `old_issues`
+ LEFT JOIN borrowers USING(borrowernumber)
+ LEFT JOIN items USING(itemnumber)
+ LEFT JOIN biblioitems USING(biblioitemnumber)
+ WHERE old_issues.borrowernumber IS NOT NULL
+ ";
+ my @filterterms = (
+ 'old_issues.issuedate >',
+ 'old_issues.issuedate <',
+ 'old_issues.returndate >',
+ 'old_issues.returndate <',
+ 'old_issues.branchcode like',
+ 'biblioitems.itemtype like',
+ 'borrowers.categorycode like',
+ );
+ foreach ((@$filters)[0..9]) {
+ my $term = shift @filterterms; # go through both arrays in step
+ ($_) or next;
+ s/\*/%/g;
+ $strcalc .= " AND $term '$_' ";
}
-
- my $i=0;
-# my @totalcol;
- my $hilighted=-1;
-
- #Initialization of cell values.....
- my @table;
-
-# warn "init table";
- for (my $i=1;$i<=$line;$i++) {
- foreach my $col ( @loopcol ) {
-# warn " init table : $row->{rowtitle} / $col->{coltitle} ";
- $table[$i]->{($col->{coltitle})?$col->{coltitle}:"total"}=0;
+ $strcalc .= " GROUP BY borrowers.borrowernumber";
+ $strcalc .= ", $colfield" if ($column);
+ $strcalc .= " ORDER BY RANK DESC";
+ $strcalc .= ",$colfield " if ($colfield);
+ $strcalc .= " LIMIT $limit" if ($limit);
+
+ $debug and print DEBUG "(old_issues) SQL : $strcalc\n";
+ my $dbcalc = $dbh->prepare($strcalc);
+ $dbcalc->execute;
+ $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
+ my %patrons = ();
+ # DATA STRUCTURE is going to look like this:
+ # (2253=> {name=>"John Doe",
+ # allcols=>{MAIN=>12, MEDIA_LIB=>3}
+ # },
+ # )
+ while (my @data = $dbcalc->fetchrow) {
+ my ($row, $rank, $id, $col) = @data;
+ $col = "zzEMPTY" if (!defined($col));
+ unless ($patrons{$id}) {
+ $patrons{$id} = {name=>$row, allcols=>{}, newcols=>{}, oldcols=>{}};
}
- }
+ $patrons{$id}->{oldcols}->{$col} = $rank;
+ }
+ use Data::Dumper;
-# preparing calculation
- my $strcalc ;
-
-# Processing average loanperiods
- $strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber) , COUNT(*) AS RANK";
- $strcalc .= " , $colfield " if ($colfield);
- $strcalc .= " FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN issuingrules ON (issuingrules.branchcode=issues.branchcode AND issuingrules.itemtype=biblioitems.itemtype AND issuingrules.categorycode=borrowers.categorycode) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
+ $strcalc =~ s/old_issues/issues/g;
+ $debug and print DEBUG "(issues) SQL : $strcalc\n";
+ $dbcalc = $dbh->prepare($strcalc);
+ $dbcalc->execute;
+ $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
+ while (my @data = $dbcalc->fetchrow) {
+ my ($row, $rank, $id, $col) = @data;
+ $col = "zzEMPTY" if (!defined($col));
+ unless ($patrons{$id}) {
+ $patrons{$id} = {name=>$row, allcols=>{}, newcols=>{}, oldcols=>{}};
+ }
+ $patrons{$id}->{newcols}->{$col} = $rank;
+ }
- @$filters[0]=~ s/\*/%/g if (@$filters[0]);
- $strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
- @$filters[1]=~ s/\*/%/g if (@$filters[1]);
- $strcalc .= " AND issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] );
- @$filters[2]=~ s/\*/%/g if (@$filters[2]);
- $strcalc .= " AND issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
- @$filters[3]=~ s/\*/%/g if (@$filters[3]);
- $strcalc .= " AND issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] );
- @$filters[4]=~ s/\*/%/g if (@$filters[4]);
- $strcalc .= " AND issues.branchcode like '" . @$filters[4] ."'" if ( @$filters[4] );
- @$filters[5]=~ s/\*/%/g if (@$filters[5]);
- $strcalc .= " AND biblioitems.itemtype like '" . @$filters[5] ."'" if ( @$filters[5] );
- @$filters[6]=~ s/\*/%/g if (@$filters[6]);
- $strcalc .= " AND borrowers.categorycode like '" . @$filters[6] ."'" if ( @$filters[6] );
- @$filters[7]=~ s/\*/%/g if (@$filters[7]);
- $strcalc .= " AND dayname(issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]);
- @$filters[8]=~ s/\*/%/g if (@$filters[8]);
- $strcalc .= " AND monthname(issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]);
- @$filters[9]=~ s/\*/%/g if (@$filters[9]);
- $strcalc .= " AND year(issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] );
-
- $strcalc .= " group by borrowers.borrowernumber";
- $strcalc .= ", $colfield" if ($column);
- $strcalc .= " order by ";
- $strcalc .= "$colfield, " if ($colfield);
- $strcalc .= "RANK DESC ";
- my $max;
- if (@loopcol) {
- $max = $line*@loopcol;
- } else { $max=$line;}
- $strcalc .= " LIMIT 0,$max";
- warn "SQL :". $strcalc;
-
- my $dbcalc = $dbh->prepare($strcalc);
- $dbcalc->execute;
-# warn "filling table";
- my $previous_col;
- my $i=1;
- while (my @data = $dbcalc->fetchrow) {
- my ($row, $rank, $col )=@data;
-# warn "filling table $row / $col / $issuedate / $returndate /$weight";
- $col = "zzEMPTY" if ($col eq undef);
- $table[$i]->{$col}=$row;
- warn " ".$i." ".$col. " ".$row;
- $i++;
- $i=1 if (($previous_col) and not($col eq $previous_col));
- $previous_col=$col;
-# $table{$row}->{totalrow}+=$weight*$loanlength;
- }
-
- push @loopcol,{coltitle => "Global"};
-
- for ($i=1; $i<=$line;$i++) {
- warn " ".$i;
- my @loopcell;
- #@loopcol ensures the order for columns is common with column titles
- # and the number matches the number of columns
- my $colcount=0;
- foreach my $col ( @loopcol ) {
- my $value;
- if (@loopcol){
- #warn " test ".(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle};
- $value =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}};
- } else {
- $value =$table[$i]->{"zzEMPTY"};
- }
-# $table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} = $value;
- #$table{$row}->{totalrow}+=$value;
- #warn "row : $row col:$col $cnttable{$row}->{(($col->{coltitle} eq \"NULL\")or ($col->{coltitle} eq \"\"))?\"zzEMPTY\":$col->{coltitle}}";
-# $colcount+=$cnttable{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}};
- push @loopcell, {value => $value} ;
+ foreach my $id (keys %patrons) {
+ my @uniq = keys %{{ %{$patrons{$id}->{newcols}}, %{$patrons{$id}->{oldcols}} }}; # get uniq keys, see perlfaq4
+ foreach (@uniq) {
+ my $count = ($patrons{$id}->{newcols}->{$_} || 0) +
+ ($patrons{$id}->{oldcols}->{$_} || 0);
+ $patrons{$id}->{allcols}->{$_} = $count;
+ $patrons{$id}->{total} += $count;
}
- #warn "row : $row colcount:$colcount";
- #my $total = $table[$i]->{totalrow}/$colcount if ($colcount>0);
- push @looprow,{ 'rowtitle' => $i ,
- 'loopcell' => \@loopcell,
- 'hilighted' => ($hilighted >0),
- #'totalrow' => ($total)?sprintf("%.2f",$total):0
- };
- $hilighted = -$hilighted;
}
-#
-
-
- # the header of the table
- $globalline{loopfilter}=\@loopfilter;
- # the core of the table
- $globalline{looprow} = \@looprow;
- $globalline{loopcol} = \@loopcol;
-# # the foot (totals by borrower type)
- $globalline{loopfooter} = \@loopfooter;
- $globalline{total}= $grantotal;
- $globalline{line} = $line;
- $globalline{column} = $column;
- push @mainloop,\%globalline;
- return \@mainloop;
+ $debug and print DEBUG "\n\npatrons: ", Dumper(\%patrons);
+
+ my $i = 1;
+ my @cols_in_order = sort keys %columns; # if you want to order the columns, do something here
+ my @ranked_ids = sort {
+ $patrons{$b}->{total} <=> $patrons{$a}->{total}
+ || $patrons{$a}->{name} cmp $patrons{$b}->{name}
+ } keys %patrons;
+ foreach my $id (@ranked_ids) {
+ my @loopcell;
+ foreach my $key (@cols_in_order) {
+ if($column){
+ push @loopcell, {
+ value => $patrons{$id}->{name},
+ reference => $id,
+ count => $patrons{$id}->{allcols}->{$key},
+ };
+ }else{
+ push @loopcell, {
+ value => $patrons{$id}->{name},
+ reference => $id,
+ count => $patrons{$id}->{total},
+ };
+ }
+ }
+ push @looprow,{ 'rowtitle' => $i++ ,
+ 'loopcell' => \@loopcell,
+ 'hilighted' => ($i%2),
+ };
+ }
+
+ # the header of the table
+ $globalline{loopfilter}=\@loopfilter;
+ # the core of the table
+ $globalline{looprow} = \@looprow;
+ $globalline{loopcol} = [ map {{coltitle=>$_}} @cols_in_order ];
+ # the foot (totals by borrower type)
+ $globalline{loopfooter} = [];
+ $globalline{total}= $grantotal; # FIXME: useless
+ $globalline{column} = $column;
+ return [\%globalline]; # reference to a 1 element array: that element is a hashref
}
-1;
\ No newline at end of file
+$debug and close DEBUG;
+1;
+__END__
projects / koha.git / blobdiff