summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/browse/deploy_zone.html126
-rwxr-xr-xhttemplate/browse/part_pkg-fcc.html226
-rw-r--r--httemplate/edit/deploy_zone-fixed.html95
-rw-r--r--httemplate/edit/deploy_zone-mobile.html90
-rwxr-xr-xhttemplate/edit/part_pkg.cgi37
-rw-r--r--httemplate/edit/process/bulk-part_pkg-fcc.html42
-rw-r--r--httemplate/edit/process/deploy_zone-fixed.html9
-rw-r--r--httemplate/edit/process/deploy_zone-mobile.html9
-rw-r--r--httemplate/elements/deploy_zone_block.html47
-rw-r--r--httemplate/elements/deploy_zone_vertex.html45
-rw-r--r--httemplate/elements/input-fcc_options.html108
-rw-r--r--httemplate/elements/tr-input-fcc_options.html4
-rw-r--r--httemplate/misc/part_pkg_fcc_options.html20
-rw-r--r--httemplate/search/477.html84
-rwxr-xr-xhttemplate/search/report_477.html26
15 files changed, 905 insertions, 63 deletions
diff --git a/httemplate/browse/deploy_zone.html b/httemplate/browse/deploy_zone.html
new file mode 100644
index 000000000..ddfbde43d
--- /dev/null
+++ b/httemplate/browse/deploy_zone.html
@@ -0,0 +1,126 @@
+<& /elements/header.html, 'Deployment zones' &>
+<& /elements/menubar.html,
+ 'Add a new fixed broadband zone' => $p.'edit/deploy_zone-fixed.html',
+ 'Add a new mobile zone' => $p.'edit/deploy_zone-mobile.html',
+&>
+<P><FONT SIZE="+1"><B>Fixed Broadband Zones</B></FONT></P>
+<& elements/browse.html,
+ name_singular => 'zone',
+ query => { table => 'deploy_zone',
+ hashref => { zonetype => 'B' },
+ },
+ count_query => "SELECT COUNT(*) FROM deploy_zone WHERE zonetype = 'B'",
+ agent_virt => 1,
+ header => [ '#',
+ 'Description',
+ 'Technology',
+ 'Market',
+ 'Advertised Mbps',
+ 'Contractual Mbps',
+ 'Census blocks',
+ ],
+ fields => [ 'zonenum',
+ 'description',
+ sub { my $self = shift;
+ $tech_label->{$self->technology} },
+ sub { my $self = shift;
+ join( ' / ',
+ $self->is_consumer ? 'consumer' : (),
+ $self->is_business ? 'business' : ()
+ )
+ },
+ sub { my $self = shift;
+ join( ' / ', grep $_,
+ $self->adv_speed_down,
+ $self->adv_speed_up
+ )
+ },
+ sub { my $self = shift;
+ join( ' / ', grep $_,
+ $self->cir_speed_down,
+ $self->cir_speed_up
+ )
+ },
+ sub { my $self = shift;
+ FS::deploy_zone_block->count('zonenum = '.$self->zonenum)
+ },
+ ],
+ sort_fields => [ 'zonenum',
+ 'description',
+ 'technology',
+ '(is_consumer is not null, is_business is not null)',
+ '(adv_speed_down, adv_speed_up)',
+ '(cir_speed_down, cir_speed_up)',
+ ],
+ links => [ '', $link_fixed, ],
+ align => 'clllllr',
+ nohtmlheader => 1,
+ disable_maxselect => 1,
+ disable_total => 1,
+&>
+<P><FONT SIZE="+1"><B>Mobile Zones</B></FONT></P>
+<& elements/browse.html,
+ name_singular => 'zone',
+ query => { table => 'deploy_zone',
+ hashref => { zonetype => 'P' },
+ },
+ count_query => "SELECT COUNT(*) FROM deploy_zone WHERE zonetype = 'P'",
+ agent_virt => 1,
+ header => [ '#',
+ 'Description',
+ 'Technology',
+ 'Spectrum',
+ 'Service Type',
+ 'Advertised Mbps',
+ 'Vertices', # number of vertices? not so useful
+ ],
+ fields => [ 'zonenum',
+ 'description',
+ sub { my $self = shift;
+ $tech_label->{$self->technology} },
+ sub { my $self = shift;
+ $spec_label->{$self->spectrum} },
+ sub { my $self = shift;
+ join( ' / ',
+ $self->is_voice ? 'voice' : (),
+ $self->is_broadband ? 'broadband' : (),
+ )
+ },
+ sub { my $self = shift;
+ join( ' / ', grep $_,
+ $self->adv_speed_down,
+ $self->adv_speed_up
+ )
+ },
+ sub { my $self = shift;
+ FS::deploy_zone_vertex->count('zonenum = '.$self->zonenum)
+ },
+ ],
+ sort_fields => [ 'zonenum',
+ 'description',
+ 'technology',
+ 'spectrum',
+ '(is_voice is not null, is_broadband is not null)',
+ '(adv_speed_down, adv_speed_up)',
+ ],
+ links => [ '', $link_mobile, ],
+ align => 'clllllr',
+ nohtmlheader => 1,
+ disable_maxselect => 1,
+ disable_total => 1,
+&>
+
+<& /elements/footer.html &>
+<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+my $acl_edit = $curuser->access_right('Edit FCC report configuration');
+my $acl_edit_global = $curuser->access_right('Edit FCC report configuration for all agents');
+die "access denied"
+ unless $acl_edit or $acl_edit_global;
+
+my $link_fixed = [ $p.'edit/deploy_zone-fixed.html?', 'zonenum' ];
+my $link_mobile= [ $p.'edit/deploy_zone-mobile.html?', 'zonenum' ];
+
+my $tech_label = FS::part_pkg_fcc_option->technology_labels;
+my $spec_label = FS::part_pkg_fcc_option->spectrum_labels;
+</%init>
diff --git a/httemplate/browse/part_pkg-fcc.html b/httemplate/browse/part_pkg-fcc.html
new file mode 100755
index 000000000..14dfcba08
--- /dev/null
+++ b/httemplate/browse/part_pkg-fcc.html
@@ -0,0 +1,226 @@
+<& elements/browse.html,
+ 'title' => 'Package Definitions - FCC Options',
+ 'menubar' => \@menubar,
+ 'html_init' => $html_init,
+ 'html_form' => $html_form,
+ 'name' => 'package definitions',
+ 'disableable' => 1,
+ 'disabled_statuspos' => 4,
+ 'agent_virt' => 1,
+ 'agent_null_right' => [ $edit, $edit_global ],
+ 'agent_null_right_link' => $edit_global,
+ 'agent_pos' => 3,
+ 'query' =>
+ { 'select' => $select,
+ 'table' => 'part_pkg',
+ 'addl_from' => $addl_from,
+ 'hashref' => \%hash,
+ 'extra_sql' => $extra_sql,
+ 'order_by' => "ORDER BY $orderby"
+ },
+ 'count_query' => $count_query,
+ 'header' => \@header,
+ 'fields' => \@fields,
+ 'links' => \@links,
+ 'align' => $align,
+ 'link_field' => 'pkgpart',
+ 'html_foot' => $html_foot,
+&>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my $edit = 'Edit FCC report configuration';
+my $edit_global = 'Edit FCC report configuration for all agents';
+my $acl_edit = $curuser->access_right($edit);
+my $acl_edit_global = $curuser->access_right($edit_global);
+
+die "access denied"
+ unless $acl_edit || $acl_edit_global;
+
+if ( $cgi->param('redirect') ) {
+ my $session = $cgi->param('redirect');
+ my $pref = $curuser->option("redirect$session");
+ die "unknown redirect session $session\n" unless length($pref);
+ $cgi = new CGI($pref);
+ $cgi->param('redirect', $session);
+}
+
+my $conf = new FS::Conf;
+
+my $orderby = 'pkgpart';
+my %hash = ();
+my $extra_count = '';
+
+my @where = ();
+
+# only ever show recurring packages here
+$hash{'freq'} = { op=>'!=', value=>'0' };
+$extra_count = " freq != '0' ";
+
+# filter by classnum
+my $classnum = '';
+if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
+ $classnum = $1;
+ push @where, $classnum ? "classnum = $classnum"
+ : "classnum IS NULL";
+}
+$cgi->delete('classnum');
+
+# filter by agent permissions
+push @where, FS::part_pkg->curuser_pkgs_sql
+ unless $acl_edit_global;
+
+my $extra_sql = scalar(@where)
+ ? ( scalar(keys %hash) ? ' AND ' : ' WHERE ' ).
+ join( 'AND ', @where)
+ : '';
+
+# pull option values into the select
+my @optionnames = ( qw(
+ media
+ is_consumer
+ is_broadband technology broadband_upstream broadband_downstream
+ is_phone phone_wholesale phone_vges phone_circuits
+ phone_lines phone_longdistance phone_localloop
+ is_voip voip_lastmile voip_sessions
+) );
+
+my $select = join(',',
+ 'part_pkg.*',
+ '(SELECT classname FROM pkg_class WHERE pkg_class.classnum = part_pkg.classnum) AS classname', # grr, disableable...
+ @optionnames
+);
+
+my $addl_from =
+ FS::Report::FCC_477::join_optionnames(@optionnames);
+
+$cgi->param('classnum', $classnum) if length($classnum);
+
+my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
+
+my @header = ( '#', 'Package', 'Comment' );
+my @fields = ( 'pkgpart', 'pkg', 'comment' ,);
+my $align = 'rll';
+my @links = ( $link, $link, '', );
+
+unless ( length($classnum) ) {
+ push @header, 'Class';
+ push @fields, 'classname';
+ $align .= 'l';
+}
+
+# still include the report_option classes, to help with migration
+# but not other plan options
+
+my %report_optionname_name = map { 'report_option_'.$_->num, $_->name }
+ qsearch('part_pkg_report_option', { disabled => '' });
+
+push @header, 'Report classes';
+
+push @fields,
+ sub {
+ my $part_pkg = shift;
+ my %options = $part_pkg->options;
+ # gather any options that are really report options,
+ # convert them to their user-friendly names,
+ # and sort them (I think?)
+ my @report_options =
+ sort { $a cmp $b }
+ map { $report_optionname_name{$_} }
+ grep { $options{$_}
+ and exists($report_optionname_name{$_}) }
+ keys %options;
+
+ my @rows;
+ foreach (@report_options) {
+ push @rows, [
+ { 'data' => $_,
+ 'align' => 'center',
+ 'colspan' => 2
+ }
+ ];
+ } # foreach @report_options
+ \@rows;
+ };
+
+$align .= 'cr';
+
+# --------
+# now the FCC option part
+# --------
+
+my @pkgparts;
+push @header, 'FCC report parameters';
+push @fields, sub {
+ my $part_pkg = shift;
+ my %hash = $part_pkg->fcc_options;
+ include('/elements/input-fcc_options.html',
+ id => 'pkgpart'.$part_pkg->pkgpart,
+ curr_value => encode_json(\%hash),
+ html_only => 1
+ );
+};
+$align .= 'l';
+
+my $count_extra_sql = $extra_sql;
+$count_extra_sql =~ s/^\s*AND /WHERE /i;
+$extra_count = ( $count_extra_sql ? ' AND ' : ' WHERE ' ). $extra_count
+ if $extra_count;
+my $count_query = "SELECT COUNT(*) FROM part_pkg $count_extra_sql $extra_count";
+
+# in case of error redirect
+if ( $cgi->param('redirect') ) {
+ push @header, '';
+ push @fields, sub {
+ my $part_pkg = shift;
+ my $pkgpart = $part_pkg->pkgpart;
+ '<B><FONT COLOR="#ffffff">' . $cgi->param("error$pkgpart") || '' . '</FONT></B>'
+ };
+ $align .= 'l';
+}
+
+my $html_init =
+ include('/elements/init_overlib.html') .
+ include('/elements/input-fcc_options.html', js_only => 1) .
+ include('.style');
+
+my $html_form = qq!<FORM ACTION="${p}edit/process/bulk-part_pkg-fcc.html" METHOD="POST">
+ ( show class: !.
+ include('/elements/select-pkg_class.html',
+ #'curr_value' => $classnum,
+ 'value' => $classnum, #insist on 0 :/
+ 'onchange' => 'filter_change()',
+ 'pre_options' => [ '-1' => 'all',
+ '0' => '(none)', ],
+ 'disable_empty' => 1,
+ ).
+ ' )
+ <BR><BR>' .
+ qq!<SCRIPT TYPE="text/javascript">
+ function filter_change() {
+ window.location = '! . $cgi->self_url . qq!?classnum='
+ + document.getElementById('classnum').value;
+ }
+ </SCRIPT>!;
+
+my $html_foot = qq!
+ <INPUT TYPE="submit" VALUE="Save changes">
+ </FORM>!;
+
+my @menubar =
+ ( 'Package definitions' => $p.'browse/part_pkg.cgi' );
+
+</%init>
+<%def .style>
+<style>
+ ul.fcc_options {
+ text-align: left;
+ }
+ ul.fcc_options li {
+ }
+ button.edit_fcc_options {
+ float: right;
+ }
+</style>
+</%def>
diff --git a/httemplate/edit/deploy_zone-fixed.html b/httemplate/edit/deploy_zone-fixed.html
new file mode 100644
index 000000000..1a79500ff
--- /dev/null
+++ b/httemplate/edit/deploy_zone-fixed.html
@@ -0,0 +1,95 @@
+<& elements/edit.html,
+ 'name_singular' => 'deployment zone',
+ 'table' => 'deploy_zone',
+ 'post_url' => popurl(1).'process/deploy_zone-fixed.html',
+ 'labels' => {
+ 'description' => 'Description',
+ 'agentnum' => 'Agent',
+ 'dbaname' => 'Business name (if different from agent)',
+ 'technology' => 'Technology',
+ 'adv_speed_up' => 'Upstream',
+ 'adv_speed_down' => 'Downstream',
+ 'cir_speed_up' => 'Upstream',
+ 'cir_speed_down' => 'Downstream',
+ 'is_consumer' => 'Consumer/mass market',
+ 'is_business' => 'Business/government',
+ 'blocknum' => '',
+ 'active_date' => 'Active since',
+ },
+ 'fields' => [
+ { field => 'zonetype',
+ type => 'hidden',
+ value => 'B'
+ },
+ { field => 'is_broadband',
+ type => 'hidden',
+ value => 'Y',
+ },
+ 'description',
+ { field => 'active_date',
+ type => 'fixed-date',
+ value => time,
+ },
+ { field => 'agentnum',
+ type => 'select-agent',
+ disable_empty => 1,
+ viewall_right => 'Edit FCC report configuration for all agents',
+ },
+ 'dbaname',
+ { field => 'technology',
+ type => 'select',
+ options => [ map { @$_ } values(%$media_types) ],
+ labels => $technology_labels,
+ },
+ { field => 'is_consumer', type => 'checkbox', value=>'Y' },
+ { field => 'is_business', type => 'checkbox', value=>'Y' },
+ { type => 'tablebreak-tr-title',
+ value => 'Advertised maximum speed (Mbps)' },
+ 'adv_speed_down',
+ 'adv_speed_up',
+ { type => 'tablebreak-tr-title',
+ value => 'Contractually guaranteed speed (Mbps)' },
+ 'cir_speed_down',
+ 'cir_speed_up',
+
+ { type => 'tablebreak-tr-title', value => 'Census blocks'},
+ { field => 'blocknum',
+ type => 'deploy_zone_block',
+ o2m_table => 'deploy_zone_block',
+ m2_label => ' ',
+ m2_error_callback => $m2_error_callback,
+ },
+ ],
+
+&>
+<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+die "access denied"
+ unless $curuser->access_right([
+ 'Edit FCC report configuration',
+ 'Edit FCC report configuration for all agents',
+ ]);
+
+my $technology_labels = FS::part_pkg_fcc_option->technology_labels;
+my $media_types = FS::part_pkg_fcc_option->media_types;
+delete $media_types->{'Mobile Wireless'}; # cause this is the fixed zone page
+
+my $m2_error_callback = sub {
+ my ($cgi, $deploy_zone) = @_;
+ my @blocknums = grep {
+ /^blocknum\d+/ and length($cgi->param($_.'_censusblock'))
+ } $cgi->param;
+
+ sort { $a->censusblock <=> $b->censusblock }
+ map {
+ my $k = $_;
+ FS::deploy_zone_block->new({
+ blocknum => scalar($cgi->param($k)),
+ zonenum => $deploy_zone->zonenum,
+ censusblock => scalar($cgi->param($k.'_censusblock')),
+ censusyear => scalar($cgi->param($k.'_censusyear')),
+ })
+ } @blocknums;
+};
+
+</%init>
diff --git a/httemplate/edit/deploy_zone-mobile.html b/httemplate/edit/deploy_zone-mobile.html
new file mode 100644
index 000000000..8e985b1c9
--- /dev/null
+++ b/httemplate/edit/deploy_zone-mobile.html
@@ -0,0 +1,90 @@
+<& elements/edit.html,
+ 'name_singular' => 'deployment zone',
+ 'table' => 'deploy_zone',
+ 'post_url' => popurl(1).'process/deploy_zone-mobile.html',
+ 'labels' => {
+ 'description' => 'Description',
+ 'agentnum' => 'Agent',
+ 'dbaname' => 'Business name (if different from agent)',
+ 'technology' => 'Technology',
+ 'spectrum' => 'Spectrum',
+ 'is_broadband', => 'Broadband Internet',
+ 'adv_speed_up' => 'Upstream',
+ 'adv_speed_down' => 'Downstream',
+ 'is_voice', => 'Voice',
+ 'vertexnum' => '',
+ 'active_date' => 'Active since',
+ },
+ 'fields' => [
+ { field => 'zonetype',
+ type => 'hidden',
+ value => 'P'
+ },
+ 'description',
+ { field => 'active_date',
+ type => 'fixed-date',
+ value => time,
+ },
+ { field => 'agentnum',
+ type => 'select-agent',
+ disable_empty => 1,
+ viewall_right => 'Edit FCC report configuration for all agents',
+ },
+ 'dbaname',
+ { field => 'technology',
+ type => 'select',
+ options => $media_types->{'Mobile Wireless'},
+ labels => $technology_labels,
+ },
+ { field => 'spectrum',
+ type => 'select',
+ options => [ keys %$spectrum_labels ],
+ labels => $spectrum_labels,
+ },
+ { field => 'is_broadband', type => 'checkbox', value=>'Y' },
+ { field => 'is_voice', type => 'checkbox', value=>'Y' },
+ { type => 'tablebreak-tr-title',
+ value => 'Advertised minimum speed (Mbps)' },
+ 'adv_speed_down',
+ 'adv_speed_up',
+ { type => 'tablebreak-tr-title', value => 'Footprint'},
+ { field => 'vertexnum',
+ type => 'deploy_zone_vertex',
+ o2m_table => 'deploy_zone_vertex',
+ m2_label => ' ',
+ m2_error_callback => $m2_error_callback,
+ },
+ ],
+
+&>
+<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+die "access denied"
+ unless $curuser->access_right([
+ 'Edit FCC report configuration',
+ 'Edit FCC report configuration for all agents',
+ ]);
+
+my $technology_labels = FS::part_pkg_fcc_option->technology_labels;
+my $spectrum_labels = FS::part_pkg_fcc_option->spectrum_labels;
+my $media_types = FS::part_pkg_fcc_option->media_types;
+
+my $m2_error_callback = sub {
+ my ($cgi, $deploy_zone) = @_;
+ my @vertexnums = sort { $a <=> $b } grep {
+ /^vertexnum\d+/ and length($cgi->param($_.'_latitude'))
+ } $cgi->param;
+
+ map {
+ my $k = $_;
+ my $s = 0;
+ FS::deploy_zone_vertex->new({
+ vertexnum => scalar($cgi->param($k)),
+ zonenum => $deploy_zone->zonenum,
+ latitude => scalar($cgi->param($k.'_latitude')),
+ longitude => scalar($cgi->param($k.'_longitude')),
+ })
+ } @vertexnums;
+};
+
+</%init>
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 9e55d9f42..65eca6cf4 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -232,23 +232,26 @@
},
},
- { type => 'tablebreak-tr-title',
- value => 'FCC Form 477 information',
- },
- { field => 'fcc_options_string',
- type => 'input-fcc_options',
- curr_value_callback => sub {
- my ($cgi, $part_pkg, $fref) = @_;
- if ( $cgi->param('fcc_options_string') ) {
- # error redirect
- return $cgi->param('fcc_options_string');
- }
- my %hash;
- %hash = $part_pkg->fcc_options
- if ($part_pkg->pkgpart);
- return encode_json(\%hash);
+ ($fcc_opts ? (
+ { type => 'tablebreak-tr-title',
+ value => 'FCC Form 477 information',
},
- },
+ { field => 'fcc_options_string',
+ type => 'input-fcc_options',
+ curr_value_callback => sub {
+ my ($cgi, $part_pkg, $fref) = @_;
+ if ( $cgi->param('fcc_options_string') ) {
+ # error redirect
+ return $cgi->param('fcc_options_string');
+ }
+ my %hash;
+ %hash = $part_pkg->fcc_options
+ if ($part_pkg->pkgpart);
+ return encode_json(\%hash);
+ },
+ },
+ ) : ()
+ ),
{ type => 'tablebreak-tr-title',
value => 'External Links', #better name?
@@ -405,6 +408,8 @@ my $agent_clone_extra_sql =
my $conf = new FS::Conf;
my $taxproducts = $conf->exists('enable_taxproducts');
+my $fcc_opts = $conf->exists('part_pkg-show_fcc_options');
+
my @locales = grep { ! /^en_/i } $conf->config('available-locales'); #should filter from the default locale lang instead of en_
my %locale_labels = map {
( $_ => 'Package -- '. FS::Locales->description($_) )
diff --git a/httemplate/edit/process/bulk-part_pkg-fcc.html b/httemplate/edit/process/bulk-part_pkg-fcc.html
new file mode 100644
index 000000000..17579aa61
--- /dev/null
+++ b/httemplate/edit/process/bulk-part_pkg-fcc.html
@@ -0,0 +1,42 @@
+% if ( keys %error ) {
+% foreach my $pkgpart (keys %error) {
+% # stuff all the errors back into $cgi
+% $cgi->param("error$pkgpart", $error{$pkgpart});
+% }
+% my $session = int(rand(4294967296)); #XXX
+% my $pref = new FS::access_user_pref({
+% 'usernum' => $FS::CurrentUser::CurrentUser->usernum,
+% 'prefname' => "redirect$session",
+% 'prefvalue' => $cgi->query_string,
+% 'expiration' => time + 3600, #1h? 1m?
+% });
+% my $pref_error = $pref->insert;
+% if ( $pref_error ) {
+% die "FATAL: couldn't even set redirect cookie: $pref_error".
+% " attempting to set redirect$session to ". $cgi->query_string."\n";
+% }
+<% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?redirect='.$session) %>
+% } else {
+<% $cgi->redirect($fsurl.'browse/part_pkg-fcc.html?classnum='.$classnum) %>
+% }
+<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
+die "access denied"
+ unless $curuser->access_right('Bulk edit package definitions');
+
+# non-atomic; report errors but allow successful changes to go through
+# not that I even know how you'd get an error doing this
+
+my %error;
+foreach my $param ($cgi->param) {
+ $param =~ /^pkgpart(\d+)$/ or next;
+ my $pkgpart = $1;
+ my $part_pkg = FS::part_pkg->by_key($pkgpart);
+ my $hashref = decode_json( $cgi->param($param) );
+ my $error = $part_pkg->set_fcc_options($hashref);
+ $error{$pkgpart} = $error if $error;
+}
+
+my $classnum = $cgi->param('classnum');
+
+</%init>
diff --git a/httemplate/edit/process/deploy_zone-fixed.html b/httemplate/edit/process/deploy_zone-fixed.html
new file mode 100644
index 000000000..c14c81c58
--- /dev/null
+++ b/httemplate/edit/process/deploy_zone-fixed.html
@@ -0,0 +1,9 @@
+<& elements/process.html,
+ error_redirect => popurl(2).'deploy_zone-fixed.html?',
+ table => 'deploy_zone',
+ viewall_dir => 'browse',
+ process_o2m =>
+ { 'table' => 'deploy_zone_block',
+ 'fields' => [qw( censusblock censusyear )]
+ },
+&>
diff --git a/httemplate/edit/process/deploy_zone-mobile.html b/httemplate/edit/process/deploy_zone-mobile.html
new file mode 100644
index 000000000..c913c5cd6
--- /dev/null
+++ b/httemplate/edit/process/deploy_zone-mobile.html
@@ -0,0 +1,9 @@
+<& elements/process.html,
+ error_redirect => popurl(2).'deploy_zone-mobile.html?',
+ table => 'deploy_zone',
+ viewall_dir => 'browse',
+ process_o2m =>
+ { 'table' => 'deploy_zone_vertex',
+ 'fields' => [qw( latitude longitude )]
+ },
+&>
diff --git a/httemplate/elements/deploy_zone_block.html b/httemplate/elements/deploy_zone_block.html
new file mode 100644
index 000000000..9985944bd
--- /dev/null
+++ b/httemplate/elements/deploy_zone_block.html
@@ -0,0 +1,47 @@
+% unless ( $opt{'js_only'} ) {
+
+ <INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
+ Block
+ <INPUT TYPE = "text"
+ NAME = "<%$name%>_censusblock"
+ ID = "<%$id%>_censusblock"
+ VALUE = "<% scalar($cgi->param($name.'_censusblock'))
+ || $deploy_zone_block->censusblock
+ %>"
+ SIZE = 17
+ MAXLENGTH = 15
+ <% $onchange %>
+ >
+ &nbsp;
+ Year
+ <INPUT TYPE = "text"
+ NAME = "<%$name%>_censusyear"
+ ID = "<%$id%>_censusyear"
+ VALUE = "<% scalar($cgi->param($name.'_censusyear'))
+ || $deploy_zone_block->censusyear
+ %>"
+ SIZE = 5
+ MAXLENGTH = 4
+ <% $onchange %>
+ >
+% }
+<%init>
+
+my( %opt ) = @_;
+
+my $name = $opt{'element_name'} || $opt{'field'} || 'blocknum';
+my $id = $opt{'id'} || 'blocknum';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+my $onchange = $opt{'onchange'};
+if ( $onchange ) {
+ $onchange =~ s/\(what\);/(this);/;
+ $onchange = 'onchange="'.$onchange.'"';
+}
+
+my $deploy_zone_block = $curr_value
+ ? FS::deploy_zone_block->by_key($curr_value)
+ : FS::deploy_zone_block->new;
+
+</%init>
diff --git a/httemplate/elements/deploy_zone_vertex.html b/httemplate/elements/deploy_zone_vertex.html
new file mode 100644
index 000000000..b3c8b31ea
--- /dev/null
+++ b/httemplate/elements/deploy_zone_vertex.html
@@ -0,0 +1,45 @@
+% unless ( $opt{'js_only'} ) {
+
+ <INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
+ Latitude&nbsp;
+ <INPUT TYPE = "text"
+ NAME = "<%$name%>_latitude"
+ ID = "<%$id%>_latitude"
+ VALUE = "<% scalar($cgi->param($name.'_latitude'))
+ || $deploy_zone_vertex->latitude
+ %>"
+ SIZE = 18
+ <% $onchange %>
+ >
+ &nbsp;
+ Longitude&nbsp;
+ <INPUT TYPE = "text"
+ NAME = "<%$name%>_longitude"
+ ID = "<%$id%>_longitude"
+ VALUE = "<% scalar($cgi->param($name.'_longitude'))
+ || $deploy_zone_vertex->longitude
+ %>"
+ SIZE = 18
+ <% $onchange %>
+ >
+% }
+<%init>
+
+my( %opt ) = @_;
+
+my $name = $opt{'element_name'} || $opt{'field'} || 'vertexnum';
+my $id = $opt{'id'} || 'vertexnum';
+
+my $curr_value = $opt{'curr_value'} || $opt{'value'};
+
+my $onchange = $opt{'onchange'};
+if ( $onchange ) {
+ $onchange =~ s/\(what\);/(this);/;
+ $onchange = 'onchange="'.$onchange.'"';
+}
+
+my $deploy_zone_vertex = $curr_value
+ ? FS::deploy_zone_vertex->by_key($curr_value)
+ : FS::deploy_zone_vertex->new;
+
+</%init>
diff --git a/httemplate/elements/input-fcc_options.html b/httemplate/elements/input-fcc_options.html
new file mode 100644
index 000000000..1d56cf274
--- /dev/null
+++ b/httemplate/elements/input-fcc_options.html
@@ -0,0 +1,108 @@
+% unless ($opt{js_only}) {
+<& hidden.html, 'field' => $id, @_ &>
+%# <& input-text.html, 'id' => $id, @_ &> # XXX debugging
+<UL ID="<%$id%>_display_fcc_options" CLASS="fcc_options">
+</UL>
+<button type="button" class="edit_fcc_button" data-target="<% $id %>">
+ Edit
+</button>
+% }
+% unless ($opt{html_only}) {
+% my $popup = $fsurl.'misc/part_pkg_fcc_options.html?id=';
+% my $popup_name = 'popup-'.time. "-$$-". rand() * 2**32;
+<SCRIPT TYPE="text/javascript">
+function edit_fcc_options() {
+ var id = this.dataset['target'];
+ overlib(
+ OLiframeContent( '<% $popup %>' + id,
+ 760, 600, '<% $popup_name %>', 0, 'auto' ),
+ CAPTION, 'FCC Form 477 options',
+ STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0,
+ DRAGGABLE, CLOSECLICK,
+ BGCOLOR, '#333399', CGCOLOR, '#333399',
+ CLOSETEXT, 'Close'
+ );
+}
+
+var technology_labels = <% encode_json(FS::part_pkg_fcc_option->technology_labels) %>;
+function show_fcc_options(id) {
+ var curr_values = JSON.parse(document.getElementById(id).value);
+ // hardcoded for the same reasons as misc/part_pkg_fcc_options
+ var out = '';
+ var tech = curr_values['technology'];
+ if ( tech ) {
+ if (technology_labels[tech]) {
+ tech = technology_labels[tech];
+ } else {
+ tech = 'Technology '+tech; // unknown?
+ }
+ }
+ var media = String.toLowerCase(curr_values['media'] || 'unknown media');
+ if ( curr_values['is_consumer'] ) {
+ out += '<li><strong>Consumer-grade</strong> service</li>';
+ } else {
+ out += '<li><strong>Business-grade</strong> service</li>';
+ }
+ if ( curr_values['is_broadband'] ) {
+ out += '<li>Broadband via <strong>' + tech + '</strong>'
+ + '<li><strong>' + curr_values['broadband_downstream']
+ + 'Mbps </strong> down / '
+ + '<strong>' + curr_values['broadband_upstream']
+ + 'Mbps </strong> up</li>';
+ }
+ if ( curr_values['is_phone'] ) {
+ if ( curr_values['phone_wholesale'] ) {
+ out += '<li>Wholesale telephone</li>';
+ if ( curr_values['phone_vges'] ) {
+ out += '<li><strong>' + curr_values['phone_vges'] + '</strong>'
+ + ' switched voice-grade lines</li>';
+ }
+ if ( curr_values['phone_circuits'] ) {
+ out += '<li><strong>' + curr_values['phone_circuits'] + '</strong>'
+ + ' unswitched circuits</li>';
+ }
+ } else {
+ // enduser service
+ out += '<li>Local telephone over <strong>' + media + '</strong></li>'
+ + '<li><strong>' + curr_values['phone_lines']
+ + '</strong> voice-grade lines</li>';
+ if ( curr_values['phone_localloop'] == 'resale' ) {
+ out += '<li><strong>Resold</strong> from another carrier</li>>';
+ } else if ( curr_values['phone_localloop'] == 'leased' ) {
+ out += '<li>Using <strong>leased circuits</strong> from another carrier</li>';
+ } else if ( curr_values['phone_localloop'] == 'owned' ) {
+ out += '<li>Using <strong>our own circuits</strong></li>';
+ }
+ if ( curr_values['phone_longdistance'] ) {
+ out += '<li>Includes <strong>long-distance service</strong></li>';
+ }
+ }
+ } // is_phone
+ if ( curr_values['is_voip'] ) {
+ out += '<li><strong>VoIP</strong> telephone service</li>';
+ out += '<li><strong>' + curr_values['voip_sessions'] +
+ '</strong> sessions allowed</li>';
+ if ( curr_values['voip_lastmile'] ) {
+ out += '<li><strong>Including</strong> last-mile connection</li>';
+ } else {
+ out += '<li>Using a <strong>separate</strong> last-mile connection</li>';
+ }
+ } // is_voip
+
+ var out_ul = document.getElementById(id + '_display_fcc_options');
+ out_ul.innerHTML = out;
+}
+<&| onload.js &>
+ var edit_fcc_buttons = document.getElementsByClassName('edit_fcc_button');
+ for(var i = 0; i < edit_fcc_buttons.length; i++) {
+ var button = edit_fcc_buttons[i];
+ show_fcc_options( button.dataset['target'] );
+ button.addEventListener('click', edit_fcc_options);
+ }
+</&>
+</SCRIPT>
+% }
+<%init>
+my %opt = @_;
+my $id = $opt{id} || $opt{field};
+</%init>
diff --git a/httemplate/elements/tr-input-fcc_options.html b/httemplate/elements/tr-input-fcc_options.html
index 11cb4a962..58f7247c4 100644
--- a/httemplate/elements/tr-input-fcc_options.html
+++ b/httemplate/elements/tr-input-fcc_options.html
@@ -41,9 +41,9 @@ function show_fcc_options() {
}
var media = String.toLowerCase(curr_values['media'] || 'unknown media');
if ( curr_values['is_consumer'] ) {
- out += '<li><strong>Consumer-grade</strong> service</li>>';
+ out += '<li><strong>Consumer-grade</strong></li>>';
} else {
- out += '<li><strong>Business-grade</strong> service</li>';
+ out += '<li><strong>Business-grade</strong></li>';
}
if ( curr_values['is_broadband'] ) {
out += '<li>Broadband via <strong>' + tech + '</strong>'
diff --git a/httemplate/misc/part_pkg_fcc_options.html b/httemplate/misc/part_pkg_fcc_options.html
index f74328446..27b45e003 100644
--- a/httemplate/misc/part_pkg_fcc_options.html
+++ b/httemplate/misc/part_pkg_fcc_options.html
@@ -90,10 +90,21 @@
<& .checkbox, 'is_voip' &>
<LABEL FOR="is_voip">This package provides VoIP telephone service</LABEL>
<FIELDSET ID="voip">
+ <LABEL FOR="voip_sessions">Number of simultaneous calls possible</LABEL>
+ <INPUT NAME="voip_sessions" ID="voip_sessions">
+ <BR>
<& .checkbox, 'voip_lastmile' &>
<LABEL FOR="voip_lastmile">Do you also provide last-mile connectivity?</LABEL>
</FIELDSET>
</P>
+ <P>
+ <& .checkbox, 'is_mobile' &>
+ <LABEL FOR="is_mobile">This package provides mobile telephone service</LABEL>
+ <FIELDSET ID="mobile">
+ <LABEL FOR="mobile_direct">Do you bill the customer directly?</LABEL>
+ <& .checkbox, 'mobile_direct' &>
+ </FIELDSET>
+ </P>
<DIV WIDTH="100%" STYLE="text-align:center">
<INPUT TYPE="submit" VALUE="Save changes">
</DIV>
@@ -145,7 +156,7 @@ function save_changes() {
}
parent_input.value = JSON.stringify(data);
// update the display
- parent.show_fcc_options();
+ parent.show_fcc_options(parent_input.id);
parent.cClick(); //overlib
}
@@ -166,7 +177,7 @@ function enable_fieldset(fieldset_id) {
// set up all event handlers
addEventListener(form, 'submit', save_changes);
- var sections = [ 'broadband', 'phone', 'voip' ];
+ var sections = [ 'broadband', 'phone', 'voip', 'mobile' ];
for(var i = 0; i < sections.length; i++) {
var toggle = form.elements['is_'+sections[i]];
addEventListener(toggle, 'change', enable_fieldset(sections[i]));
@@ -179,6 +190,11 @@ function enable_fieldset(fieldset_id) {
form.elements['phone1'].disabled = (this.value == '');
}
);
+ addEventListener(form.elements['is_phone'], 'change',
+ function() {
+ form.elements['phone_wholesale'].dispatchEvent( new Event('change') );
+ }
+ );
// load data from the parent form and trigger handlers
for(var i = 0; i < form.elements.length; i++) {
diff --git a/httemplate/search/477.html b/httemplate/search/477.html
index 68493377d..fb85f1e09 100644
--- a/httemplate/search/477.html
+++ b/httemplate/search/477.html
@@ -36,20 +36,19 @@ a.download {
float: right;
}
</STYLE>
-% foreach my $partnum (@partnums) {
-% $cgi->param('parts', $partnum);
+% foreach my $partname (@partnames) {
+% $cgi->param('parts', $partname);
% $cgi->param('type', 'csv');
<table class="fcc477part">
<caption>
- <span class="parttitle">Part <% $partnum %></span>
+ <span class="parttitle"><% $part_titles->{$partname} %></span>
<a class="download" href="<% $cgi->self_url %>">Download</a>
</caption>
-% my $header = ".header$partnum";
-% my $data = $parts{$partnum};
+% my $header = ".header_$partname";
+% my $data = $parts{$partname};
<thead>
<& $header &>
</thead>
-% #XXX column headings
% foreach my $row (@$data) {
<tr>
% foreach my $item (@$row) {
@@ -58,7 +57,7 @@ a.download {
</tr>
% }
</table>
-% } # foreach $partnum
+% } # foreach $partname
<& /elements/footer.html &>
<%init>
die "access denied"
@@ -80,10 +79,9 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/ ) {
$agentnum = $1;
}
my $date = parse_datetime($cgi->param('date')) || time;
-my @partnums = grep /^\d+$/, $cgi->param('parts');
-foreach my $partnum (@partnums) {
- my $method = "part$partnum";
- $parts{$partnum} ||= FS::Report::FCC_477->$method(
+my @partnames = grep /^\w+$/, $cgi->param('parts');
+foreach my $partname (@partnames) {
+ $parts{$partname} ||= FS::Report::FCC_477->report( $partname,
date => $date,
agentnum => $agentnum
);
@@ -93,11 +91,11 @@ $m->cache->set($session, \%parts, '1h');
my $title = 'FCC Form 477 Data - ' . time2str('%b %o, %Y', $date);
if ( $cgi->param('type') eq 'csv' ) {
- my $partnum = $partnums[0]; # ignore any beyond the first
- my $data = $parts{$partnum};
+ my $partname = $partnames[0]; # ignore any beyond the first
+ my $data = $parts{$partname};
my $csv = Text::CSV_XS->new({ eol => "\r\n" }); # i think
- my $filename = time2str('%Y-%m-%d', $date) . '-part' . $partnum . '.csv';
+ my $filename = time2str('%Y-%m-%d', $date) . '-'. $partname . '.csv';
http_header('Content-Type' => 'text/csv');
http_header('Content-Disposition' => qq(attachment;filename="$filename"));
@@ -110,24 +108,30 @@ if ( $cgi->param('type') eq 'csv' ) {
$m->abort;
}
+my $part_titles = FS::Report::FCC_477->parts;
+
</%init>
-<%def .header6>
+<%def .header_fbd>
<TR CLASS="head">
- <TD ROWSPAN=2>Census Tract</TD>
+ <TD ROWSPAN=2>Census Block</TD>
+ <TD ROWSPAN=2>DBA Name</TD>
<TD ROWSPAN=2>Technology</TD>
- <TD COLSPAN=2>Speed (Mbps)</TD>
- <TD COLSPAN=2>Subscriptions</TD>
+ <TD ROWSPAN=2>Consumer?</TD>
+ <TD COLSPAN=2>Advertised Speed (Mbps)</TD>
+ <TD ROWSPAN=2>Business?</TD>
+ <TD COLSPAN=2>Contractual Speed (Mbps)</TD>
</TR>
<TR CLASS="subhead">
<TD>Down</TD>
<TD>Up</TD>
- <TD>Total</TD>
- <TD>Consumer</TD>
+ <TD>Down</TD>
+ <TD>Up</TD>
</TR>
</%def>
-<%def .header7>
+<%def .header_fbs>
<TR CLASS="head">
- <TD ROWSPAN=2>State</TD>
+ <TD ROWSPAN=2>Census Tract</TD>
+ <TD ROWSPAN=2>Technology</TD>
<TD COLSPAN=2>Speed (Mbps)</TD>
<TD COLSPAN=2>Subscriptions</TD>
</TR>
@@ -138,17 +142,18 @@ if ( $cgi->param('type') eq 'csv' ) {
<TD>Consumer</TD>
</TR>
</%def>
-<%def .header8>
+<%def .header_fvs>
<TR CLASS="head">
- <TD ROWSPAN=2>State</TD>
- <TD COLSPAN=2>Subscriptions</TD>
+ <TD ROWSPAN=2>Census Tract</TD>
+ <TD ROWSPAN=2>VoIP?</TD>
+ <TD COLSPAN=2>Lines/Subscriptions</TD>
</TR>
<TR CLASS="subhead">
<TD>Total</TD>
- <TD>Direct</TD>
+ <TD>Consumer</TD>
</TR>
</%def>
-<%def .header9>
+<%def .header_lts>
<TR CLASS="head">
<TD ROWSPAN=3>State</TD>
<TD COLSPAN=2>Wholesale</TD>
@@ -183,7 +188,7 @@ if ( $cgi->param('type') eq 'csv' ) {
<TD>Wireless</TD>
</TR>
</%def>
-<%def .header10>
+<%def .header_voip>
<TR CLASS="head">
<TD ROWSPAN=2>State</TD>
<TD COLSPAN=2>VoIP OTT</TD>
@@ -206,14 +211,29 @@ if ( $cgi->param('type') eq 'csv' ) {
<TD>Other</TD>
</TR>
</%def>
-<%def .header11>
+<%def .header_mbs>
+%# unimplemented
<TR CLASS="head">
- <TD ROWSPAN=2>Census Tract</TD>
- <TD ROWSPAN=2>VoIP?</TD>
- <TD COLSPAN=2>Lines/Subscriptions</TD>
+ <TD ROWSPAN=2>State</TD>
+ <TD COLSPAN=2>Speed (Mbps)</TD>
+ <TD COLSPAN=2>Subscriptions</TD>
</TR>
<TR CLASS="subhead">
+ <TD>Down</TD>
+ <TD>Up</TD>
<TD>Total</TD>
<TD>Consumer</TD>
</TR>
</%def>
+<%def .header_mvs>
+%# unimplemented
+ <TR CLASS="head">
+ <TD ROWSPAN=2>State</TD>
+ <TD COLSPAN=2>Subscriptions</TD>
+ </TR>
+ <TR CLASS="subhead">
+ <TD>Total</TD>
+ <TD>Direct</TD>
+ </TR>
+</%def>
+
diff --git a/httemplate/search/report_477.html b/httemplate/search/report_477.html
index e3ae69e6f..cbbd5d902 100755
--- a/httemplate/search/report_477.html
+++ b/httemplate/search/report_477.html
@@ -4,7 +4,14 @@
% $m->abort;
% }
<& /elements/header.html, 'FCC Form 477 Report' &>
-
+% if ( $curuser->access_right('Edit FCC report configuration') ) {
+<FONT SIZE="+1"><STRONG>Preparation</STRONG></FONT>
+<UL>
+ <LI> <A HREF="<% $p %>browse/part_pkg-fcc.html">Configure packages</A> for FCC reporting categories.</LI>
+ <LI> <A HREF="<% $p %>browse/deploy_zone.html">Enter deployment zones</A> for broadband Internet or mobile phone.</LI>
+</UL>
+% }
+
<FORM ACTION="477.html" METHOD="GET">
<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
@@ -30,15 +37,8 @@
<& /elements/tr-checkbox-multiple.html,
'label' => 'Enable parts',
'field' => 'parts',
- 'labels' => {
- 6 => 'Part 6 (Fixed Broadband Subscription)',
- #7 => 'Part 7 (Mobile Wireless Broadband Subscription),
- #8 => 'Part 8 (Mobile Local Telephone Subscription),
- 9 => 'Part 9 (Local Exchange Telephone Subscription)',
- 10 => 'Part 10 (Interconnected VoIP Subscription)',
- 11 => 'Part 11 (Voice Telephone Subscription Detail)',
- },
- options => [ 6, 9, 10, 11 ],
+ 'labels' => $part_titles,
+ 'options' => [ keys %$part_titles ]
&>
</TABLE>
@@ -50,8 +50,12 @@
<& /elements/footer.html &>
<%init>
+my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('List packages');
+ unless $curuser->access_right('List packages');
my $conf = FS::Conf->new;
+
+my $part_titles = FS::Report::FCC_477->parts;
+
</%init>
generated by cgit v1.2.1 (git 2.18.0) at 2025-08-09 10:34:08 +0000