[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-devel] CVS: koha stats.pl,1.2,1.3
From: |
Chris Cornack |
Subject: |
[Koha-devel] CVS: koha stats.pl,1.2,1.3 |
Date: |
Wed, 21 Feb 2001 14:28:01 -0800 |
Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv1935
Modified Files:
stats.pl
Log Message:
Fixed a little glitch in the daily stats script that meant it wasnt counting
renewals
Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/stats.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stats.pl 2001/01/31 23:40:25 1.2
--- stats.pl 2001/02/21 22:27:59 1.3
***************
*** 46,50 ****
my %shannon;
my $oldtime;
! #my $totalc=0;
#my $totalcf=0;
print mktablehdr;
--- 46,50 ----
my %shannon;
my $oldtime;
! my $totalw=0;
#my $totalcf=0;
print mktablehdr;
***************
*** 55,60 ****
my $sec=substr($payments[$i]{'timestamp'},12,2);
my $time="$hour:$min:$sec";
! $payments[$i]{'amount'}*=-1;
! $total+=$payments[$i]{'amount'};
my
@charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'});
my address@hidden;
--- 55,63 ----
my $sec=substr($payments[$i]{'timestamp'},12,2);
my $time="$hour:$min:$sec";
! if ($payments[$i]{'accounttype'} ne 'W'){
! $payments[$i]{'amount'}*=-1;
! $total+=$payments[$i]{'amount'};
! }
!
my
@charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'});
my address@hidden;
***************
*** 63,84 ****
my $temptotalres=0;
my $temptotalren=0;
! for (my $i2=0;$i2<$count;$i2++){
if ($charges[$i2]->{'amountoutstanding'} != $oldtime){
! print
mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'',
! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'});
! if ($charges[$i2]->{'accounttype'} eq 'Rent'){
!
$temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! }
! if ($charges[$i2]->{'accounttype'} eq 'F' ||
$charges[$i2]->{'accounttype'} eq 'FU'){
!
$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 $time2="$payments[$i]{'date'} $time";
my $branch=Getpaidbranch($time2);
--- 66,96 ----
my $temptotalres=0;
my $temptotalren=0;
! my $temptotalw=0;
!
!
! for (my $i2=0;$i2<$count;$i2++){
if ($charges[$i2]->{'amountoutstanding'} != $oldtime){
! print
mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'',
! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'});
! if ($payments[$i]{'accounttype'} ne 'W'){
! # print $payments[$i]{'accounttype'};
! if ($charges[$i2]->{'accounttype'} eq 'Rent'){
!
$temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
! }
! if ($charges[$i2]->{'accounttype'} eq 'F' ||
$charges[$i2]->{'accounttype'} eq 'FU'){
!
$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'};
! }
! }
}
! }
! if ($payments[$i]{'accounttype'} eq 'W'){
! $totalw+=$payments[$i]{'amount'};
! }
my $time2="$payments[$i]{'date'} $time";
my $branch=Getpaidbranch($time2);
***************
*** 112,117 ****
print mktableft;
print endcenter;
! print "<p><b>$total</b>";
! #print "<b
print mktablehdr;
$levin{'issues'}=Count('issue','C',$date,$date2);
--- 124,130 ----
print mktableft;
print endcenter;
! #$totalw=$totalw * -1;
! print "<p><b>Total Paid $total</b>";
! print "<br><b>total written off $totalw</b>";
print mktablehdr;
$levin{'issues'}=Count('issue','C',$date,$date2);
***************
*** 121,130 ****
$foxton{'returns'}=Count('return','F',$date,$date2);
$shannon{'returns'}=Count('return','S',$date,$date2);
print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental
Charges $levin{'totalr'}",
! "Reserve Charges $levin{'totalres'}","Renewal Charges
$levin{'totalren'}","Total $levin{'total'}",
"Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns
$levin{'returns'}");
! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental
Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal
Charges $foxton{'totalren'}","Total $foxton{'total'}",
"Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns
$foxton{'returns'}");
! print mktablerow(9,'white',"<b>shannon</b>","Fines
$shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges
$shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","Total
$shannon{'total'}",
"Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns
$shannon{'returns'}");
print mktableft;
--- 134,147 ----
$foxton{'returns'}=Count('return','F',$date,$date2);
$shannon{'returns'}=Count('return','S',$date,$date2);
+ $levin{'renewals'}=Count('renew','C',$date,$date2);
+ $foxton{'renewals'}=Count('renew','F',$date,$date2);
+ $shannon{'renewals'}=Count('renew','S',$date,$date2);
+
print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental
Charges $levin{'totalr'}",
! "Reserve Charges $levin{'totalres'}","Renewal Charges
$levin{'totalren'}","<b>Total $levin{'total'}</b>",
"Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns
$levin{'returns'}");
! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental
Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal
Charges $foxton{'totalren'}","<b>Total $foxton{'total'}</b>",
"Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns
$foxton{'returns'}");
! print mktablerow(9,'white',"<b>shannon</b>","Fines
$shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges
$shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","<b>Total
$shannon{'total'}</b>",
"Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns
$shannon{'returns'}");
print mktableft;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-devel] CVS: koha stats.pl,1.2,1.3,
Chris Cornack <=