X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2F477.html;h=9a412612119dad052ec2e5ff7eb5e355a2e70efb;hp=26bd9f33ba98181086b0248de430739db8f46d18;hb=HEAD;hpb=0f359d5480aa1621d73ee802f420e8951abc620d diff --git a/httemplate/search/477.html b/httemplate/search/477.html index 26bd9f33b..9a4126121 100644 --- a/httemplate/search/477.html +++ b/httemplate/search/477.html @@ -32,30 +32,78 @@ table.fcc477part thead tr.subhead { font-size: large; float: left; } +.errortitle { + font-weight: bold; + color: #ff0000; +} +tr.error td { + background-color: #ffdddd; +} +tr.error td.error { + text-align: left; + border: none; +} +tr.error ul { + margin: 0px; + list-style-image: url("<% $fsurl %>images/cross.png"); +} a.download { float: right; } % foreach my $partname (@partnames) { +% my $this_part = $parts{$partname}; % $cgi->param('parts', $partname); % $cgi->param('type', 'csv'); % my $header = ".header_$partname"; -% my $data = $parts{$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}; <& $header &> +% my $rownum = 0; % foreach my $row (@$data) { - +% my %eh; # error hash +% if ( $error->[$rownum] ) { +% %eh = %{ $error->[$rownum] }; +% } + > +% my $first = 1; % foreach my $item (@$row) { - + +% } #foreach $item +% # display errors +% if ( keys %eh ) { + +% } # if there are errors -% } +% $rownum++; +% } #foreach $row
- <% $parttitle{$partname} %> + <% $part_titles->{$partname} %> +% if ( $this_part->{num_errors} > 0 ) { +% # show error heading while it contains errors + + <% emt('This section contains [quant,_1,error].', $this_part->{num_errors}) %> + +% } Download
<% $item %> +% if ($first and $part_link{$partname}) { + "><% $item || '(empty)' %> +% $first = 0; +% } else { + <% $item %> % } +
    +% foreach my $key (sort keys %eh) { +
  • <% $eh{$key} %>
    • +% } +
% } # foreach $partname <& /elements/footer.html &> @@ -64,6 +112,7 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('List packages'); my %parts; +my %part_link; # load from cache if possible my $session; if ( $cgi->param('session') =~ /^(\d+)$/ ) { @@ -80,12 +129,22 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/ ) { } my $date = parse_datetime($cgi->param('date')) || time; my @partnames = grep /^\w+$/, $cgi->param('parts'); +my $ignore_quantity = ($cgi->param('ignore_quantity') ? 1 : 0); + foreach my $partname (@partnames) { - my $method = "report_$partname"; - $parts{$partname} ||= FS::Report::FCC_477->$method( - date => $date, - agentnum => $agentnum - ); + $parts{$partname} ||= FS::Report::FCC_477->report( $partname, + date => $date, + agentnum => $agentnum, + ignore_quantity => $ignore_quantity, + ); # includes error, detail, and data parts + my $detail_table = FS::Report::FCC_477->part_table($partname); + if ($detail_table eq 'cust_pkg') { + my $link = popurl(1).'477_cust_pkg.html?477part='.$partname.";date=$date;"; + if ($agentnum) { + $link .= "agentnum=$agentnum;"; + } + $part_link{$partname} = $link; + } # don't include detail links to deploy_blocks, that's pointless } $m->cache->set($session, \%parts, '1h'); @@ -93,7 +152,7 @@ my $title = 'FCC Form 477 Data - ' . time2str('%b %o, %Y', $date); if ( $cgi->param('type') eq 'csv' ) { my $partname = $partnames[0]; # ignore any beyond the first - my $data = $parts{$partname}; + my $data = $parts{$partname}->{data}; my $csv = Text::CSV_XS->new({ eol => "\r\n" }); # i think my $filename = time2str('%Y-%m-%d', $date) . '-'. $partname . '.csv'; @@ -109,8 +168,41 @@ if ( $cgi->param('type') eq 'csv' ) { $m->abort; } +my $part_titles = FS::Report::FCC_477->parts; + -<%def .header_fixed_broadband> +<%def .header_fbd_old> + + Census Block + DBA Name + Technology + Consumer? + Advertised Speed (Mbps) + Business? + Contractual Speed (Mbps) + + + Down + Up + Down + Up + + +<%def .header_fbd> + + Census Block + DBA Name + Technology + Consumer? + Advertised Speed (Mbps) + Business? + + + Down + Up + + +<%def .header_fbs> Census Tract Technology @@ -124,7 +216,7 @@ if ( $cgi->param('type') eq 'csv' ) { Consumer -<%def .header_fixed_voice> +<%def .header_fvs> Census Tract VoIP? @@ -135,7 +227,7 @@ if ( $cgi->param('type') eq 'csv' ) { Consumer -<%def .header_local_phone> +<%def .header_lts> State Wholesale @@ -172,7 +264,7 @@ if ( $cgi->param('type') eq 'csv' ) { <%def .header_voip> - State + State VoIP OTT VoIP Non-OTT @@ -193,7 +285,7 @@ if ( $cgi->param('type') eq 'csv' ) { Other -<%def .header_mobile_broadband> +<%def .header_mbs> %# unimplemented State @@ -207,7 +299,7 @@ if ( $cgi->param('type') eq 'csv' ) { Consumer -<%def .header_mobile_voice> +<%def .header_mvs> %# unimplemented State