From 05b28e130257f11ba73d859a5968db106e0c38bc Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 12 Mar 2012 18:31:15 +0000 Subject: [PATCH] 2012-03-12 Miguel de Dios * include/functions_visual_map.php, include/ajax/visual_console_builder.ajax.php: apply format to graph in the data when show value in percentile item. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ .../include/ajax/visual_console_builder.ajax.php | 1 + pandora_console/include/functions_visual_map.php | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 463ce3a6b3..55ae6da118 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-03-12 Miguel de Dios + + * include/functions_visual_map.php, + include/ajax/visual_console_builder.ajax.php: apply format to graph in the + data when show value in percentile item. + 2012-03-12 Juan Manuel Ramon * general/shortcut_bar.php: Fixed Ajax callbacks in this view. diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 6f8d02390f..38e83cda02 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -124,6 +124,7 @@ switch ($action) { if (($layoutData['type'] == PERCENTILE_BAR) || ($layoutData['type'] == PERCENTILE_BUBBLE)) { if ($value_show == 'value') { + $returnValue = format_for_graph($returnValue, 2); $unit_text_db = db_get_sql ('SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ' . $layoutData['id_agente_modulo']); $unit_text_db = trim(io_safe_output($unit_text_db)); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index ea2f12d29c..a0a38535a7 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -192,7 +192,7 @@ function visual_map_print_item($layoutData) { $unit_text = db_get_sql ('SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ' . $id_module); $unit_text = trim(io_safe_output($unit_text)); - $value_text = $module_value; + $value_text = format_for_graph($module_value, 2); if (!empty($unit_text)) $value_text .= " " . $unit_text; } @@ -1131,7 +1131,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line $unit_text = db_get_sql ('SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ' . $layout_data['id_agente_modulo']); $unit_text = trim(io_safe_output($unit_text)); - $value_text = $valor; + $value_text = format_for_graph($valor, 2); if (!empty($unit_text)) $value_text .= " " . $unit_text; }