more formatting updates to RADIUS report

[freeside.git] / httemplate / search / sqlradius.cgi

diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 3c5046b..11edf3c 100644 (file)
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -123,9 +123,10 @@
 
   my $time_format = sub {
     my $time = shift;
-    $time > 0
-      ? time2str('%T%P %a %b %o %Y', $time )
-      : ' ';
+    return ' ' if $time == 0;
+    my $pretty = time2str('%T%P %a %b %o %Y', $time );
+    $pretty =~ s/ (\d)(st|dn|rd|th)/$1$2/;
+    $pretty;
   };
 
   my $duration_format = sub {
@@ -160,47 +161,56 @@
                              name    => 'User',
                              attrib  => 'UserName',
                              fmt     => $user_format,
+                             align   => 'left',
                            },
     'realm'             => {
                              name    => 'Realm',
                              attrib  => 'Realm',
+                             align   => 'left',
                            },
     'dummy'             => {
                              name    => 'Customer',
                              attrib  => '',
                              fmt     => $customer_format,
+                             align   => 'left',
                            },
     'framedipaddress'   => {
-                             name    => 'IP Address',
+                             name    => 'IP Address',
                              attrib  => 'Framed-IP-Address',
                              fmt     => sub { my $ip = shift;
                                               length($ip) ? $ip : '&nbsp';
                                             },
+                             align   => 'right',
                            },
     'acctstarttime'     => {
-                             name    => 'Start time',
+                             name    => 'Start time',
                              attrib  => 'Acct-Start-Time',
                              fmt     => $time_format,
+                             align   => 'left',
                            },
     'acctstoptime'      => {
-                             name    => 'End time',
+                             name    => 'End time',
                              attrib  => 'Acct-Stop-Time',
                              fmt     => $time_format,
+                             align   => 'left',
                            },
     'acctsessiontime'   => {
                              name    => 'Duration',
                              attrib  => 'Acct-Session-Time',
                              fmt     => $duration_format,
+                             align   => 'right',
                            },
     'acctinputoctets'   => {
                              name    => 'Upload', # (from user)',
                              attrib  => 'Acct-Input-Octets',
                              fmt     => $octets_format,
+                             align   => 'right',
                            },
     'acctoutputoctets'  => {
                              name    => 'Download', # (to user)',
                              attrib  => 'Acct-Output-Octets',
                              fmt     => $octets_format,
+                             align   => 'right',
                            },
   ;
   $fields{$_}->{fmt} ||= sub { length($_[0]) ? shift : '&nbsp'; }
@@ -223,7 +233,7 @@
   <% foreach my $field ( keys %fields ) { %>
     <TH>
       <%= $fields{$field}->{name} %><BR>
-      <FONT SIZE=-1><%= $fields{$field}->{attrib} %></FONT>
+      <FONT SIZE=-2><%= $fields{$field}->{attrib} %></FONT>
     </TH>
   <% } %>
 </TR>