477 report: improve browse-edit UI

2 files changed, 37 insertions, 18 deletions

diff --git a/httemplate/search/477.html b/httemplate/search/477.html
index 26bd9f33b..fb85f1e09 100644
--- a/httemplate/search/477.html
+++ b/httemplate/search/477.html
@@ -41,7 +41,7 @@ a.download {
 %   $cgi->param('type', 'csv');
 <table class="fcc477part">
   <caption>
-    <span class="parttitle"><% $parttitle{$partname} %></span>
+    <span class="parttitle"><% $part_titles->{$partname} %></span>
     <a class="download" href="<% $cgi->self_url %>">Download</a>
   </caption>
 %   my $header = ".header_$partname";
@@ -81,8 +81,7 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/ ) {
 my $date = parse_datetime($cgi->param('date')) || time;
 my @partnames = grep /^\w+$/, $cgi->param('parts');
 foreach my $partname (@partnames) {
-  my $method = "report_$partname";
-  $parts{$partname} ||= FS::Report::FCC_477->$method(
+  $parts{$partname} ||= FS::Report::FCC_477->report( $partname,
     date      => $date,
     agentnum  => $agentnum
   );
@@ -109,8 +108,27 @@ if ( $cgi->param('type') eq 'csv' ) {
   $m->abort;
 }
 
+my $part_titles = FS::Report::FCC_477->parts;
+
 </%init>
-<%def .header_fixed_broadband>
+<%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>
+    <TD COLSPAN=2>Contractual Speed (Mbps)</TD>
+  </TR>
+  <TR CLASS="subhead">
+    <TD>Down</TD>
+    <TD>Up</TD>
+    <TD>Down</TD>
+    <TD>Up</TD>
+  </TR>
+</%def>
+<%def .header_fbs>
   <TR CLASS="head">
     <TD ROWSPAN=2>Census Tract</TD>
     <TD ROWSPAN=2>Technology</TD>
@@ -124,7 +142,7 @@ if ( $cgi->param('type') eq 'csv' ) {
     <TD>Consumer</TD>
   </TR>
 </%def>
-<%def .header_fixed_voice>
+<%def .header_fvs>
   <TR CLASS="head">
     <TD ROWSPAN=2>Census Tract</TD>
     <TD ROWSPAN=2>VoIP?</TD>
@@ -135,7 +153,7 @@ if ( $cgi->param('type') eq 'csv' ) {
     <TD>Consumer</TD>
   </TR>
 </%def>
-<%def .header_local_phone>
+<%def .header_lts>
   <TR CLASS="head">
     <TD ROWSPAN=3>State</TD>
     <TD COLSPAN=2>Wholesale</TD>
@@ -193,7 +211,7 @@ if ( $cgi->param('type') eq 'csv' ) {
     <TD>Other</TD>
   </TR>
 </%def>
-<%def .header_mobile_broadband>
+<%def .header_mbs>
 %# unimplemented
   <TR CLASS="head">
     <TD ROWSPAN=2>State</TD>
@@ -207,7 +225,7 @@ if ( $cgi->param('type') eq 'csv' ) {
     <TD>Consumer</TD>
   </TR>
 </%def>
-<%def .header_mobile_voice>
+<%def .header_mvs>
 %# unimplemented
   <TR CLASS="head">
     <TD ROWSPAN=2>State</TD>
diff --git a/httemplate/search/report_477.html b/httemplate/search/report_477.html
index 2a6878ef4..78ba35cfc 100755
--- a/httemplate/search/report_477.html
+++ b/httemplate/search/report_477.html
@@ -4,7 +4,12 @@
 %   $m->abort;
 % }
 <& /elements/header.html, 'FCC Form 477 Report' &>
-
+<FONT SIZE="+1"><STRONG>Preparation</STRONG></FONT>
+<UL>
+  <LI> <A HREF="<% $p %>browse/part_pkg-fcc.html">Configure packages</A> for FCC reporting categories.</LI>
+  <LI> <A HREF="<% $p %>browse/deploy_zone.html">Enter deployment zones</A> for broadband Internet or mobile phone.</LI>
+</UL>
+  
 <FORM ACTION="477.html" METHOD="GET">
 
   <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
@@ -30,15 +35,8 @@
     <& /elements/tr-checkbox-multiple.html,
       'label'   => 'Enable parts',
       'field'   => 'parts',
-      'labels'  => {
-        fixed_broadband => 'Fixed Broadband Subscription',
-        #7   => 'Part 7 (Mobile Wireless Broadband Subscription),
-        #8   => 'Part 8 (Mobile Local Telephone Subscription),
-        fixed_voice     => 'Voice Telephone Subscription',
-        local_phone     => 'Local Exchange Telephone Subscription',
-        voip            => 'Interconnected VoIP Subscription',
-      },
-      options => [ 6, 9, 10, 11 ],
+      'labels'  => $part_titles,
+      'options' => [ keys %$part_titles ]
     &>
   </TABLE>
 
@@ -54,4 +52,7 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List packages');
 
 my $conf = FS::Conf->new;
+
+my $part_titles = FS::Report::FCC_477->parts;
+
 </%init>