2012-03-07 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/jquery-1.6.1.min.js: removed this file because the console use the last jquery library. * operation/search_agents.php: clean source code style. * include/graphs/functions_flot.php, include/graphs/flot/pandora.flot.js: fixed the lost unit in the style of the divs for the graphs, into the function "pandoraFlotArea" check the alerts.lenght for empty strings, into the function "updateLegend" check empty string for to var "item.series.label", into the function "get_event_details" check empty var "event_ids" and into the function "flot_area_graph" check empty var in $long_index. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5707 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
f1bf725afc
commit
be037611d8
|
@ -1,3 +1,18 @@
|
||||||
|
2012-03-07 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
|
* include/javascript/jquery-1.6.1.min.js: removed this file because the
|
||||||
|
console use the last jquery library.
|
||||||
|
|
||||||
|
* operation/search_agents.php: clean source code style.
|
||||||
|
|
||||||
|
* include/graphs/functions_flot.php, include/graphs/flot/pandora.flot.js:
|
||||||
|
fixed the lost unit in the style of the divs for the graphs, into the
|
||||||
|
function "pandoraFlotArea" check the alerts.lenght for empty strings, into
|
||||||
|
the function "updateLegend" check empty string for to var
|
||||||
|
"item.series.label", into the function "get_event_details" check empty var
|
||||||
|
"event_ids" and into the function "flot_area_graph" check empty var in
|
||||||
|
$long_index.
|
||||||
|
|
||||||
2012-03-07 Miguel de Dios <miguel.dedios@artica.es>
|
2012-03-07 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
* operation/agentes/estado_generalagente.php, operation/search_agents.php:
|
* operation/agentes/estado_generalagente.php, operation/search_agents.php:
|
||||||
|
|
|
@ -425,7 +425,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
|
||||||
legend = legend.split(separator);
|
legend = legend.split(separator);
|
||||||
events = events.split(separator);
|
events = events.split(separator);
|
||||||
event_ids = event_ids.split(separator);
|
event_ids = event_ids.split(separator);
|
||||||
|
if (alerts.length != 0)
|
||||||
alerts = alerts.split(separator);
|
alerts = alerts.split(separator);
|
||||||
|
else
|
||||||
|
alerts = [];
|
||||||
alert_ids = alert_ids.split(separator);
|
alert_ids = alert_ids.split(separator);
|
||||||
colors = colors.split(separator);
|
colors = colors.split(separator);
|
||||||
|
|
||||||
|
@ -457,6 +460,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
|
||||||
filled = true;
|
filled = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
var datas = new Array();
|
var datas = new Array();
|
||||||
var data_base = new Array();
|
var data_base = new Array();
|
||||||
|
|
||||||
|
@ -762,7 +766,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
|
||||||
|
|
||||||
$('#'+graph_id).bind("plotclick", function (event, pos, item) {
|
$('#'+graph_id).bind("plotclick", function (event, pos, item) {
|
||||||
plot.unhighlight();
|
plot.unhighlight();
|
||||||
if (item) {
|
if (item && item.series.label != '') {
|
||||||
plot.unhighlight();
|
plot.unhighlight();
|
||||||
var canvaslimit = parseInt(plot.offset().left + plot.width());
|
var canvaslimit = parseInt(plot.offset().left + plot.width());
|
||||||
var dataset = plot.getData();
|
var dataset = plot.getData();
|
||||||
|
@ -782,6 +786,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
|
||||||
|
|
||||||
$('#extra_'+graph_id).css('left',left_pos);
|
$('#extra_'+graph_id).css('left',left_pos);
|
||||||
$('#extra_'+graph_id).css('top',plot.offset().top + 25);
|
$('#extra_'+graph_id).css('top',plot.offset().top + 25);
|
||||||
|
|
||||||
switch(item.series.label) {
|
switch(item.series.label) {
|
||||||
case legend_alerts:
|
case legend_alerts:
|
||||||
extra_info = '<b>'+legend_alerts+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(alertsz[item.dataIndex]);
|
extra_info = '<b>'+legend_alerts+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(alertsz[item.dataIndex]);
|
||||||
|
@ -791,6 +796,9 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
|
||||||
extra_info = '<b>'+legend_events+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(eventsz[item.dataIndex]);
|
extra_info = '<b>'+legend_events+' - '+labels_long[item.dataIndex]+'</b>'+get_event_details(eventsz[item.dataIndex]);
|
||||||
extra_show = true;
|
extra_show = true;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
extra_info = get_event_details(eventsz[item.dataIndex]);
|
extra_info = get_event_details(eventsz[item.dataIndex]);
|
||||||
|
@ -935,6 +943,8 @@ function set_watermark(graph_id, plot, watermark_src) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_event_details (event_ids) {
|
function get_event_details (event_ids) {
|
||||||
|
table = '';
|
||||||
|
if (typeof(event_ids) != "undefined") {
|
||||||
var inputs = [];
|
var inputs = [];
|
||||||
var table;
|
var table;
|
||||||
inputs.push ("get_events_details=1");
|
inputs.push ("get_events_details=1");
|
||||||
|
@ -951,6 +961,7 @@ function get_event_details (event_ids) {
|
||||||
table = data;
|
table = data;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return table;
|
return table;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue