From a1366299294a5135eef7a1bd7c3a4b266ffb4356 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 5 Nov 2015 13:48:01 +0100
Subject: [PATCH] Fixed other bug of simple value. Tiquet: #2952

---
 .../visual_console_builder.editor.js          | 24 ++++++++++---------
 .../include/functions_visual_map.php          | 12 ++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 281e4fdba4..d5fdd6a6a8 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -216,8 +216,8 @@ function update_button_palette_callback() {
 			break;
 		case 'simple_value':
 			$("#text_" + idItem).html(values['label']);
-			$("#simplevalue_" + idItem)
-				.html($('<img></img>').attr('src', "images/spinner.gif"));
+			//$("#simplevalue_" + idItem)
+				//.html($('<img></img>').attr('src', "images/spinner.gif"));
 			setModuleValue(idItem,values['process_simple_value'], values['period']);
 			break;
 		case 'label':
@@ -1303,7 +1303,9 @@ function setModuleValue(id_data, process_simple_value, period) {
 		dataType: 'json',
 		success: function (data)
 		{
-			$("#simplevalue_" + id_data).text(data.value);
+			text_value = $("#text_" + idItem).html();
+			text_value = text_value.replace(/_VALUE_/gi,data.value);
+			$("#text_" + id_data).html(text_value);
 		}
 	});
 }
@@ -1607,8 +1609,7 @@ function createItem(type, values, id_data) {
 			sizeStyle = '';
 			imageSize = '';
 			item = $('<div id="' + id_data + '" class="item simple_value" style="text-align: center; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
-					'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '<span id="simplevalue_' + id_data + '"></span>'+
-				'</div>'
+					'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>'
 			);
 			setModuleValue(id_data,values.process_simple_value,values.period);
 			break;
@@ -1806,12 +1807,13 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 		case 'icon':
 		case 'module_graph':
 
-			/*
-			if (type == 'module_graph') {
-				$("#image_" + idElement).attr("src", "images/spinner.gif");
-				setModuleGraph(idElement);
+			
+			if (type == 'simple_value') {
+				setModuleValue(idElement,
+					values.process_simple_value,
+						values.period);
 			}
-			*/
+			
 			
 			if ((typeof(values['mov_left']) != 'undefined') &&
 					(typeof(values['mov_top']) != 'undefined')) {
@@ -1850,7 +1852,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 				}
 			});
 			
-			if (typeof(values['parent']) != 'undefined') {
+			if (typeof(values['parent']) != 'undefined' && values['parent'] > 0 ) {
 				if (!found) {
 					set_color_line_status(lines, line, idElement, values);
 				}
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 4a6c3cbdea..0a8c05498e 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -939,7 +939,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 		case SIMPLE_VALUE_MIN:
 		case SIMPLE_VALUE_AVG:
 			$io_safe_output_text = io_safe_output($text);
-			echo $io_safe_output_text;
 			
 			//Metaconsole db connection
 			if ($layoutData['id_metaconsole'] != 0) {
@@ -966,12 +965,11 @@ function visual_map_print_item($mode = "read", $layoutData,
 			if (!is_string($value)) {
 				$value = format_for_graph($value, 2);
 			}
-			/*
-			if (!empty($unit_text))
-				$value .= " " . $unit_text;
-			*/
-			echo ' <span id="simplevalue_' . $id . '" style="font-weight:bold;">' . $value . '</span>';
-
+			
+			$io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
+			
+			echo $io_safe_output_text;
+			
 			
 			//Restore db connection
 			if ($layoutData['id_metaconsole'] != 0) {