X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=reports%2Fcat_issues_top.pl;h=604258e9c98530b7832b1b6f98f832adb07e6018;hb=refs%2Fheads%2Fkoha_ffzg;hp=606106d2a45c226c0a66e4a7dcd704bd0a04a1ef;hpb=c190d93a12c2741b8d4539b7bee175257da815c8;p=koha.git diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index 606106d2a4..604258e9c9 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -5,31 +5,30 @@ # # 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; use C4::Auth; -use CGI; +use CGI qw ( -utf8 ); use C4::Context; -use C4::Branch; # GetBranches use C4::Output; use C4::Koha; use C4::Circulation; use C4::Reports; -use C4::Dates qw/format_date format_date_in_iso/; use C4::Members; +use Koha::DateUtils; +use Koha::ItemTypes; =head1 NAME @@ -37,20 +36,18 @@ plugin that shows a stats on borrowers =head1 DESCRIPTION -=over 2 - =cut my $input = new CGI; my $do_it=$input->param('do_it'); -my $fullreportname = "reports/cat_issues_top.tmpl"; +my $fullreportname = "reports/cat_issues_top.tt"; my $limit = $input->param("Limit"); my $column = $input->param("Criteria"); -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 @filters = $input->multi_param("Filter"); +foreach ( @filters[0..3] ) { + $_ and $_ = eval { output_pref( { dt => dt_from_string ( $_ ), dateonly => 1, dateformat => 'iso' } ); }; +} + my $output = $input->param("output"); my $basename = $input->param("basename"); #warn "calcul : ".$calc; @@ -65,7 +62,6 @@ my ($template, $borrowernumber, $cookie) our $sep = $input->param("sep"); $sep = "\t" if ($sep eq 'tabulation'); $template->param(do_it => $do_it, - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); if ($do_it) { # Displaying results @@ -75,7 +71,7 @@ if ($do_it) { $template->param(mainloop => $results, limit => $limit); 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', @@ -97,64 +93,55 @@ if ($do_it) { print $line->{rowtitle}.$sep; foreach my $cell (@$x) { print $cell->{value}.$sep; + print $cell->{count} // ''; } - 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); + exit; } # Displaying choices } else { my $dbh = C4::Context->dbh; - my @values; - my %labels; - my %select; - my $req; - - my $CGIextChoice=CGI::scrolling_list( - -name => 'MIME', - -id => 'MIME', - -values => ['CSV'], # FIXME translation - -size => 1, - -multiple => 0 ); + my $CGIextChoice = ( 'CSV' ); # FIXME translation my $CGIsepChoice=GetDelimiterChoices; #doctype - my $itemtypes = GetItemTypes; - my @itemtypeloop; - foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) { - my %row =(value => $thisitemtype, - description => $itemtypes->{$thisitemtype}->{'description'}, + my $itemtypes = Koha::ItemTypes->search_with_localization; + + #ccode + my $ccodes = GetAuthorisedValues('CCODE'); + my @ccodeloop; + for my $thisccode (@$ccodes) { + my %row = (value => $thisccode->{authorised_value}, + description => $thisccode->{lib}, ); - push @itemtypeloop, \%row; + push @ccodeloop, \%row; } - - #borcat - my ($codes,$labels) = GetborCatFromCatType(undef,undef); - my @borcatloop; - foreach my $thisborcat (sort {$labels->{$a} cmp $labels->{$b}} keys %$labels) { - my %row =(value => $thisborcat, - description => $labels->{$thisborcat}, + + @ccodeloop = sort {$a->{value} cmp $b->{value}} @ccodeloop; + + #shelvingloc + my $shelvinglocs = GetAuthorisedValues('LOC'); + my @shelvinglocloop; + for my $thisloc (@$shelvinglocs) { + my %row = (value => $thisloc->{authorised_value}, + description => $thisloc->{lib}, ); - push @borcatloop, \%row; + push @shelvinglocloop, \%row; } - - #Day - #Month + + @shelvinglocloop = sort {$a->{value} cmp $b->{value}} @shelvinglocloop; + + my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']}); + $template->param( CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, - branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}), - itemtypeloop =>\@itemtypeloop, - borcatloop =>\@borcatloop, + itemtypes => $itemtypes, + ccodeloop =>\@ccodeloop, + shelvinglocloop =>\@shelvinglocloop, + patron_categories => $patron_categories, ); output_html_with_http_headers $input, $cookie, $template->output; } @@ -165,9 +152,7 @@ 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; @@ -178,7 +163,7 @@ sub calculate { # Checking filters # my @loopfilter; - for (my $i=0;$i<=6;$i++) { + for (my $i=0;$i<=12;$i++) { my %cell; if ( @$filters[$i] ) { if (($i==1) and (@$filters[$i-1])) { @@ -188,17 +173,22 @@ sub calculate { if ($i>=2) { $cell{filter} .= @$filters[$i]; } else { - $cell{filter} .= format_date(@$filters[$i]); - } $cell{crit} .="Issue From" if ($i==0); + $cell{filter} .= eval { output_pref( { dt => dt_from_string( @$filters[$i] ), dateonly => 1 }); } + if ( @$filters[$i] ); + } + $cell{crit} .="Issue From" if ($i==0); $cell{crit} .="Issue To" if ($i==1); $cell{crit} .="Return From" if ($i==2); $cell{crit} .="Return To" if ($i==3); $cell{crit} .="Branch" if ($i==4); $cell{crit} .="Doc Type" if ($i==5); - $cell{crit} .="Bor Cat" if ($i==6); - $cell{crit} .="Day" if ($i==7); - $cell{crit} .="Month" if ($i==8); - $cell{crit} .="Year" if ($i==9); + $cell{crit} .="Call number" if ($i==6); + $cell{crit} .="Collection code" if ($i==7); + $cell{crit} .="Shelving location" if ($i==8); + $cell{crit} .="Bor Cat" if ($i==9); + $cell{crit} .="Day" if ($i==10); + $cell{crit} .="Month" if ($i==11); + $cell{crit} .="Year" if ($i==12); push @loopfilter, \%cell; } } @@ -217,11 +207,15 @@ sub calculate { $colfilter[1] = @$filters[3] if ($column =~ /returndate/ ) ; $colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ; $colfilter[0] = @$filters[5] if ($column =~ /itemtype/ ) ; - $colfilter[0] = @$filters[6] if ($column =~ /category/ ) ; - # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ; - $colfilter[0] = @$filters[7] if ($column =~ /timestamp/ ) ; - $colfilter[0] = @$filters[8] if ($column =~ /timestamp/ ) ; + # These limits does not currently exist, maybe later? + # $colfilter[0] = @$filters[6] if ($column =~ /ccode/ ) ; + # $colfilter[0] = @$filters[7] if ($column =~ /location/ ) ; + $colfilter[0] = @$filters[8] if ($column =~ /category/ ) ; + # This commented out row (sort2) was not removed when adding new filters for ccode, shelving location and call number + # $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ; $colfilter[0] = @$filters[9] if ($column =~ /timestamp/ ) ; + $colfilter[0] = @$filters[10] if ($column =~ /timestamp/ ) ; + $colfilter[0] = @$filters[11] if ($column =~ /timestamp/ ) ; #warn "filtre col ".$colfilter[0]." ".$colfilter[1]; # loop cols. @@ -306,6 +300,9 @@ sub calculate { # Processing average loanperiods $strcalc .= "SELECT DISTINCT biblio.title, COUNT(biblio.biblionumber) AS RANK, biblio.biblionumber AS ID"; + $strcalc .= ", itemcallnumber as CALLNUM"; + $strcalc .= ", ccode as CCODE"; + $strcalc .= ", location as LOC"; $strcalc .= " , $colfield " if ($colfield); $strcalc .= " FROM `old_issues` LEFT JOIN items USING(itemnumber) @@ -334,13 +331,19 @@ sub calculate { $strcalc .= "'" . @$filters[5] ."'" ; } @$filters[6]=~ s/\*/%/g if (@$filters[6]); - $strcalc .= " AND borrowers.categorycode like '" . @$filters[6] ."'" if ( @$filters[6] ); + $strcalc .= " AND itemcallnumber like '" . @$filters[6] ."'" if ( @$filters[6] ); @$filters[7]=~ s/\*/%/g if (@$filters[7]); - $strcalc .= " AND dayname(old_issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]); + $strcalc .= " AND ccode like '" . @$filters[7] ."'" if ( @$filters[7] ); @$filters[8]=~ s/\*/%/g if (@$filters[8]); - $strcalc .= " AND monthname(old_issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]); + $strcalc .= " AND location like '" . @$filters[8] ."'" if ( @$filters[8] ); @$filters[9]=~ s/\*/%/g if (@$filters[9]); - $strcalc .= " AND year(old_issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] ); + $strcalc .= " AND borrowers.categorycode like '" . @$filters[9] ."'" if ( @$filters[9] ); + @$filters[10]=~ s/\*/%/g if (@$filters[10]); + $strcalc .= " AND dayname(old_issues.timestamp) like '" . @$filters[10]."'" if (@$filters[10]); + @$filters[11]=~ s/\*/%/g if (@$filters[11]); + $strcalc .= " AND monthname(old_issues.timestamp) like '" . @$filters[11]."'" if (@$filters[11]); + @$filters[12]=~ s/\*/%/g if (@$filters[12]); + $strcalc .= " AND year(old_issues.timestamp) like '" . @$filters[12] ."'" if ( @$filters[12] ); $strcalc .= " group by biblio.biblionumber"; $strcalc .= ", $colfield" if ($column); @@ -349,10 +352,9 @@ sub calculate { my $dbcalc = $dbh->prepare($strcalc); $dbcalc->execute; - my $previous_col; my %indice; while (my @data = $dbcalc->fetchrow) { - my ($row, $rank, $id, $col )=@data; + my ($row, $rank, $id, $callnum, $ccode, $loc, $col )=@data; $col = "zzEMPTY" if (!defined($col)); $indice{$col}=1 if (not($indice{$col})); $table[$indice{$col}]->{$col}->{'name'}=$row; @@ -399,7 +401,6 @@ sub calculate { $globalline{looprow} = \@looprow; $globalline{loopcol} = \@loopcol; # # the foot (totals by borrower type) - $globalline{loopfooter} = \@loopfooter; $globalline{total}= $grantotal; $globalline{line} = $line; $globalline{column} = $column;