X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Facquisitions_stats.pl;h=cdc5b9a561288a50f507028ddd86fb92011846ba;hb=82f35d17fcef6f1f1424064a7b8e1cc5734d9514;hp=e4a8ff655c7745075dfbfe82a4e3e9341beee6ab;hpb=fc1342f73df868410e0ab670981f25ba2e1acd74;p=koha.git diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index e4a8ff655c..cdc5b9a561 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl -# $Id$ # Copyright 2000-2002 Katipo Communications # @@ -15,21 +14,24 @@ # 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. # test comment -use strict; +use Modern::Perl; + use C4::Auth; use CGI; use C4::Context; - +use C4::Reports; use C4::Output; use C4::Koha; -use C4::Interface::CGI::Output; -use C4::Circulation::Circ2; +use C4::Circulation; +use C4::Dates qw/format_date format_date_in_iso/; +use C4::Branch; +use C4::Biblio; =head1 NAME @@ -37,8 +39,7 @@ plugin that shows a stats on borrowers =head1 DESCRIPTION - -=over2 +=over 2 =cut @@ -48,40 +49,40 @@ my $fullreportname = "reports/acquisitions_stats.tmpl"; my $line = $input->param("Line"); my $column = $input->param("Column"); my @filters = $input->param("Filter"); +$filters[0] = format_date_in_iso( $filters[0] ); +$filters[1] = format_date_in_iso( $filters[1] ); +$filters[2] = format_date_in_iso( $filters[2] ); +$filters[3] = format_date_in_iso( $filters[3] ); my $podsp = $input->param("PlacedOnDisplay"); my $rodsp = $input->param("ReceivedOnDisplay"); -my $aodsp = $input->param("AcquiredOnDisplay"); ##added by mason. my $calc = $input->param("Cellvalue"); 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 => {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"), - ); -if ($do_it) { - #warn -"line=$line, col=$column, pod=$podsp, rod=$rodsp, aod=$aodsp, calc=$calc, filters=@filters\n"; +my ( $template, $borrowernumber, $cookie ) = 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) { my $results = - calculate( $line, $column, $podsp, $rodsp, $aodsp, $calc, \@filters ); + calculate( $line, $column, $podsp, $rodsp, $calc, \@filters ); if ( $output eq "screen" ) { $template->param( mainloop => $results ); output_html_with_http_headers $input, $cookie, $template->output; - exit(1); } else { print $input->header( @@ -92,8 +93,6 @@ if ($do_it) { ); 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; @@ -114,69 +113,41 @@ if ($do_it) { print $sep. $col->{totalcol}; } print $sep. @$results[0]->{total}; - exit(1); } + exit; } else { my $dbh = C4::Context->dbh; - my @values; - my %labels; - my %select; my $req; - $req = - $dbh->prepare( - "SELECT distinctrow id,name FROM aqbooksellers ORDER BY name"); + $req = $dbh->prepare("SELECT distinctrow id,name FROM aqbooksellers ORDER BY name"); $req->execute; - my @select; - push @select, ""; + my $booksellers = $req->fetchall_arrayref({}); - # $select{""}=""; - while ( my ( $value, $desc ) = $req->fetchrow ) { - push @select, $desc; - - # $select{$value}=$desc; - } - my $CGIBookSellers = 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 = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"); $req->execute; - undef @select; - undef %select; + my @select; + my %select; push @select, ""; - $select{""} = ""; + $select{''} = "All Item Types"; while ( my ( $value, $desc ) = $req->fetchrow ) { push @select, $value; $select{$value} = $desc; } my $CGIItemTypes = CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', + -id => 'itemtypes', -values => \@select, -labels => \%select, -size => 1, -multiple => 0 ); - $req = - $dbh->prepare( -"SELECT DISTINCTROW bookfundid,bookfundname FROM aqbookfund ORDER BY bookfundname" - ); + $req = $dbh->prepare("SELECT DISTINCTROW budget_code, budget_name FROM aqbudgets ORDER BY budget_name"); $req->execute; undef @select; undef %select; push @select, ""; - $select{""} = ""; + $select{''} = "All budgets"; while ( my ( $value, $desc ) = $req->fetchrow ) { push @select, $value; @@ -184,7 +155,7 @@ else { } my $CGIBudget = CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', + -id => 'budget', -values => \@select, -labels => \%select, -size => 1, @@ -197,16 +168,22 @@ else { ); $req->execute; undef @select; + undef %select; push @select, ""; + $select{''} = "All"; my $hassort1; while ( my ($value) = $req->fetchrow ) { - $hassort1 = 1 if ($value); - push @select, $value; + if ($value) { + $hassort1 = 1; + push @select, $value; + $select{$value} = $value; + } } my $CGISort1 = CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', + -id => 'sort1', -values => \@select, + -labels => \%select, -size => 1, -multiple => 0 ); @@ -217,64 +194,73 @@ else { ); $req->execute; undef @select; + undef %select; push @select, ""; + $select{''} = "All"; my $hassort2; my $hglghtsort2; while ( my ($value) = $req->fetchrow ) { - $hassort2 = 1 if ($value); - $hglghtsort2 = !($hassort1); - push @select, $value; + if ($value) { + $hassort2 = 1; + $hglghtsort2 = !($hassort1); + push @select, $value; + $select{$value} = $value; + } } my $CGISort2 = CGI::scrolling_list( -name => 'Filter', - -id => 'Filter', + -id => 'sort2', -values => \@select, + -labels => \%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, + -values => ['CSV'], # FIXME translation -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 - ); + my $CGIsepChoice = GetDelimiterChoices; + + my $branches = GetBranches; + my @branches; + foreach ( sort keys %$branches ) { + push @branches, $branches->{$_}; + } + + my $ccode_subfield_structure = GetMarcSubfieldStructureFromKohaField('items.ccode', ''); + my $ccode_label; + my $ccode_avlist; + if($ccode_subfield_structure) { + $ccode_label = $ccode_subfield_structure->{liblibrarian}; + $ccode_avlist = GetAuthorisedValues($ccode_subfield_structure->{authorised_value}); + } $template->param( - CGIBookSeller => $CGIBookSellers, + booksellers => $booksellers, CGIItemType => $CGIItemTypes, CGIBudget => $CGIBudget, hassort1 => $hassort1, hassort2 => $hassort2, - HlghtSort2 => $hglghtsort2, CGISort1 => $CGISort1, CGISort2 => $CGISort2, CGIextChoice => $CGIextChoice, - CGIsepChoice => $CGIsepChoice + CGIsepChoice => $CGIsepChoice, + branches => \@branches, + ccode_label => $ccode_label, + ccode_avlist => $ccode_avlist, ); } output_html_with_http_headers $input, $cookie, $template->output; sub calculate { - my ( $line, $column, $podsp, $rodsp, $aodsp, $process, $filters ) = @_; + my ( $line, $column, $podsp, $rodsp, $process, $filters ) = @_; my @mainloop; my @loopfooter; my @loopcol; @@ -283,6 +269,9 @@ sub calculate { my %globalline; my $grantotal = 0; + $podsp ||= 0; + $rodsp ||= 0; + # extract parameters my $dbh = C4::Context->dbh; @@ -290,134 +279,91 @@ sub calculate { # Checking filters # my @loopfilter; - for ( my $i = 0 ; $i <= 8 ; $i++ ) { - my %cell; - if ( @$filters[$i] ) { + for ( my $i = 0 ; $i <= @$filters ; $i++ ) { + if( defined @$filters[$i] and @$filters[$i] ne '' ) { + my %cell; if ( ( ( $i == 1 ) or ( $i == 3 ) ) and ( @$filters[ $i - 1 ] ) ) { - $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] ); + $cell{err} = 1 if ( @$filters[$i] lt @$filters[ $i - 1 ] ); + } + # format the dates filters, otherwise just fill as is + if ($i >= 4) { + $cell{filter} = @$filters[$i]; + } else { + $cell{filter} = format_date(@$filters[$i]); } - $cell{filter} .= @$filters[$i]; - $cell{crit} .= "Placed On From" if ( $i == 0 ); - $cell{crit} .= "Placed On To" if ( $i == 1 ); - $cell{crit} .= "Received On From" if ( $i == 2 ); - $cell{crit} .= "Received On To" if ( $i == 3 ); - - $cell{crit} .= "Acquired On From" if ( $i == 4 ); - $cell{crit} .= "Acquired On To" if ( $i == 5 ); - - $cell{crit} .= "BookSeller" if ( $i == 6 ); - $cell{crit} .= "Doc Type" if ( $i == 7 ); - $cell{crit} .= "Budget" if ( $i == 8 ); - $cell{crit} .= "Sort1" if ( $i == 9 ); - $cell{crit} .= "Sort2" if ( $i == 10 ); + $cell{crit} = $i; push @loopfilter, \%cell; } } - my @linefilter; - - # warn "filtres ".@filters[0]; - # warn "filtres ".@filters[1]; - # warn "filtres ".@filters[2]; - # warn "filtres ".@filters[3]; - - $linefilter[0] = @$filters[0] if ( $line =~ /closedate/ ); - $linefilter[1] = @$filters[1] if ( $line =~ /closedate/ ); - $linefilter[0] = @$filters[2] if ( $line =~ /received/ ); - $linefilter[1] = @$filters[3] if ( $line =~ /received/ ); - - $linefilter[0] = @$filters[4] if ( $line =~ /acquired/ ); - $linefilter[1] = @$filters[5] if ( $line =~ /acquired/ ); - - $linefilter[0] = @$filters[6] if ( $line =~ /bookseller/ ); - $linefilter[0] = @$filters[7] if ( $line =~ /itemtype/ ); - $linefilter[0] = @$filters[8] if ( $line =~ /bookfund/ ); - $linefilter[0] = @$filters[9] if ( $line =~ /sort1/ ); - $linefilter[0] = @$filters[10] if ( $line =~ /sort2/ ); - - #warn "filtre lignes".$linefilter[0]." ".$linefilter[1]; - # - my @colfilter; - $colfilter[0] = @$filters[0] if ( $column =~ /closedate/ ); - $colfilter[1] = @$filters[1] if ( $column =~ /closedate/ ); - $colfilter[0] = @$filters[2] if ( $column =~ /received/ ); - $colfilter[1] = @$filters[3] if ( $column =~ /received/ ); - - $colfilter[0] = @$filters[4] if ( $column =~ /acquired/ ); - $colfilter[1] = @$filters[5] if ( $column =~ /acquired/ ); - - $colfilter[0] = @$filters[6] if ( $column =~ /bookseller/ ); - $colfilter[0] = @$filters[7] if ( $column =~ /itemtype/ ); - $colfilter[0] = @$filters[8] if ( $column =~ /bookfund/ ); - $colfilter[0] = @$filters[9] if ( $column =~ /sort1/ ); - $colfilter[0] = @$filters[10] if ( $column =~ /sort2/ ); - - #warn "filtre col ".$colfilter[0]." ".$colfilter[1]; - - #warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n"; - - # 1st, loop rows. - my $linefield; - if ( ( $line =~ /closedate/ ) and ( $podsp == 1 ) ) { - - #Display by day - $linefield .= "dayname($line)"; - } - elsif ( ( $line =~ /closedate/ ) and ( $podsp == 2 ) ) { - - #Display by Month - $linefield .= "monthname($line)"; - } - elsif ( ( $line =~ /closedate/ ) and ( $podsp == 3 ) ) { - - #Display by Year - $linefield .= "Year($line)"; - - } - elsif ( ( $line =~ /received/ ) and ( $rodsp == 1 ) ) { - - #Display by day - $linefield .= "dayname($line)"; - } - elsif ( ( $line =~ /received/ ) and ( $rodsp == 2 ) ) { - - #Display by Month - $linefield .= "monthname($line)"; - } - elsif ( ( $line =~ /received/ ) and ( $rodsp == 3 ) ) { - - #Display by Year - $linefield .= "Year($line)"; - - } - elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 1 ) ) { - - #Display by day - $linefield .= "dayname($line)"; - } - elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 2 ) ) { - - #Display by Month - $linefield .= "monthname($line)"; + my %filter; + my %field; + foreach ($line, $column) { + $filter{$_} = []; + $field{$_} = $_; + given ($_) { + when (/closedate/) { + $filter{$_}->[0] = @$filters[0]; + $filter{$_}->[1] = @$filters[1]; + my $a = $_; + given ($podsp) { + when (1) { $field{$a} = "concat(hex(weekday($a)+1),'-',dayname($a))" } + when (2) { $field{$a} = "concat(hex(month($a)),'-',monthname($a))" } + when (3) { $field{$a} = "Year($a)" } + default { $field{$a} = $a } + } + } + when (/received/) { + $filter{$_}->[0] = @$filters[2]; + $filter{$_}->[1] = @$filters[3]; + my $a = $_; + given ($rodsp) { + when (1) { $field{$a} = "concat(hex(weekday($a)+1),'-',dayname($a))" } + when (2) { $field{$a} = "concat(hex(month($a)),'-',monthname($a))" } + when (3) { $field{$a} = "Year($a)" } + default { $field{$a} = $a } + } + } + when (/bookseller/) { + $filter{$_}->[0] = @$filters[4]; + } + when (/homebranch/) { + $filter{$_}->[0] = @$filters[5]; + } + when (/ccode/) { + $filter{$_}->[0] = @$filters[6]; + } + when (/itemtype/) { + $filter{$_}->[0] = @$filters[7]; + } + when (/budget/) { + $filter{$_}->[0] = @$filters[8]; + } + when (/sort1/) { + $filter{$_}->[0] = @$filters[9]; + } + when (/sort2/) { + $filter{$_}->[0] = @$filters[10]; + } + } } - elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 3 ) ) { - #Display by Year - $linefield .= "Year($line)"; + my @linefilter = @{ $filter{$line} }; + my $linefield = $field{$line}; + my @colfilter = @{ $filter{$column} }; + my $colfield = $field{$column}; - } - else { - $linefield .= $line; - } - - my $strsth; - $strsth .= - "SELECT DISTINCTROW $linefield FROM (aqorders, aqbasket,aqorderbreakdown) - LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber) - LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber) - LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber ) - LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno) - AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) AND $line IS NOT NULL "; + # 1st, loop rows. + my $strsth = " + SELECT DISTINCTROW $linefield + FROM aqorders + LEFT JOIN aqbasket ON (aqorders.basketno = aqbasket.basketno) + LEFT JOIN aqorders_items ON (aqorders.ordernumber = aqorders_items.ordernumber) + LEFT JOIN items ON (aqorders_items.itemnumber = items.itemnumber) + LEFT JOIN biblioitems ON (aqorders.biblionumber = biblioitems.biblionumber) + LEFT JOIN aqbudgets ON (aqorders.budget_id = aqbudgets.budget_id ) + LEFT JOIN aqbooksellers ON (aqbasket.booksellerid = aqbooksellers.id) + WHERE $line IS NOT NULL AND $line <> '' "; if (@linefilter) { if ( $linefilter[1] ) { @@ -425,17 +371,16 @@ sub calculate { $strsth .= " AND $line BETWEEN ? AND ? "; } else { - $strsth .= " AND $line < ? "; + $strsth .= " AND $line <= ? "; } } elsif ( ( $linefilter[0] ) and ( ( $line =~ /closedate/ ) - or ( $line =~ /received/ ) - or ( $line =~ /acquired/ ) ) + or ( $line =~ /received/ )) ) { - $strsth .= " AND $line > ? "; + $strsth .= " AND $line >= ? "; } elsif ( $linefilter[0] ) { $linefilter[0] =~ s/\*/%/g; @@ -443,13 +388,11 @@ sub calculate { } } $strsth .= " GROUP BY $linefield"; - $strsth .= " ORDER BY $linefield"; - - #warn "377:strsth= $strsth"; + $strsth .= " ORDER BY $line"; my $sth = $dbh->prepare($strsth); if ( (@linefilter) and ( $linefilter[1] ) ) { - $sth->execute( "'" . $linefilter[0] . "'", "'" . $linefilter[1] . "'" ); + $sth->execute( $linefilter[0], $linefilter[1] ); } elsif ( $linefilter[0] ) { $sth->execute( $linefilter[0] ); @@ -457,84 +400,27 @@ sub calculate { else { $sth->execute; } - while ( my ($celvalue) = $sth->fetchrow ) { my %cell; if ($celvalue) { $cell{rowtitle} = $celvalue; - - # } else { - # $cell{rowtitle} = ""; + push @loopline, \%cell; } $cell{totalrow} = 0; - push @loopline, \%cell; } - #warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n"; - # 2nd, loop cols. - my $colfield; - if ( ( $column =~ /closedate/ ) and ( $podsp == 1 ) ) { - - #Display by day - $colfield .= "dayname($column)"; - } - elsif ( ( $column =~ /closedate/ ) and ( $podsp == 2 ) ) { - - #Display by Month - $colfield .= "monthname($column)"; - } - elsif ( ( $column =~ /closedate/ ) and ( $podsp == 3 ) ) { - - #Display by Year - $colfield .= "Year($column)"; - - } - elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 1 ) ) { - - #Display by day - $colfield .= "dayname($column)"; - } - elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 2 ) ) { - - #Display by Month - $colfield .= "monthname($column)"; - } - elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 3 ) ) { - - #Display by Year - $colfield .= "Year($column)"; - - } - elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 1 ) ) { - - #Display by day - $colfield .= "dayname($column)"; - } - elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 2 ) ) { - - #Display by Month - $colfield .= "monthname($column)"; - } - elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 3 ) ) { - - #Display by Year - $colfield .= "Year($column)"; - - } - else { - $colfield .= $column; - } - - my $strsth2; - $strsth2 .= - "SELECT distinctrow $colfield FROM (aqorders, aqbasket,aqorderbreakdown) - LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber) - LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber) - LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber ) - LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) - WHERE (aqorders.basketno=aqbasket.basketno) AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) - AND $column IS NOT NULL"; + my $strsth2 = " + SELECT DISTINCTROW $colfield + FROM aqorders + LEFT JOIN aqbasket ON (aqorders.basketno = aqbasket.basketno) + LEFT JOIN aqorders_items ON (aqorders.ordernumber = aqorders_items.ordernumber) + LEFT JOIN items ON (aqorders_items.itemnumber = items.itemnumber) + LEFT JOIN biblioitems ON (aqorders.biblionumber = biblioitems.biblionumber) + LEFT JOIN aqbudgets ON (aqorders.budget_id = aqbudgets.budget_id ) + LEFT JOIN aqbooksellers ON (aqbasket.booksellerid = aqbooksellers.id) + WHERE $column IS NOT NULL AND $column <> '' + "; if (@colfilter) { if ( $colfilter[1] ) { @@ -542,33 +428,30 @@ sub calculate { $strsth2 .= " AND $column BETWEEN ? AND ? "; } else { - $strsth2 .= " AND $column < ? "; + $strsth2 .= " AND $column <= ? "; } } elsif ( ( $colfilter[0] ) and ( ( $column =~ /closedate/ ) - or ( $line =~ /received/ ) - or ( $line =~ /acquired/ ) ) + or ( $line =~ /received/ )) ) { - $strsth2 .= " AND $column > ? "; + $strsth2 .= " AND $column >= ? "; } elsif ( $colfilter[0] ) { $colfilter[0] =~ s/\*/%/g; $strsth2 .= " AND $column LIKE ? "; } } + $strsth2 .= " GROUP BY $colfield"; $strsth2 .= " ORDER BY $colfield"; - # warn "MASON:. $strsth2"; - my $sth2 = $dbh->prepare($strsth2); - if ( (@colfilter) and ( $colfilter[1] ) ) { - # warn "from : ".$colfilter[0]." To :".$colfilter[1]; - $sth2->execute( "'" . $colfilter[0] . "'", "'" . $colfilter[1] . "'" ); + if ( (@colfilter) and ($colfilter[1]) ) { + $sth2->execute( $colfilter[0], $colfilter[1] ); } elsif ( $colfilter[0] ) { $sth2->execute( $colfilter[0] ); @@ -576,19 +459,14 @@ sub calculate { else { $sth2->execute; } - - while ( my ($celvalue) = $sth2->fetchrow ) { + while ( my $celvalue = $sth2->fetchrow ) { my %cell; if ($celvalue) { - - # warn "coltitle :".$celvalue; $cell{coltitle} = $celvalue; + push @loopcol, \%cell; } - push @loopcol, \%cell; } - # warn "fin des titres colonnes"; - my $i = 0; my @totalcol; my $hilighted = -1; @@ -596,11 +474,8 @@ sub calculate { #Initialization of cell values..... my %table; - # warn "init table"; 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; @@ -609,42 +484,50 @@ sub calculate { # preparing calculation my $strcalc; $strcalc .= "SELECT $linefield, $colfield, "; - $strcalc .= "SUM( aqorders.quantity ) " if ( $process == 1 ); - $strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) " - if ( $process == 2 ); - $strcalc .= "FROM (aqorders, aqbasket,aqorderbreakdown) - LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber) - LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber) - LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber ) - LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno) - AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) "; - + given ($process) { + when (1) { $strcalc .= "COUNT(*) " } + when (2) { $strcalc .= "COUNT(DISTINCT(aqorders.biblionumber)) " } + when ([3,4,5]) { $strcalc .= "SUM(aqorders.listprice) " } + default { $strcalc .= "NULL " } + } + $strcalc .= " + FROM aqorders + LEFT JOIN aqbasket ON (aqorders.basketno = aqbasket.basketno) + LEFT JOIN aqorders_items ON (aqorders.ordernumber = aqorders_items.ordernumber) + LEFT JOIN items ON (aqorders_items.itemnumber = items.itemnumber) + LEFT JOIN biblioitems ON (aqorders.biblionumber = biblioitems.biblionumber) + LEFT JOIN aqbudgets ON (aqorders.budget_id = aqbudgets.budget_id ) + LEFT JOIN aqbooksellers ON (aqbasket.booksellerid = aqbooksellers.id) + WHERE aqorders.datecancellationprinted IS NULL "; + $strcalc .= " AND (aqorders.datereceived IS NULL OR aqorders.datereceived = '') " + if ( $process == 4 ); + $strcalc .= " AND aqorders.datereceived IS NOT NULL AND aqorders.datereceived <> '' " + if ( $process == 5 ); @$filters[0] =~ s/\*/%/g if ( @$filters[0] ); - $strcalc .= " AND aqbasket.closedate > '" . @$filters[0] . "'" + $strcalc .= " AND aqbasket.closedate >= '" . @$filters[0] . "'" if ( @$filters[0] ); @$filters[1] =~ s/\*/%/g if ( @$filters[1] ); - $strcalc .= " AND aqbasket.closedate < '" . @$filters[1] . "'" + $strcalc .= " AND aqbasket.closedate <= '" . @$filters[1] . "'" if ( @$filters[1] ); @$filters[2] =~ s/\*/%/g if ( @$filters[2] ); - $strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] . "'" + $strcalc .= " AND aqorders.datereceived >= '" . @$filters[2] . "'" if ( @$filters[2] ); @$filters[3] =~ s/\*/%/g if ( @$filters[3] ); - $strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] . "'" + $strcalc .= " AND aqorders.datereceived <= '" . @$filters[3] . "'" if ( @$filters[3] ); @$filters[4] =~ s/\*/%/g if ( @$filters[4] ); - $strcalc .= " AND aqbasket.closedate > '" . @$filters[4] . "'" + $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[4] . "'" if ( @$filters[4] ); - @$filters[5] =~ s/\*/%/g if ( @$filters[5] ); - $strcalc .= " AND aqbasket.closedate < '" . @$filters[5] . "'" + $strcalc .= " AND items.homebranch = '" . @$filters[5] . "'" if ( @$filters[5] ); @$filters[6] =~ s/\*/%/g if ( @$filters[6] ); - $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[6] . "'" + $strcalc .= " AND items.ccode = '" . @$filters[6] . "'" if ( @$filters[6] ); @$filters[7] =~ s/\*/%/g if ( @$filters[7] ); $strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[7] . "'" if ( @$filters[7] ); @$filters[8] =~ s/\*/%/g if ( @$filters[8] ); - $strcalc .= " AND aqbookfund.bookfundid LIKE '" . @$filters[8] . "'" + $strcalc .= " AND aqbudgets.budget_code LIKE '" . @$filters[8] . "'" if ( @$filters[8] ); @$filters[9] =~ s/\*/%/g if ( @$filters[9] ); $strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[9] . "'" @@ -652,20 +535,16 @@ sub calculate { @$filters[10] =~ s/\*/%/g if ( @$filters[10] ); $strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[10] . "'" if ( @$filters[10] ); - $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield"; - # warn "/n/n". $strcalc; + $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield"; 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; @@ -676,28 +555,24 @@ sub calculate { 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} - }; + my $value = $table{$row}->{ ( $col->{coltitle} eq "NULL" ) ? "zzEMPTY" : $col->{coltitle} }; + $value = sprintf("%.2f", $value) if($value and grep /$process/, (3,4,5)); push @loopcell, { value => $value }; } - push @looprow, - { - 'rowtitle' => ( $row eq "zzEMPTY" ) ? "NULL" : $row, - 'loopcell' => \@loopcell, - 'hilighted' => ( $hilighted > 0 ), - 'totalrow' => $table{$row}->{totalrow} - }; + my $r = { + rowtitle => ( $row eq "zzEMPTY" ) ? "NULL" : $row, + loopcell => \@loopcell, + hilighted => ( $hilighted > 0 ), + totalrow => $table{$row}->{totalrow} + }; + $r->{totalrow} = sprintf("%.2f", $r->{totalrow}) if($r->{totalrow} and grep /$process/, (3,4,5)); + push @looprow, $r; $hilighted = -$hilighted; } - # warn "footer processing"; foreach my $col (@loopcol) { my $total = 0; foreach my $row (@looprow) { @@ -708,21 +583,20 @@ sub calculate { ( $col->{coltitle} eq "NULL" ) ? "zzEMPTY" : $col->{coltitle} }; - -# warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle}; } + $total = sprintf("%.2f", $total) if($total and grep /$process/, (3,4,5)); - # warn "summ for column ".$col->{coltitle}." = ".$total; push @loopfooter, { 'totalcol' => $total }; } # the header of the table - # $globalline{loopfilter}=\@loopfilter; + $globalline{loopfilter} = \@loopfilter; # the core of the table $globalline{looprow} = \@looprow; $globalline{loopcol} = \@loopcol; # # the foot (totals by borrower type) + $grantotal = sprintf("%.2f", $grantotal) if ($grantotal and grep /$process/, (3,4,5)); $globalline{loopfooter} = \@loopfooter; $globalline{total} = $grantotal; $globalline{line} = $line;