From 5b48183ad64fb7ea119c994ed1a921fcda4a0f9d Mon Sep 17 00:00:00 2001 From: khoff Date: Mon, 7 Jul 2003 22:44:40 +0000 Subject: Various virtual field UI updates/bug fixes. Fixed ordered qsearches. --- FS/FS/Record.pm | 6 ++++-- FS/bin/freeside-setup | 28 +++++++++++++++++++++++++- httemplate/browse/part_svc.cgi | 10 ++++++---- httemplate/browse/router.cgi | 25 ++++++++++++----------- httemplate/edit/part_svc.cgi | 21 ++++++++++++++------ httemplate/edit/router.cgi | 42 ++++++++++----------------------------- httemplate/edit/svc_acct.cgi | 12 +++++++++-- httemplate/edit/svc_broadband.cgi | 34 +++++++------------------------ httemplate/edit/svc_www.cgi | 12 +++++++++-- httemplate/index.html | 8 +++----- httemplate/view/svc_acct.cgi | 23 ++++++++++++++++++--- httemplate/view/svc_broadband.cgi | 5 +++++ httemplate/view/svc_forward.cgi | 9 ++++++++- httemplate/view/svc_www.cgi | 11 ++++++++-- 14 files changed, 147 insertions(+), 99 deletions(-) diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 8f31c204a..f0da22798 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -326,12 +326,14 @@ sub qsearch { my %result; tie %result, "Tie::IxHash"; @virtual_fields = "FS::$table"->virtual_fields; + + my @stuff = @{ $sth->fetchall_arrayref( {} ) }; if($pkey) { - %result = %{ $sth->fetchall_hashref( $pkey ) }; + %result = map { $_->{$pkey}, $_ } @stuff; } else { - my @stuff = @{ $sth->fetchall_arrayref( {} ) }; @result{@stuff} = @stuff; } + $sth->finish; if ( keys(%result) and @virtual_fields ) { $statement = diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup index 734744efe..a5cfc167a 100755 --- a/FS/bin/freeside-setup +++ b/FS/bin/freeside-setup @@ -1031,7 +1031,7 @@ sub tables_hash_hack { 'columns' => [ 'routernum', 'serial', '', '', 'routername', 'varchar', '', $char_d, - 'svcnum', 'int', '0', '', + 'svcnum', 'int', 'NULL', '', ], 'primary_key' => 'routernum', 'unique' => [], @@ -1122,6 +1122,32 @@ sub tables_hash_hack { 'index' => [], }, + 'part_virtual_field' => { + 'columns' => [ + 'vfieldpart', 'int', '', '', + 'dbtable', 'varchar', '', 32, + 'name', 'varchar', '', 32, + 'check_block', 'text', 'NULL', '', + 'length', 'int', 'NULL', '', + 'list_source', 'text', 'NULL', '', + 'label', 'varchar', 'NULL', 80, + ], + 'primary_key' => 'vfieldpart', + 'unique' => [], + 'index' => [], + }, + + 'virtual_field' => { + 'columns' => [ + 'recnum', 'int', '', '', + 'vfieldpart', 'int', '', '', + 'value', 'varchar', '', 128, + ], + 'primary_key' => '', + 'unique' => [ [ 'vfieldpart', 'recnum' ] ], + 'index' => [], + }, + ); %tables; diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index ee7a2622a..56021798f 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -53,12 +53,13 @@ function part_export_areyousure(href) { <% foreach my $part_svc ( @part_svc ) { my $hashref = $part_svc->hashref; my $svcdb = $hashref->{svcdb}; - my @dfields = fields($svcdb); + my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } ); + my @dfields = $svc_x->fields; push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge my @fields = - grep { $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag } - @dfields; - + grep { $svc_x->pvf($_) + or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag } + @dfields ; my $rowspan = scalar(@fields) || 1; my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}"; %> @@ -96,6 +97,7 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export <% if ( $flag eq "D" ) { print "Default"; } elsif ( $flag eq "F" ) { print "Fixed"; } + elsif ( not $flag ) { } else { print "(Unknown!)"; } %> <%= $part_svc->part_svc_column($field)->columnvalue%> diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi index 8864936d9..a9ec6fd61 100644 --- a/httemplate/browse/router.cgi +++ b/httemplate/browse/router.cgi @@ -14,21 +14,22 @@ my $p2 = popurl(2); Add a new router

<%=table()%> - -<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) { %> - - + Router name + Address block(s) + +<% foreach $router (sort {$a->routernum <=> $b->routernum} @router) { + my @addr_block = $router->addr_block; +%> + + <%=$router->routername%> - + + <% foreach my $block ( @addr_block ) { %> + <%=$block->NetAddr%>
+ <% } %> + <% } %> diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index d1a726fdc..45e0b6ffe 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -65,6 +65,9 @@ blank slipip as well as a fixed shell something like /bin/true or

<% + +my %vfields; + #these might belong somewhere else for other user interfaces #pry need to eventually create stuff that's shared amount UIs my %defs = ( @@ -130,6 +133,7 @@ my %defs = ( foreach $svcdb (keys(%defs)) { my $self = "FS::$svcdb"->new; + $vfields{$svcdb} = {}; foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them my $pvf = $self->pvf($field); my @list = $pvf->list; @@ -138,13 +142,13 @@ my %defs = ( type => 'select', select_list => \@list }; } else { - warn "$field"; $defs{$svcdb}->{$field} = $pvf->label; } #endif + $vfields{$svcdb}->{$field} = $pvf; + warn "\$vfields{$svcdb}->{$field} = $pvf"; } #next $field } #next $svcdb - - + my @dbs = $hashref->{svcdb} ? ( $hashref->{svcdb} ) : qw( svc_acct svc_domain svc_forward svc_www svc_broadband ); @@ -170,7 +174,7 @@ my %defs = ( $html .= '

'. table(). table(). "Exports"; foreach my $part_export ( @part_export ) { - $html .= 'svcpart ) #null svcpart search causing error @@ -215,8 +219,8 @@ my %defs = ( qq!Default ". qq!Fixed ". - '
'; + ' CHECKED'x($flag eq 'F'). ">Fixed "; + $html .= '
'; } if ( ref($def) ) { if ( $def->{type} eq 'select' ) { @@ -250,6 +254,11 @@ my %defs = ( $html .= qq!!; } + + if($vfields{$layer}->{$field}) { + $html .= qq!
Excluded "; + } $html .= "\n"; } $part_svc->svcpart('') if $clone; #undone diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi index b524c6494..de0fa6dbe 100755 --- a/httemplate/edit/router.cgi +++ b/httemplate/edit/router.cgi @@ -16,7 +16,6 @@ if ( $cgi->keywords ) { my $routernum = $router->routernum; my $action = $routernum ? 'Edit' : 'Add'; -my $hashref = $router->hashref; print header("$action Router", menubar( 'Main Menu' => "$p", @@ -27,11 +26,14 @@ if($cgi->param('error')) { %> Error: <%=$cgi->param('error')%> <% } %> -
+ + + + Router #<%=$routernum or "(NEW)"%> -

Name +

Name

Custom fields: @@ -39,35 +41,11 @@ Custom fields: <%=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.'"' : ''%>> - <% } %> - -<% } %> +foreach my $field ($router->virtual_fields) { + print $router->pvf($field)->widget('HTML', 'edit', + $router->getfield($field)); +} +%> diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 4420bb609..44606d9a0 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -35,8 +35,6 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_acct = new FS::svc_acct({}); - foreach $_ (split(/-/,$query)) { $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; @@ -44,6 +42,8 @@ if ( $cgi->param('error') ) { $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); die "No part_svc entry for svcpart $svcpart!" unless $part_svc; + $svc_acct = new FS::svc_acct({svcpart => $svcpart}); + $svcnum=''; #set gecos @@ -281,6 +281,14 @@ if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) { } print ''; +foreach $field ($svc_acct->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + # If the flag is X, it won't even show up in $svc_acct->virtual_fields. + print $svc_acct->pvf($field)->widget('HTML', 'edit', + $svc_acct->getfield($field)); + } +} + #submit print qq!
!; diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi index ee7f8becf..6828791c0 100644 --- a/httemplate/edit/svc_broadband.cgi +++ b/httemplate/edit/svc_broadband.cgi @@ -36,8 +36,6 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_broadband = new FS::svc_broadband({}); - foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; @@ -45,7 +43,7 @@ if ( $cgi->param('error') ) { $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; - $svc_broadband->setfield('svcpart', $svcpart); + $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart }); $svcnum=''; @@ -159,30 +157,12 @@ Service #<%=$svcnum ? $svcnum : "(NEW)"%>

<% } %> <% - - 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.'"' : ''%>> - <% } %> - - -<% } %> +foreach $field ($svc_broadband->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + print $svc_broadband->pvf($field)->widget('HTML', 'edit', + $svc_broadband->getfield($field)); + } +} %>
diff --git a/httemplate/edit/svc_www.cgi b/httemplate/edit/svc_www.cgi index d2c9ade5c..043af610b 100644 --- a/httemplate/edit/svc_www.cgi +++ b/httemplate/edit/svc_www.cgi @@ -29,12 +29,12 @@ if ( $cgi->param('error') ) { } else { #adding - $svc_www = new FS::svc_www({}); - foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart $pkgnum=$1 if /^pkgnum(\d+)$/; $svcpart=$1 if /^svcpart(\d+)$/; } + $svc_www = new FS::svc_www { svcpart => $svcpart }; + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; @@ -167,6 +167,14 @@ foreach $_ (keys %username) { } print ""; +foreach $field ($svc_www->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + # If the flag is X, it won't even show up in $svc_acct->virtual_fields. + print $svc_www->pvf($field)->widget('HTML', 'edit', + $svc_www->getfield($field)); + } +} + print '
'; print < freeside main menu - version %%%VERSION%%% + version 1.5.0pre2
Freeside home page
Documentation @@ -196,10 +196,8 @@ - Points of Presence
  • 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 virtual fields + - Locally defined fields
  • View/Edit routers - Broadband access routers
  • View/Edit address blocks diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 599c1d8b9..83cea05f7 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -172,7 +172,7 @@ if ($svc_acct->slipip) { : $svc_acct->slipip ). ""; my($attribute); - foreach $attribute ( grep /^radius_/, fields('svc_acct') ) { + foreach $attribute ( grep /^radius_/, $svc_acct->fields ) { #warn $attribute; $attribute =~ /^radius_(.*)$/; my $pattribute = $FS::raddb::attrib{$1}; @@ -180,7 +180,7 @@ if ($svc_acct->slipip) { "". $svc_acct->getfield($attribute). ""; } - foreach $attribute ( grep /^rc_/, fields('svc_acct') ) { + foreach $attribute ( grep /^rc_/, $svc_acct->fields ) { #warn $attribute; $attribute =~ /^rc_(.*)$/; my $pattribute = $FS::raddb::attrib{$1}; @@ -195,7 +195,24 @@ if ($svc_acct->slipip) { print 'RADIUS groups'. join('
    ', $svc_acct->radius_groups). ''; -print '

    '; +# Can this be abstracted further? Maybe a library function like +# widget('HTML', 'view', $svc_acct) ? It would definitely make UI +# style management easier. + +foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { + print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)), + "\n"; +} +%> + +<% +foreach (sort { $a cmp $b } keys(%{$sb_field})) { + print q!! . $_ . + q!! . $sb_field->{$_} . + q!!; +} + +print '

    '; print join("\n", $conf->config('svc_acct-notes') ). '

    '. joblisting({'svcnum'=>$svcnum}, 1). ''; diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi index 164b5b22c..dd5997d92 100644 --- a/httemplate/view/svc_broadband.cgi +++ b/httemplate/view/svc_broadband.cgi @@ -64,6 +64,11 @@ print header('Broadband Service View', menubar( qq!$ip_addr!. ''; +foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) { + print $svc_broadband->pvf($_)->widget('HTML', 'view', + $svc_broadband->getfield($_)), "\n"; +} + # foreach my $sb_field # ( qsearch('sb_field', { svcnum => $svcnum }) ) { diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi index c8d1d6213..5d619de54 100755 --- a/httemplate/view/svc_forward.cgi +++ b/httemplate/view/svc_forward.cgi @@ -61,7 +61,14 @@ print qq!Edit this information!. qq!Email to!. qq!$source!. qq!Forwards to !. - qq!$destination!. + qq!$destination!; + +foreach (sort { $a cmp $b } $svc_forward->virtual_fields) { + print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)), + "\n"; +} + +print qq! !. '
    '. joblisting({'svcnum'=>$svcnum}, 1). '' ; diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi index 442614491..7a716b4b8 100644 --- a/httemplate/view/svc_www.cgi +++ b/httemplate/view/svc_www.cgi @@ -47,8 +47,15 @@ print header('Website View', menubar( qq!Website name!. qq!$www!. qq!Account!. - qq!$email!. - ''. + qq!$email!; + +foreach (sort { $a cmp $b } $svc_www->virtual_fields) { + print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)), + "\n"; +} + + +print ''. '
    '. joblisting({'svcnum'=>$svcnum}, 1). '' ; -- cgit v1.2.1