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

2012-03-12 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2012-03-12 18:31:15 +00:00
parent 0e16e2e14b
commit 56dfd72f2b
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-12 Miguel de Dios <miguel.dedios@artica.es>
* 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 <juanmanuel.ramon@artica.es> 2012-03-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/shortcut_bar.php: Fixed Ajax callbacks in this view. * general/shortcut_bar.php: Fixed Ajax callbacks in this view.

1
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -124,6 +124,7 @@ switch ($action) {
if (($layoutData['type'] == PERCENTILE_BAR) || if (($layoutData['type'] == PERCENTILE_BAR) ||
($layoutData['type'] == PERCENTILE_BUBBLE)) { ($layoutData['type'] == PERCENTILE_BUBBLE)) {
if ($value_show == 'value') { 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 = 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)); $unit_text_db = trim(io_safe_output($unit_text_db));

4
pandora_console/include/functions_visual_map.php
View File

@ -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 = db_get_sql ('SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ' . $id_module);
$unit_text = trim(io_safe_output($unit_text)); $unit_text = trim(io_safe_output($unit_text));
$value_text = $module_value; $value_text = format_for_graph($module_value, 2);
if (!empty($unit_text)) if (!empty($unit_text))
$value_text .= " " . $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 = 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)); $unit_text = trim(io_safe_output($unit_text));
$value_text = $valor; $value_text = format_for_graph($valor, 2);
if (!empty($unit_text)) if (!empty($unit_text))
$value_text .= " " . $unit_text; $value_text .= " " . $unit_text;
} }