[Koha-cvs] CVS: koha stats.pl,1.9,1.10

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv31634

Modified Files:
	stats.pl 
Log Message:
* PARTIAL fix for #322 => gives strange results imho
* removing unused subs
* indenting with tabs
* adding monthly report (stats.pl?time=month)


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** stats.pl	30 Apr 2003 00:14:59 -0000	1.9
--- stats.pl	19 May 2003 16:20:51 -0000	1.10
***************
*** 49,71 ****
  my $date2;
  if ($time eq 'yesterday'){
!   $date=ParseDate('yesterday');
!   $date2=ParseDate('today');
  }
  if ($time eq 'today'){
!   $date=ParseDate('today');
!   $date2=ParseDate('tomorrow');
  }
  if ($time eq 'daybefore'){
!   $date=ParseDate('2 days ago');
!   $date2=ParseDate('yesterday');
  }
  if ($time=~ /\//){
!   $date=ParseDate($time);
!   $date2=ParseDateDelta('+ 1 day');
!   $date2=DateCalc($date,$date2);
  }
  $date=UnixDate($date,'%Y-%m-%d');
  $date2=UnixDate($date2,'%Y-%m-%d');
! my @payments=TotalPaid($date);
  my $count=@payments;
  my $total=0;
--- 49,77 ----
  my $date2;
  if ($time eq 'yesterday'){
! 	$date=ParseDate('yesterday');
! 	$date2=ParseDate('today');
  }
  if ($time eq 'today'){
! 	$date=ParseDate('today');
! 	$date2=ParseDate('tomorrow');
  }
  if ($time eq 'daybefore'){
! 	$date=ParseDate('2 days ago');
! 	$date2=ParseDate('yesterday');
! }
! if ($time eq 'month') {
! 	$date = ParseDate('1 month ago');
! 	$date2 = ParseDate('today');
! 	warn "d : $date // d2 : $date2";
  }
  if ($time=~ /\//){
! 	$date=ParseDate($time);
! 	$date2=ParseDateDelta('+ 1 day');
! 	$date2=DateCalc($date,$date2);
  }
  $date=UnixDate($date,'%Y-%m-%d');
  $date2=UnixDate($date2,'%Y-%m-%d');
! 	warn "d : $date // d2 : $date2";
! my @payments=TotalPaid($date,$date2);
  my $count=@payments;
  my $total=0;
***************
*** 76,156 ****
  my $i=0;
  while ($i<$count){
!   my $time=$payments[$i]{'datetime'};
!   my $payments=$payments[$i]{'value'};
!   my $charge=0;
!   my @temp=split(/ /,$payments[$i]{'datetime'});
!   my $date=$temp[0];
!   my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'});
!   my $count=@charges;
!   my $temptotalf=0;
!   my $temptotalr=0;
!   my $temptotalres=0;
!   my $temptotalren=0;
!   my $temptotalw=0;
!   for (my $i2=0;$i2<$count;$i2++){
!      $charge+=$charges[$i2]->{'amount'};
!      %row = ( name   => $charges[$i2]->{'description'},
!               type   => $charges[$i2]->{'accounttype'},
!               time   => $charges[$i2]->{'timestamp'},
!               amount => $charges[$i2]->{'amount'},
!               branch => $charges[$i2]->{'amountoutstanding'} );
!       push(@loop, \%row);
!       if ($payments[$i]{'accountytpe'} ne 'W'){
!         if ($charges[$i2]->{'accounttype'} eq 'Rent'){
!           $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
!         }
!         if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU' || $charges[$i2]->{'accounttype'} eq 'FN' ){
!           $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
!         }
!         if ($charges[$i2]->{'accounttype'} eq 'Res'){
!           $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
!         }
!         if ($charges[$i2]->{'accounttype'} eq 'R'){
!          $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
!         }
!      }
!   }
! 
!   my $hour=substr($payments[$i]{'timestamp'},8,2);
!   my  $min=substr($payments[$i]{'timestamp'},10,2);
!   my $sec=substr($payments[$i]{'timestamp'},12,2);
!   my $time="$hour:$min:$sec";
!   my $time2="$payments[$i]{'date'}";
!   my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
!   my $bornum=$payments[$i]{'borrowernumber'};
!   my $oldtime=$payments[$i]{'timestamp'};
!   my $oldtype=$payments[$i]{'accounttype'};
!   while ($bornum eq $payments[$i]{'borrowernumber'} && $oldtype == $payments[$i]{'accounttype'}  && $oldtime eq $payments[$i]{'timestamp'}){
!      my $hour=substr($payments[$i]{'timestamp'},8,2);
!      my  $min=substr($payments[$i]{'timestamp'},10,2);
!      my $sec=substr($payments[$i]{'timestamp'},12,2);
!      my $time="$hour:$min:$sec";
!          my $time2="$payments[$i]{'date'}";
!      my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
! 
!     if ($payments[$i]{'accounttype'} eq 'W'){
!       $totalw+=$payments[$i]{'amount'};
!     } else {
!       $payments[$i]{'amount'}=$payments[$i]{'amount'}*-1;
!       $total+=$payments[$i]{'amount'};
!     }
! 
!    %row = ( name   => $payments[$i]{'firstname'} . " <b>" . $payments[$i]{'surname'} . "</b>",
!             type   => $payments[$i]{'accounttype'},
!             time   => $payments[$i]{'date'},
!             amount => $payments[$i]{'amount'},
!             branch => $branch );
!     
!     push(@loop, \%row);
!              
!     $oldtype=$payments[$i]{'accounttype'};
!     $oldtime=$payments[$i]{'timestamp'};
!     $bornum=$payments[$i]{'borrowernumber'};
!     $i++;
  
!   }
  }
  
! $template->param( loop   => \@loop,
  		  totalw => $totalw,
  		  total  => $total );
--- 82,156 ----
  my $i=0;
  while ($i<$count){
! 	warn " pay : ".$payments[$i]{'timestamp'};
! 	my $time=$payments[$i]{'datetime'};
! 	my $payments=$payments[$i]{'value'};
! 	my $charge=0;
! 	my @temp=split(/ /,$payments[$i]{'datetime'});
! 	my $date=$temp[0];
! 	my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'});
! 	my $count=@charges;
! 	my $temptotalf=0;
! 	my $temptotalr=0;
! 	my $temptotalres=0;
! 	my $temptotalren=0;
! 	my $temptotalw=0;
! 	for (my $i2=0;$i2<$count;$i2++){
! 		$charge+=$charges[$i2]->{'amount'};
! 		%row = ( name   => $charges[$i2]->{'description'},
! 					type   => $charges[$i2]->{'accounttype'},
! 					time   => $charges[$i2]->{'timestamp'},
! 					amount => $charges[$i2]->{'amount'},
! 					branch => $charges[$i2]->{'amountoutstanding'} );
! 		push(@loop, \%row);
! 		if ($payments[$i]{'accountytpe'} ne 'W'){
! 			if ($charges[$i2]->{'accounttype'} eq 'Rent'){
! 				$temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! 			}
! 			if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU' || $charges[$i2]->{'accounttype'} eq 'FN' ){
! 				$temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! 			}
! 			if ($charges[$i2]->{'accounttype'} eq 'Res'){
! 				$temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! 			}
! 			if ($charges[$i2]->{'accounttype'} eq 'R'){
! 			$temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! 			}
! 		}
! 	}
! 	my $hour=substr($payments[$i]{'timestamp'},8,2);
! 	my  $min=substr($payments[$i]{'timestamp'},10,2);
! 	my $sec=substr($payments[$i]{'timestamp'},12,2);
! 	my $time="$hour:$min:$sec";
! 	my $time2="$payments[$i]{'date'}";
! 	my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
! 	my $bornum=$payments[$i]{'borrowernumber'};
! 	my $oldtime=$payments[$i]{'timestamp'};
! 	my $oldtype=$payments[$i]{'accounttype'};
! 	while ($bornum eq $payments[$i]{'borrowernumber'} && $oldtype == $payments[$i]{'accounttype'}  && $oldtime eq $payments[$i]{'timestamp'}){
! 		my $hour=substr($payments[$i]{'timestamp'},8,2);
! 		my  $min=substr($payments[$i]{'timestamp'},10,2);
! 		my $sec=substr($payments[$i]{'timestamp'},12,2);
! 		my $time="$hour:$min:$sec";
! 		my $time2="$payments[$i]{'date'}";
! 		my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
! 		if ($payments[$i]{'accounttype'} eq 'W'){
! 			$totalw+=$payments[$i]{'amount'};
! 		} else {
! 			$payments[$i]{'amount'}=$payments[$i]{'amount'}*-1;
! 			$total+=$payments[$i]{'amount'};
! 		}
  
! 		%row = ( name   => "<b>".$payments[$i]{'firstname'}.$payments[$i]{'surname'} . "</b>",
! 					type   => $payments[$i]{'accounttype'}, time   => $payments[$i]{'date'},
! 					amount => $payments[$i]{'amount'}, branch => $branch );
! 		push(@loop, \%row);
! 		$oldtype=$payments[$i]{'accounttype'};
! 		$oldtime=$payments[$i]{'timestamp'};
! 		$bornum=$payments[$i]{'borrowernumber'};
! 		$i++;
! 	}
  }
  
! $template->param( loop1   => \@loop,
  		  totalw => $totalw,
  		  total  => $total );