2012-06-11 Miguel de Dios <miguel.dedios@artica.es>

* include/functions_visual_map.php: cleaned source code style.
	
	* include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.editor.js: fixed the set
	status to items when change somethings that module or method to get
	status that agent to module status item.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,14 @@
+2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/functions_visual_map.php: cleaned source code style.
+	
+	* include/ajax/visual_console_builder.ajax.php,
+	godmode/reporting/visual_console_builder.editor.js: fixed the set
+	status to items when change somethings that module or method to get
+	status that agent to module status item.
+	
+	MERGED FROM 4.0.2
+
 2012-06-11  Vanessa Gil <vanessa.gil@artica.es>
 
 	* godmode/users/configure_user.php

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -188,46 +188,6 @@ function updateAction() {
 			
 			$("#" + idItem).css('color', values['label_color']);
 			
-			switch ($('#hidden-status_' + idItem).val()) {
-				case '1':
-					//Critical (BAD)
-					suffix = "_bad.png";
-					break;
-				case '4':
-					//Critical (ALERT)
-					suffix = "_bad.png";
-					break;
-				case '0':
-					//Normal (OK)
-					suffix = "_ok.png";
-					break;
-				case '2':
-					//Warning
-					suffix = "_warning.png";
-					break;
-				case '3':
-					//Unknown
-				default:
-					suffix = ".png";
-					// Default is Grey (Other)
-			}
-			
-			var params = [];
-			params.push("get_image_path=1");
-			params.push("img_src=images/console/icons/" + values['image'] + suffix);
-			params.push("page=include/ajax/skins.ajax");
-			params.push("only_src=1");
-			jQuery.ajax ({
-				data: params.join ("&"),
-				type: 'POST',
-				url: action="ajax.php",
-				async: false,
-				timeout: 10000,
-				success: function (data) {
-					$("#image_" + idItem).attr('src', data);
-				}
-			});	
-			
 			if ((values['width'] != 0) && (values['height'] != 0)) {
 				$("#image_" + idItem).attr('width', values['width']);
 				$("#image_" + idItem).attr('height', values['height']);
@@ -1170,6 +1130,64 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 		case 'module_graph':
 			$("#image_" + idElement).attr("src", getModuleGraph(idElement));
 		case 'static_graph':
+			if (event != 'dragstop') {
+				var element_status= null;
+				var parameter = Array();
+				parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
+				parameter.push ({name: "get_element_status", value: "1"});
+				parameter.push ({name: "id_element", value: idElement});
+				
+				jQuery.ajax ({
+					type: 'POST',
+					url: action="ajax.php",
+					data: parameter,
+					async: false,
+					timeout: 10000,
+					success: function (data) {
+						$('#hidden-status_' + idElement).val(data);
+					}
+				});
+				
+				switch ($('#hidden-status_' + idElement).val()) {
+					case '1':
+						//Critical (BAD)
+						suffix = "_bad.png";
+						break;
+					case '4':
+						//Critical (ALERT)
+						suffix = "_bad.png";
+						break;
+					case '0':
+						//Normal (OK)
+						suffix = "_ok.png";
+						break;
+					case '2':
+						//Warning
+						suffix = "_warning.png";
+						break;
+					case '3':
+						//Unknown
+					default:
+						suffix = ".png";
+						// Default is Grey (Other)
+				}
+				
+				var params = [];
+				params.push("get_image_path=1");
+				params.push("img_src=images/console/icons/" + values['image'] + suffix);
+				params.push("page=include/ajax/skins.ajax");
+				params.push("only_src=1");
+				jQuery.ajax ({
+					data: params.join ("&"),
+					type: 'POST',
+					url: action="ajax.php",
+					async: false,
+					timeout: 10000,
+					success: function (data) {
+						$("#image_" + idElement).attr('src', data);
+					}
+				});
+			}
 		case 'percentile_item':
 		case 'simple_value':
 		case 'label':

pandora_console/include/ajax/visual_console_builder.ajax.php

@@ -481,11 +481,13 @@ switch ($action) {
 }
 
 /* visual map element status check  */
-if ($get_element_status){
+if ($get_element_status) {
+	$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
 	
-	$res = visual_map_get_status_element($id_element);
+	$res = visual_map_get_status_element($layoutData);
 	
 	echo $res;
+	
 	return;
 }
 

pandora_console/include/functions_visual_map.php

@@ -626,7 +626,9 @@ function visual_map_get_status_element($layoutData) {
 	if ($layoutData['id_layout_linked'] != 0) {
 		$status = visual_map_get_layout_status ($layoutData['id_layout_linked']);
 	}
-	else if ($layoutData["type"] == 0) { //Single object
+	else if ($layoutData["type"] == 0) {
+		//Single object
+		
 		//Status for a simple module
 		if ($layoutData['id_agente_modulo'] != 0) {
 			$status = modules_get_agentmodule_status ($layoutData['id_agente_modulo']);