diff options
| author | jeff <jeff> | 2007-06-22 21:25:38 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2007-06-22 21:25:38 +0000 |
| commit | c83d3328b27ea804fe6a15ea3e9daf032f0b197e (patch) | |
| tree | 7a54e39e3c4d5e13e498cec847e3c8bbcb33f793 | |
| parent | 999cd23800332bd1ef9afed325094b500e0bc613 (diff) | |
self-service usage report enhancements (1495)
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 1 | ||||
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/view_usage_details.html | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi index 2e1da4168..10a489f36 100644 --- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi +++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi @@ -8,6 +8,7 @@ use CGI::Carp qw(fatalsToBrowser); use Text::Template; use HTML::Entities; use Date::Format; +use Number::Format; use FS::SelfService qw( login customer_info invoice payment_info process_payment process_prepay diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage_details.html b/fs_selfservice/FS-SelfService/cgi/view_usage_details.html index 9067755b0..afa99ffb5 100644 --- a/fs_selfservice/FS-SelfService/cgi/view_usage_details.html +++ b/fs_selfservice/FS-SelfService/cgi/view_usage_details.html @@ -35,8 +35,12 @@ <TH ALIGN="left">Account</TH> <TH ALIGN="right">Start Time</TH> <TH ALIGN="right">Duration</TH> + <TH ALIGN="right">Upload</TH> + <TH ALIGN="right">Download</TH> </TR> <%= my $total = 0; + my $utotal = 0; + my $dtotal = 0; foreach my $usage ( @usage ) { $OUT .= '<TR><TD>'; $OUT .= $usage->{'username'}; @@ -49,13 +53,26 @@ my $m = sprintf("%02d", int(($duration % 3600) / 60)); my $s = sprintf("%02d", $duration % 60); $OUT .= "$h:$m:$s"; + $OUT .= '</TD><TD ALIGN="right">'; + $OUT .= Number::Format::format_bytes($usage->{'acctinputoctets'}, precision => 2); + $utotal += $usage->{'acctinputoctets'}; + $OUT .= '</TD><TD ALIGN="right">'; + $OUT .= Number::Format::format_bytes($usage->{'acctoutputoctets'}, precision => 2); + $dtotal += $usage->{'acctoutputoctets'}; $OUT .= '</TD></TR>'; } my $h = int($total/3600); my $m = sprintf("%02d", int(($total % 3600) / 60)); my $s = sprintf("%02d", $total % 60); - $OUT .= qq!<TR><TD></TD><TD></TD><TD ALIGN="right">========</TD></TR>!; - $OUT .= qq!<TR><TD></TD><TD></TD><TD ALIGN="right">$h:$m:$s</TD></TR>!; %> + $OUT .= qq!<TR><TD></TD><TD></TD>!; + $OUT .= qq!<TD ALIGN="right">========</TD>! x 3; + $OUT .= qq!</TR>!; + $OUT .= qq!<TR><TD></TD><TD></TD><TD ALIGN="right">$h:$m:$s</TD>!; + $OUT .= qq!<TD ALIGN="right">!; + $OUT .= Number::Format::format_bytes($utotal, precision => 2). qq!</TD>!; + $OUT .= qq!<TD ALIGN="right">!; + $OUT .= Number::Format::format_bytes($dtotal, precision => 2). qq!</TD>!; + $OUT .= qq!</TR>!; %> </TABLE> <BR> |