X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=05b6ac56dc346a4b76f1f6f19c9d8d53e14f6fc8;hb=8f17111eec549dfa9c94688ae69f3b12026755a6;hp=627775992301d76a7b84c66acc3114f50afe4aa0;hpb=7aef2e455fe8a4722036f231ee8609ac63b2a9c9;p=freeside.git

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 627775992..05b6ac56d 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -2,6 +2,7 @@
   table   => 'svc_broadband',
   labels  => \%labels,
   fields  => \@fields,
+  svc_callback => \&svc_callback,
 &>
 <%init>
 
@@ -13,18 +14,27 @@ my %labels = map { $_ => ( ref($fields->{$_})
                           );
                  } keys %$fields;
 
-$labels{'router'} = emt('Router');
+#my %labels = ();
+
+$labels{'description'} = emt('Description');
+$labels{'speed_down'} = emt('Download Speed');
+$labels{'speed_up'} = emt('Upload Speed');
+$labels{'ip_addr'} = emt('IP Address');
 $labels{'usergroup'} = emt('RADIUS groups'); #?
 
+$labels{'coordinates'} = 'Latitude/Longitude';
+
 my @fields = (
   'description',
-  { field => 'router', value => \&router },
+  { field => 'routernum', value_callback => \&router },
   'speed_down',
   'speed_up',
-  { field => 'ip_addr', value => \&ip_addr },
-  'mac_addr',
-  'latitude',
-  'longitude',
+  { field => 'ip_addr', value_callback => \&ip_addr },
+  { field => 'sectornum', value_callback => \&sectornum },
+  { field => 'mac_addr', value_callback => \&mac_addr },
+  #'latitude',
+  #'longitude',
+  { field => 'coordinates', value_callback => \&coordinates },
   'altitude',
   'vlan_profile',
   'authkey',
@@ -32,21 +42,24 @@ my @fields = (
 );
 
 push @fields,
-  { field => 'usergroup', value => \&usergroup }
+  { field => 'usergroup', value_callback => \&usergroup }
   if $conf->exists('svc_broadband-radius');
 
 sub router {
   my $svc = shift;
-  my $addr_block = $svc->addr_block or return '';
-  my $router = $addr_block->router or return '';
-  $router->routernum . ': ' . $router->routername;
+  my $router = $svc->router;
+  my $block = $svc->addr_block;
+  $router = $router->routernum . ': ' . $router->routername if $router;
+  $block = '; '.$block->cidr if $block;
+  $router . $block
 }
 
 sub ip_addr {
   my $svc = shift;
   my $ip_addr = $svc->ip_addr;
-  my $out = $ip_addr . ' (' . 
-    include('/elements/popup_link-ping.html', ip => $ip_addr) . ')';
+  my $out = $ip_addr;
+  $out .= ' (' . include('/elements/popup_link-ping.html', ip => $ip_addr) . ')'
+    if $ip_addr;
   if ( my $addr_block = $svc->addr_block ) {
     $out .= '<br>Netmask: ' . $addr_block->NetAddr->mask .
             '<br>Gateway: ' . $addr_block->ip_gateway;
@@ -54,10 +67,70 @@ sub ip_addr {
   $out;
 }
 
+sub mac_addr {
+  my $svc = shift;
+  join(':', $svc->mac_addr =~ /../g);
+}
+
 sub usergroup {
   my $svc = shift;
   my $usergroup = $svc->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>' : '');
+}
+
+sub coordinates {
+  my $s = shift; #$svc_broadband
+  return '' unless $s->latitude && $s->longitude;
+
+  my $d = $s->description;
+  my $agentnum;
+  unless ($d) {
+    if ( my $cust_pkg = $s->cust_svc->cust_pkg ) {
+      $d = $cust_pkg->cust_main->name_short;
+      $agentnum = $cust_pkg->cust_main->agentnum;
+    }
+  }
+  
+  #'Latitude: '. $s->latitude. ', Longitude: '. $s->longitude. ' '.
+  $s->latitude. ', '. $s->longitude. ' '.
+    include('/elements/coord-links.html', 
+      $s->latitude,
+      $s->longitude,
+      $d,
+      $agentnum
+    );
+}
+
+sub svc_callback {
+  # trying to move to the callback style
+  my ($cgi, $svc_x, $part_svc, $cust_pkg, $fields, $opt) = @_;
+  # again, we assume at most one of these exports per part_svc
+  my ($nas_export) = $part_svc->part_export('broadband_nas');
+  if ( $nas_export ) {
+    my $nas = qsearchs('nas', { 'svcnum' => $svc_x->svcnum });
+    if ( $nas ) {
+      $svc_x->set($_, $nas->$_) foreach (fields('nas'));
+      push @$fields, qw(shortname secret type ports server community);
+      $opt->{'labels'}{'shortname'}  = 'Short name';
+      $opt->{'labels'}{'secret'}     = 'Shared secret';
+      $opt->{'labels'}{'type'}       = 'Type';
+      $opt->{'labels'}{'ports'}      = 'Ports';
+      $opt->{'labels'}{'server'}     = 'Server';
+      $opt->{'labels'}{'community'}  = 'Community';
+    } #if $nas
+  } #$nas_export
+};
+
+
 </%init>