[freeside-commits] freeside/httemplate/search report_svc_acct.html, 1.9, 1.10 report_svc_broadband.html, 1.1, 1.2 svc_acct.cgi, 1.64, 1.65 svc_broadband.cgi, 1.12, 1.13

[Mark Wells]

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

Modified Files:
	report_svc_acct.html report_svc_broadband.html svc_acct.cgi 
	svc_broadband.cgi 
Log Message:
search services by tower/sector, #15950

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_broadband.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- svc_broadband.cgi	13 Jan 2012 03:26:37 -0000	1.12
+++ svc_broadband.cgi	18 Jan 2012 02:48:03 -0000	1.13
@@ -8,6 +8,7 @@
               'header'      => [ '#',
                                  'Service',
                                  'Router',
+                                 @tower_header,
                                  'IP Address',
                                  FS::UI::Web::cust_header($cgi->param('cust_fields')),
                                ],
@@ -17,22 +18,26 @@
                                    my $blocknum = shift->blocknum or return '';
                                    $routerbyblock{$blocknum}->routername;
                                  },
+                                 @tower_fields,
                                  'ip_addr',
                                  \&FS::UI::Web::cust_fields,
                                ],
               'links'       => [ $link,
                                  $link,
                                  '', #$link_router,
+                                 (map '', @tower_fields),
                                  $link,
                                  ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
                                        FS::UI::Web::cust_header($cgi->param('cust_fields'))
                                  ),
                                ],
-              'align'       => 'rllr'. FS::UI::Web::cust_aligns(),
+              'align'       => 'rll'.('r' x @tower_fields).'r'.
+                                FS::UI::Web::cust_aligns(),
               'color'       => [ 
                                  '',
                                  '',
                                  '',
+                                 (map '', @tower_fields),
                                  '',
                                  FS::UI::Web::cust_colors(),
                                ],
@@ -40,6 +45,7 @@
                                  '',
                                  '',
                                  '',
+                                 (map '', @tower_fields),
                                  '',
                                  FS::UI::Web::cust_styles(),
                                ],
@@ -60,7 +66,7 @@
   foreach (qw(custnum agentnum svcpart)) {
     $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
   }
-  foreach (qw(pkgpart routernum)) {
+  foreach (qw(pkgpart routernum towernum sectornum)) {
     $search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
   }
 }
@@ -71,6 +77,14 @@
 
 my $sql_query = FS::svc_broadband->search(\%search_hash);
 
+my @tower_header;
+my @tower_fields;
+if ( FS::tower_sector->count > 0 ) {
+  push @tower_header, 'Tower/Sector';
+  push @tower_fields, sub { $_[0]->tower_sector ? 
+                            $_[0]->tower_sector->description : '' };
+}
+
 my %routerbyblock = ();
 foreach my $router (qsearch('router', {})) {
   foreach ($router->addr_block) {

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_acct.cgi,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -w -d -r1.64 -r1.65
--- svc_acct.cgi	18 May 2011 01:49:08 -0000	1.64
+++ svc_acct.cgi	18 Jan 2012 02:48:03 -0000	1.65
@@ -119,6 +119,10 @@
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
 }
 
+for (qw( towernum sectornum )) {
+  $search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
+}
+
 my $timepermonth = '';
 
 my $orderby = 'ORDER BY svcnum';

Index: report_svc_acct.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_svc_acct.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- report_svc_acct.html	21 May 2011 17:58:08 -0000	1.9
+++ report_svc_acct.html	18 Jan 2012 02:48:03 -0000	1.10
@@ -72,6 +72,16 @@
     
     <& /elements/tr-selectmultiple-part_pkg.html &> 
 
+%   my $conf = new FS::Conf;
+%   if ( $conf->exists('svc_acct-tower_sector') 
+%        and FS::tower_sector->count > 0 ) {
+    <& /elements/tr-select-tower_sector.html,
+          'multiple'    => 1,
+          'label'       => 'Tower/Sector',
+    &>
+%   }
+
+
     <TR>
       <TH CLASS="background" COLSPAN=2> </TH>
     </TR>

Index: report_svc_broadband.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_svc_broadband.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- report_svc_broadband.html	17 Sep 2010 18:07:08 -0000	1.1
+++ report_svc_broadband.html	18 Jan 2012 02:48:03 -0000	1.2
@@ -26,13 +26,20 @@
                     'multiple'      => 'multiple',
               )
     %>
-% }
 
     <% include( '/elements/tr-selectmultiple-part_pkg.html',
                 %pkg_search,
               )
     %> 
 
+%     if ( FS::tower_sector->count > 0 ) {
+    <& /elements/tr-select-tower_sector.html,
+          'multiple'    => 1,
+          'label'       => 'Tower/Sector',
+    &>
+%     }
+
+%   }
     <TR>
       <TH CLASS="background" COLSPAN=2> </TH>
     </TR>