X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2F477partVI_census.html;h=b4f6ddc01d059c847c5fcadb3c6743e593b31853;hp=dbaaaab611db8372d33486c366cad5b849b2d5ca;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hpb=2f8745267b13bd027109e12e64b3e37fa50edb9d diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html index dbaaaab61..b4f6ddc01 100755 --- 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' => '

Part VI

', + '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,17 +35,60 @@ die "access denied" my %opt = @_; -my $html_init = '

Part VI

'; +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{'classnum'} = [ $cgi->param('classnum') ]; + +$search_hash{'active'} = [ $opt{date}, $opt{date} ]; +$search_hash{'country'} = 'US'; +$search_hash{'classnum'} = [ $cgi->param('classnum') ] + if grep { $_ eq 'classnum' } $cgi->param; my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option') if $cgi->param('part1_column_option'); @@ -110,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++; @@ -125,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 = $_; @@ -143,15 +153,30 @@ 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; }; +for (1..8) { push @links, [ $link, $link_suffix ]; } + + 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; + '
WARNING: multiple states found
'. ''. #nicer formatting someday join('', map { ''. @@ -159,8 +184,9 @@ my $html_foot = sub { ( &FS::Report::FCC_477::statenum2state($_) || 'None' ). ''. ''. '';
'. - qq(). - $state_pkgcount{$_}. ' packages in '. + qq(). + $state_pkgcount{$_}. + ' packages in '. $state_hash{$_}. ' census tracts'. '