X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fcat_issues_top.pl;h=22b88ae017b368efaf243b54657663c2515994d8;hb=2b8b5ae225af6119e41e2112f9a8573b4170b927;hp=8b2b61ca751080c5181684cd864b2ba1335e66ce;hpb=606ecb532aa42562687bf0d05b4d6df6697300d7;p=koha_fer diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index 8b2b61ca75..22b88ae017 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,7 +27,8 @@ use C4::Branch; # GetBranches use C4::Output; use C4::Koha; use C4::Circulation; -use C4::Date; +use C4::Reports; +use C4::Dates qw/format_date format_date_in_iso/; use C4::Members; =head1 NAME @@ -47,21 +49,22 @@ 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 => get_date_format_string_for_DHTMLcalendar(), ); if ($do_it) { # Displaying results @@ -71,7 +74,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 +83,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 +107,7 @@ if ($do_it) { print $sep.$col->{totalcol}; } print $sep.@$results[0]->{total}; - exit(1); + exit; } # Displaying choices } else { @@ -116,45 +117,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 +139,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 +151,7 @@ if ($do_it) { $template->param( CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, - branchloop =>\@branchloop, + branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}), itemtypeloop =>\@itemtypeloop, borcatloop =>\@borcatloop, ); @@ -229,8 +204,10 @@ sub calculate { my $colfield; my $colorder; if ($column){ - $column = "issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/)); - $column = "biblioitems.".$column if $column=~/itemtype/; + $column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/)); + 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/ ) ; @@ -249,17 +226,17 @@ sub calculate { # loop cols. if ($column eq "Day") { #Display by day - $column = "issues.timestamp"; + $column = "old_issues.timestamp"; $colfield .="dayname($column)"; $colorder .="weekday($column)"; } elsif ($column eq "Month") { #Display by Month - $column = "issues.timestamp"; + $column = "old_issues.timestamp"; $colfield .="monthname($column)"; $colorder .="month($column)"; } elsif ($column eq "Year") { #Display by Year - $column = "issues.timestamp"; + $column = "old_issues.timestamp"; $colfield .="Year($column)"; $colorder .= $column; } else { @@ -268,7 +245,12 @@ sub calculate { } 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"; + $strsth2 .= "SELECT distinctrow $colfield + FROM `old_issues` + LEFT JOIN borrowers ON borrowers.borrowernumber=old_issues.borrowernumber + LEFT JOIN items ON old_issues.itemnumber=items.itemnumber + LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber + WHERE 1"; if (($column=~/timestamp/) or ($column=~/returndate/)){ if ($colfilter[1] and ($colfilter[0])){ $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ; @@ -283,7 +265,6 @@ sub calculate { } $strsth2 .=" group by $colfield"; $strsth2 .=" order by $colorder"; - warn "". $strsth2; my $sth2 = $dbh->prepare( $strsth2 ); if (( @colfilter ) and ($colfilter[1])){ @@ -325,53 +306,57 @@ sub calculate { # Processing average loanperiods $strcalc .= "SELECT DISTINCT biblio.title, COUNT(biblio.biblionumber) AS RANK, biblio.biblionumber AS ID"; $strcalc .= " , $colfield " if ($colfield); - $strcalc .= " FROM `issues`,borrowers,(items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN biblio ON (biblio.biblionumber=items.biblionumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null"; + $strcalc .= " FROM `old_issues` + 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]); - $strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] ); + $strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] ); @$filters[1]=~ s/\*/%/g if (@$filters[1]); - $strcalc .= " AND issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] ); + $strcalc .= " AND old_issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] ); @$filters[2]=~ s/\*/%/g if (@$filters[2]); - $strcalc .= " AND issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] ); + $strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] ); @$filters[3]=~ s/\*/%/g if (@$filters[3]); - $strcalc .= " AND issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] ); + $strcalc .= " AND old_issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] ); @$filters[4]=~ s/\*/%/g if (@$filters[4]); - $strcalc .= " AND issues.branchcode like '" . @$filters[4] ."'" 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]); - $strcalc .= " AND dayname(issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]); + $strcalc .= " AND dayname(old_issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]); @$filters[8]=~ s/\*/%/g if (@$filters[8]); - $strcalc .= " AND monthname(issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]); + $strcalc .= " AND monthname(old_issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]); @$filters[9]=~ s/\*/%/g if (@$filters[9]); - $strcalc .= " AND year(issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] ); + $strcalc .= " AND year(old_issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] ); $strcalc .= " group by biblio.biblionumber"; $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}++; } @@ -379,12 +364,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; @@ -397,15 +380,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; }