[freeside-commits] freeside/httemplate/search report_cdr.html, 1.6, 1.7 cdr.html, 1.8, 1.9

[Ivan,,,]

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

Modified Files:
	report_cdr.html cdr.html 
Log Message:
add ability to query ranges of duration & billable seconds to CDR report

Index: report_cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cdr.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- report_cdr.html	30 Sep 2007 00:26:03 -0000	1.6
+++ report_cdr.html	26 Mar 2008 02:27:06 -0000	1.7
@@ -2,7 +2,7 @@
 
 <FORM ACTION="cdr.html" METHOD="GET">
 
-<TABLE>
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
   <TR>
     <TD ALIGN="right">Status: </TD>
     <TD>
@@ -30,6 +30,18 @@
     </TD>
   </TR>
 
+  <% include( '/elements/tr-input-lessthan_greaterthan.html',
+                'label' => 'Duration (sec)',
+                'field' => 'duration',
+            )
+  %>
+
+  <% include( '/elements/tr-input-lessthan_greaterthan.html',
+                'label' => 'Billable duration (sec)',
+                'field' => 'billsec',
+            )
+  %>
+
 </TABLE>
 
 <BR>

Index: cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cdr.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cdr.html	29 Oct 2007 11:32:24 -0000	1.8
+++ cdr.html	26 Mar 2008 02:27:06 -0000	1.9
@@ -24,7 +24,6 @@
 # and fixup $count_query
 
 my @search = ();
-my @qsearch = ();
 
 ###
 # freesidestatus
@@ -51,18 +50,22 @@
 my $str2time_sql = str2time_sql;
 
 my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @search,
-my @dsearch = ( "$str2time_sql calldate) >= $beginning ",
-                "$str2time_sql calldate) <= $ending"
-	      );
-push @search, @dsearch;
-push @qsearch, @search;
+push @search, "$str2time_sql calldate) >= $beginning ",
+              "$str2time_sql calldate) <= $ending";
 
+###
+# duration / billsec
+###
+
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'duration');
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'billsec');
 
 ###
 # src/dest
 ###
 
+my @qsearch = @search;
+
 if ( $cgi->param('src') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
   ( my $src = $1 ) =~ s/\D//g;
   $hashref->{'src'} = $src;