tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-13 Sergio Martin <sergio.martin@artica.es> 

* include/graphs/functions_flot.php
	include/graphs/flot/pandora.flot.js
	operation/agentes/stat_win.php: Improve the legend of the
	interactive graphs for bug 3573814



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7640 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-13 09:41:59 +00:00
parent d34059d6cd
commit 69aef3596b
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-13 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_flot.php
include/graphs/flot/pandora.flot.js
operation/agentes/stat_win.php: Improve the legend of the
interactive graphs for bug 3573814
2013-02-13 Sergio Martin <sergio.martin@artica.es> 2013-02-13 Sergio Martin <sergio.martin@artica.es>
* include/styles/dialog.css * include/styles/dialog.css

3
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -788,7 +788,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
var label_aux = series.label + ' = '; var label_aux = series.label + ' = ';
if (serie_types[i] != 'points') { // The graphs of points type and unknown graphs will dont be updated
if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) {
legends.eq(i).text(label_aux.replace(/=.*/, '= ' + parseFloat(y).toFixed(2) +' '+unit)); legends.eq(i).text(label_aux.replace(/=.*/, '= ' + parseFloat(y).toFixed(2) +' '+unit));
} }

3
pandora_console/include/graphs/functions_flot.php
View File

@ -296,6 +296,9 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
$force_integer = 'false'; $force_integer = 'false';
} }
// Trick to get translated string from javascript
$return .= html_print_input_hidden('unknown_text', __('Unknown'), true);
// Javascript code // Javascript code
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "//<![CDATA[\n"; $return .= "//<![CDATA[\n";

6
pandora_console/operation/agentes/stat_win.php
View File

@ -228,6 +228,8 @@ $label = base64_decode(get_parameter('label', ''));
$urlImage = ui_get_full_url(false); $urlImage = ui_get_full_url(false);
$unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $id);
// log4x doesnt support flash yet // log4x doesnt support flash yet
// //
if ($config['flash_charts'] == 1) if ($config['flash_charts'] == 1)
@ -237,7 +239,7 @@ $label = base64_decode(get_parameter('label', ''));
switch ($graph_type) { switch ($graph_type) {
case 'boolean': case 'boolean':
echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height, echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,
$label, null, $draw_alerts, $avg_only, false, $date, false, $urlImage, 'adapter_'.$graph_type, $time_compare, $unknown_graph); $label, $unit, $draw_alerts, $avg_only, false, $date, false, $urlImage, 'adapter_'.$graph_type, $time_compare, $unknown_graph);
echo '<br>'; echo '<br>';
if ($show_events_graph) if ($show_events_graph)
echo graphic_module_events($id, $width, $height, echo graphic_module_events($id, $width, $height,
@ -245,7 +247,7 @@ $label = base64_decode(get_parameter('label', ''));
break; break;
case 'sparse': case 'sparse':
echo grafico_modulo_sparse ($id, $period, $draw_events, $width, $height, echo grafico_modulo_sparse ($id, $period, $draw_events, $width, $height,
$label, null, $draw_alerts, $avg_only, false, $date, '', $baseline, $label, null, $draw_alerts, $avg_only, false, $date, $unit, $baseline,
0, true, false, $urlImage, 1, false, 'adapter_'.$graph_type, $time_compare, $unknown_graph); 0, true, false, $urlImage, 1, false, 'adapter_'.$graph_type, $time_compare, $unknown_graph);
echo '<br>'; echo '<br>';
if ($show_events_graph) if ($show_events_graph)