X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Fborrowers_out.pl;h=50c73b0dcbed7ba5ca9e2373d5076999f629de66;hb=916e9f4619229da80d7d8c45cecb77fc7db61816;hp=6a31475030e7c2c163d83a034009a0f16bc89fc1;hpb=a5bd2403218b5add150088ab525b1f00e50a0c12;p=koha.git diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl index 6a31475030..50c73b0dcb 100755 --- a/reports/borrowers_out.pl +++ b/reports/borrowers_out.pl @@ -1,65 +1,69 @@ #!/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 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 3 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. +# 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 +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; -use CGI; +use warnings; + +use CGI qw ( -utf8 ); use C4::Auth; use C4::Context; use C4::Koha; use C4::Output; use C4::Circulation; +use C4::Reports; use C4::Members; -use C4::Date; + +use Koha::DateUtils; +use Koha::Patron::Categories; =head1 NAME -plugin that shows a stats on borrowers +reports/borrowers_out.pl =head1 DESCRIPTION -=over 2 +Plugin that shows a stats on borrowers =cut my $input = new CGI; my $do_it=$input->param('do_it'); -my $fullreportname = "reports/borrowers_out.tmpl"; +my $fullreportname = "reports/borrowers_out.tt"; my $limit = $input->param("Limit"); my $column = $input->param("Criteria"); -my @filters = $input->param("Filter"); +my @filters = $input->multi_param("Filter"); +$filters[1] = eval { output_pref( { dt => dt_from_string( $filters[1]), dateonly => 1, dateformat => 'iso' } ); } + if ( $filters[1] ); + my $output = $input->param("output"); my $basename = $input->param("basename"); -my $mime = $input->param("MIME"); -my $del = $input->param("sep"); -#warn "calcul : ".$calc; +our $sep = $input->param("sep") || ''; +$sep = "\t" if ($sep eq 'tabulation'); my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => $fullreportname, query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {reports => 1}, + flagsrequired => {reports => '*'}, debug => 1, }); $template->param(do_it => $do_it, - DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(), ); if ($do_it) { # Displaying results @@ -68,7 +72,7 @@ if ($do_it) { # Printing results to screen $template->param(mainloop => $results); output_html_with_http_headers $input, $cookie, $template->output; - exit(1); + exit; } else { # Printing to a csv file print $input->header(-type => 'application/vnd.sun.xml.calc', @@ -77,8 +81,6 @@ if ($do_it) { -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 @@ -91,9 +93,10 @@ if ($do_it) { my $x = $line->{loopcell}; print $line->{rowtitle}.$sep; foreach my $cell (@$x) { - print $cell->{value}.$sep; + my $cellvalue = defined $cell->{value} ? $cell->{value}.$sep : ''.$sep; + print $cellvalue; } - print $line->{totalrow}; +# print $line->{totalrow}; print "\n"; } # footer @@ -103,7 +106,7 @@ if ($do_it) { print $sep.$col->{totalcol}; } print $sep.@$results[0]->{total}; - exit(1); + exit; } # Displaying choices } else { @@ -113,47 +116,19 @@ if ($do_it) { 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 ); - - my ($codes,$labels) = GetborCatFromCatType(undef,undef); - my @borcatloop; - foreach my $thisborcat (sort keys %$labels) { -# my $selected = 1 if $thisbranch eq $branch; - my %row =(value => $thisborcat, -# selected => $selected, - description => $labels->{$thisborcat}, - ); - push @borcatloop, \%row; - } + my $CGIextChoice = ( 'CSV' ); # FIXME translation + my $CGIsepChoice = GetDelimiterChoices; + + my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']}); $template->param( CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, - borcatloop =>\@borcatloop, + patron_categories => $patron_categories, ); output_html_with_http_headers $input, $cookie, $template->output; } - - sub calculate { my ($line, $column, $filters) = @_; my @mainloop; @@ -185,7 +160,7 @@ sub calculate { my $colfield; my $colorder; if ($column){ - $column = "borrowers.".$column if $column=~/categorycode/; + $column = "borrowers.".$column if $column=~/categorycode/ || $column=~/branchcode/; my @colfilter ; $colfilter[0] = @$filters[0] if ($column =~ /category/ ) ; # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ; @@ -196,20 +171,19 @@ sub calculate { $colorder .= $column; my $strsth2; - $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `issues` ON issues.borrowernumber=borrowers.borrowernumber"; - if ($colfilter[0]) { + $strsth2 .= "select distinct " . $dbh->quote($colfield) . " FROM borrowers WHERE 1"; + my @query_args; + if ( $colfilter[0] ) { $colfilter[0] =~ s/\*/%/g; - $strsth2 .= " and $column LIKE '$colfilter[0]' " ; + $strsth2 .= " and " . $dbh->quote($column) . "LIKE ?" ; + push @query_args, $colfilter[0]; } - $strsth2 .=" group by $colfield"; - $strsth2 .=" order by $colorder"; - warn "". $strsth2; + $strsth2 .=" group by " . $dbh->quote($colfield); + $strsth2 .=" order by " . $dbh->quote($colorder); + # warn "". $strsth2; my $sth2 = $dbh->prepare( $strsth2 ); - $sth2->execute; - - - + $sth2->execute( @query_args ); while (my ($celvalue) = $sth2->fetchrow) { my %cell; # my %ft; @@ -223,16 +197,16 @@ sub calculate { 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; + if($line) { + for (my $i=1;$i<=$line;$i++) { + foreach my $col ( @loopcol ) { + $table[$i]->{($col->{coltitle})?$col->{coltitle}:"Global"}=0; + } } } @@ -242,57 +216,56 @@ sub calculate { # Processing calculation $strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)"; - $strcalc .= " , $colfield " if ($colfield); + $strcalc .= " , " . $dbh->quote($colfield) if ($colfield); $strcalc .= " FROM borrowers "; $strcalc .= "WHERE 1 "; - @$filters[0]=~ s/\*/%/g if (@$filters[0]); - $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] ); - if (@$filters[1]){ - my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] "; - my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> ".format_date_in_iso(@$filters[1])); - $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)"; - -# $queryfilter->execute(@$filters[1]); -# while (my ($borrowernumber)=$queryfilter->fetchrow){ -# $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber "; -# } - } else { - my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues "; - my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues "); - $queryfilter->execute; - $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)"; -# while (my ($borrowernumber)=$queryfilter->fetchrow){ -# $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber "; -# } + my @query_args; + if ( @$filters[0] ) { + @$filters[0]=~ s/\*/%/g; + $strcalc .= " AND borrowers.categorycode like ?"; + push @query_args, @$filters[0]; + } + $strcalc .= " AND NOT EXISTS (SELECT * FROM issues WHERE issues.borrowernumber=borrowers.borrowernumber "; + if ( @$filters[1] ) { + $strcalc .= " AND issues.timestamp > ?"; + push @query_args, @$filters[1]; + } + $strcalc .= ") "; + $strcalc .= " AND NOT EXISTS (SELECT * FROM old_issues WHERE old_issues.borrowernumber=borrowers.borrowernumber "; + if ( @$filters[1] ) { + $strcalc .= " AND old_issues.timestamp > ?"; + push @query_args, @$filters[1]; } + $strcalc .= ") "; $strcalc .= " group by borrowers.borrowernumber"; - $strcalc .= ", $colfield" if ($column); - $strcalc .= " order by $colfield " if ($colfield); + $strcalc .= ", " . $dbh->quote($colfield) if ($column); + $strcalc .= " order by " . $dbh->quote($colfield) if ($colfield); my $max; - if (@loopcol) { - $max = $line*@loopcol; - } else { $max=$line;} - $strcalc .= " LIMIT 0,$max" if ($line); - warn "SQL :". $strcalc; + if ($line) { + if (@loopcol) { + $max = $line*@loopcol; + } else { $max=$line;} + $strcalc .= " LIMIT 0,$max"; + } my $dbcalc = $dbh->prepare($strcalc); - $dbcalc->execute; + $dbcalc->execute( @query_args ); # warn "filling table"; my $previous_col; - my $i=1; + $i=1; while (my @data = $dbcalc->fetchrow) { my ($row, $col )=@data; - $col = "zzEMPTY" if ($col eq undef); + $col = "zzEMPTY" if (!defined($col)); $i=1 if (($previous_col) and not($col eq $previous_col)); $table[$i]->{$col}=$row; -# warn " ".$i." ".$col. " ".$row; +# warn " $i $col $row"; $i++; $previous_col=$col; } push @loopcol,{coltitle => "Global"} if not($column); - my $max =(($line)?$line:@table -1); + $max =(($line)?$line:@table -1); for ($i=1; $i<=$max;$i++) { my @loopcell; #@loopcol ensures the order for columns is common with column titles @@ -309,9 +282,7 @@ sub calculate { } push @looprow,{ 'rowtitle' => $i , 'loopcell' => \@loopcell, - 'hilighted' => ($hilighted >0), }; - $hilighted = -$hilighted; } @@ -331,3 +302,4 @@ sub calculate { } 1; +__END__