[freeside-commits] freeside/httemplate/search report_477.html, 1.5, 1.5.2.1 477partVI_census.html, 1.2, 1.2.2.1 477partV.html, 1.3, 1.3.4.1 477partIIB.html, 1.2, 1.2.4.1 477partIIA.html, 1.2, 1.2.4.1 477partIA_summary.html, 1.3, 1.3.2.1 477partIA_detail.html, 1.5, 1.5.2.1 477.html, 1.7, 1.7.2.1
Erik Levinson
levinse at wavetail.420.am
Sun Apr 24 21:00:06 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv20129/httemplate/search
Modified Files:
Tag: FREESIDE_2_1_BRANCH
report_477.html 477partVI_census.html 477partV.html
477partIIB.html 477partIIA.html 477partIA_summary.html
477partIA_detail.html 477.html
Log Message:
FCC form 477 report improvements, RT12089
Index: 477partIIB.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIIB.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- 477partIIB.html 22 May 2010 19:57:52 -0000 1.2
+++ 477partIIB.html 25 Apr 2011 04:00:04 -0000 1.2.4.1
@@ -22,9 +22,10 @@
my $html_init = '<H2>Part IIB</H2>';
my %search_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my @row_option = grep { /^\d+$/ } $cgi->param('part2b_row_option')
if $cgi->param('part2b_row_option');
Index: 477partVI_census.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partVI_census.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -w -d -r1.2 -r1.2.2.1
--- 477partVI_census.html 1 Sep 2010 20:25:00 -0000 1.2
+++ 477partVI_census.html 25 Apr 2011 04:00:03 -0000 1.2.2.1
@@ -77,9 +77,10 @@
my @sql_query = ();
my %state_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
if $cgi->param('part1_column_option');
Index: 477partIA_detail.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIA_detail.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -d -r1.5 -r1.5.2.1
--- 477partIA_detail.html 1 Sep 2010 18:48:20 -0000 1.5
+++ 477partIA_detail.html 25 Apr 2011 04:00:04 -0000 1.5.2.1
@@ -23,10 +23,12 @@
my %opt = @_;
my %search_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
+
my @column_option = grep { /^\d+/ } $cgi->param('part1_column_option')
if $cgi->param('part1_column_option');
Index: 477.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477.html,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -w -d -r1.7 -r1.7.2.1
--- 477.html 24 Aug 2010 17:30:34 -0000 1.7
+++ 477.html 25 Apr 2011 04:00:04 -0000 1.7.2.1
@@ -81,7 +81,18 @@
my %part = map { $_ => 1 } grep { /^\w+$/ } $cgi->param('part');
my $type = $cgi->param('_type') || 'html';
my $xlsname = '477report';
-my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
+my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi,1);
+
+# save upload and download mappings
+my @download = $cgi->param('part1_column_option');
+my @upload = $cgi->param('part1_row_option');
+for(my $i=0; $i < scalar(@download); $i++) {
+ &FS::Report::FCC_477::save_fcc477map("part1_column_option_$i",$download[$i]);
+}
+for(my $i=0; $i < scalar(@upload); $i++) {
+ &FS::Report::FCC_477::save_fcc477map("part1_row_option_$i",$upload[$i]);
+}
+
my $url_mangler = sub {
my $part = shift;
my $url = $cgi->url('-path_info' => 1, '-full' => 1);
Index: report_477.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_477.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -d -r1.5 -r1.5.2.1
--- report_477.html 24 Aug 2010 17:30:34 -0000 1.5
+++ report_477.html 25 Apr 2011 04:00:03 -0000 1.5.2.1
@@ -18,7 +18,7 @@
%>
<% include( '/elements/tr-select-pkg_class.html',
- 'pre_options' => [ '0' => 'all' ],
+ 'multiple' => 1,
'empty_label' => '(empty class)',
)
%>
@@ -46,6 +46,7 @@
<TR id='partIA' style="display:none"><TD>Part IA</TD><TD><TABLE>
<TR><TD>Download speeds</TD><TD>
<TABLE>
+% my $i = 0;
% foreach my $speed ( @FS::Report::FCC_477::download ) {
<TR>
<TH><% $speed %></TH>
@@ -56,14 +57,18 @@
'hashref' => { 'disabled' => '' },
'element_name' => 'part1_column_option',
'disable_empty' => 1,
+ 'curr_value' =>
+ FS::Report::FCC_477::restore_fcc477map("part1_column_option_$i"),
)
%>
</TD>
</TR>
+% $i++
% }
</TABLE></TD>
<TD>Upload speeds</TD><TD>
<TABLE>
+% $i = 0;
% foreach my $speed ( @FS::Report::FCC_477::upload ) {
<TR>
<TH><% $speed %></TH>
@@ -74,15 +79,18 @@
'hashref' => { 'disabled' => '' },
'element_name' => 'part1_row_option',
'disable_empty' => 1,
+ 'curr_value' =>
+ FS::Report::FCC_477::restore_fcc477map("part1_row_option_$i"),
)
%>
</TD>
</TR>
+% $i++
% }
</TABLE></TD></TR>
<TR><TD>Technologies</TD><TD>
<TABLE>
-% my $i = 0;
+% $i = 0;
% foreach my $tech ( @FS::Report::FCC_477::technology ) {
<TR>
<TH><% $tech %></TH>
@@ -93,6 +101,8 @@
'hashref' => { 'disabled' => '' },
'element_name' => "part1_technology_option_$i",
'empty_label' => '(omit)',
+ 'curr_value' =>
+ FS::Report::FCC_477::restore_fcc477map("part1_technology_option_$i"),
)
%>
</TD>
Index: 477partIIA.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIIA.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- 477partIIA.html 22 May 2010 19:57:52 -0000 1.2
+++ 477partIIA.html 25 Apr 2011 04:00:04 -0000 1.2.4.1
@@ -22,9 +22,10 @@
my $html_init = '<H2>Part IIA</H2>';
my %search_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my @row_option = grep { /^\d+$/ } $cgi->param('part2a_row_option')
if $cgi->param('part2a_row_option');
Index: 477partV.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partV.html,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -w -d -r1.3 -r1.3.4.1
--- 477partV.html 5 Jun 2010 05:56:07 -0000 1.3
+++ 477partV.html 25 Apr 2011 04:00:03 -0000 1.3.4.1
@@ -26,9 +26,10 @@
my @sql_query = ();
my @count_query = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my $sql_query = FS::cust_pkg->search( { %search_hash, 'fcc_line' > 1 });
$sql_query->{select} = 'DISTINCT zip';
Index: 477partIA_summary.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partIA_summary.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -w -d -r1.3 -r1.3.2.1
--- 477partIA_summary.html 1 Sep 2010 18:48:20 -0000 1.3
+++ 477partIA_summary.html 25 Apr 2011 04:00:04 -0000 1.3.2.1
@@ -40,9 +40,10 @@
my %opt = @_;
my %search_hash = ();
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
if $cgi->param('part1_column_option');
More information about the freeside-commits
mailing list