Merge branch 'master' of https://github.com/jgoodman/Freeside

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

diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html
index 534d872..b4f6ddc 100755 (executable)
--- a/httemplate/search/477partVI_census.html
+++ b/httemplate/search/477partVI_census.html
@@ -1,67 +1,31 @@
-<% include( 'elements/search.html',
-                  'html_init'     => $html_init,
-                  'html_foot'     => $html_foot,
-                  'name'          => 'regions',
-                  'query'         => [ @sql_query ],
-                  'count_query'   =>  $count_query,
-                  'order_by'      => 'ORDER BY censustract',
-                  'avoid_quote'   => 1,
-                  'no_csv_header' => 1,
-                  'nohtmlheader'  => 1,
-                  'header'        => [
-                                       'County code',
-                                       'Census tract code',
-                                       'Upload rate',
-                                       'Download rate',
-                                       'Technology code',
-                                       'Technology code other',
-                                       'Quantity',
-                                       'Percentage residential',
-                                     ],
-                  'xml_elements'  => [
-                                       'county_fips',
-                                       'census_tract',
-                                       'upload_rate_code',
-                                       'download_rate_code',
-                                       'technology_code',
-                                       'technology_code_other',
-                                       'value',
-                                       'percentage',
-                                     ],
-                  'fields'        => [
-                    sub { my $row = shift; 
-                          my $state = substr($row->censustract, 0, 2);
-                          $state_hash{$state}++;
-                          substr($row->censustract, 2, 3) || 'None';
-                        },
-                    sub { my $row = shift;
-                          substr($row->censustract, 5) || 'None';
-                        },
-                    'upload',
-                    'download',
-                    'technology_code',
-                    sub { $cgi->param('_type') eq 'xml' ? '0' : '' },#broken
-                    sub { my $row = shift;
-                          my $state = substr($row->censustract, 0, 2);
-                          $state_pkgcount{$state} += $row->quantity;
-                          $row->quantity;
-                        },
-                    sub { my $row = shift; sprintf "%.2f", $row->residential },
-                  ],
-                  'links'        => [
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                  ],
-                  'url'          => $opt{url} || '',
+<& elements/search.html,
+                  'html_init'       => '<H2>Part VI</H2>',
+                  'html_foot'       => $html_foot,
+                  'name'            => 'regions',
+                  'query'           => [ @sql_query ],
+                  'count_query'     =>  $count_query,
+                  'order_by'        => 'ORDER BY censustract',
+                  'avoid_quote'     => 1,
+                  'no_csv_header'   => 1,
+                  'nohtmlheader'    => 1,
+                  'header'          => \@header,
+                  'xml_elements'    => [
+                                         'county_fips',
+                                         'census_tract',
+                                         'upload_rate_code',
+                                         'download_rate_code',
+                                         'technology_code',
+                                         'technology_code_other',
+                                         'value',
+                                         'percentage',
+                                       ],
+                  'fields'          => \@fields,
+                  'links'           => \@links,
+                  'url'             => $opt{url} || '',
                   'xml_row_element' => 'Datarow',
-              )
-%>
+                  'really_disable_download' => 1,
+              
+&>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
@@ -71,16 +35,58 @@ die "access denied"
 
 my %opt = @_;
 
-my $html_init = '<H2>Part VI</H2>';
+my %state_hash = ();
+my %state_pkgcount = ();
+
+my @header = ();
+my @fields = ();
+my @links = ();
+my $num = ($cgi->param('offset') =~ /^(\d+)$/) ? $1 : 0;
+unless ( $cgi->param('_type') eq 'xml' ) {
+  push @header, '#';
+  push @fields, sub { ++$num };
+  push @links,  '';
+}
+push @header,
+  'County code',
+  'Census tract code',
+  'Upload rate',
+  'Download rate',
+  'Technology code',
+  'Technology code other',
+  'Quantity',
+  'Percentage residential',
+;
+push @fields,
+  sub { my $row = shift; 
+        my $state = substr($row->censustract, 0, 2);
+        $state_hash{$state}++;
+        substr($row->censustract, 2, 3) || 'None';
+      },
+  sub { my $row = shift;
+        substr($row->censustract, 5) || 'None';
+      },
+  'upload',
+  'download',
+  'technology_code',
+  sub { $cgi->param('_type') eq 'xml' ? '0' : '' },#broken
+  sub { my $row = shift;
+        my $state = substr($row->censustract, 0, 2);
+        $state_pkgcount{$state} += $row->quantity;
+        $row->quantity;
+      },
+  sub { my $row = shift; sprintf "%.3f", $row->residential },
+;
 
 my %search_hash = ();
 my @sql_query = ();
-my %state_hash = ();
-my %state_pkgcount = ();
   
-for ( qw(agentnum magic) ) {
+for ( qw(agentnum state) ) {
   $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
 }
+
+$search_hash{'active'}  = [ $opt{date}, $opt{date} ];
+$search_hash{'country'} = 'US';
 $search_hash{'classnum'} = [ $cgi->param('classnum') ]
   if grep { $_ eq 'classnum' } $cgi->param;
 
@@ -111,12 +117,11 @@ foreach my $row ( @row_option ) {
           ($report_option ? ( 'report_option' => $report_option ) : () ),
         }
       );
+warn Dumper($sql_query) if $rowcount==1 and $columncount==3;
       my $extracolumns = "$rowcount AS upload, $columncount AS download, $tech_code as technology_code";
       my $percent = "CASE WHEN count(*) > 0 THEN 100-100*cast(count(cust_main.company) as numeric)/cast(count(*) as numeric) ELSE cast(0 as numeric) END AS residential";
-      $sql_query->{select} = "count(*) AS quantity, $extracolumns, censustract, $percent";
-      $sql_query->{extra_sql} =~ /^(.*)(ORDER BY pkgnum)(.*)$/s
-        or die "couldn't parse extra_sql";
-      $sql_query->{extra_sql} = "$1 GROUP BY censustract $3";
+      $sql_query->{select} = "count(*) AS quantity, $extracolumns, cust_location.censustract, $percent";
+      $sql_query->{order_by} = " GROUP BY cust_location.censustract ";
       push @sql_query, $sql_query;
     }
     $columncount++;
@@ -126,11 +131,15 @@ foreach my $row ( @row_option ) {
 
 my $count_query = 'SELECT count(*) FROM ( ('.
    join( ') UNION ALL (',
-          map { my $extra = $_->{extra_sql};  my $addl = $_->{addl_from};
-                "SELECT censustract from cust_pkg $addl $extra";
-              }
-          @sql_query
-       ). ') ) AS foo';
+      map { my $addl_from = $_->{addl_from};
+            my $extra_sql = $_->{extra_sql};
+            my $order_by  = $_->{order_by};
+            "SELECT cust_location.censustract from cust_pkg $addl_from 
+            $extra_sql $order_by";
+          }
+      @sql_query
+   ). ') ) AS foo';
+
 
 my $link = 'cust_pkg.cgi?'. join(';',
                                       map { my $key = $_;
@@ -153,6 +162,9 @@ my $link_suffix = sub { my $row = shift;
                         $result;
                       };
 
+for (1..8) { push @links, [ $link, $link_suffix ]; }
+
+
 my $html_foot = sub {
   if (scalar(keys %state_hash) > 1) {