From da355fb20a69bbe5710ce7dca16e2c84a207a084 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Tue, 27 Mar 2018 09:20:05 -0400 Subject: RT# 78356 - added ability to create and modify rateplans and access point when changed on freeside. cleanded up documentation. Conflicts: FS/FS/tower_sector.pm httemplate/edit/process/tower.html httemplate/edit/tower.html --- httemplate/edit/part_export.cgi | 14 ++++++++++++++ httemplate/edit/process/elements/process.html | 8 ++++++++ httemplate/edit/process/tower.html | 2 +- httemplate/edit/tower.html | 10 +++++----- httemplate/elements/tr-tower_sectors.html | 14 +++++++------- 5 files changed, 35 insertions(+), 13 deletions(-) (limited to 'httemplate') diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi index 5411feb5f..381fbcaf8 100644 --- a/httemplate/edit/part_export.cgi +++ b/httemplate/edit/part_export.cgi @@ -290,6 +290,20 @@ my $widget = new HTML::Widgets::SelectLayers( $html .= ' CHECKED' if $part_export->no_suspend eq 'Y'; $html .= '>'; + foreach my $script ( keys %{$exports->{$layer}{scripts}} ) { + $html .= '' . + include('/elements/progress-init.html', + $part_export->exportname, + [ $script.'_exportnum', $script.'_script' ], + rooturl().'view/svc_export/run_script.cgi', + rooturl().'edit/part_export.cgi?'.$part_export->{Hash}->{exportnum}, + $script, + ) . + ' + + '.$exports->{$layer}{scripts}{$script}->{html_label}.''; + } + $html .= ''; # false laziness with config_element above diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html index 76722c960..8c307f0b6 100644 --- a/httemplate/edit/process/elements/process.html +++ b/httemplate/edit/process/elements/process.html @@ -459,6 +459,14 @@ foreach my $value ( @values ) { } +if ($class eq "FS::tower") { + foreach my $part_svc_broadband_export ( FS::tower_sector->part_export_svc_broadband ) { + if ($part_svc_broadband_export and $part_svc_broadband_export->can('export_tower_sector')) { + $error = $part_svc_broadband_export->export_tower_sector($new); + } + } +} + # set up redirect URLs my $redirect; diff --git a/httemplate/edit/process/tower.html b/httemplate/edit/process/tower.html index e17cd55ae..ba7309c99 100644 --- a/httemplate/edit/process/tower.html +++ b/httemplate/edit/process/tower.html @@ -5,7 +5,7 @@ 'fields' => [qw( sectorname ip_addr height freq_mhz direction width downtilt v_width margin - sector_range up_rate down_rate + sector_range up_rate_limit down_rate_limit )], }, &> diff --git a/httemplate/edit/tower.html b/httemplate/edit/tower.html index 660788849..b9fea779f 100644 --- a/httemplate/edit/tower.html +++ b/httemplate/edit/tower.html @@ -12,8 +12,8 @@ 'altitude', 'height', 'veg_height', - 'up_rate', - 'down_rate', + 'up_rate_limit', + 'down_rate_limit', { field => 'sectornum', type => 'tower_sector', o2m_table => 'tower_sector', @@ -32,8 +32,8 @@ 'height' => 'Height (feet)', 'veg_height' => 'Vegetation height (feet)', 'color' => 'Color', - 'up_rate' => 'Up Rate (Kbps)', - 'down_rate' => 'Down Rate (Kbps)', + 'up_rate_limit' => 'Up Rate Limit(Kbps)', + 'down_rate_limit' => 'Down Rate Limit(Kbps)', }, &> <%init> @@ -43,7 +43,7 @@ my $m2_error_callback = sub { # reconstruct the list my @fields = qw( sectorname ip_addr height freq_mhz direction width tilt v_width margin - sector_range up_rate down_rate + sector_range up_rate_limit down_rate_limit ); map { diff --git a/httemplate/elements/tr-tower_sectors.html b/httemplate/elements/tr-tower_sectors.html index 6843f4fdc..8acedb84b 100644 --- a/httemplate/elements/tr-tower_sectors.html +++ b/httemplate/elements/tr-tower_sectors.html @@ -17,7 +17,7 @@ my $tabcounter = 0; my @fields = qw( sectorname ip_addr height freq_mhz direction width downtilt v_width db_high db_low sector_range - power line_loss antenna_gain hardware_typenum up_rate down_rate + power line_loss antenna_gain hardware_typenum up_rate_limit down_rate_limit ); my @sectors; @@ -294,16 +294,16 @@ $(function() {

+ id="<% $id %>_up_rate_limit" + name="<% $id %>_up_rate_limit" + value="<% $sector->up_rate_limit |h %>">

+ id="<% $id %>_down_rate_limit" + name="<% $id %>_down_rate_limit" + value="<% $sector->down_rate_limit |h %>">

-- cgit v1.2.1