vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 19:15:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rework chart flows to use datatables

Browse source
This commit is contained in:
emanuele-f 2018-08-07 11:00:14 +02:00
parent bbef910131
commit 789d5734d7
6 changed files with 19 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

43
httpdocs/js/graph_utils.js
View file

@ -242,30 +242,17 @@ function fixTimeRange(chart, params, step) {
chart.xAxis.tickFormat(function(d) { return d3.time.format(fmt)(new Date(d*1000)) });
}
function populateFlowsTable(table, params, data) {
var tstart = params.epoch_begin;
var tend = params.epoch_end;
table.empty();
var row = $("<tr></tr>");
$("<td>TODO</td>").appendTo(row);
row.appendTo(table);
}
// add a new updateStackedChart function
function attachStackedChartCallback(chart, schema_name, chart_id, zoom_out_id, flows_id, params, step) {
function attachStackedChartCallback(chart, schema_name, chart_id, zoom_out_id, flows_dt, params, step) {
var pending_request = null;
var pending_flows_request = null;
var d3_sel = d3.select(chart_id);
var $chart = $(chart_id);
var $zoom_out = $(zoom_out_id);
var $flows_table = $(flows_id);
var max_interval = step * 8;
var is_max_zoom = false;
var zoom_stack = [];
var url = http_prefix + "/lua/get_ts.lua";
var flows_url = http_prefix + "/lua/pro/get_flows.lua";
var first_load = true;
//var spinner = $("<img class='chart-loading-spinner' src='" + spinner_url + "'/>");
var spinner = $('<i class="chart-loading-spinner fa fa-spinner fa-lg fa-spin"></i>');
@ -540,25 +527,13 @@ function attachStackedChartCallback(chart, schema_name, chart_id, zoom_out_id, f
update_chart_data([]);
});
if(pending_flows_request)
pending_flows_request.abort();
pending_flows_request = $.get(flows_url, params, function(data) {
if (!data || !data.length)
$flows_table.hide();
else {
populateFlowsTable($flows_table, params, data);
$flows_table.show();
}
pending_flows_request = null;
}).fail(function(xhr, status, error) {
if (xhr.statusText =='abort') {
return;
}
console.error("Error while retrieving the flows data [" + status + "]: " + error);
});
if(first_load) {
first_load = false;
} else {
/* Reload datatable */
if(flows_dt)
flows_dt.render();
}
return true;
}