X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=ad4d6046df7a9e50d71d406c431b2bad1b7aa058;hp=8a108f891d6e7cf1284e528c0eb7616a1950267b;hb=573139dbd6c37808697bfa72a3a468bb0980d4dd;hpb=63a268637b2d51a8766412617724b9436439deb6

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 8a108f891..ad4d6046d 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,27 +1,13 @@
-<% include('elements/svc_Common.html',
+<& elements/svc_Common.html,
      'post_url'             => popurl(1). 'process/svc_broadband.cgi',
      'name'                 => 'broadband service',
      'table'                => 'svc_broadband',
-     'labels'               => { 'svcnum'       => 'Service',
-                                 'description'  => 'Description',
-                                 'ip_addr'      => 'IP address',
-                                 'speed_down'   => 'Download speed',
-                                 'speed_up'     => 'Upload speed',
-                                 'blocknum'     => 'Router/Block',
-                                 'block_label'  => 'Router/Block',
-                                 'mac_addr'     => 'MAC address',
-                                 'latitude'     => 'Latitude',
-                                 'longitude'    => 'Longitude',
-                                 'altitude'     => 'Altitude',
-                                 'vlan_profile' => 'VLAN profile',
-                                 'performance_profile' => 'Performance profile',
-                                 'authkey'      => 'Authentication key',
-                               },
      'fields'               => \@fields, 
      'field_callback'       => $callback,
      'dummy'                => $cgi->query_string,
-     )
-%>
+     'onsubmit'             => 'validate_coords',
+     'html_foot'            => $js,
+&>
 <%init>
 
 die "access denied"
@@ -32,12 +18,102 @@ die "access denied"
 
 my $conf = new FS::Conf;
 
+my $js = <<END
+    <script type="text/javascript">
+        function validate_coords(f){
+END
+;
+if ( $conf->exists('svc_broadband-require-nw-coordinates') ) {
+$js .= <<END
+            var lon = f.longitude;
+            var lat = f.latitude;
+            if ( lon == null || lat == null || 
+                lon.value.length == 0 || lat.value.length == 0 ) return true;
+
+            return (ut_coord(lat.value,1,90) && ut_coord(lon.value,-180,-1));
+        } // validate_coords
+
+        /* this is a JS re-implementation of FS::Record::ut_coord */
+        function ut_coord(coord,lower,upper) {
+            var neg = /^-/.test(coord);
+            coord = coord.replace(/^-/,'');
+
+            var d = 0;
+            var m = 0;
+            var s = 0;
+            
+            var t1 = /^(\\s*\\d{1,3}(?:\\.\\d+)?)\\s*\$/.exec(coord);
+            var t2 = /^(\\s*\\d{1,3})\\s+(\\d{1,2}(?:\\.\\d+))\\s*\$/.exec(coord);
+            var t3 = /^(\\s*\\d{1,3})\\s+(\\d{1,2})\\s+(\\d{1,3})\\s*\$/.exec(coord);
+            if ( t1 != null ) {
+                d = t1[1];
+            } else if ( t2 != null ) {
+                d = t2[1];
+                m = t2[2];
+            } else if ( t3 != null ) {
+                d = t3[1];
+                m = t3[2];
+                s = t3[3];
+            } else {
+                alert('Invalid co-ordinates! Latitude must be positive and longitude must be negative.');
+                return false;
+            } 
+            
+            var ts = /^\\d{3}\$/.exec(s);
+            if ( ts != null || s > 59 ) {
+               s /= 1000; 
+            } else {
+                s /= 60;
+            }
+            s /= 60;
+
+            m /= 60;
+            if ( m > 59 ) {
+                alert('Invalid coordinate with minutes > 59');
+                return false;
+            }
+
+            var tmp = parseInt(d)+parseInt(m)+parseInt(s);
+            tmp = tmp.toFixed(8);
+            coord = (neg ? -1 : 1) * tmp;
+
+            if(coord < lower) {
+                alert('Error: invalid coordinate < '+lower);
+                return false;
+            }
+            if(coord > upper) {
+                alert('Error: invalid coordinate > '+upper);
+                return false;
+            }
+
+            return true;
+END
+;
+}
+$js .= <<END
+        }
+    </script>
+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 )
+  qw( mac_addr latitude longitude altitude vlan_profile 
+      performance_profile authkey plan_id ),
 );
 
+if ( $conf->exists('svc_broadband-radius') ) {
+  push @fields,
+  { field     => 'usergroup',
+    type      => 'select-radius_group',
+    multiple  => 1,
+  }
+}
+
+
 my $fixedblock = '';
 
 my $callback = sub {
@@ -51,10 +127,17 @@ my $callback = sub {
 
   my $columndef = $part_svc->part_svc_column($fieldref->{'field'});
   if ($columndef->columnflag eq 'F') {
-    $fieldref->{'type'} = 'fixed';
+    $fieldref->{'type'} = length($columndef->columnvalue)
+                            ? 'fixed'
+                            : 'hidden';
     $fieldref->{'value'} = $columndef->columnvalue;
     $fixedblock = $fieldref->{value}
       if $fieldref->{field} eq 'blocknum';
+
+    if ( $fieldref->{field} eq 'usergroup' ) {
+      $fieldref->{'formatted_value'} = 
+        [ $object->radius_groups('long_description') ];
+    }
   }
 
   if ($object->svcnum) { 
@@ -63,12 +146,12 @@ my $callback = sub {
       if $fieldref->{field} eq 'blocknum';
       
     $fieldref->{value} = $object->addr_block->label
-      if $fieldref->{field} eq 'block_label';
+      if $fieldref->{field} eq 'block_label' && $object->addr_block;
 
   } else { 
 
     if ($fieldref->{field} eq 'block_label') {
-      if ($fixedblock) {
+      if ($fixedblock && $object->addr_block) {
         $object->blocknum($fixedblock);
         $fieldref->{value} = $object->addr_block->label;
       }else{
@@ -93,7 +176,8 @@ my $callback = sub {
                && $FS::CurrentUser::CurrentUser->agentnum($_->agentnum)
              }
         map { $_->addr_block } $object->allowed_routers;
-      my @options = map { $_->blocknum } @addr_block;
+      my @options = map { $_->blocknum } 
+                    sort { $a->label cmp $b->label } @addr_block;
       my %option_labels = map { ( $_->blocknum => $_->label ) } @addr_block;
       $fieldref->{type}    = 'select';
       $fieldref->{options} = \@options;