diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl index 09f72ae4ba..2b279c000e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl @@ -3,7 +3,7 @@ -

Koha : Top List On borrowers' Issues

+

Koha : Top List borrowers for Issues

Filtered on

@@ -32,7 +32,7 @@ -

Koha : Top List On borrowers' Issues

+

Koha : Top List borrowers for Issues

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl new file mode 100644 index 0000000000..4b04afacf6 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl @@ -0,0 +1,94 @@ + +
+ + + +

Koha : Borrowers with No Issues

+ +

Filtered on

+ +

+ + +
+
+ + + + + + + + + + + + + + +
Num/Borrowers
+ + +
+ + +

Koha : Borrowers with no Issues

+ + + + + + + + + + + + + + + + + + + + + + +
Limit to By Filters
+ + + +
  Borrower Category
+ +
+

Output

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

+
+

+ + "> + +

+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl index 9237a9b9a6..4c2bd1782a 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl @@ -13,7 +13,7 @@
- + diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl new file mode 100644 index 0000000000..e847e46228 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl @@ -0,0 +1,99 @@ + +
+ + + +

Koha : Items with no Issues

+ +

Filtered on

+ +

+ + +
+
Rank/TitlesRank/biblioitemnumber
+ + + + + + + + + + + + + + +
Num/Items
+ + +
+ + +

Koha : Items with no Issues

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Limit to By Filters
+ + + +
  Branch
  Document Type
+ +
+

Output

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

+ + "> + +

+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl index 82fc60d5ae..55a11d2b66 100644 --- a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl @@ -8,33 +8,26 @@ -

-

-

Stat wizard on

-

Acquisitions

-

Borrowers

-

Catalogue

-

Issues

-
-

-

-

-

Top Lists

-

on issues

- -
-

-

-
-

Outsiders

-

No issue Borrowers

-

No issue Items

-
+

+

+

Top Lists

+

on issues

+ +
+

+

+

+

Stat wizard on

+

Acquisitions

+

Borrowers

+

Catalogue

+

Issues

+
+

-

Other stats

@@ -54,13 +47,20 @@
-
-

data exports

-
  • Borrowers
    • -
  • Circulation
    • -
  • Acquisitions
    • -
  • Issues
    • -
    +

    +

    +

    Outsiders

    +

    No issue Borrowers

    +

    No issue Items

    +
    +

    +
    +

    data exports

    +
  • Borrowers
    • +
  • Circulation
    • +
  • Acquisitions
    • +
  • Issues
    • +
    diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl index 235ac3d255..3883908b64 100755 --- a/reports/bor_issues_top.pl +++ b/reports/bor_issues_top.pl @@ -67,7 +67,7 @@ if ($do_it) { my $results = calculate($limit, $column, \@filters); if ($output eq "screen"){ # Printing results to screen - $template->param(mainloop => $results); + $template->param(mainloop => $results, limit=>$limit); output_html_with_http_headers $input, $cookie, $template->output; exit(1); } else { @@ -323,17 +323,15 @@ sub calculate { 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); + $i=1 if (($previous_col) and not($col eq $previous_col)); $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"}; + push @loopcol,{coltitle => "Global"} if not($column); for ($i=1; $i<=$line;$i++) { warn " ".$i; @@ -344,23 +342,15 @@ sub calculate { 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} ; } - #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; } diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl new file mode 100755 index 0000000000..0718c6bade --- /dev/null +++ b/reports/borrowers_out.pl @@ -0,0 +1,303 @@ +#!/usr/bin/perl + +# $Id$ + +# Copyright 2000-2002 Katipo Communications +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# 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 + +use strict; +use C4::Auth; +use CGI; +use C4::Context; +use HTML::Template; +use C4::Search; +use C4::Output; +use C4::Koha; +use C4::Interface::CGI::Output; +use C4::Circulation::Circ2; +use Date::Manip; + +=head1 NAME + +plugin that shows a stats on borrowers + +=head1 DESCRIPTION + + +=over2 + +=cut + +my $input = new CGI; +my $do_it=$input->param('do_it'); +my $fullreportname = "reports/borrowers_out.tmpl"; +my $limit = $input->param("Limit"); +my $column = $input->param("Criteria"); +my @filters = $input->param("Filter"); +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); +if ($do_it) { +# Displaying results + 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 { +# 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"); +# header top-right + print "num /". @$results[0]->{column} .$sep; +# Other header + 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"; + } +# 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; +} + + + + +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; + +# 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} .="Bor Cat" if ($i==0); + push @loopfilter, \%cell; + } + } + my $colfield; + my $colorder; + if ($column){ + $column = "borrowers.".$column if $column=~/categorycode/; + my @colfilter ; + $colfilter[0] = @$filters[0] if ($column =~ /category/ ) ; + # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ; + #warn "filtre col ".$colfilter[0]." ".$colfilter[1]; + + # loop cols. + $colfield .= $column; + $colorder .= $column; + + my $strsth2; + $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `issues` ON issues.borrowernumber=borrowers.borrowernumber"; + if ($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 ); + $sth2->execute; + + + + while (my ($celvalue) = $sth2->fetchrow) { + my %cell; + # my %ft; + # warn "coltitle :".$celvalue; + $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; + +# 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}:"Global"}=0; + } + } + + +# preparing calculation + my $strcalc ; + +# Processing average loanperiods + $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); + $strcalc .= " order by $colfield " if ($colfield); + my $max; + if (@loopcol) { + $max = $line*@loopcol; + } else { $max=$line;} + $strcalc .= " LIMIT 0,$max" if ($line); + 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, $col )=@data; + $col = "zzEMPTY" if ($col eq undef); + $i=1 if (($previous_col) and not($col eq $previous_col)); + $table[$i]->{$col}=$row; +# warn " ".$i." ".$col. " ".$row; + $i++; + $previous_col=$col; + } + + push @loopcol,{coltitle => "Global"} if not($column); + + my $max =(($line)?$line:@table); + for ($i=1; $i<=$max;$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){ + $value =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}; + } else { + $value =$table[$i]->{"zzEMPTY"}; + } + push @loopcell, {value => $value} ; + } + push @looprow,{ 'rowtitle' => $i , + 'loopcell' => \@loopcell, + 'hilighted' => ($hilighted >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; +} + +1; \ No newline at end of file diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index bfbf5b31b6..3e08f686f7 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -67,7 +67,8 @@ if ($do_it) { my $results = calculate($limit, $column, \@filters); if ($output eq "screen"){ # Printing results to screen - $template->param(mainloop => $results); + $template->param(mainloop => $results, + limit => $limit); output_html_with_http_headers $input, $cookie, $template->output; exit(1); } else { @@ -325,15 +326,15 @@ sub calculate { 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)); + $table[$i]->{$col}=$row; +# warn " ".$i." ".$col. " ".$row; + $i++; $previous_col=$col; # $table{$row}->{totalrow}+=$weight*$loanlength; } - push @loopcol,{coltitle => "Global"}; + push @loopcol,{coltitle => "Global"} if not ($column); for ($i=1; $i<=$line;$i++) { warn " ".$i; diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl new file mode 100755 index 0000000000..3a7c2424d4 --- /dev/null +++ b/reports/catalogue_out.pl @@ -0,0 +1,315 @@ +#!/usr/bin/perl + +# $Id$ + +# Copyright 2000-2002 Katipo Communications +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# 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 + +use strict; +use C4::Auth; +use CGI; +use C4::Context; +use HTML::Template; +use C4::Search; +use C4::Output; +use C4::Koha; +use C4::Interface::CGI::Output; +use C4::Circulation::Circ2; +use Date::Manip; + +=head1 NAME + +plugin that shows a stats on borrowers + +=head1 DESCRIPTION + + +=over2 + +=cut + +my $input = new CGI; +my $do_it=$input->param('do_it'); +my $fullreportname = "reports/catalogue_out.tmpl"; +my $limit = $input->param("Limit"); +my $column = $input->param("Criteria"); +my @filters = $input->param("Filter"); +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); +if ($do_it) { +# Displaying results + 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 { +# 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"); +# header top-right + print "num /". @$results[0]->{column} .$sep; +# Other header + 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"; + } +# 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; +} + + + + +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; + +# 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} .="Branch" if ($i==0); + $cell{crit} .="Doc Type" if ($i==1); + 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 =~ /branch/ ) ; + $colfilter[0] = @$filters[1] if ($column =~ /itemtype/ ) ; + + # loop cols. + $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 ($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 ); + $sth2->execute; + + + + while (my ($celvalue) = $sth2->fetchrow) { + my %cell; + # my %ft; + # warn "coltitle :".$celvalue; + $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; + +# 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}:"Global"}=0; + } + } + + +# preparing calculation + my $strcalc ; + +# Processing average loanperiods + $strcalc .= "SELECT CONCAT( items.itemnumber, \" \",biblioitems.biblioitemnumber)"; + $strcalc .= " , $colfield " if ($colfield); + $strcalc .= " FROM (items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber) LEFT JOIN issues ON issues.itemnumber=items.itemnumber WHERE issues.itemnumber is null"; +# @$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[0]=~ s/\*/%/g if (@$filters[0]); + $strcalc .= " AND items.homebranch like '" . @$filters[0] ."'" if ( @$filters[0] ); + @$filters[1]=~ s/\*/%/g if (@$filters[1]); + $strcalc .= " AND biblioitems.itemtype like '" . @$filters[1] ."'" if ( @$filters[1] ); + + $strcalc .= " group by items.itemnumber"; + $strcalc .= ", $colfield" if ($column); + $strcalc .= " order by $colfield " if ($colfield); + my $max; + if (@loopcol) { + $max = $line*@loopcol; + } else { $max=$line;} + $strcalc .= " LIMIT 0,$max" if ($line); + 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, $col )=@data; + $col = "zzEMPTY" if ($col eq undef); + $i=1 if (($previous_col) and not($col eq $previous_col)); + $table[$i]->{$col}=$row; +# warn " ".$i." ".$col. " ".$row; + $i++; + $previous_col=$col; + } + + push @loopcol,{coltitle => "Global"} if not($column); + + my $max =(($line)?$line:@table); + for ($i=1; $i<$max;$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){ + $value =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}; + } else { + $value =$table[$i]->{"zzEMPTY"}; + } + push @loopcell, {value => $value} ; + } + push @looprow,{ 'rowtitle' => $i , + 'loopcell' => \@loopcell, + 'hilighted' => ($hilighted >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; +} + +1; \ No newline at end of file