[freeside-commits] freeside/httemplate/search report_cdr.html, 1.15, 1.15.2.1 cdr.html, 1.24.2.2, 1.24.2.3

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv331/httemplate/search

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	report_cdr.html cdr.html 
Log Message:
CDR Report: add top sources, top destinations, and longest calls report options, RT12185

Index: report_cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cdr.html,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -w -d -r1.15 -r1.15.2.1
--- report_cdr.html	25 Oct 2010 00:28:41 -0000	1.15
+++ report_cdr.html	17 Jun 2011 06:30:02 -0000	1.15.2.1
@@ -1,5 +1,13 @@
 <% include('/elements/header.html', 'Call Detail Record Search' ) %>
 
+<SCRIPT type="text/javascript">
+    function clearfield(which){
+        var f = document.getElementById(which);
+        if ( f == null) return;
+        f.value = '';
+    }
+</SCRIPT>
+
 <FORM ACTION="cdr.html" METHOD="GET">
 
 <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
@@ -95,6 +103,21 @@
             )
   %>
 
+  <TR>
+    <TD ALIGN="right">Top</TD>
+    <TD><INPUT TYPE="TEXT" id="top_dst" NAME="top_dst" SIZE="7" onfocus="clearfield('top_src');"> destinations</TD>
+  </TR>
+  
+  <TR>
+    <TD ALIGN="right">Top</TD>
+    <TD><INPUT TYPE="TEXT" id="top_src" NAME="top_src" SIZE="7" onfocus="clearfield('top_dst');"> sources</TD>
+  </TR>
+  
+  <TR>
+    <TD ALIGN="right"></TD>
+    <TD><INPUT TYPE="TEXT" NAME="longest" SIZE="7"> longest calls</TD>
+  </TR>
+  
   <% include( '/elements/tr-select-cdrbatch.html' ) %>
 
   <TR>

Index: cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cdr.html,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -w -d -r1.24.2.2 -r1.24.2.3
--- cdr.html	10 Apr 2011 18:04:20 -0000	1.24.2.2
+++ cdr.html	17 Jun 2011 06:30:02 -0000	1.24.2.3
@@ -1,31 +1,13 @@
 <% include( 'elements/search.html',
                'title' => $title,
                'name'  => 'call detail records',
-
-               'query' => { 'table'     => 'cdr',
-                            'hashref'   => $hashref,
-			    'extra_sql' => $qsearch,
-			    'order_by'  => 'ORDER BY calldate',
-                          },
+               'query' => $query,
                'count_query' => $count_query,
-               'count_addl' => [ $totalminutes_sub ],
-               'header' => [
-                             '', # checkbox column
-                             @header,
-                           ],
-               'fields' => [
-                             sub {
-                               return '' unless $edit_data;
-                               $areboxes = 1;
-                               my $cdr = shift;
-                               my $acctid = $cdr->acctid;
-                               qq!<INPUT NAME="acctid$acctid" TYPE="checkbox" VALUE="1">!;
-                             },
-                             @fields,       #XXX fill in some pretty-print
-                                            #processing, etc.
-                           ],
+               'count_addl' => $nototalminutes ? '' : [ $totalminutes_sub ],
+               'disable_total' => $topmode ? 1 : '',
+               'header' => \@header,
+               'fields' => \@fields,
                'links' => \@links,
-
                'html_form'   => qq!<FORM NAME="cdrForm" ACTION="$p/misc/cdr.cgi" METHOD="POST">!,
                #false laziness w/queue.html
                'html_foot' => sub {
@@ -264,6 +246,8 @@
 # finish it up
 ###
 
+my $nototalminutes = 0;
+
 my $search = join(' AND ', @search);
 $search = "WHERE $search" if $search;
 
@@ -273,6 +257,20 @@
 $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch
   if $qsearch;
 
+my $query =     {   'table'     => 'cdr',
+                    'hashref'   => $hashref,
+			        'extra_sql' => $qsearch,
+			        'order_by'  => 'ORDER BY calldate',
+                };
+
+if ( $cgi->param('longest') =~ /^(\d+)$/ && $cgi->param('longest') > 0 ) {
+    $cgi->param('maxrecords',$1);
+    $count_query = "SELECT $1";
+    $query->{'order_by'} = 'ORDER BY billsec desc';
+    $nototalminutes = 1;
+}
+
+
 ###
 # display fields
 ###
@@ -297,6 +295,7 @@
                      ucfirst($header);
                    }
                  } @fields;
+unshift @header, ' ';
 
 my $date_sub_factory = sub {
   my $column = shift;
@@ -318,8 +317,60 @@
 );
 
 @fields = map { exists($fields{$_}) ? $fields{$_} : $_ } @fields;
+unshift @fields, sub {
+                       return '' unless $edit_data;
+                       $areboxes = 1;
+                       my $cdr = shift;
+                       my $acctid = $cdr->acctid;
+                       qq!<INPUT NAME="acctid$acctid" TYPE="checkbox" VALUE="1">!;
+                     };
 
-              #checkbox column
 my @links = ( '', map { exists($links{$_}) ? $links{$_} : '' } @fields );
 
+
+###
+# top dst / top src
+###
+
+my $topmode = 0;
+
+if ( $cgi->param('top_dst') =~ /^(\d+)$/ && $cgi->param('top_dst') > 0 ) {
+        $topmode = $1;
+        @fields = ('dst');
+        @header = ('Destination');
+}
+elsif ( $cgi->param('top_src') =~ /^(\d+)$/ && $cgi->param('top_src') > 0 ) {
+        $topmode = $1;
+        @fields = ('src');
+        @header = ('Source');
+}
+
+if ( $topmode ) {
+    my $whichfield = $fields[0];
+    $query = {  'select'    => "$whichfield, count(1) as cnt",
+                'table'     => 'cdr',
+                'hashref'   => {},
+                'extra_sql' => "$search
+                                group by $whichfield
+                                order by cnt desc",
+             };
+    $count_query = "SELECT $topmode";
+
+    # this is weird, maybe we should change search.html
+    $cgi->param('maxrecords',$topmode);
+    
+    # kind of hacked
+    my $link = "${p}search/cdr.html?".$cgi->query_string;
+    $link =~ s/;top_(dst|src)=(\d+|)//g;
+    $link =~ s/;maxrecords=(\d+|)//;
+    $link =~ s/;(src|dst)=(\d+|)//g;
+    $link = [ "$link;$whichfield=", sub { shift->$whichfield } ];
+    @links = ($link);
+
+    push @fields, 'cnt';
+    push @header, '# Calls';
+    
+    $nototalminutes = 1;
+}
+
 </%init>