From 573139dbd6c37808697bfa72a3a468bb0980d4dd Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 10 Dec 2011 00:37:04 +0000 Subject: [PATCH] tower tracking, RT#15538 --- FS/FS.pm | 4 + FS/FS/Mason.pm | 2 + FS/FS/Schema.pm | 51 ++++++-- FS/FS/svc_broadband.pm | 17 ++- FS/FS/tower.pm | 142 ++++++++++++++++++++++ FS/FS/tower_sector.pm | 154 ++++++++++++++++++++++++ FS/MANIFEST | 4 + FS/t/tower.t | 5 + FS/t/tower_sector.t | 5 + httemplate/browse/tower.html | 44 +++++++ httemplate/edit/process/tower.html | 7 ++ httemplate/edit/svc_broadband.cgi | 4 +- httemplate/edit/tower.html | 37 ++++++ httemplate/elements/select-tower_sector.html | 7 ++ httemplate/elements/tower_sector.html | 60 +++++++++ httemplate/elements/tr-select-tower_sector.html | 11 ++ httemplate/elements/tr-tower_sector.html | 24 ++++ httemplate/view/svc_broadband.cgi | 12 ++ 18 files changed, 574 insertions(+), 16 deletions(-) create mode 100644 FS/FS/tower.pm create mode 100644 FS/FS/tower_sector.pm create mode 100644 FS/t/tower.t create mode 100644 FS/t/tower_sector.t create mode 100644 httemplate/browse/tower.html create mode 100644 httemplate/edit/process/tower.html create mode 100644 httemplate/edit/tower.html create mode 100644 httemplate/elements/select-tower_sector.html create mode 100644 httemplate/elements/tower_sector.html create mode 100644 httemplate/elements/tr-select-tower_sector.html create mode 100644 httemplate/elements/tr-tower_sector.html diff --git a/FS/FS.pm b/FS/FS.pm index e8f2cdc33..2552dbd08 100644 --- a/FS/FS.pm +++ b/FS/FS.pm @@ -162,6 +162,10 @@ L - Address block class L - Router class +L - Tower class + +L - Tower sector class + L - Broadband virtual field class L - Phone service class diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 99cc1cd6f..0cb2a0bff 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -299,6 +299,8 @@ if ( -e $addl_handler_use_file ) { use FS::rate_tier_detail; use FS::radius_attr; use FS::discount_plan; + use FS::tower; + use FS::tower_sector; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index c15f393bb..1f850b103 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2501,26 +2501,51 @@ sub tables_hashref { 'svc_broadband' => { 'columns' => [ - 'svcnum', 'int', '', '', '', '', - 'description', 'varchar', 'NULL', $char_d, '', '', - 'blocknum', 'int', 'NULL', '', '', '', - 'speed_up', 'int', 'NULL', '', '', '', - 'speed_down', 'int', 'NULL', '', '', '', - 'ip_addr', 'varchar', 'NULL', 15, '', '', - 'mac_addr', 'varchar', 'NULL', 12, '', '', - 'authkey', 'varchar', 'NULL', 32, '', '', - 'latitude', 'decimal', 'NULL', '', '', '', - 'longitude', 'decimal', 'NULL', '', '', '', - 'altitude', 'decimal', 'NULL', '', '', '', - 'vlan_profile', 'varchar', 'NULL', $char_d, '', '', + 'svcnum', 'int', '', '', '', '', + 'description', 'varchar', 'NULL', $char_d, '', '', + 'blocknum', 'int', 'NULL', '', '', '', + 'sectornum', 'int', 'NULL', '', '', '', + 'speed_up', 'int', 'NULL', '', '', '', + 'speed_down', 'int', 'NULL', '', '', '', + 'ip_addr', 'varchar', 'NULL', 15, '', '', + 'mac_addr', 'varchar', 'NULL', 12, '', '', + 'authkey', 'varchar', 'NULL', 32, '', '', + 'latitude', 'decimal', 'NULL', '', '', '', + 'longitude', 'decimal', 'NULL', '', '', '', + 'altitude', 'decimal', 'NULL', '', '', '', + 'vlan_profile', 'varchar', 'NULL', $char_d, '', '', 'performance_profile', 'varchar', 'NULL', $char_d, '', '', - 'plan_id', 'varchar', 'NULL', $char_d, '', '', + 'plan_id', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'svcnum', 'unique' => [ [ 'mac_addr' ] ], 'index' => [], }, + 'tower' => { + 'columns' => [ + 'towernum', 'serial', '', '', '', '', + #'agentnum', 'int', 'NULL', '', '', '', + 'towername', 'varchar', '', $char_d, '', '', + 'disabled', 'char', 'NULL', 1, '', '', + ], + 'primary_key' => 'towernum', + 'unique' => [ [ 'towername' ] ], # , 'agentnum' ] ], + 'index' => [], + }, + + 'tower_sector' => { + 'columns' => [ + 'sectornum', 'serial', '', '', '', '', + 'towernum', 'int', '', '', '', '', + 'sectorname', 'varchar', '', $char_d, '', '', + 'ip_addr', 'varchar', 'NULL', 15, '', '', + ], + 'primary_key' => 'sectornum', + 'unique' => [ [ 'towernum', 'sectorname' ], [ 'ip_addr' ], ], + 'index' => [ [ 'towernum' ] ], + }, + 'part_virtual_field' => { 'columns' => [ 'vfieldpart', 'serial', '', '', '', '', diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index 83c481ef3..35de8b3d9 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -2,12 +2,13 @@ package FS::svc_broadband; use strict; use vars qw(@ISA $conf); +use NetAddr::IP; use FS::Record qw( qsearchs qsearch dbh ); use FS::svc_Common; use FS::cust_svc; use FS::addr_block; use FS::part_svc_router; -use NetAddr::IP; +use FS::tower_sector; @ISA = qw( FS::svc_Radius_Mixin FS::svc_Common ); @@ -97,7 +98,8 @@ sub table_info { 'cancel_weight' => 70, 'ip_field' => 'ip_addr', 'fields' => { - 'description' => 'Descriptive label for this particular device.', + 'svcnum' => 'Service', + 'description' => 'Descriptive label for this particular device', 'speed_down' => 'Maximum download speed for this service in Kbps. 0 denotes unlimited.', 'speed_up' => 'Maximum upload speed for this service in Kbps. 0 denotes unlimited.', 'ip_addr' => 'IP address. Leave blank for automatic assignment.', @@ -356,6 +358,7 @@ sub check { my $error = $self->ut_numbern('svcnum') || $self->ut_numbern('blocknum') + || $self->ut_foreign_keyn('sectornum', 'tower_sector', 'sectornum') || $self->ut_textn('description') || $self->ut_numbern('speed_up') || $self->ut_numbern('speed_down') @@ -478,6 +481,16 @@ sub NetAddr { new NetAddr::IP ($self->ip_addr); } +=item tower_sector + +=cut + +sub tower_sector { + my $self = shift; + return '' unless $self->sectornum; + qsearchs('tower_sector', { sectornum => $self->sectornum }); +} + =item addr_block Returns the FS::addr_block record (i.e. the address block) for this broadband service. diff --git a/FS/FS/tower.pm b/FS/FS/tower.pm new file mode 100644 index 000000000..0d9447729 --- /dev/null +++ b/FS/FS/tower.pm @@ -0,0 +1,142 @@ +package FS::tower; + +use strict; +use base qw( FS::o2m_Common FS::Record ); +use FS::Record qw( qsearch ); #qsearchs ); +use FS::tower_sector; + +=head1 NAME + +FS::tower - Object methods for tower records + +=head1 SYNOPSIS + + use FS::tower; + + $record = new FS::tower \%hash; + $record = new FS::tower { 'column' => 'value' }; + + $error = $record->insert; + + $error = $new_record->replace($old_record); + + $error = $record->delete; + + $error = $record->check; + +=head1 DESCRIPTION + +An FS::tower object represents a tower. FS::tower inherits from +FS::Record. The following fields are currently supported: + +=over 4 + +=item towernum + +primary key + +=item towername + +Tower name + +=item disabled + +Disabled flag, empty or 'Y' + +=back + +=head1 METHODS + +=over 4 + +=item new HASHREF + +Creates a new tower. To add the tower to the database, see L<"insert">. + +Note that this stores the hash reference, not a distinct copy of the hash it +points to. You can ask the object for a copy with the I method. + +=cut + +# the new method can be inherited from FS::Record, if a table method is defined + +sub table { 'tower'; } + +=item insert + +Adds this record to the database. If there is an error, returns the error, +otherwise returns false. + +=cut + +# the insert method can be inherited from FS::Record + +=item delete + +Delete this record from the database. + +=cut + +# the delete method can be inherited from FS::Record + +=item replace OLD_RECORD + +Replaces the OLD_RECORD with this one in the database. If there is an error, +returns the error, otherwise returns false. + +=cut + +# the replace method can be inherited from FS::Record + +=item check + +Checks all fields to make sure this is a valid tower. If there is +an error, returns the error, otherwise returns false. Called by the insert +and replace methods. + +=cut + +# the check method should currently be supplied - FS::Record contains some +# data checking routines + +sub check { + my $self = shift; + + my $error = + $self->ut_numbern('towernum') + || $self->ut_text('towername') + || $self->ut_enum('disabled', [ '', 'Y' ]) + ; + return $error if $error; + + $self->SUPER::check; +} + +=item tower_sector + +Returns the sectors of this tower, as FS::tower_sector objects (see +L). + +=cut + +sub tower_sector { + my $self = shift; + qsearch({ + 'table' => 'tower_sector', + 'hashref' => { 'towernum' => $self->towernum }, + 'order_by' => 'ORDER BY sectorname', + }); +} + +=back + +=head1 BUGS + +=head1 SEE ALSO + +L, L, L + +=cut + +1; + diff --git a/FS/FS/tower_sector.pm b/FS/FS/tower_sector.pm new file mode 100644 index 000000000..583b93301 --- /dev/null +++ b/FS/FS/tower_sector.pm @@ -0,0 +1,154 @@ +package FS::tower_sector; + +use strict; +use base qw( FS::Record ); +use FS::Record qw( qsearchs ); # qsearch ); +use FS::tower; + +=head1 NAME + +FS::tower_sector - Object methods for tower_sector records + +=head1 SYNOPSIS + + use FS::tower_sector; + + $record = new FS::tower_sector \%hash; + $record = new FS::tower_sector { 'column' => 'value' }; + + $error = $record->insert; + + $error = $new_record->replace($old_record); + + $error = $record->delete; + + $error = $record->check; + +=head1 DESCRIPTION + +An FS::tower_sector object represents an example. FS::tower_sector inherits from +FS::Record. The following fields are currently supported: + +=over 4 + +=item sectornum + +primary key + +=item towernum + +towernum + +=item sectorname + +sectorname + +=item ip_addr + +ip_addr + + +=back + +=head1 METHODS + +=over 4 + +=item new HASHREF + +Creates a new example. To add the example to the database, see L<"insert">. + +Note that this stores the hash reference, not a distinct copy of the hash it +points to. You can ask the object for a copy with the I method. + +=cut + +# the new method can be inherited from FS::Record, if a table method is defined + +sub table { 'tower_sector'; } + +=item insert + +Adds this record to the database. If there is an error, returns the error, +otherwise returns false. + +=cut + +# the insert method can be inherited from FS::Record + +=item delete + +Delete this record from the database. + +=cut + +# the delete method can be inherited from FS::Record + +=item replace OLD_RECORD + +Replaces the OLD_RECORD with this one in the database. If there is an error, +returns the error, otherwise returns false. + +=cut + +# the replace method can be inherited from FS::Record + +=item check + +Checks all fields to make sure this is a valid example. If there is +an error, returns the error, otherwise returns false. Called by the insert +and replace methods. + +=cut + +# the check method should currently be supplied - FS::Record contains some +# data checking routines + +sub check { + my $self = shift; + + my $error = + $self->ut_numbern('sectornum') + || $self->ut_number('towernum', 'tower', 'towernum') + || $self->ut_text('sectorname') + || $self->ut_textn('ip_addr') + ; + return $error if $error; + + $self->SUPER::check; +} + +=item tower + +Returns the tower for this sector, as an FS::tower object (see L). + +=cut + +sub tower { + my $self = shift; + qsearchs('tower', { 'towernum'=>$self->towernum } ); +} + +=item description + +Returns a description for this sector including tower name. + +=cut + +sub description { + my $self = shift; + $self->tower->towername. ' sector '. $self->sectorname; +} + +=back + +=head1 BUGS + +=head1 SEE ALSO + +L, L, schema.html from the base documentation. + +=cut + +1; + diff --git a/FS/MANIFEST b/FS/MANIFEST index 3cd5c3839..dac2af0d1 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -624,3 +624,7 @@ FS/rate_tier_detail.pm t/rate_tier_detail.t FS/radius_attr.pm t/radius_attr.t +FS/tower.pm +t/tower.t +FS/tower_sector.pm +t/tower_sector.t diff --git a/FS/t/tower.t b/FS/t/tower.t new file mode 100644 index 000000000..66b93e215 --- /dev/null +++ b/FS/t/tower.t @@ -0,0 +1,5 @@ +BEGIN { $| = 1; print "1..1\n" } +END {print "not ok 1\n" unless $loaded;} +use FS::tower; +$loaded=1; +print "ok 1\n"; diff --git a/FS/t/tower_sector.t b/FS/t/tower_sector.t new file mode 100644 index 000000000..f082ebe8e --- /dev/null +++ b/FS/t/tower_sector.t @@ -0,0 +1,5 @@ +BEGIN { $| = 1; print "1..1\n" } +END {print "not ok 1\n" unless $loaded;} +use FS::tower_sector; +$loaded=1; +print "ok 1\n"; diff --git a/httemplate/browse/tower.html b/httemplate/browse/tower.html new file mode 100644 index 000000000..660e92469 --- /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 + ]; + +}; + + diff --git a/httemplate/edit/process/tower.html b/httemplate/edit/process/tower.html new file mode 100644 index 000000000..7353784e5 --- /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 d4baf35a0..ad4d6046d 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 000000000..c27d9d255 --- /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); +}; + + diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html new file mode 100644 index 000000000..a64d88608 --- /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 000000000..a8bbbc5d1 --- /dev/null +++ b/httemplate/elements/tower_sector.html @@ -0,0 +1,60 @@ +% unless ( $opt{'js_only'} ) { + + + + + +% foreach my $field ( @fields ) { + + +% } + +
+ get($field) |h %>" + <% $onchange %> + >
+ <% $label{$field} %> +
+ + +% } +<%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; + + diff --git a/httemplate/elements/tr-select-tower_sector.html b/httemplate/elements/tr-select-tower_sector.html new file mode 100644 index 000000000..d55f42b6e --- /dev/null +++ b/httemplate/elements/tr-select-tower_sector.html @@ -0,0 +1,11 @@ +<% include('tr-td-label.html', label => emt('Tower sector'), %opt ) %> + > + <% include( '/elements/select-tower_sector.html', %opt ) %> + + +<%init> + +my( %opt ) = @_; +my $style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : ''; + + diff --git a/httemplate/elements/tr-tower_sector.html b/httemplate/elements/tr-tower_sector.html new file mode 100644 index 000000000..871c7fd9c --- /dev/null +++ b/httemplate/elements/tr-tower_sector.html @@ -0,0 +1,24 @@ +% unless ( $opt{'js_only'} ) { + + <% include('tr-td-label.html', %opt) %> + > + +% } +% + <% include( '/elements/sector.html', %opt ) %> +% +% unless ( $opt{'js_only'} ) { + + + + +% } +<%init> + +my( %opt ) = @_; + +my $cell_style = $opt{'cell_style'} ? 'STYLE="'. $opt{'cell_style'}. '"' : ''; + +$opt{'label'} ||= 'Sector'; + + diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi index 627775992..22cbb1f44 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 => \§ornum }, 'mac_addr', 'latitude', 'longitude', @@ -60,4 +61,15 @@ sub usergroup { join('
', $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 + ? '' + : ''; + + $link . $tower_sector->description. ( $link ? '' : ''); +} + -- 2.11.0