From 0354f39ed0e74fd2eae1d9da13906625b4f56591 Mon Sep 17 00:00:00 2001 From: khoff Date: Wed, 5 Feb 2003 23:17:17 +0000 Subject: svc_broadband rewrite --- httemplate/browse/addr_block.cgi | 76 +++++++ httemplate/browse/generic.cgi | 46 ++++ httemplate/browse/part_sb_field.cgi | 31 +++ httemplate/browse/router.cgi | 37 ++++ httemplate/edit/part_router_field.cgi | 70 ++++++ httemplate/edit/part_sb_field.cgi | 79 +++++++ httemplate/edit/process/addr_block/add.cgi | 20 ++ httemplate/edit/process/addr_block/allocate.cgi | 25 +++ httemplate/edit/process/addr_block/deallocate.cgi | 24 +++ httemplate/edit/process/addr_block/split.cgi | 19 ++ httemplate/edit/process/generic.cgi | 69 ++++++ httemplate/edit/process/router.cgi | 100 +++++++++ httemplate/edit/process/svc_broadband.cgi | 54 ++++- httemplate/edit/router.cgi | 88 ++++++++ httemplate/edit/svc_broadband.cgi | 251 ++++++++++------------ httemplate/index.html | 14 +- httemplate/view/svc_broadband.cgi | 62 ++++-- 17 files changed, 884 insertions(+), 181 deletions(-) create mode 100644 httemplate/browse/addr_block.cgi create mode 100644 httemplate/browse/generic.cgi create mode 100644 httemplate/browse/part_sb_field.cgi create mode 100644 httemplate/browse/router.cgi create mode 100644 httemplate/edit/part_router_field.cgi create mode 100644 httemplate/edit/part_sb_field.cgi create mode 100755 httemplate/edit/process/addr_block/add.cgi create mode 100755 httemplate/edit/process/addr_block/allocate.cgi create mode 100755 httemplate/edit/process/addr_block/deallocate.cgi create mode 100755 httemplate/edit/process/addr_block/split.cgi create mode 100644 httemplate/edit/process/generic.cgi create mode 100644 httemplate/edit/process/router.cgi create mode 100755 httemplate/edit/router.cgi (limited to 'httemplate') diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi new file mode 100644 index 000000000..06ac556cf --- /dev/null +++ b/httemplate/browse/addr_block.cgi @@ -0,0 +1,76 @@ +<%= header('Address Blocks', menubar('Main Menu' => $p)) %> +<% + +use NetAddr::IP; + +my @addr_block = qsearch('addr_block', {}); +my @router = qsearch('router', {}); +my $block; +my $p2 = popurl(2); +my $path = $p2 . "edit/process/addr_block"; + +%> + +<% if ($cgi->param('error')) { %> + Error: <%=$cgi->param('error')%> +

+<% } %> + +<%=table()%> + +<% foreach $block (sort {$a->NetAddr cmp $b->NetAddr} @addr_block) { %> + + <%=$block->NetAddr%> + <% if (my $router = $block->router) { %> + <% if (scalar($block->svc_broadband) == 0) { %> + + <%=$router->routername%> + + + + + <% } else { %> + + <%=$router->routername%> + + <% } %> + <% } else { %> + + + + + + + +<% } + } %> +
+ + + + + + + diff --git a/httemplate/browse/generic.cgi b/httemplate/browse/generic.cgi new file mode 100644 index 000000000..9ac0f2391 --- /dev/null +++ b/httemplate/browse/generic.cgi @@ -0,0 +1,46 @@ +<% + +use FS::Record qw(qsearch dbdef); +use DBIx::DBSchema; +use DBIx::DBSchema::Table; + +my $error; +my $p2 = popurl(2); +my ($table) = $cgi->keywords; +my $dbdef = dbdef or die "Cannot fetch dbdef!"; +my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table"; + +my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table"; +print header("Browse $table", menubar('Main Menu' => $p)); + +my @rec = qsearch($table, {}); +my @col = $dbdef_table->columns; + +if ($cgi->param('error')) { %> + Error: <%=$cgi->param('error')%> +

+<% } +%> +Add a new <%=$table%>

+ +<%=table()%> + +<% foreach (grep { $_ ne $pkey } @col) { + %><%=$_%> + <% } %> + +<% foreach $rec (sort {$a->getfield($pkey) cmp $b->getfield($pkey) } @rec) { + %> + + + + <%=$rec->getfield($pkey)%> <% + foreach $col (grep { $_ ne $pkey } @col) { %> + <%=$rec->getfield($col)%> <% } %> + + +<% } %> + + + + diff --git a/httemplate/browse/part_sb_field.cgi b/httemplate/browse/part_sb_field.cgi new file mode 100644 index 000000000..4c9641e86 --- /dev/null +++ b/httemplate/browse/part_sb_field.cgi @@ -0,0 +1,31 @@ +<%= header('svc_broadband extended fields', menubar('Main Menu' => $p)) %> +<% + +my @psf = qsearch('part_sb_field', {}); +my $block; +my $p2 = popurl(2); + +%> + +<% if ($cgi->param('error')) { %> + Error: <%=$cgi->param('error')%> +

+<% } %> + +Add a new field

+ +<%=table()%> +Field nameService type +<% foreach $psf (sort {$a->name cmp $b->name} @psf) { %> + + + + + <%=$psf->name%> + <%=$psf->part_svc->svc%> + +<% } %> + + + + diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi new file mode 100644 index 000000000..8864936d9 --- /dev/null +++ b/httemplate/browse/router.cgi @@ -0,0 +1,37 @@ +<%= header('Routers', menubar('Main Menu' => $p)) %> +<% + +my @router = qsearch('router', {}); +my $p2 = popurl(2); + +%> + +<% if ($cgi->param('error')) { %> + Error: <%=$cgi->param('error')%> +

+<% } %> + +Add a new router

+ +<%=table()%> + +<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) { %> + + + + <%=$router->routername%> + + + +<% } %> + + + + diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi new file mode 100644 index 000000000..c3e99be2c --- /dev/null +++ b/httemplate/edit/part_router_field.cgi @@ -0,0 +1,70 @@ + +<% +my ($routerfieldpart, $part_router_field); + +if ( $cgi->param('error') ) { + $part_router_field = new FS::part_router_field ( { + map { $_, scalar($cgi->param($_)) } fields('part_router_field')}); + $routerfieldpart = $part_router_field->routerfieldpart; +} else { + my($query) = $cgi->keywords; + if ( $query =~ /^(\d+)$/ ) { #editing + $routerfieldpart=$1; + $part_router_field=qsearchs('part_router_field', + {'routerfieldpart' => $routerfieldpart}) + or die "Unknown routerfieldpart!"; + + } else { #adding + $part_router_field = new FS::part_router_field({}); + } +} +my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add'; + +my $p1 = popurl(1); +print header("$action Router Extended Field Definition", ''); + +print qq!Error: !, $cgi->param('error'), + "" + if $cgi->param('error'); +%> + + +

+If you don't understand what check_block and +list_source mean, LEAVE THEM BLANK. We mean it. + + + + diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi new file mode 100644 index 000000000..9e0cc9e4f --- /dev/null +++ b/httemplate/edit/part_sb_field.cgi @@ -0,0 +1,79 @@ + +<% +my ($sbfieldpart, $part_sb_field); + +if ( $cgi->param('error') ) { + $part_sb_field = new FS::part_sb_field ( { + map { $_, scalar($cgi->param($_)) } fields('part_sb_field')}); + $sbfieldpart = $part_sb_field->sbfieldpart; +} else { + my($query) = $cgi->keywords; + if ( $query =~ /^(\d+)$/ ) { #editing + $sbfieldpart=$1; + $part_sb_field=qsearchs('part_sb_field', + {'sbfieldpart' => $sbfieldpart}) + or die "Unknown sbfieldpart!"; + + } else { #adding + $part_sb_field = new FS::part_sb_field({}); + } +} +my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add'; + +my $p1 = popurl(1); +print header("$action svc_broadband Extended Field Definition", ''); + +print qq!Error: !, $cgi->param('error'), + "" + if $cgi->param('error'); +%> + + +

+If you don't understand what check_block and +list_source mean, LEAVE THEM BLANK. We mean it. + + + + diff --git a/httemplate/edit/process/addr_block/add.cgi b/httemplate/edit/process/addr_block/add.cgi new file mode 100755 index 000000000..34d799ccd --- /dev/null +++ b/httemplate/edit/process/addr_block/add.cgi @@ -0,0 +1,20 @@ +<% + +my $error = ''; +my $ip_gateway = $cgi->param('ip_gateway'); +my $ip_netmask = $cgi->param('ip_netmask'); + +my $new = new FS::addr_block { + ip_gateway => $ip_gateway, + ip_netmask => $ip_netmask, + routernum => 0 }; + +$error = $new->insert; + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string ); +} else { + print $cgi->redirect(popurl(4). "browse/addr_block.cgi"); +} +%> diff --git a/httemplate/edit/process/addr_block/allocate.cgi b/httemplate/edit/process/addr_block/allocate.cgi new file mode 100755 index 000000000..85b0d7a7a --- /dev/null +++ b/httemplate/edit/process/addr_block/allocate.cgi @@ -0,0 +1,25 @@ +<% +my $error = ''; +my $blocknum = $cgi->param('blocknum'); +my $routernum = $cgi->param('routernum'); + +my $addr_block = qsearchs('addr_block', { blocknum => $blocknum }); +my $router = qsearchs('router', { routernum => $routernum }); + +if($addr_block) { + if ($router) { + $error = $addr_block->allocate($router); + } else { + $error = "Cannot find router with routernum $routernum"; + } +} else { + $error = "Cannot find block with blocknum $blocknum"; +} + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string); +} else { + print $cgi->redirect(popurl(4). "browse/addr_block.cgi"); +} +%> diff --git a/httemplate/edit/process/addr_block/deallocate.cgi b/httemplate/edit/process/addr_block/deallocate.cgi new file mode 100755 index 000000000..cfb7ed04d --- /dev/null +++ b/httemplate/edit/process/addr_block/deallocate.cgi @@ -0,0 +1,24 @@ +<% +my $error = ''; +my $blocknum = $cgi->param('blocknum'); + +my $addr_block = qsearchs('addr_block', { blocknum => $blocknum }); + +if($addr_block) { + my $router = $addr_block->router; + if ($router) { + $error = $addr_block->deallocate($router); + } else { + $error = "Block is not allocated to a router"; + } +} else { + $error = "Cannot find block with blocknum $blocknum"; +} + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(4). "browse/addr_block.cgi?" . $cgi->query_string); +} else { + print $cgi->redirect(popurl(4). "browse/addr_block.cgi"); +} +%> diff --git a/httemplate/edit/process/addr_block/split.cgi b/httemplate/edit/process/addr_block/split.cgi new file mode 100755 index 000000000..bb6d4ba3e --- /dev/null +++ b/httemplate/edit/process/addr_block/split.cgi @@ -0,0 +1,19 @@ +<% +my $error = ''; +my $blocknum = $cgi->param('blocknum'); +my $addr_block = qsearchs('addr_block', { blocknum => $blocknum }); + +if ( $addr_block) { + $error = $addr_block->split_block; +} else { + $error = "Unknown blocknum: $blocknum"; +} + + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(4). "browse/addr_block.cgi?". $cgi->query_string ); +} else { + print $cgi->redirect(popurl(4). "browse/addr_block.cgi"); +} +%> diff --git a/httemplate/edit/process/generic.cgi b/httemplate/edit/process/generic.cgi new file mode 100644 index 000000000..751987f7a --- /dev/null +++ b/httemplate/edit/process/generic.cgi @@ -0,0 +1,69 @@ +<% + +# Welcome to generic.cgi. +# +# This script provides a generic edit/process/ backend for simple table +# editing. All it knows how to do is take the values entered into +# the script and insert them into the table specified by $cgi->param('table'). +# If there's an existing record with the same primary key, it will be +# replaced. (Deletion will be added in the future.) +# +# Special cgi params for this script: +# table: the name of the table to be edited. The script will die horribly +# if it can't find the table. +# redirect_ok: URL to be displayed after a successful edit. The value of +# the record's primary key will be passed as a keyword. +# Defaults to (freeside root)/view/$table.cgi. +# redirect_error: URL to be displayed if there's an error. The original +# query string, plus the error message, will be passed. +# Defaults to $cgi->referer() (i.e. go back where you +# came from). + + +use FS::Record qw(qsearchs dbdef); +use DBIx::DBSchema; +use DBIx::DBSchema::Table; + + +my $error; +my $p2 = popurl(2); +my $table = $cgi->param('table'); +my $dbdef = dbdef or die "Cannot fetch dbdef!"; + +my $dbdef_table = $dbdef->table($table) or die "Cannot fetch schema for $table"; + +my $pkey = $dbdef_table->primary_key or die "Cannot fetch pkey for $table"; +my $pkey_val = $cgi->param($pkey); + + +#warn "new FS::Record ( $table, (hashref) )"; +my $new = FS::Record::new ( "FS::$table", { + map { $_, scalar($cgi->param($_)) } fields($table) +} ); + +#warn 'created $new of class '.ref($new); + +if($pkey_val and (my $old = qsearchs($table, { $pkey, $pkey_val} ))) { + # edit + $error = $new->replace($old); +} else { + #add + $error = $new->insert; + $pkey_val = $new->getfield($pkey); + # New records usually don't have their primary keys set until after + # they've been checked/inserted, so grab the new $pkey_val so we can + # redirect to it. +} + +my $redirect_ok = (($cgi->param('redirect_ok')) ? + $cgi->param('redirect_ok') : $p2."view/$table.cgi"); +my $redirect_error = (($cgi->param('redirect_error')) ? + $cgi->param('redirect_error') : $cgi->referer()); + +if($error) { + $cgi->param('error', $error); + print $cgi->redirect($redirect_error . '?' . $cgi->query_string); +} else { + print $cgi->redirect($redirect_ok . '?' .$pkey_val); +} +%> diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi new file mode 100644 index 000000000..c0cb884f0 --- /dev/null +++ b/httemplate/edit/process/router.cgi @@ -0,0 +1,100 @@ +<% + +use FS::UID qw(dbh); + +my $dbh = dbh; +local $FS::UID::AutoCommit=0; + +sub check { + my $error = shift; + if($error) { + $cgi->param('error', $error); + print $cgi->redirect(popurl(3) . "edit/router.cgi?". $cgi->query_string); + $dbh->rollback; + exit; + } +} + +my $error = ''; +my $routernum = $cgi->param('routernum'); +my $routername = $cgi->param('routername'); +my $old = qsearchs('router', { routernum => $routernum }); +my @old_rf; +my @old_psr; + +my $new = new FS::router { + routernum => $routernum, + routername => $routername, + svcnum => 0 + }; + +if($old) { + if($old->routername ne $new->routername) { + $error = $new->replace($old); + } #else do nothing +} else { + $error = $new->insert; +} + +check($error); + +if ($old) { + @old_psr = $old->part_svc_router; + foreach $psr (@old_psr) { + if($cgi->param('svcpart_'.$psr->svcpart) eq 'ON') { + # do nothing + } else { + $error = $psr->delete; + } + } + check($error); + @old_rf = $old->router_field; + foreach $rf (@old_rf) { + if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) { + if($new_val ne $rf->value) { + my $new_rf = new FS::router_field + { routernum => $routernum, + value => $new_val, + routerfieldpart => $rf->routerfieldpart }; + $error = $new_rf->replace($rf); + } #else do nothing + } else { + $error = $rf->delete; + } + check($error); + } +} + +foreach($cgi->param) { + if($cgi->param($_) eq 'ON' and /^svcpart_(\d+)$/) { + my $svcpart = $1; + if(grep {$_->svcpart == $svcpart} @old_psr) { + # do nothing + } else { + my $new_psr = new FS::part_svc_router { svcpart => $svcpart, + routernum => $routernum }; + $error = $new_psr->insert; + } + check($error); + } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) { + my $part = $1; + if(my @x = grep {$_->routerfieldpart == $part} @old_rf) { + # already handled all of these + } else { + my $new_rf = new FS::router_field + { routernum => $routernum, + value => $cgi->param('rf_'.$part), + routerfieldpart => $part }; + $error = $new_rf->insert; + check($error); + } + } +} + + + +# Yay, everything worked! +$dbh->commit or die $dbh->errstr; +print $cgi->redirect(popurl(3). "edit/router.cgi?$routernum"); + +%> diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi index fd7ba20d5..ab8b9f9d8 100644 --- a/httemplate/edit/process/svc_broadband.cgi +++ b/httemplate/edit/process/svc_broadband.cgi @@ -1,12 +1,19 @@ <% +# If it's stupid but it works, it's not stupid. +# -- U.S. Army + +local $FS::UID::AutoCommit = 0; +my $dbh = FS::UID::dbh; + $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!"; my $svcnum = $1; -my $old; +my $old; my @old_sbf; if ( $svcnum ) { $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } ) or die "fatal: can't find broadband service (svcnum $svcnum)!"; + @old_sbf = $old->sb_field; } else { $old = ''; } @@ -17,14 +24,6 @@ my $new = new FS::svc_broadband ( { } ( fields('svc_broadband'), qw( pkgnum svcpart ) ) } ); -unless ( $new->ip_addr ) { - $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d)))); -} - -unless ( $new->mac_addr) { - $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f)))); -} - my $error; if ( $svcnum ) { $error = $new->replace($old); @@ -33,12 +32,47 @@ if ( $svcnum ) { $svcnum = $new->svcnum; } +unless ($error) { + my $sb_field; + + foreach ($cgi->param) { + #warn "\$cgi->param $_: " . $cgi->param($_); + if(/^sbf_(\d+)/) { + my $part = $1; + #warn "\$part $part"; + $sb_field = new FS::sb_field + { svcnum => $svcnum, + value => $cgi->param($_), + sbfieldpart => $part }; + if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) { + #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) { + #warn "array: " . scalar(@x); + if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { + #warn "replacing " . $x[0]->value . " with " . $sb_field->value; + $error = $sb_field->replace($x[0]); + #$error = $sb_field->replace($old_sb_field); + } elsif (length($sb_field->value) == 0) { + #warn "delete"; + $error = $x[0]->delete; + } + } else { + if (length($sb_field->value) > 0) { + #warn "insert"; + $error = $sb_field->insert; + } + # else do nothing + } + } + } +} + if ( $error ) { $cgi->param('error', $error); $cgi->param('ip_addr', $new->ip_addr); - $cgi->param('mac_addr', $new->mac_addr); + $dbh->rollback; print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string ); } else { + $dbh->commit or die $dbh->errstr; print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum ); } diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi new file mode 100755 index 000000000..d2279ff00 --- /dev/null +++ b/httemplate/edit/router.cgi @@ -0,0 +1,88 @@ + + +<% + +my $router; +if ( $cgi->keywords ) { + my($query) = $cgi->keywords; + $query =~ /^(\d+)$/; + $router = qsearchs('router', { routernum => $1 }) + or print $cgi->redirect(popurl(2)."browse/router.cgi") ; +} else { + $router = new FS::router ( { + map { $_, scalar($cgi->param($_)) } fields('router') + } ); +} + +my $routernum = $router->routernum; +my $action = $routernum ? 'Edit' : 'Add'; +my $hashref = $router->hashref; + +print header("$action Router", menubar( + 'Main Menu' => "$p", + 'View all routers' => "${p}browse/router.cgi", +)); + +if($cgi->param('error')) { +%> Error: <%=$cgi->param('error')%> +<% } %> + +

+ + Router #<%=$routernum or "(NEW)"%> + +

Name +<%=table() %> + +<% +# I know, I know. Massive false laziness with edit/svc_broadband.cgi. But +# Kristian won't let me generalize the custom field mechanism to every table in +# the database, so this is what we get. +# -- MW + +my @part_router_field = qsearch('part_router_field', { }); +my %rf = map { $_->part_router_field->name, $_->value } $router->router_field; +foreach (sort { $a->name cmp $b->name } @part_router_field) { + %> + + <%=$_->name%> + <% + if(my @opts = $_->list_values) { + %> + <% } else { %> + length ? 'SIZE="'.$_->length.'"' : ''%>> + <% } %> + +<% } %> + + + + +

Select the service types available on this router
+<% + +foreach my $part_svc ( qsearch('part_svc', { svcdb => 'svc_broadband', + disabled => '' }) ) { + %> +
+ $part_svc->svcpart, + routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON"> + + <%=$part_svc->svcpart%>: <%=$part_svc->svc%> + <% } %> + +

+ + + diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi index d8a1f7a2a..f017d7a6e 100644 --- a/httemplate/edit/svc_broadband.cgi +++ b/httemplate/edit/svc_broadband.cgi @@ -1,6 +1,13 @@ <% +# If it's stupid but it works, it's still stupid. +# -Kristian + + +use HTML::Widgets::SelectLayers; +use Tie::IxHash; + my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_broadband ); if ( $cgi->param('error') ) { $svc_broadband = new FS::svc_broadband ( { @@ -38,6 +45,8 @@ if ( $cgi->param('error') ) { $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; + $svc_broadband->setfield('svcpart', $svcpart); + $svcnum=''; #set fixed and default fields from part_svc @@ -53,12 +62,9 @@ if ( $cgi->param('error') ) { } my $action = $svc_broadband->svcnum ? 'Edit' : 'Add'; -my @ac_list; - if ($pkgnum) { - unless ($svc_broadband->actypenum) {die "actypenum must be set fixed";}; - @ac_list = qsearch('ac', { actypenum => $svc_broadband->getfield('actypenum') }); + #Nothing? } elsif ( $action eq 'Edit' ) { @@ -68,152 +74,111 @@ if ($pkgnum) { die "\$action eq Add, but \$pkgnum is null!\n"; } - my $p1 = popurl(1); -print header("Broadband Service $action", ''); - -print qq!Error: !, $cgi->param('error'), - "" - if $cgi->param('error'); - -print qq!

!; - -#display - - - -#svcnum -print qq!!; -print qq!Service #!, $svcnum ? $svcnum : "(NEW)", "

"; - -#pkgnum -print qq!!; - -#svcpart -print qq!!; - -#actypenum -print ''; - - -print &ntable("#cccccc",2) . qq!AC!; - -#acnum -if (( $part_svc->part_svc_column('acnum')->columnflag eq 'F' ) or - ( !$pkgnum )) { - - my $ac = qsearchs('ac', { acnum => $svc_broadband->acnum }); - my ($acnum, $acname) = ($ac->acnum, $ac->acname); - - print qq!! . - qq!${acnum}: ${acname}!; - -} else { - - my @ac_list = qsearch('ac', { actypenum => $svc_broadband->actypenum }); - print qq!! . - qq!${speed_down}Kbps!; -} else { - print qq!! . - qq!Kbps!; -} - -print 'Upload speed'; -if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { - print qq!! . - qq!${speed_up}Kbps!; -} else { - print qq!! . - qq!Kbps!; -} +my ($ip_addr, $speed_up, $speed_down, $blocknum) = + ($svc_broadband->ip_addr, + $svc_broadband->speed_up, + $svc_broadband->speed_down, + $svc_broadband->blocknum); -#ip_addr & ip_netmask -#We're assuming that ip_netmask is fixed if ip_addr is fixed. -#If it isn't, well, what the heck are you doing!?!? - -my ($ip_addr, $ip_netmask) = ($svc_broadband->ip_addr, - $svc_broadband->ip_netmask); - -print 'IP address/Mask'; -if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) { - print qq!! . - qq!! . - qq!${ip_addr}/${ip_netmask}!; -} else { - $ip_addr =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/; - print <. - . - . - / - - - -

Leave the IP address and netmask blank for automatic assignment of a /32 address. Specifing the netmask and not the address will force assignment of a larger block.

- -END -} - -#mac_addr -my $mac_addr = $svc_broadband->mac_addr; - -unless (( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) and - ( $mac_addr eq '' )) { - print 'MAC Address'; - if ( $part_svc->part_svc_column('mac_addr')->columnflag eq 'F' ) { #Why? - print qq!! . - qq!${mac_addr}!; - } else { - #Ewwww - $mac_addr =~ /^([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2}):([a-f0-9]{2})$/i; - print <: - : - : - : - : - - -END +%> +<%=header("Broadband Service $action", '')%> + +<% if ($cgi->param('error')) { %> +Error: <%=$cgi->param('error')%>
+<% } %> + +Service #<%=$svcnum ? $svcnum : "(NEW)"%>

+ + + + + + + + <%=&ntable("#cccccc",2)%> + + + Download speed + +<% if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) { %> + <%=$speed_down%>Kbps +<% } else { %> + Kbps +<% } %> + + + + Upload speed + +<% if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { %> + <%=$speed_up%>Kbps +<% } else { %> + Kbps +<% } %> + + +<% if ($action eq 'Add') { %> + + Router/Block + + + + +<% } else { %> -print 'Location'; -if ( $part_svc->part_svc_column('location')->columnflag eq 'F' ) { - print qq!

${location}

!; -} else { - print qq!!; -} + + Router/Block + + <%=$svc_broadband->addr_block->router->routername%>:<%=$svc_broadband->addr_block->NetAddr%> + + + -print '
'; +<% } %> -print < - + my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart }); + my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart); + foreach (sort { $a->name cmp $b->name } @part_sb_field) { + %> + + <%=$_->name%> + <% + if(my @opts = $_->list_values) { + %> + + <% } else { %> + length ? 'SIZE="'.$_->length.'"' : ''%>> + <% } %> + + +<% } %> + +
+ + + -END -%> + diff --git a/httemplate/index.html b/httemplate/index.html index e8c3681b4..d13649b07 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -194,12 +194,16 @@ into counties and assign different tax rates to each.

View/Edit Access Numbers - Points of Presence -

View/Edit AC Types - - Broadband service access concentrator types. -

View/Edit AC - - Broadband service access concentrators.

View/Edit invoice events - Actions for overdue invoices -

View/Edit message catalog - Change error messages and other customizable labels. +

View/Edit custom svc_broadband fields + - Custom broadband service fields for site-specific export/informational data. +

View/Edit custom router fields + - Custom router fields for site-specific export data. +

View/Edit routers + - Broadband access routers +

View/Edit address blocks + - Manage address blocks and block assignments to broadband routers.
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi index 156edfaec..164b5b22c 100644 --- a/httemplate/view/svc_broadband.cgi +++ b/httemplate/view/svc_broadband.cgi @@ -20,28 +20,26 @@ if ($pkgnum) { } #eofalse -my $ac = qsearchs('ac', { acnum => $svc_broadband->getfield('acnum') }); +my $router = $svc_broadband->addr_block->router; + +if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" }; my ( - $acname, - $acnum, + $routername, + $routernum, $speed_down, $speed_up, - $ip_addr, - $ip_netmask, - $mac_addr, - $location + $ip_addr ) = ( - $ac->getfield('acname'), - $ac->getfield('acnum'), + $router->getfield('routername'), + $router->getfield('routernum'), $svc_broadband->getfield('speed_down'), $svc_broadband->getfield('speed_up'), - $svc_broadband->getfield('ip_addr'), - $svc_broadband->getfield('ip_netmask'), - $svc_broadband->getfield('mac_addr'), - $svc_broadband->getfield('location') + $svc_broadband->getfield('ip_addr') ); + + print header('Broadband Service View', menubar( ( ( $custnum ) ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum", @@ -56,20 +54,38 @@ print header('Broadband Service View', menubar( ntable("#cccccc"). ''. ntable("#cccccc",2). qq!Service number!. qq!$svcnum!. - qq!AC!. - qq!$acnum: $acname!. + qq!Router!. + qq!$routernum: $routername!. qq!Download Speed!. qq!$speed_down!. qq!Upload Speed!. qq!$speed_up!. - qq!IP Address/Mask!. - qq!$ip_addr/$ip_netmask!. - qq!MAC Address!. - qq!$mac_addr!. - qq!Location!. - qq!

$location

!. - ''. - '
'. joblisting({'svcnum'=>$svcnum}, 1). + qq!IP Address!. + qq!$ip_addr!. + ''; + + +# foreach my $sb_field +# ( qsearch('sb_field', { svcnum => $svcnum }) ) { +# my $part_sb_field = qsearchs('part_sb_field', +# { sbfieldpart => $sb_field->sbfieldpart }); +# print q!! . $part_sb_field->name . +# q!! . $sb_field->value . +# q!!; +# } +# print ''; + + + my $sb_field = $svc_broadband->sb_field_hashref; + foreach (sort { $a cmp $b } keys(%{$sb_field})) { + print q!! . $_ . + q!! . $sb_field->{$_} . + q!!; + } + print ''; + + +print '
'. joblisting({'svcnum'=>$svcnum}, 1). '' ; %> -- cgit v1.2.1