Now takes date range, and credits are displayed as 2dp.

diff --git a/stats.screen.pl b/stats.screen.pl
index 9ada1fe..a5143c1 100755 (executable)
--- a/stats.screen.pl
+++ b/stats.screen.pl
@@ -9,16 +9,20 @@ use C4::Interface::CGI::Output;
 use C4::Context;\r
 use Date::Manip;\r
 use C4::Stats;\r
+use Data::Dumper;\r
+\r
 &Date_Init("DateFormat=non-US"); # set non-USA date, eg:19/08/2005\r
 \r
 my $input=new CGI;\r
 my $time=$input->param('time');\r
+my $time2=$input->param('time2');\r
+\r
 \r
 my ($template, $loggedinuser, $cookie)\r
-    = get_template_and_user({template_name => "stats.screen.tmpl",\r
+    = get_template_and_user({template_name => "stats_screen.tmpl",\r
                              query => $input,\r
                              type => "intranet",\r
-                             authnotrequired => 0,\r
+                             authnotrequired => 1,\r
                              flagsrequired => {borrowers => 1},\r
                              debug => 1,\r
                              });\r
@@ -53,16 +57,22 @@ if ($time eq ''){
         $date2=ParseDate('tomorrow');\r
 }\r
 \r
+# if script is called with a start and finsh date range...\r
+if ($time ne '' && $time2 ne ''){\r
+          $date=ParseDate($time);\r
+          $date2=ParseDate($time2);\r
+}\r
 \r
 \r
 my $date=UnixDate($date,'%Y-%m-%d');\r
 my $date2=UnixDate($date2,'%Y-%m-%d');\r
-\r
-#warn "MASON: DATE: $date, $date2";\r
+warn "MASON: TIME: $time, $time2";\r
+warn "MASON: DATE: $date, $date2";\r
 \r
 #get a list of every payment\r
 my @payments=TotalPaid($date,$date2);\r
 \r
+\r
 my $count=@payments;\r
 # print "MASON: number of payments=$count\n";\r
 \r
@@ -81,7 +91,11 @@ while ($i<$count ){
        my $count;\r
        my @charges;\r
 \r
-       if ($payments[$i]{'type'} ne 'writeoff'){         # lets ignore writeoff payments!.\r
+\r
+       if ($payments[$i]{'type'} ne 'writeoff'){\r
+\r
+#       warn Dumper $payments[$i];\r
+\r
            @charges=getcharges($payments[$i]{'borrowernumber'}, $payments[$i]{'timestamp'}, $payments[$i]{'proccode'});\r
            $totalcharges++;\r
            $count=@charges;\r
@@ -130,7 +144,8 @@ while ($i<$count ){
                     creditfirstname     => $credits[$i]->{'firstname'},\r
                     creditdescription   => $credits[$i]->{'description'},\r
                     creditaccounttype   => $credits[$i]->{'accounttype'},\r
-                    creditamount        => $credits[$i]->{'amount'});\r
+                    creditamount        => sprintf("%.2f", $credits[$i]->{'amount'})\r
+                    );\r
 \r
        push (@loop2, \%rows2);\r
        $i++; #increment the while loop\r
@@ -149,3 +164,4 @@ $template->param( loop1               => \@loop1,
                   totalwritten        => $totalwritten );\r
 \r
 output_html_with_http_headers $input, $cookie, $template->output;\r
+\r