[freeside-commits] freeside/httemplate/search 477partIA_detail.html, 1.4, 1.5 477partIA_summary.html, 1.2, 1.3

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv29733/httemplate/search

Modified Files:
	477partIA_detail.html 477partIA_summary.html 
Log Message:
fix xml tag for upper left corner of part ia and actually calculate the above 200kpbs residential percentage

Index: 477partIA_summary.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIA_summary.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- 477partIA_summary.html	22 May 2010 19:57:52 -0000	1.2
+++ 477partIA_summary.html	1 Sep 2010 18:48:20 -0000	1.3
@@ -26,7 +26,7 @@
                                           sub { '100.00' },
                                           sub { '100.00' },
                                           sub { $total_percentage },
-                                          sub { $total_percentage },
+                                          sub { $above_200_percentage },
                                         ],
               )
 %>
@@ -54,11 +54,13 @@
 
 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 +72,16 @@
 
     $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>

Index: 477partIA_detail.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIA_detail.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- 477partIA_detail.html	25 Aug 2010 07:34:26 -0000	1.4
+++ 477partIA_detail.html	1 Sep 2010 18:48:20 -0000	1.5
@@ -94,7 +94,7 @@
     my $return = $count;
 
     if ($cgi->param('_type') eq 'xml') {
-      $rowchar++ if $column == 1;
+      $rowchar++ if $column == 0;
       $xml_element = $xml_prefix. chr($rowchar). ($column+1);
       $return = '' if $count == 0 and $cgi->param('_type') eq 'xml';
     } else {