1110 : Balance carts and lists, follow-up : Added Opac lists features to admin lists

[koha.git] / reports / issues_avg_stats.pl

diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index 71e0b30..4710295 100755 (executable)
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -26,6 +26,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 Date::Calc qw(Delta_Days);
 
@@ -55,7 +56,6 @@ my $calc = $input->param("Cellvalue");
 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,
@@ -65,6 +65,8 @@ my ($template, $borrowernumber, $cookie)
                 flagsrequired => {reports => 1},
                 debug => 1,
                     });
+our $sep     = $input->param("sep");
+$sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
         DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     );
@@ -84,8 +86,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
@@ -212,13 +212,7 @@ if ($do_it) {
                 -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 $CGIsepChoice=GetDelimiterChoices;
     
     $template->param(
                     CGIBorCat => $CGIBorCat,
@@ -363,28 +357,28 @@ sub calculate {
                     (issuingrules.branchcode=old_issues.branchcode
                     AND  issuingrules.itemtype=biblioitems.itemtype 
                     AND  issuingrules.categorycode=borrowers.categorycode) 
-                WHERE returndate is not null";
+                WHERE 1";
     
     if (($line=~/timestamp/) or ($line=~/returndate/)){
         if ($linefilter[1] and ($linefilter[0])){
-            $strsth .= " and $line between '$linefilter[0]' and '$linefilter[1]' " ;
+            $strsth .= " AND $line BETWEEN '$linefilter[0]' AND '$linefilter[1]' " ;
         } elsif ($linefilter[1]) {
-                $strsth .= " and $line < \'$linefilter[1]\' " ;
+                $strsth .= " AND $line < \'$linefilter[1]\' " ;
         } elsif ($linefilter[0]) {
-            $strsth .= " and $line > \'$linefilter[0]\' " ;
+            $strsth .= " AND $line > \'$linefilter[0]\' " ;
         }
         if ($linefilter[2]){
-            $strsth .= " and dayname($line) = '$linefilter[2]' " ;
+            $strsth .= " AND dayname($line) = '$linefilter[2]' " ;
         }
         if ($linefilter[3]){
-            $strsth .= " and monthname($line) = '$linefilter[3]' " ;
+            $strsth .= " AND monthname($line) = '$linefilter[3]' " ;
         }
     } elsif ($linefilter[0]) {
         $linefilter[0] =~ s/\*/%/g;
-        $strsth .= " and $line LIKE '$linefilter[0]' " ;
+        $strsth .= " AND $line LIKE '$linefilter[0]' " ;
     }
-    $strsth .=" group by $linefield";
-    $strsth .=" order by $lineorder";
+    $strsth .=" GROUP BY $linefield";
+    $strsth .=" ORDER BY $lineorder";
    
     my $sth = $dbh->prepare( $strsth );
     $sth->execute;
@@ -434,28 +428,28 @@ sub calculate {
                     (issuingrules.branchcode=old_issues.branchcode 
                     AND  issuingrules.itemtype=biblioitems.itemtype 
                     AND  issuingrules.categorycode=borrowers.categorycode) 
-                  WHERE returndate is not null";
+                  WHERE 1";
     
     if (($column=~/timestamp/) or ($column=~/returndate/)){
         if ($colfilter[1] and ($colfilter[0])){
-            $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ;
+            $strsth2 .= " AND $column BETWEEN '$colfilter[0]' AND '$colfilter[1]' " ;
         } elsif ($colfilter[1]) {
-                $strsth2 .= " and $column < '$colfilter[1]' " ;
+                $strsth2 .= " AND $column < '$colfilter[1]' " ;
         } elsif ($colfilter[0]) {
-            $strsth2 .= " and $column > '$colfilter[0]' " ;
+            $strsth2 .= " AND $column > '$colfilter[0]' " ;
         }
         if ($colfilter[2]){
-            $strsth2 .= " and dayname($column) = '$colfilter[2]' " ;
+            $strsth2 .= " AND dayname($column) = '$colfilter[2]' " ;
         }
         if ($colfilter[3]){
-            $strsth2 .= " and monthname($column) = '$colfilter[3]' " ;
+            $strsth2 .= " AND monthname($column) = '$colfilter[3]' " ;
         }
     } elsif ($colfilter[0]) {
         $colfilter[0] =~ s/\*/%/g;
-        $strsth2 .= " and $column LIKE '$colfilter[0]' " ;
+        $strsth2 .= " AND $column LIKE '$colfilter[0]' " ;
     }
-    $strsth2 .=" group by $colfield";
-    $strsth2 .=" order by $colorder";
+    $strsth2 .=" GROUP BY $colfield";
+    $strsth2 .=" ORDER BY $colorder";
     warn "". $strsth2;
     
     my $sth2 = $dbh->prepare( $strsth2 );
@@ -543,9 +537,9 @@ sub calculate {
     while (my  @data = $dbcalc->fetchrow) {
         my ($row, $col, $issuedate, $returndate, $weight)=@data;
 #              warn "filling table $row / $col / $issuedate / $returndate /$weight";
-        $emptycol=1 if ($col eq undef);
-        $col = "zzEMPTY" if ($col eq undef);
-        $row = "zzEMPTY" if ($row eq undef);
+        $emptycol=1 if (!defined($col));
+        $col = "zzEMPTY" if (!defined($col));
+        $row = "zzEMPTY" if (!defined($row));
         # fill returndate to avoid an error with date calc (needed for all non returned issues)
         $returndate= join '-',Date::Calc::Today if $returndate eq '0000-00-00';
     #  DateCalc returns => 0:0:WK:DD:HH:MM:SS   the weeks, days, hours, minutes,