X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Ftower.html;h=7f096a74865fde78b7a51230438ad5ee581c0670;hb=ccc2208b2b7d09a9b1671846bc76a060649e64a4;hp=660e92469fc8711fd8b169caafb18b0afe8b23e2;hpb=e6f7e02b32ebaa471230819d36a88f88b98bed6a;p=freeside.git
diff --git a/httemplate/browse/tower.html b/httemplate/browse/tower.html
index 660e92469..7f096a748 100644
--- a/httemplate/browse/tower.html
+++ b/httemplate/browse/tower.html
@@ -8,13 +8,12 @@
'count_query' => 'SELECT COUNT(*) FROM tower',
'disableable' => 1,
'disabled_statuspos' => 1,
- 'header' => [ 'Name', 'Sectors', ],
- 'fields' => [ 'towername',
+ 'header' => [ 'Name', 'Sectors', 'Coordinates'],
+ 'fields' => [ $tower_sub,
$sector_sub,
+ $coord_sub,
],
- 'links' => [ $link,
- '',
- ],
+ 'links' => [ ],
)
%>
<%init>
@@ -22,22 +21,82 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $link = [ "${p}edit/tower.html?", 'towernum' ];
+my $num_svc_links = sub {
+ my ($query_string, $sectors) = @_;
+ return if !$sectors;
+ my $num_svc_broadband = FS::svc_broadband->count("sectornum IN($sectors)");
+ my $num_svc_acct = FS::svc_acct->count("sectornum IN($sectors)");
-my $sector_sub = sub {
+ {
+ 'data' => $num_svc_broadband ?
+ ''.$num_svc_broadband.''.
+ ' broadband'
+ : '',
+ 'link' => $p.'search/svc_broadband.cgi?'.$query_string,
+ 'size' => '-1',
+ 'align'=> 'right',
+ 'colspan'=> 2,
+ },
+
+ {
+ 'data' => $num_svc_acct ?
+ ''.$num_svc_acct.''.
+ ' login'
+ : '',
+ 'link' => $p.'search/svc_acct.cgi?magic=advanced;'.$query_string,
+ 'size' => '-1',
+ 'align'=> 'right',
+ 'colspan'=> 2,
+ },
+};
+
+my $coord_sub = sub {
my $tower = shift;
-
- [ map {
- [
- { 'data' => $_->sectorname,
- 'link' => ( $_->ip_addr ? 'http://'. $_->ip_addr : '' ),
- },
- ],
+ my $coords = $m->scomp("/elements/coord-links.html", $tower->latitude, $tower->longitude, $tower->towername);
+
+ [
+ [
+ { 'data' => "Latitude: " . $tower->latitude . "
Longitude: " . $tower->longitude, },
+ { 'data' => $coords, 'link' => "Coordinates", },
+ ],
+ ]
+};
+
+my $tower_sub = sub {
+ my $tower = shift;
+ my $sectors = join(',',
+ map { $_->sectornum } $tower->tower_sector, $tower->default_sector
+ );
+ [ #rows
+ [
+ { 'data' => $tower->towername, },
+ { 'data' => ' (edit) ', size => '-1',
+ 'link' => $p.'edit/tower.html?' . $tower->towernum },
+ ],
+ # turn these into rows
+ map { [ $_ ] }
+ &{$num_svc_links}( 'towernum='.$tower->towernum, $sectors )
+ ] #rows
+};
- }
- $tower->tower_sector
- ];
+my $sector_sub = sub {
+ my $tower = shift;
+
+ [ #rows
+ map {
+ my $sector = $_;
+ my $sectornum = $sector->sectornum;
+ [
+ {
+ 'data' => $sector->sectorname,
+ 'link' => ( $sector->ip_addr ? 'http://'. $sector->ip_addr : '' ),
+ },
+
+ &{$num_svc_links}( 'sectornum='.$sectornum, $sectornum )
+ ]
+ } $tower->tower_sector
+ ] #rows
};