X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partIA_summary.html;h=ebf081c718f03d93ec72767ebb62bdd16a7c6e7d;hb=0832972047a36d19ffcf7d1462abc48de7045d3d;hp=269f2caf2b8aa6e4f13a999beb529c6ca373ecdc;hpb=4ef5b3b917b7802a136551ad567dc9d649700f53;p=freeside.git

diff --git a/httemplate/search/477partIA_summary.html b/httemplate/search/477partIA_summary.html
index 269f2caf2..ebf081c71 100755
--- a/httemplate/search/477partIA_summary.html
+++ b/httemplate/search/477partIA_summary.html
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                   'html_init'        => $html_init,
                   'name'             => 'lines',
                   'query'            => 'SELECT 1',
@@ -26,10 +26,10 @@
                                           sub { '100.00' },
                                           sub { '100.00' },
                                           sub { $total_percentage },
-                                          sub { $total_percentage },
+                                          sub { $above_200_percentage },
                                         ],
-              )
-%>
+              
+&>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
@@ -40,9 +40,11 @@ die "access denied"
 my %opt = @_;
 my %search_hash = ();
   
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic state) ) {
   $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
 }
+$search_hash{'country'} = 'US';
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
 
 my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
   if $cgi->param('part1_column_option');
@@ -54,11 +56,13 @@ my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
 
 my $total_count = 0;
 my $total_residential = 0;
+my $above_200 = 0;
 my $tech_code = $opt{tech_code};
 my $technology = $FS::Report::FCC_477::technology[$tech_code] || 'unknown';
 my $html_init = "<H2>Part IA $technology totals</H2>";
 my $xml_prefix = 'PartIA_'. chr(65 + $tech_code);
 
+my $not_first_row = 0; # ugh;
 foreach my $row ( @row_option ) {
   foreach my $column ( @column_option ) {
 
@@ -70,11 +74,16 @@ foreach my $row ( @row_option ) {
 
     $total_count += $count;
     $total_residential += $residential;
+    $above_200 += $residential if $not_first_row;
   }
+  $not_first_row++;
 }
 
 my $total_percentage =
   sprintf("%.2f", $total_count ? 100*$total_residential/$total_count : 0);
 
+my $above_200_percentage =
+  sprintf("%.2f", $total_count ? 100*$above_200/$total_count : 0);
+
 
 </%init>