diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2021-03-17 22:16:16 -0700 | 
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2021-03-17 22:16:38 -0700 | 
| commit | 96c3f2f68af47a3ac9dca07c51b7b4d5a0930671 (patch) | |
| tree | a0e229dd6c2cc26d0371a1aa87e35a91b94cb0ef | |
| parent | 9ebca80fb935533c0d9df44eb8a44a631f834d31 (diff) | |
contractually guaranteed speed no longer required as of 2020, RT#85671
| -rw-r--r-- | FS/FS/Report/FCC_477.pm | 8 | ||||
| -rw-r--r-- | httemplate/edit/deploy_zone-fixed.html | 3 | ||||
| -rw-r--r-- | httemplate/elements/tr-note.html | 12 | ||||
| -rw-r--r-- | httemplate/search/477.html | 19 | 
4 files changed, 38 insertions, 4 deletions
| diff --git a/FS/FS/Report/FCC_477.pm b/FS/FS/Report/FCC_477.pm index 75ddee0d7..bb01db4c8 100644 --- a/FS/FS/Report/FCC_477.pm +++ b/FS/FS/Report/FCC_477.pm @@ -365,10 +365,12 @@ sub fbd_sql {      'adv_speed_down',      'adv_speed_up',      'CASE WHEN is_business IS NOT NULL THEN 1 ELSE 0 END', -    'cir_speed_down', -    'cir_speed_up',    ); -  push @select, 'blocknum' if $opt{detail}; +  push @select, 'cir_speed_down', 'cir_speed_up' +    if $opt{date} < 1569826800; #9/30/2019, halfway between the two filing +                                # "as of" dates when it changed +  push @select, 'blocknum' +    if $opt{detail};    my $from = 'deploy_zone_block      JOIN deploy_zone USING (zonenum) diff --git a/httemplate/edit/deploy_zone-fixed.html b/httemplate/edit/deploy_zone-fixed.html index ce98c46e8..fd138543d 100644 --- a/httemplate/edit/deploy_zone-fixed.html +++ b/httemplate/edit/deploy_zone-fixed.html @@ -62,6 +62,9 @@          'adv_speed_up',          { type => 'tablebreak-tr-title',            value => 'Contractually guaranteed speed (Mbps)' }, +        { type => 'note', +          value => 'Only required for filings as of June 30th, 2019 (due Sep. 3rd, 2019) and before', +        },          'cir_speed_down',          'cir_speed_up',          { type => 'tablebreak-tr-title', value => 'Footprint'}, diff --git a/httemplate/elements/tr-note.html b/httemplate/elements/tr-note.html new file mode 100644 index 000000000..8493e5a83 --- /dev/null +++ b/httemplate/elements/tr-note.html @@ -0,0 +1,12 @@ +<TR> +  <TD COLSPAN=<% $opt{colspan} || 2 %> ALIGN="left" <%$id%>> +    <I><% $opt{value} %></I> +  </TD> +</TR> + +<%init> + +my %opt = @_; +my $id = 'ID="'.$opt{id}.'"' if $opt{id}; + +</%init> diff --git a/httemplate/search/477.html b/httemplate/search/477.html index 84fd7fb9f..9a4126121 100644 --- a/httemplate/search/477.html +++ b/httemplate/search/477.html @@ -67,6 +67,9 @@ a.download {      <a class="download" href="<% $cgi->self_url %>">Download</a>    </caption>  %   my $header = ".header_$partname"; +%   $header .= '_old' if $partname eq 'fbd' && $date < 1569826800; #9/30/2019 +%              # ( halfway between the two filing "as of" dates when it changed +  %   my $data = $this_part->{data};  %   my $error = $this_part->{error};    <thead> @@ -168,7 +171,7 @@ if ( $cgi->param('type') eq 'csv' ) {  my $part_titles = FS::Report::FCC_477->parts;  </%init> -<%def .header_fbd> +<%def .header_fbd_old>    <TR CLASS="head">      <TD ROWSPAN=2>Census Block</TD>      <TD ROWSPAN=2>DBA Name</TD> @@ -185,6 +188,20 @@ my $part_titles = FS::Report::FCC_477->parts;      <TD>Up</TD>    </TR>  </%def> +<%def .header_fbd> +  <TR CLASS="head"> +    <TD ROWSPAN=2>Census Block</TD> +    <TD ROWSPAN=2>DBA Name</TD> +    <TD ROWSPAN=2>Technology</TD> +    <TD ROWSPAN=2>Consumer?</TD> +    <TD COLSPAN=2>Advertised Speed (Mbps)</TD> +    <TD ROWSPAN=2>Business?</TD> +  </TR> +  <TR CLASS="subhead"> +    <TD>Down</TD> +    <TD>Up</TD> +  </TR> +</%def>  <%def .header_fbs>    <TR CLASS="head">      <TD ROWSPAN=2>Census Tract</TD> | 
