135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#478 rewrite wireless client count report which was bobbins

Browse Source
This commit is contained in:
Oliver Gorwits
2023-02-25 14:07:44 +00:00
parent 4e6f143dec
commit 252c9c7e66
2 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
View File

@@ -17,20 +17,18 @@ register_report(
get '/ajax/content/report/apclients' => require_login sub { get '/ajax/content/report/apclients' => require_login sub {
my @results = schema(vars->{'tenant'})->resultset('Device')->search( my @results = schema(vars->{'tenant'})->resultset('Device')->search(
{ 'nodes.time_last' => { '>=', \'me.last_macsuck' } }, { 'nodes.time_last' => { '>=', \'me.last_macsuck' },
{ select => [ 'ip', 'dns', 'name', 'model', 'location' ], 'ports.port' => { '-in' => schema(vars->{'tenant'})->resultset('DevicePortWireless')->get_column('port')->as_query },
join => { 'ports' => { 'ssid' => 'nodes' } }, },
{ select => [ 'ip', 'model', 'ports.port', 'ports.name', 'ports.type' ],
join => { 'ports' => 'nodes' },
'+columns' => [ '+columns' => [
{ 'port' => 'ports.port' },
{ 'description' => 'ports.name' },
{ 'ssid' => 'ssid.ssid' },
{ 'mac_count' => { count => 'nodes.mac' } }, { 'mac_count' => { count => 'nodes.mac' } },
], ],
group_by => [ group_by => [
'me.ip', 'me.dns', 'me.name', 'me.model', 'me.ip', 'me.model', 'ports.port', 'ports.name', 'ports.type',
'me.location', 'ports.port', 'ports.descr', 'ports.name', 'ssid.ssid',
], ],
order_by => { -desc => [qw/count/] }, order_by => { -asc => [qw/ports.name ports.type/] },
} }
)->hri->all; )->hri->all;

30
share/views/ajax/report/apclients.tt
View File

@@ -1,11 +1,9 @@
<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0"> <table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th>Device</th> <th>Access Point</th>
<th>Model</th> <th>Model</th>
<th>Location</th> <th>Radio</th>
<th>Port</th>
<th>SSID</th>
<th>Node Count</th> <th>Node Count</th>
</tr> </tr>
</thead> </thead>
@@ -15,16 +13,15 @@
$(document).ready(function() { $(document).ready(function() {
var table = $('#data-table').dataTable({ var table = $('#data-table').dataTable({
"deferRender": true, "deferRender": true,
"order": [[ 5, "desc" ]],
"data": [% results | none %], "data": [% results | none %],
"columns": [ "columns": [
{ {
"data": 'ip', "data": 'ports.port',
"type": 'portsort',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return type === 'display' ? return type === 'display' ?
'<a href="[% uri_for('/device') | none %]?tab=details&q=' + encodeURIComponent(row.ip) + '">' '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(row.ports.name || '') + '</a>' :
+ he.encode(row.dns || row.name || row.ip) + '</a>' : he.encode(data || '');
data;
} }
}, { }, {
"data": 'model', "data": 'model',
@@ -32,20 +29,7 @@ $(document).ready(function() {
return he.encode(data || ''); return he.encode(data || '');
} }
}, { }, {
"data": 'location', "data": 'ports.type',
"render": function(data, type, row, meta) {
return he.encode(data || '');
}
}, {
"data": 'port',
"type": 'portsort',
"render": function(data, type, row, meta) {
return type === 'display' ?
'<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data || '') + '</a>' :
he.encode(data || '');
}
}, {
"data": 'ssid',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return he.encode(data || ''); return he.encode(data || '');
} }