X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fcat_issues_top.pl;h=2a6409d2c95ac91349faa15652dd657fade73bbd;hb=37328c709ecb1e8868c4dd8ce344e844647d8715;hp=b5db4ed3c8051428793f67eeea77654cec707c58;hpb=2026434ed78dff7c483640b531f0dda262a97c71;p=koha_fer diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index b5db4ed3c8..2a6409d2c9 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -14,11 +14,12 @@ # 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. use strict; +#use warnings; FIXME - Bug 2505 use C4::Auth; use CGI; use C4::Context; @@ -26,6 +27,7 @@ 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; @@ -47,19 +49,21 @@ 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 $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}, + flagsrequired => { reports => '*'}, debug => 1, }); +our $sep = $input->param("sep"); +$sep = "\t" if ($sep eq 'tabulation'); $template->param(do_it => $do_it, DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); @@ -71,7 +75,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', @@ -80,8 +84,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 @$results[0]->{line} ."/". @$results[0]->{column} .$sep; # Other header @@ -106,7 +108,7 @@ if ($do_it) { print $sep.$col->{totalcol}; } print $sep.@$results[0]->{total}; - exit(1); + exit; } # Displaying choices } else { @@ -116,45 +118,21 @@ 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, + -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 ); - #branch - my $branches = GetBranches; - my @branchloop; - foreach my $thisbranch (keys %$branches) { -# my $selected = 1 if $thisbranch eq $branch; - my %row =(value => $thisbranch, -# selected => $selected, - branchname => $branches->{$thisbranch}->{'branchname'}, - ); - push @branchloop, \%row; - } + my $CGIsepChoice=GetDelimiterChoices; #doctype my $itemtypes = GetItemTypes; my @itemtypeloop; - foreach my $thisitemtype (keys %$itemtypes) { -# my $selected = 1 if $thisbranch eq $branch; + foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) { my %row =(value => $thisitemtype, -# selected => $selected, - description => $itemtypes->{$thisitemtype}->{'description'}, + description => $itemtypes->{$thisitemtype}->{'description'}, ); push @itemtypeloop, \%row; } @@ -162,11 +140,9 @@ if ($do_it) { #borcat my ($codes,$labels) = GetborCatFromCatType(undef,undef); my @borcatloop; - foreach my $thisborcat (sort keys %$labels) { -# my $selected = 1 if $thisbranch eq $branch; + foreach my $thisborcat (sort {$labels->{$a} cmp $labels->{$b}} keys %$labels) { my %row =(value => $thisborcat, -# selected => $selected, - description => $labels->{$thisborcat}, + description => $labels->{$thisborcat}, ); push @borcatloop, \%row; } @@ -176,7 +152,7 @@ if ($do_it) { $template->param( CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, - branchloop =>\@branchloop, + branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}), itemtypeloop =>\@itemtypeloop, borcatloop =>\@borcatloop, ); @@ -230,7 +206,9 @@ sub calculate { my $colorder; if ($column){ $column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/)); - $column = "biblioitems.".$column if $column=~/itemtype/; + if($column=~/itemtype/){ + $column = C4::Context->preference('item-level_itypes') ? "items.itype": "biblioitems.itemtype"; + } $column = "borrowers.".$column if $column=~/categorycode/; my @colfilter ; $colfilter[0] = @$filters[0] if ($column =~ /timestamp/ ) ; @@ -288,7 +266,6 @@ sub calculate { } $strsth2 .=" group by $colfield"; $strsth2 .=" order by $colorder"; - warn "". $strsth2; my $sth2 = $dbh->prepare( $strsth2 ); if (( @colfilter ) and ($colfilter[1])){ @@ -331,11 +308,10 @@ sub calculate { $strcalc .= "SELECT DISTINCT biblio.title, COUNT(biblio.biblionumber) AS RANK, biblio.biblionumber AS ID"; $strcalc .= " , $colfield " if ($colfield); $strcalc .= " FROM `old_issues` - LEFT JOIN borrowers ON old_issues.borrowernumber=borrowers.borrowernumber - LEFT JOIN (items - LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber) - ON items.itemnumber=old_issues.itemnumber - LEFT JOIN biblio ON (biblio.biblionumber=items.biblionumber) + LEFT JOIN items USING(itemnumber) + LEFT JOIN biblio USING(biblionumber) + LEFT JOIN biblioitems USING(biblionumber) + LEFT JOIN borrowers USING(borrowernumber) WHERE 1"; @$filters[0]=~ s/\*/%/g if (@$filters[0]); @@ -349,7 +325,14 @@ sub calculate { @$filters[4]=~ s/\*/%/g if (@$filters[4]); $strcalc .= " AND old_issues.branchcode like '" . @$filters[4] ."'" if ( @$filters[4] ); @$filters[5]=~ s/\*/%/g if (@$filters[5]); - $strcalc .= " AND biblioitems.itemtype like '" . @$filters[5] ."'" if ( @$filters[5] ); + if ( @$filters[5] ){ + if(C4::Context->preference('item-level_itypes') ){ + $strcalc .= " AND items.itype like " + }else{ + $strcalc .= " AND biblioitems.itemtype like " + } + $strcalc .= "'" . @$filters[5] ."'" ; + } @$filters[6]=~ s/\*/%/g if (@$filters[6]); $strcalc .= " AND borrowers.categorycode like '" . @$filters[6] ."'" if ( @$filters[6] ); @$filters[7]=~ s/\*/%/g if (@$filters[7]); @@ -363,27 +346,18 @@ sub calculate { $strcalc .= ", $colfield" if ($column); $strcalc .= " order by RANK DESC"; $strcalc .= ", $colfield " if ($colfield); - -# my $max; -# if (@loopcol) { -# $max = $line*@loopcol; -# } else { $max=$line;} -# $strcalc .= " LIMIT 0,$max"; - warn "SQL :". $strcalc; my $dbcalc = $dbh->prepare($strcalc); $dbcalc->execute; -# warn "filling table"; my $previous_col; my %indice; while (my @data = $dbcalc->fetchrow) { my ($row, $rank, $id, $col )=@data; - $col = "zzEMPTY" if ($col eq undef); + $col = "zzEMPTY" if (!defined($col)); $indice{$col}=1 if (not($indice{$col})); $table[$indice{$col}]->{$col}->{'name'}=$row; $table[$indice{$col}]->{$col}->{'count'}=$rank; $table[$indice{$col}]->{$col}->{'link'}=$id; -# warn " ".$i." ".$col. " ".$row; $indice{$col}++; } @@ -391,12 +365,10 @@ sub calculate { for ($i=1; $i<=$line;$i++) { my @loopcell; - warn " $i"; #@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 ) { -# warn " colonne :$col->{coltitle}"; my $value; my $count=0; my $link; @@ -409,15 +381,12 @@ sub calculate { $count =$table[$i]->{"zzEMPTY"}->{'count'}; $link =$table[$i]->{"zzEMPTY"}->{'link'}; } -# warn " ".$i ." value:$value count:$count reference:$link"; push @loopcell, {value => $value, count =>$count, reference => $link} ; } - #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; }