From 8456bee398e743bc26232895f0f4d7139de42f1b Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 18 Apr 2007 14:19:52 +0000 Subject: [PATCH] improving issues_stats by adding location & itemcallnumber filters --- .../prog/en/reports/issues_stats.tmpl | 442 ++++----- reports/catalogue_stats.pl | 15 +- reports/issues_stats.pl | 894 +++++++++--------- 3 files changed, 691 insertions(+), 660 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl index 69bd4cea52..52a09ab4d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl @@ -12,225 +12,231 @@ - -

Issues statistics

- -

Filtered on

- -

=

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
/ TOTAL
- - -   - - - -
TOTAL - -
- + +

Issues statistics

+ +

Filtered on

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
/ TOTAL
+ + +   + + + +
TOTAL + +
+ -

Issues statistics

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Title
RowColumnFilter
Period From - /includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"> - - To - /includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0"> - -
Type :group by - - - Select Day : - Select Month : -
Borrower Category
Document Type
Branch
Sort1
Sort2
- - -

Cell value

-

Count issues

-

Circulation rate

- - -

Output

- To screen into the browser - - To file into an application - - -

- -

- - " /> - -

+

Issues statistics

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title
RowColumnFilter
Period From + /includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top"> + + To + /includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0"> + +
Type :group by + + Select Day : + Select Month : +
Borrower Category
Document Type
Branch
Location
Item CallnumberFrom (included) to (excluded)
Borrower sort1
Borrower sort2
+

Cell value

+

Count issues

+

Circulation rate

+

Output

+ To screen into the browser + To file into an application + + +

+

+ + " /> + +

diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index 16e3b506d1..b2c1494e6a 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -174,7 +174,7 @@ if ($do_it) { # warn "highlightLOC ".$hglghtLOC; - $req = $dbh->prepare("select distinctrow itemtype from biblioitems order by itemtype"); + $req = $dbh->prepare("select itemtype from itemtypes order by itemtype"); $req->execute; undef @select; push @select,""; @@ -216,12 +216,15 @@ if ($do_it) { -size => 1, -multiple => 0 ); - $req = $dbh->prepare("select distinctrow holdingbranch from items order by holdingbranch"); + $req = $dbh->prepare("select distinctrow location from items order by location"); $req->execute; undef @select; push @select,""; + while (my ($value) =$req->fetchrow) { + push @select, $value; + } my $CGIlocation=CGI::scrolling_list( -name => 'Filter', - -id => 'holdingbranch', + -id => 'location', -values => \@select, -size => 1, -multiple => 0 ); @@ -333,7 +336,7 @@ sub calculate { $linefilter[0] = @$filters[8] if ($line =~ /publicationyear/ ) ; $linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ; @linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ; - @linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ; + @linefilter[0] = @$filters[11] if ($line =~ /items.location/ ) ; # my @colfilter ; $colfilter[0] = @$filters[0] if ($column =~ /dewey/ ) ; @@ -347,7 +350,7 @@ sub calculate { $colfilter[0] = @$filters[8] if ($column =~ /publicationyear/ ) ; $colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ; @colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ; - @colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ; + @colfilter[0] = @$filters[11] if ($column =~ /items.location/ ) ; # 1st, loop rows. my $linefield; @@ -506,7 +509,7 @@ sub calculate { } if (@$filters[11]){ @$filters[11]=~ s/\*/%/g; - $strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] ); + $strcalc .= " AND items.location like '" . @$filters[11] ."'" if ( @$filters[11] ); } $strcalc .= " group by $linefield, $colfield order by $linefield,$colfield"; diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index dca3db46d8..bc5f4604e5 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -58,489 +58,511 @@ 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 => {reports => 1}, - debug => 1, - }); + = get_template_and_user({template_name => $fullreportname, + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {reports => 1}, + debug => 1, + }); $template->param(do_it => $do_it, - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), - ); + intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), + intranetstylesheet => C4::Context->preference("intranetstylesheet"), + IntranetNav => C4::Context->preference("IntranetNav"), + ); if ($do_it) { # Displaying results - my $results = calculate($line, $column, $podsp, $type, $daysel, $monthsel, $calc, \@filters); - if ($output eq "screen"){ + my $results = calculate($line, $column, $podsp, $type, $daysel, $monthsel, $calc, \@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); + output_html_with_http_headers $input, $cookie, $template->output; + exit(1); + } else { # Printing to a csv file - 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}; - 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}; + my $sep; + $sep =C4::Context->preference("delimiter"); # 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"; + foreach my $col ( @$cols ) { + print $col->{coltitle}.$sep; + } + print "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; + foreach my $cell (@$x) { + print $cell->{value}.$sep; + } + print $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); - } + 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; - $req = $dbh->prepare("select distinctrow categorycode,description from categories order by description"); - $req->execute; - my @select; - push @select,""; - $select{""}=""; - while (my ($value, $desc) =$req->fetchrow) { - push @select, $value; - $select{$value}=$desc; - } - my $CGIBorCat=CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', - -values => \@select, - -labels => \%select, - -size => 1, - -multiple => 0 ); - - $req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes order by description"); - $req->execute; - undef @select; - undef %select; - push @select,""; - $select{""}=""; - while (my ($value,$desc) =$req->fetchrow) { - push @select, $value; - $select{$value}=$desc; - } - my $CGIItemTypes=CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', - -values => \@select, - -labels => \%select, - -size => 1, - -multiple => 0 ); - - $req = $dbh->prepare("select distinctrow sort1 from borrowers where sort1 is not null order by sort1"); - $req->execute; - undef @select; - push @select,""; - my $hassort1; - while (my ($value) =$req->fetchrow) { - $hassort1 =1 if ($value); - push @select, $value; - } - my $branches=GetBranches(); - my @select_branch; - my %select_branches; - push @select_branch,""; - $select_branches{""} = ""; - foreach my $branch (keys %$branches) { - push @select_branch, $branch; - $select_branches{$branch} = $branches->{$branch}->{'branchname'}; - } - my $CGIBranch=CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', - -values => \@select_branch, - -labels => \%select_branches, - -size => 1, - -multiple => 0 ); - - my $CGISort1=CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', - -values => \@select, - -size => 1, - -multiple => 0 ); - - $req = $dbh->prepare("select distinctrow sort2 from borrowers where sort2 is not null order by sort2"); - $req->execute; - undef @select; - push @select,""; - my $hassort2; - my $hglghtsort2; - while (my ($value) =$req->fetchrow) { - $hassort2 =1 if ($value); - $hglghtsort2= !($hassort1); - push @select, $value; - } - my $CGISort2=CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', - -values => \@select, - -size => 1, - -multiple => 0 ); - - 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( - CGIBorCat => $CGIBorCat, - CGIItemType => $CGIItemTypes, - CGIBranch => $CGIBranch, - hassort1=> $hassort1, - hassort2=> $hassort2, - HlghtSort2 => $hglghtsort2, - CGISort1 => $CGISort1, - CGISort2 => $CGISort2, - CGIextChoice => $CGIextChoice, - CGIsepChoice => $CGIsepChoice - ); -output_html_with_http_headers $input, $cookie, $template->output; + my $dbh = C4::Context->dbh; + my @values; + my %labels; + my %select; + my $req; + $req = $dbh->prepare("select distinctrow categorycode,description from categories order by description"); + $req->execute; + my @select; + push @select,""; + $select{""}=""; + while (my ($value, $desc) =$req->fetchrow) { + push @select, $value; + $select{$value}=$desc; + } + my $CGIBorCat=CGI::scrolling_list( -name => 'Filter', + -id => 'Filter', + -values => \@select, + -labels => \%select, + -size => 1, + -multiple => 0 ); + + $req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes order by description"); + $req->execute; + undef @select; + undef %select; + push @select,""; + $select{""}=""; + while (my ($value,$desc) =$req->fetchrow) { + push @select, $value; + $select{$value}=$desc; + } + my $CGIItemTypes=CGI::scrolling_list( -name => 'Filter', + -id => 'Filter', + -values => \@select, + -labels => \%select, + -size => 1, + -multiple => 0 ); + + $req = $dbh->prepare("select distinctrow sort1 from borrowers where sort1 is not null order by sort1"); + $req->execute; + undef @select; + push @select,""; + my $hassort1; + while (my ($value) =$req->fetchrow) { + $hassort1 =1 if ($value); + push @select, $value; + } + my $branches=GetBranches(); + my @select_branch; + my %select_branches; + push @select_branch,""; + $select_branches{""} = ""; + foreach my $branch (keys %$branches) { + push @select_branch, $branch; + $select_branches{$branch} = $branches->{$branch}->{'branchname'}; + } + my $CGIBranch=CGI::scrolling_list( -name => 'Filter', + -id => 'Filter', + -values => \@select_branch, + -labels => \%select_branches, + -size => 1, + -multiple => 0 ); + + my $CGISort1=CGI::scrolling_list( -name => 'Filter', + -id => 'Filter', + -values => \@select, + -size => 1, + -multiple => 0 ); + + $req = $dbh->prepare("select distinctrow sort2 from borrowers where sort2 is not null order by sort2"); + $req->execute; + undef @select; + push @select,""; + my $hassort2; + my $hglghtsort2; + while (my ($value) =$req->fetchrow) { + $hassort2 =1 if ($value); + $hglghtsort2= !($hassort1); + push @select, $value; + } + my $CGISort2=CGI::scrolling_list( -name => 'Filter', + -id => 'Filter', + -values => \@select, + -size => 1, + -multiple => 0 ); + # location list + $req = $dbh->prepare("select distinctrow location from items order by location"); + $req->execute; + undef @select; + push @select,""; + while (my ($value) =$req->fetchrow) { + push @select, $value; + } + my $CGIlocation=CGI::scrolling_list( -name => 'Filter', + -id => 'location', + -values => \@select, + -size => 1, + -multiple => 0 ); + # various + my @mime = ( C4::Context->preference("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( + CGIBorCat => $CGIBorCat, + CGIItemType => $CGIItemTypes, + CGIBranch => $CGIBranch, + hassort1=> $hassort1, + hassort2=> $hassort2, + HlghtSort2 => $hglghtsort2, + CGISort1 => $CGISort1, + CGISort2 => $CGISort2, + CGIextChoice => $CGIextChoice, + CGIsepChoice => $CGIsepChoice, + CGILocation => $CGIlocation, + ); + output_html_with_http_headers $input, $cookie, $template->output; } sub calculate { - my ($line, $column, $dsp, $type,$daysel,$monthsel ,$process, $filters) = @_; - my @mainloop; - my @loopfooter; - my @loopcol; - my @loopline; - my @looprow; - my %globalline; - my $grantotal =0; + my ($line, $column, $dsp, $type,$daysel,$monthsel ,$process, $filters) = @_; + my @mainloop; + my @loopfooter; + my @loopcol; + my @loopline; + my @looprow; + my %globalline; + my $grantotal =0; # extract parameters - my $dbh = C4::Context->dbh; + 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} .="Period From" if ($i==0); - $cell{crit} .="Period To" if ($i==1); - $cell{crit} .="Borrower Cat" if ($i==2); - $cell{crit} .="Doc Type" if ($i==3); - $cell{crit} .="Branch" if ($i==4); - $cell{crit} .="Sort1" if ($i==5); - $cell{crit} .="Sort2" if ($i==6); - push @loopfilter, \%cell; - } - } - push @loopfilter,{crit=>"Issue|Return ",filter=>$type}; - push @loopfilter,{crit=>"Display by ",filter=>$dsp} if ($dsp); - push @loopfilter,{crit=>"Select Day ",filter=>$daysel} if ($daysel); - push @loopfilter,{crit=>"Select Month ",filter=>$monthsel} if ($monthsel); - - - my @linefilter; + my @loopfilter; + for (my $i=0;$i<=9;$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} .="Period From" if ($i==0); + $cell{crit} .="Period To" if ($i==1); + $cell{crit} .="Borrower Cat=" if ($i==2); + $cell{crit} .="Doc Type=" if ($i==3); + $cell{crit} .="Branch=" if ($i==4); + $cell{crit} .="Location=" if ($i==5); + $cell{crit} .="Item callnumber>=" if ($i==6); + $cell{crit} .="Item callnumber<" if ($i==7); + $cell{crit} .="sort1=" if ($i==8); + $cell{crit} .="sort2=" if ($i==9); + + push @loopfilter, \%cell; + } + } + push @loopfilter,{crit=>"Issue|Return ",filter=>$type}; + push @loopfilter,{crit=>"Display by ",filter=>$dsp} if ($dsp); + push @loopfilter,{crit=>"Select Day ",filter=>$daysel} if ($daysel); + push @loopfilter,{crit=>"Select Month ",filter=>$monthsel} if ($monthsel); + + + my @linefilter; # warn "filtres ".@filters[0]; # warn "filtres ".@filters[1]; # warn "filtres ".@filters[2]; # warn "filtres ".@filters[3]; - - $linefilter[0] = @$filters[0] if ($line =~ /datetime/ ) ; - $linefilter[1] = @$filters[1] if ($line =~ /datetime/ ) ; - $linefilter[0] = @$filters[2] if ($line =~ /category/ ) ; - $linefilter[0] = @$filters[3] if ($line =~ /itemtype/ ) ; - $linefilter[0] = @$filters[4] if ($line =~ /branch/ ) ; -# $linefilter[0] = @$filters[11] if ($line =~ /sort2/ ) ; - $linefilter[0] = @$filters[5] if ($line =~ /sort1/ ) ; - $linefilter[0] = @$filters[6] if ($line =~ /sort2/ ) ; -#warn "filtre lignes".$linefilter[0]." ".$linefilter[1]; -# - my @colfilter ; - $colfilter[0] = @$filters[0] if ($column =~ /datetime/) ; - $colfilter[1] = @$filters[1] if ($column =~ /datetime/) ; - $colfilter[0] = @$filters[2] if ($column =~ /category/) ; - $colfilter[0] = @$filters[3] if ($column =~ /itemtype/) ; - $colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ; - $colfilter[0] = @$filters[5] if ($column =~ /sort1/ ) ; - $colfilter[0] = @$filters[6] if ($column =~ /sort2/ ) ; -#warn "filtre col ".$colfilter[0]." ".$colfilter[1]; - + + $linefilter[0] = @$filters[0] if ($line =~ /datetime/ ) ; + $linefilter[1] = @$filters[1] if ($line =~ /datetime/ ) ; + $linefilter[0] = @$filters[2] if ($line =~ /category/ ) ; + $linefilter[0] = @$filters[3] if ($line =~ /itemtype/ ) ; + $linefilter[0] = @$filters[4] if ($line =~ /branch/ ) ; + $linefilter[0] = @$filters[5] if ($line =~ /location/ ) ; + $linefilter[0] = @$filters[6] if ($line =~ /sort1/ ) ; + $linefilter[0] = @$filters[7] if ($line =~ /sort2/ ) ; + + my @colfilter ; + $colfilter[0] = @$filters[0] if ($column =~ /datetime/) ; + $colfilter[1] = @$filters[1] if ($column =~ /datetime/) ; + $colfilter[0] = @$filters[2] if ($column =~ /category/) ; + $colfilter[0] = @$filters[3] if ($column =~ /itemtype/) ; + $colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ; + $colfilter[0] = @$filters[5] if ($column =~ /location/ ) ; + $colfilter[0] = @$filters[6] if ($column =~ /sort1/ ) ; + $colfilter[0] = @$filters[7] if ($column =~ /sort2/ ) ; # 1st, loop rows. - my $linefield; - if (($line =~/datetime/) and ($dsp == 1)) { - #Display by day - $linefield .="dayname($line)"; - } elsif (($line=~/datetime/) and ($dsp == 2)) { - #Display by Month - $linefield .="monthname($line)"; - } elsif (($line=~/datetime/) and ($dsp == 3)) { - #Display by Year - $linefield .="Year($line)"; - } elsif ($line=~/datetime/) { - $linefield .= 'date_format(`datetime`,"%Y-%m-%d")'; - } else { - $linefield .= $line; - } - my $lineorder = $linefield; - $lineorder = "weekday($line)" if $linefield =~ /dayname/; - $lineorder = "month($line)" if $linefield =~ "^month"; - $lineorder = $linefield if (not ($linefield =~ "^month") and not($linefield =~ /dayname/)); + my $linefield; + if (($line =~/datetime/) and ($dsp == 1)) { + #Display by day + $linefield .="dayname($line)"; + } elsif (($line=~/datetime/) and ($dsp == 2)) { + #Display by Month + $linefield .="monthname($line)"; + } elsif (($line=~/datetime/) and ($dsp == 3)) { + #Display by Year + $linefield .="Year($line)"; + } elsif ($line=~/datetime/) { + $linefield .= 'date_format(`datetime`,"%Y-%m-%d")'; + } else { + $linefield .= $line; + } + my $lineorder = $linefield; + $lineorder = "weekday($line)" if $linefield =~ /dayname/; + $lineorder = "month($line)" if $linefield =~ "^month"; + $lineorder = $linefield if (not ($linefield =~ "^month") and not($linefield =~ /dayname/)); - my $strsth; - $strsth .= "select distinctrow $linefield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not null "; - - if ($line=~/datetime/) { - if ($linefilter[1] and ($linefilter[0])){ - $strsth .= " and $line between ? and ? " ; - } elsif ($linefilter[1]) { - $strsth .= " and $line < ? " ; - } elsif ($linefilter[0]) { - $strsth .= " and $line > ? " ; - } - $strsth .= " and type ='".$type."' " if $type; - $strsth .= " and dayname(datetime) ='". $daysel ."' " if $daysel; - $strsth .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel; - } elsif ($linefilter[0]) { - $linefilter[0] =~ s/\*/%/g; - $strsth .= " and $line LIKE ? " ; - } - $strsth .=" group by $linefield"; - $strsth .=" order by $lineorder"; - warn "". $strsth; - - my $sth = $dbh->prepare( $strsth ); - if (( @linefilter ) and ($linefilter[1])){ - $sth->execute("'".$linefilter[0]."'","'".$linefilter[1]."'"); - } elsif ($linefilter[0]) { - $sth->execute($linefilter[0]); - } else { - $sth->execute; - } - - while ( my ($celvalue) = $sth->fetchrow) { - my %cell; - if ($celvalue) { - $cell{rowtitle} = $celvalue; - } else { - $cell{rowtitle} = ""; - } - $cell{totalrow} = 0; - push @loopline, \%cell; - } + my $strsth; + $strsth .= "select distinctrow $linefield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not null "; + + if ($line=~/datetime/) { + if ($linefilter[1] and ($linefilter[0])){ + $strsth .= " and $line between ? and ? " ; + } elsif ($linefilter[1]) { + $strsth .= " and $line < ? " ; + } elsif ($linefilter[0]) { + $strsth .= " and $line > ? " ; + } + $strsth .= " and type ='".$type."' " if $type; + $strsth .= " and dayname(datetime) ='". $daysel ."' " if $daysel; + $strsth .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel; + } elsif ($linefilter[0]) { + $linefilter[0] =~ s/\*/%/g; + $strsth .= " and $line LIKE ? " ; + } + $strsth .=" group by $linefield"; + $strsth .=" order by $lineorder"; + warn "". $strsth; + + my $sth = $dbh->prepare( $strsth ); + if (( @linefilter ) and ($linefilter[1])){ + $sth->execute("'".$linefilter[0]."'","'".$linefilter[1]."'"); + } elsif ($linefilter[0]) { + $sth->execute($linefilter[0]); + } else { + $sth->execute; + } + + while ( my ($celvalue) = $sth->fetchrow) { + my %cell; + if ($celvalue) { + $cell{rowtitle} = $celvalue; + } else { + $cell{rowtitle} = ""; + } + $cell{totalrow} = 0; + push @loopline, \%cell; + } # 2nd, loop cols. - my $colfield; - my $colorder; - if (($column =~/datetime/) and ($dsp == 1)) { - #Display by day - $colfield .="dayname($column)"; - } elsif (($column=~/datetime/) and ($dsp == 2)) { - #Display by Month - $colfield .="monthname($column)"; - } elsif (($column=~/datetime/) and ($dsp == 3)) { - #Display by Year - $colfield .="Year($column)"; - } elsif ($column=~/datetime/) { - $colfield .='date_format(`datetime`,"%Y-%m-%d")'; - } else { - $colfield .= $column; - } - $colorder = "weekday($line)" if $colfield =~ "^dayname"; - $colorder = "month($line)" if $colfield =~ "^month"; - $colorder = $colfield if (not ($colfield =~ "^month") and not($colfield =~ "^dayname")); - - my $strsth2; - $strsth2 .= "select distinctrow $colfield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $column is not null "; - - if ($column=~/datetime/){ - if (($colfilter[1]) and ($colfilter[0])){ - $strsth2 .= " and $column between ? and ? " ; - } elsif ($colfilter[1]) { - $strsth2 .= " and $column < ? " ; - } elsif ($colfilter[0]) { - $strsth2 .= " and $column > ? " ; - } - $strsth2 .= " and type ='".$type."' " if $type; - $strsth2 .= " and dayname(datetime) ='". $daysel ."' " if $daysel; - $strsth2 .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel; - } elsif ($colfilter[0]) { - $colfilter[0] =~ s/\*/%/g; - $strsth2 .= " and $column LIKE ? " ; - } - $strsth2 .=" group by $colfield"; - $strsth2 .=" order by $colorder"; + my $colfield; + my $colorder; + if (($column =~/datetime/) and ($dsp == 1)) { + #Display by day + $colfield .="dayname($column)"; + } elsif (($column=~/datetime/) and ($dsp == 2)) { + #Display by Month + $colfield .="monthname($column)"; + } elsif (($column=~/datetime/) and ($dsp == 3)) { + #Display by Year + $colfield .="Year($column)"; + } elsif ($column=~/datetime/) { + $colfield .='date_format(`datetime`,"%Y-%m-%d")'; + } else { + $colfield .= $column; + } + $colorder = "weekday($line)" if $colfield =~ "^dayname"; + $colorder = "month($line)" if $colfield =~ "^month"; + $colorder = $colfield if (not ($colfield =~ "^month") and not($colfield =~ "^dayname")); + + my $strsth2; + $strsth2 .= "select distinctrow $colfield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $column is not null "; + + if ($column=~/datetime/){ + if (($colfilter[1]) and ($colfilter[0])){ + $strsth2 .= " and $column between ? and ? " ; + } elsif ($colfilter[1]) { + $strsth2 .= " and $column < ? " ; + } elsif ($colfilter[0]) { + $strsth2 .= " and $column > ? " ; + } + $strsth2 .= " and type ='".$type."' " if $type; + $strsth2 .= " and dayname(datetime) ='". $daysel ."' " if $daysel; + $strsth2 .= " and monthname(datetime) ='". $monthsel ."' " if $monthsel; + } elsif ($colfilter[0]) { + $colfilter[0] =~ s/\*/%/g; + $strsth2 .= " and $column LIKE ? " ; + } + $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; - } - + + 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; + while (my ($celvalue) = $sth2->fetchrow) { + my %cell; + my %ft; # warn "coltitle :".$celvalue; - $cell{coltitle} = $celvalue; - $ft{totalcol} = 0; - push @loopcol, \%cell; - } + $cell{coltitle} = $celvalue; + $ft{totalcol} = 0; + push @loopcol, \%cell; + } # warn "fin des titres colonnes"; - my $i=0; - my @totalcol; - my $hilighted=-1; - - #Initialization of cell values..... - my %table; + my $i=0; + my @totalcol; + my $hilighted=-1; + + #Initialization of cell values..... + my %table; # warn "init table"; - foreach my $row ( @loopline ) { - foreach my $col ( @loopcol ) { + 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}}->{$col->{coltitle}}=0; + } + $table{$row->{rowtitle}}->{totalrow}=0; + } # preparing calculation - my $strcalc ; - - $strcalc .= "SELECT $linefield, $colfield, "; - $strcalc .= "COUNT( * ) " if ($process ==1); - if ($process ==2){ - $strcalc .= "(COUNT(DISTINCT borrowers.borrowernumber))" ; - } - if ($process ==3){ - $strcalc .= "(COUNT(DISTINCT issues.itemnumber))" ; - } - if ($process ==4){ - my $rqbookcount = $dbh->prepare("SELECT count(*) FROM items"); - $rqbookcount->execute; - my ($bookcount) = $rqbookcount->fetchrow; - $strcalc .= "100*(COUNT(DISTINCT issues.itemnumber))/ $bookcount " ; - } - $strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) "; + my $strcalc ; - @$filters[0]=~ s/\*/%/g if (@$filters[0]); - $strcalc .= " AND statistics.datetime > '" . @$filters[0] ."'" if ( @$filters[0] ); - @$filters[1]=~ s/\*/%/g if (@$filters[1]); - $strcalc .= " AND statistics.datetime < '" . @$filters[1] ."'" if ( @$filters[1] ); - @$filters[2]=~ s/\*/%/g if (@$filters[2]); - $strcalc .= " AND borrowers.categorycode like '" . @$filters[2] ."'" if ( @$filters[2] ); - @$filters[3]=~ s/\*/%/g if (@$filters[3]); - $strcalc .= " AND statistics.itemtype like '" . @$filters[3] ."'" if ( @$filters[3] ); - @$filters[4]=~ s/\*/%/g if (@$filters[4]); - $strcalc .= " AND statistics.branch like '" . @$filters[4] ."'" if ( @$filters[4] ); - @$filters[5]=~ s/\*/%/g if (@$filters[5]); - $strcalc .= " AND borrowers.sort1 like '" . @$filters[5] ."'" if ( @$filters[5] ); - @$filters[6]=~ s/\*/%/g if (@$filters[6]); - $strcalc .= " AND borrowers.sort2 like '" . @$filters[6] ."'" if ( @$filters[6] ); - $strcalc .= " AND dayname(datetime) like '" . $daysel ."'" if ( $daysel ); - $strcalc .= " AND monthname(datetime) like '" . $monthsel ."'" if ( $monthsel ); - $strcalc .= " AND statistics.type like '" . $type ."'" if ( $type ); - - $strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder"; - warn "". $strcalc; - my $dbcalc = $dbh->prepare($strcalc); - $dbcalc->execute; + $strcalc .= "SELECT $linefield, $colfield, "; + $strcalc .= "COUNT( * ) " if ($process ==1); + if ($process ==2){ + $strcalc .= "(COUNT(DISTINCT borrowers.borrowernumber))" ; + } + if ($process ==3){ + $strcalc .= "(COUNT(DISTINCT issues.itemnumber))" ; + } + if ($process ==4){ + my $rqbookcount = $dbh->prepare("SELECT count(*) FROM items"); + $rqbookcount->execute; + my ($bookcount) = $rqbookcount->fetchrow; + $strcalc .= "100*(COUNT(DISTINCT issues.itemnumber))/ $bookcount " ; + } + $strcalc .= "FROM statistics "; + $strcalc .= "LEFT JOIN borrowers ON statistics.borrowernumber=borrowers.borrowernumber "; + $strcalc .= "LEFT JOIN items ON statistics.itemnumber=items.itemnumber " if @$filters[5] or @$filters[6]; + + $strcalc .= "WHERE 1=1 "; + @$filters[0]=~ s/\*/%/g if (@$filters[0]); + $strcalc .= " AND statistics.datetime > '" . @$filters[0] ."'" if ( @$filters[0] ); + @$filters[1]=~ s/\*/%/g if (@$filters[1]); + $strcalc .= " AND statistics.datetime < '" . @$filters[1] ."'" if ( @$filters[1] ); + @$filters[2]=~ s/\*/%/g if (@$filters[2]); + $strcalc .= " AND borrowers.categorycode like '" . @$filters[2] ."'" if ( @$filters[2] ); + @$filters[3]=~ s/\*/%/g if (@$filters[3]); + $strcalc .= " AND statistics.itemtype like '" . @$filters[3] ."'" if ( @$filters[3] ); + @$filters[4]=~ s/\*/%/g if (@$filters[4]); + $strcalc .= " AND statistics.branch like '" . @$filters[4] ."'" if ( @$filters[4] ); + @$filters[5]=~ s/\*/%/g if (@$filters[5]); + $strcalc .= " AND items.location like '" . @$filters[5] ."'" if ( @$filters[5] ); + @$filters[6]=~ s/\*/%/g if (@$filters[6]); + $strcalc .= " AND items.itemcallnumber >='" . @$filters[6] ."'" if ( @$filters[6] ); + @$filters[7]=~ s/\*/%/g if (@$filters[7]); + $strcalc .= " AND items.itemcallnumber <'" . @$filters[7] ."'" if ( @$filters[7] ); + @$filters[8]=~ s/\*/%/g if (@$filters[8]); + $strcalc .= " AND borrowers.sort1 like '" . @$filters[8] ."'" if ( @$filters[8] ); + @$filters[9]=~ s/\*/%/g if (@$filters[9]); + $strcalc .= " AND borrowers.sort2 like '" . @$filters[9] ."'" if ( @$filters[9] ); + $strcalc .= " AND dayname(datetime) like '" . $daysel ."'" if ( $daysel ); + $strcalc .= " AND monthname(datetime) like '" . $monthsel ."'" if ( $monthsel ); + $strcalc .= " AND statistics.type like '" . $type ."'" if ( $type ); + + $strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder"; + warn "". $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); - - $table{$row}->{$col}+=$value; - $table{$row}->{totalrow}+=$value; - $grantotal += $value; - } - push @loopcol,{coltitle => "NULL"} if ($emptycol); + 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); + + $table{$row}->{$col}+=$value; + $table{$row}->{totalrow}+=$value; + $grantotal += $value; + } + push @loopcol,{coltitle => "NULL"} if ($emptycol); - foreach my $row (@loopline) { - 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->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}}; - push @loopcell, {value => $value } ; - } - push @looprow,{ 'rowtitle' => ($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}, - 'loopcell' => \@loopcell, - 'hilighted' => ($hilighted >0), - 'totalrow' => $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{totalrow} - }; - $hilighted = -$hilighted; - } - + foreach my $row (@loopline) { + 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->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}}; + push @loopcell, {value => $value } ; + } + push @looprow,{ 'rowtitle' => ($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}, + 'loopcell' => \@loopcell, + 'hilighted' => ($hilighted >0), + 'totalrow' => $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{totalrow} + }; + $hilighted = -$hilighted; + } + # warn "footer processing"; - foreach my $col ( @loopcol ) { - my $total=0; - foreach my $row ( @looprow ) { - $total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}}; + foreach my $col ( @loopcol ) { + my $total=0; + foreach my $row ( @looprow ) { + $total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}}; # warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle}; - } + } # warn "summ for column ".$col->{coltitle}." = ".$total; - push @loopfooter, {'totalcol' => $total}; - } - + push @loopfooter, {'totalcol' => $total}; + } + - # the header of the table - $globalline{loopfilter}=\@loopfilter; - # the core of the table - $globalline{looprow} = \@looprow; - $globalline{loopcol} = \@loopcol; + # 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; + $globalline{loopfooter} = \@loopfooter; + $globalline{total}= $grantotal; + $globalline{line} = $line; + $globalline{column} = $column; + push @mainloop,\%globalline; + return \@mainloop; } 1; -- 2.20.1