[Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.4.2.2,1.4.2.3

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7912/reports

Modified Files:
      Tag: rel_2_2
        acquisitions_stats.pl 
Log Message:
Minor bug Fix: Displaying Months and day in usual order.

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** acquisitions_stats.pl       7 Apr 2005 12:18:43 -0000       1.4.2.2
--- acquisitions_stats.pl       28 Jun 2005 10:15:11 -0000      1.4.2.3
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
!       my $linefield;                               
        if (($line =~/closedate/) and ($podsp == 1)) {
                #Display by day
                $linefield .="dayname($line)";  
        } elsif (($line=~/closedate/) and ($podsp == 2)) {
                #Display by Month
                $linefield .="monthname($line)";  
        } elsif (($line=~/closedate/) and ($podsp == 3)) {
                #Display by Year
                $linefield .="Year($line)";
        } elsif (($line =~/received/) and ($rodsp == 1)) {
                #Display by day
                $linefield .="dayname($line)";  
        } elsif (($line=~/received/) and ($rodsp == 2)) {
                #Display by Month
                $linefield .="monthname($line)";  
        } elsif (($line=~/received/) and ($rodsp == 3)) {
                #Display by Year
                $linefield .="Year($line)";
        } else {
                $linefield .= $line;
        }  
        
--- 272,304 ----
                                                
  # 1st, loop rows.                             
!       my $linefield;
!       my $lineorder;                               
        if (($line =~/closedate/) and ($podsp == 1)) {
                #Display by day
                $linefield .="dayname($line)";  
+               $lineorder .="weekday($line)";  
        } elsif (($line=~/closedate/) and ($podsp == 2)) {
                #Display by Month
                $linefield .="monthname($line)";  
+               $lineorder .="month($line)";  
        } elsif (($line=~/closedate/) and ($podsp == 3)) {
                #Display by Year
                $linefield .="Year($line)";
+               $lineorder .=$linefield;  
        } elsif (($line =~/received/) and ($rodsp == 1)) {
                #Display by day
                $linefield .="dayname($line)";  
+               $lineorder .="weekday($line)";  
        } elsif (($line=~/received/) and ($rodsp == 2)) {
                #Display by Month
                $linefield .="monthname($line)";  
+               $lineorder .="month($line)";  
        } elsif (($line=~/received/) and ($rodsp == 3)) {
                #Display by Year
                $linefield .="Year($line)";
+               $lineorder .=$linefield;  
        } else {
                $linefield .= $line;
+               $lineorder .=$linefield;  
        }  
        
***************
*** 313,317 ****
        }
        $strsth .=" group by $linefield";
!       $strsth .=" order by $linefield";
        warn "". $strsth;
        
--- 321,325 ----
        }
        $strsth .=" group by $linefield";
!       $strsth .=" order by $lineorder";
        warn "". $strsth;
        
***************
*** 338,361 ****
  # 2nd, loop cols.
        my $colfield;
        if (($column =~/closedate/) and ($podsp == 1)) {
                #Display by day
!               $colfield .="dayname($column)";  
        } elsif (($column=~/closedate/) and ($podsp == 2)) {
                #Display by Month
                $colfield .="monthname($column)";  
        } elsif (($column=~/closedate/) and ($podsp == 3)) {
                #Display by Year
                $colfield .="Year($column)";
        } elsif (($column =~/received/) and ($rodsp == 1)) {
                #Display by day
                $colfield .="dayname($column)";  
        } elsif (($column=~/received/) and ($rodsp == 2)) {
                #Display by Month
                $colfield .="monthname($column)";  
        } elsif (($column=~/received/) and ($rodsp == 3)) {
                #Display by Year
                $colfield .="Year($column)";
        } else {
                $colfield .= $column;
        }  
        
--- 346,377 ----
  # 2nd, loop cols.
        my $colfield;
+       my $colorder;
        if (($column =~/closedate/) and ($podsp == 1)) {
                #Display by day
!               $colfield .="dayname($column)";
!               $colorder .="weekday($column)";
        } elsif (($column=~/closedate/) and ($podsp == 2)) {
                #Display by Month
                $colfield .="monthname($column)";  
+               $colorder .="month($column)";
        } elsif (($column=~/closedate/) and ($podsp == 3)) {
                #Display by Year
                $colfield .="Year($column)";
+               $colorder .= $colfield;
        } elsif (($column =~/received/) and ($rodsp == 1)) {
                #Display by day
                $colfield .="dayname($column)";  
+               $colorder .="weekday($column)";
        } elsif (($column=~/received/) and ($rodsp == 2)) {
                #Display by Month
                $colfield .="monthname($column)";  
+               $colorder .="month($column)";
        } elsif (($column=~/received/) and ($rodsp == 3)) {
                #Display by Year
                $colfield .="Year($column)";
+               $colorder .= $colfield;
        } else {
                $colfield .= $column;
+               $colorder .= $colfield;
        }  
        
***************
*** 378,382 ****
        }
        $strsth2 .=" group by $colfield";
!       $strsth2 .=" order by $colfield";
        warn "". $strsth2;
        
--- 394,398 ----
        }
        $strsth2 .=" group by $colfield";
!       $strsth2 .=" order by $colorder";
        warn "". $strsth2;
        
***************
*** 439,443 ****
        @$filters[7]=~ s/\*/%/g if (@$filters[7]);
        $strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( 
@$filters[7] );
!       $strcalc .= " group by $linefield, $colfield order by 
$linefield,$colfield";
        warn "". $strcalc;
        my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
        @$filters[7]=~ s/\*/%/g if (@$filters[7]);
        $strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( 
@$filters[7] );
!       $strcalc .= " group by $linefield, $colfield order by 
$lineorder,$colorder";
        warn "". $strcalc;
        my $dbcalc = $dbh->prepare($strcalc);