X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=reports%2Fissues_avg_stats.pl;h=372f3c00733f4f6df036a612f427ed791ddbf130;hb=5a61a3bbfe94b3f3a2210dbd78884c8b53c5b533;hp=4710295427a62e81175bba5dfd22a104d1938968;hpb=da1085ccfa587fb8075fe33125060a54ceda6c97;p=koha.git

diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index 4710295427..372f3c0073 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.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;
@@ -55,14 +56,13 @@ my $rodsp = $input->param("ReturnDisplay");
 my $calc = $input->param("Cellvalue");
 my $output = $input->param("output");
 my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
 #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");
@@ -77,7 +77,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',
@@ -110,7 +110,7 @@ if ($do_it) {
             print $sep.$col->{totalcol};
         }
         print $sep.@$results[0]->{total};
-        exit(1);
+        exit;
     }
 # Displaying choices
 } else {
@@ -200,15 +200,10 @@ if ($do_it) {
                 -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 );
     
@@ -450,7 +445,6 @@ sub calculate {
     }
     $strsth2 .=" GROUP BY $colfield";
     $strsth2 .=" ORDER BY $colorder";
-    warn "". $strsth2;
     
     my $sth2 = $dbh->prepare( $strsth2 );
     if (( @colfilter ) and ($colfilter[1])){
@@ -521,7 +515,6 @@ sub calculate {
     $strcalc .= " AND monthname(returndate) like '" . @$filters[6] ."'" if ( @$filters[6] );
     
     $strcalc .= " group by  $linefield, $colfield, issuedate, returndate order by $linefield, $colfield";
-    warn "SQL :". $strcalc;
     
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
@@ -561,8 +554,23 @@ sub calculate {
     # and the number matches the number of columns
         my $colcount=0;
         foreach my $col ( @loopcol ) {
-            my $value =$table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} / $wgttable{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} if ($table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}});
-
+            my $value;
+            if ($table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                }
+              ) {
+                $value = $table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  } / $wgttable{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  };
+            }
             $table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} = $value;
             $table{$row}->{totalrow}+=$value;
             #warn "row : $row col:$col  $cnttable{$row}->{(($col->{coltitle} eq \"NULL\")or ($col->{coltitle} eq \"\"))?\"zzEMPTY\":$col->{coltitle}}";
@@ -570,12 +578,16 @@ sub calculate {
             push @loopcell, {value => ($value)?sprintf("%.2f",$value):0  } ;
         }
         #warn "row : $row colcount:$colcount";
-        my $total = $table{$row}->{totalrow}/$colcount if ($colcount>0);
-        push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
-                        'loopcell' => \@loopcell,
-                        'hilighted' => ($hilighted >0),
-                        'totalrow' => ($total)?sprintf("%.2f",$total):0
-                    };
+        my $total;
+        if ( $colcount > 0 ) {
+            $total = $table{$row}->{totalrow} / $colcount;
+        }
+        push @looprow,
+          { 'rowtitle' => ( $row eq "zzEMPTY" ) ? "NULL" : $row,
+            'loopcell' => \@loopcell,
+            'hilighted' => ( $hilighted > 0 ),
+            'totalrow'  => ($total) ? sprintf( "%.2f", $total ) : 0
+          };
         $hilighted = -$hilighted;
     }
 #