combine ticket notification scrips, #15353

[freeside.git] / httemplate / search / 477partVI_census.html

diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html
index 15d2b81..534d872 100755 (executable)
--- a/httemplate/search/477partVI_census.html
+++ b/httemplate/search/477partVI_census.html
@@ -144,15 +144,27 @@ my $link = 'cust_pkg.cgi?'. join(';',
 
 my $link_suffix = sub { my $row = shift;
                         my $result = 'censustract='. $row->censustract. ';';
-                        $result .= 'report_option='. @row_option[$row->upload - 1]
-                          if @row_option[$row->upload - 1];
-                        $result .= 'report_option='. @column_option[$row->download - 1]
-                          if @column_option[$row->download - 1];
+                        my @ro = grep $_,
+                          @row_option[$row->upload - 1],
+                          @column_option[$row->download - 2],
+                          @technology_option[$row->technology_code - 1],
+                        ;
+                        $result .= 'report_option='. join(',',@ro) if @ro;
                         $result;
                       };
 
 my $html_foot = sub {
   if (scalar(keys %state_hash) > 1) {
+
+    my $roa_r = join(',', grep $_, @row_option);
+    $roa_r = ";report_option_any_r=$roa_r" if $roa_r;
+
+    my $roa_c = join(',', grep $_, @column_option);
+    $roa_c = ";report_option_any_c=$roa_c" if $roa_c;
+
+    my $roa_t = join(',', grep $_, @technology_option);
+    $roa_t = ";report_option_any_t=$roa_t" if $roa_t;
+    
     '<BR><B>WARNING: multiple states found</B><BR>'.
     '<TABLE BORDER=0>'. #nicer formatting someday
     join('', map { '<TR>'.
@@ -160,8 +172,9 @@ my $html_foot = sub {
                        ( &FS::Report::FCC_477::statenum2state($_) || 'None' ).
                      '</TD>'.
                      '<TD>'.
-                       qq(<A HREF="${link}censustract2=$_">).
-                       $state_pkgcount{$_}. ' packages</A> in '.
+                       qq(<A HREF="${link}censustract2=$_$roa_r$roa_c$roa_t">).
+                       $state_pkgcount{$_}.
+                      ' packages</A> in '.
                        $state_hash{$_}. ' census tracts'.
                      '</TD>'.
                    '</TR>';