tower tracking, RT#15538

9 files changed, 205 insertions, 1 deletions

diff --git a/httemplate/browse/tower.html b/httemplate/browse/tower.html
new file mode 100644
index 0000000..660e924
--- /dev/null
+++ b/httemplate/browse/tower.html
@@ -0,0 +1,44 @@
+<% include( 'elements/browse.html',
+                 'title'       => 'Towers',
+                 'name'        => 'towers',
+                 'menubar'     => [ 'Add a new tower' =>
+                                      $p.'edit/tower.html',
+                                  ],
+                 'query'       => { 'table' => 'tower', },
+                 'count_query' => 'SELECT COUNT(*) FROM tower',
+                 'disableable' => 1,
+                 'disabled_statuspos' => 1,
+                 'header'      => [ 'Name', 'Sectors', ],
+                 'fields'      => [ 'towername',
+                                    $sector_sub,
+                                  ],
+                 'links'       => [ $link,
+                                    '',
+                                  ],
+             )
+%>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $link = [ "${p}edit/tower.html?", 'towernum' ];
+
+my $sector_sub = sub {
+  my $tower = shift;
+  
+  [ map {
+
+          [
+            { 'data' => $_->sectorname,
+              'link' => ( $_->ip_addr ? 'http://'. $_->ip_addr : '' ),
+            },
+          ],
+
+        }
+      $tower->tower_sector
+  ];
+
+};
+
+</%init>
diff --git a/httemplate/edit/process/tower.html b/httemplate/edit/process/tower.html
new file mode 100644
index 0000000..7353784
--- /dev/null
+++ b/httemplate/edit/process/tower.html
@@ -0,0 +1,7 @@
+<& elements/process.html, 
+    table       => 'tower',
+    viewall_dir => 'browse',
+    process_o2m => { 'table'  => 'tower_sector',
+                     'fields' => [qw( sectorname ip_addr )],
+                   },
+&>
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index d4baf35..ad4d604 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -97,7 +97,9 @@ END
 ;
 
 my @fields = (
-  qw( description ip_addr speed_down speed_up blocknum ),
+  qw( description ip_addr speed_down speed_up ),
+  { field=>'sectornum', type=>'select-tower_sector', },
+  qw( blocknum ),
   { field=>'block_label', type=>'fixed' },
   qw( mac_addr latitude longitude altitude vlan_profile 
       performance_profile authkey plan_id ),
diff --git a/httemplate/edit/tower.html b/httemplate/edit/tower.html
new file mode 100644
index 0000000..c27d9d2
--- /dev/null
+++ b/httemplate/edit/tower.html
@@ -0,0 +1,37 @@
+<& elements/edit.html,
+     name_singular => 'tower',
+     table         => 'tower',
+     viewall_dir   => 'browse',
+     fields        => [ 'towername',
+                        { field=>'disabled', type=>'checkbox', value=>'Y', },
+                        { field             => 'sectornum',
+                          type              => 'tower_sector',
+                          o2m_table         => 'tower_sector',
+                          m2_label          => 'Sector',
+                          m2_error_callback => $m2_error_callback,
+                        },
+                      ],
+     labels        => { 'towernum'  => 'Tower',
+                        'towername' => 'Name',
+                        'sectornum' => 'Sector',
+                        'disabled'  => 'Disabled',
+                      },
+&>
+<%init>
+
+my $m2_error_callback = sub { # reconstruct the list
+  my ($cgi, $object) = @_;
+
+  my @fields = qw(sectorname ip_addr);
+  map {
+    my $k = $_;
+    next if !length($cgi->param($k.'_sectorname'));
+    new FS::tower_sector {
+      'towernum'  => $object->towernum,
+      'sectornum' => scalar( $cgi->param($k) ),
+      map { $_ => scalar( $cgi->param($k.'_'.$_) ) } @fields,
+    };
+  } grep /^sectornum\d+$/, ($cgi->param);
+};
+
+</%init>
diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
new file mode 100644
index 0000000..a64d886
--- /dev/null
+++ b/httemplate/elements/select-tower_sector.html
@@ -0,0 +1,7 @@
+<& /elements/select-table.html,
+    table       => 'tower_sector',
+    name_col    => 'description',
+    order_by    => 'ORDER BY towernum,sectorname',
+    empty_label => ' ',
+    @_ 
+&>
diff --git a/httemplate/elements/tower_sector.html b/httemplate/elements/tower_sector.html
new file mode 100644
index 0000000..a8bbbc5
--- /dev/null
+++ b/httemplate/elements/tower_sector.html
@@ -0,0 +1,60 @@
+% unless ( $opt{'js_only'} ) {
+
+  <INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
+
+  <TABLE>
+    <TR>
+%     foreach my $field ( @fields ) {
+
+        <TD>
+          <INPUT TYPE  = "text"
+                 NAME  = "<%$name%>_<%$field%>"
+                 ID    = "<%$id%>_<%$field%>"
+                 SIZE  = "<% $size{$field} || 15 %>"
+                 VALUE = "<% scalar($cgi->param($name."_$field"))
+                             || $tower_sector->get($field) |h %>"
+                 <% $onchange %>
+          ><BR>
+          <FONT SIZE="-1"><% $label{$field} %></FONT>
+        </TD>
+%     }
+    </TR>
+  </TABLE>
+
+
+% }
+<%init>
+
+my( %opt ) = @_;
+
+my $name = $opt{'element_name'} || $opt{'field'} || 'sectornum';
+my $id = $opt{'id'} || 'sectornum';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+my $onchange = '';
+if ( $opt{'onchange'} ) {
+  $onchange = $opt{'onchange'};
+  $onchange .= '(this)' unless $onchange =~ /\(\w*\);?$/;
+  $onchange =~ s/\(what\);/\(this\);/g; #ugh, terrible hack.  all onchange
+                                        #callbacks should act the same
+  $onchange = 'onChange="'. $onchange. '"';
+}
+
+my $tower_sector;
+if ( $curr_value ) {
+  $tower_sector = qsearchs('tower_sector', { 'sectornum' => $curr_value } );
+} else {
+  $tower_sector = new FS::tower_sector {};
+}
+
+my %size = ( 'title' => 12 );
+
+tie my %label, 'Tie::IxHash',
+  'sectorname' => 'Name',
+  'ip_addr'    => 'IP Address',
+;
+
+my @fields = keys %label;
+
+</%init>
diff --git a/httemplate/elements/tr-select-tower_sector.html b/httemplate/elements/tr-select-tower_sector.html
new file mode 100644
index 0000000..d55f42b
--- /dev/null
+++ b/httemplate/elements/tr-select-tower_sector.html
@@ -0,0 +1,11 @@
+<% include('tr-td-label.html', label => emt('Tower sector'), %opt ) %>
+  <TD <% $style %>>
+  <% include( '/elements/select-tower_sector.html', %opt ) %>
+  </TD>
+</TR>
+<%init>
+
+my( %opt ) = @_;
+my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+</%init>
diff --git a/httemplate/elements/tr-tower_sector.html b/httemplate/elements/tr-tower_sector.html
new file mode 100644
index 0000000..871c7fd
--- /dev/null
+++ b/httemplate/elements/tr-tower_sector.html
@@ -0,0 +1,24 @@
+%   unless ( $opt{'js_only'} ) {
+
+      <% include('tr-td-label.html', %opt) %>
+        <TD <% $cell_style %>>
+
+%   }
+%
+            <% include( '/elements/sector.html', %opt ) %>
+%
+%   unless ( $opt{'js_only'} ) {
+
+        </TD>
+      </TR>
+
+%   }
+<%init>
+
+my( %opt ) = @_;
+
+my $cell_style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : '';
+
+$opt{'label'} ||= 'Sector';
+
+</%init>
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 6277759..22cbb1f 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -22,6 +22,7 @@ my @fields = (
   'speed_down',
   'speed_up',
   { field => 'ip_addr', value => \&ip_addr },
+  { field => 'sectornum', value => \&sectornum },
   'mac_addr',
   'latitude',
   'longitude',
@@ -60,4 +61,15 @@ sub usergroup {
   join('<BR>', $svc->radius_groups('long_description'));
 }
 
+sub sectornum {
+  my $svc_broadband = shift;
+  return '' unless $svc_broadband->sectornum;
+  my $tower_sector = $svc_broadband->tower_sector;
+  my $link = $tower_sector->ip_addr
+               ? '<A HREF="http://'. $tower_sector->ip_addr. '">'
+               : '';
+
+  $link .  $tower_sector->description. ( $link ? '</A>' : '');
+}
+
 </%init>