From 5c4b5a02424b8571022e5dcd5fb0cf0dada0402c Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Wed, 28 Jun 2017 15:47:24 +0200
Subject: [PATCH 01/27] Add link in minor release update dialog to
 documentation - #951

---
 .../godmode/update_manager/update_manager.offline.php    | 9 ++++++++-
 pandora_console/include/functions_update_manager.php     | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 2079678fa8..afad03cc2c 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -58,7 +58,14 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
 	var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 	var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-	var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
+	var text4_mr_file = "<?php 
+	if($config['language'] == 'es'){
+		echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+	}
+	else{
+		echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+	}
+	?>";
 	var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
 	var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
 	var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 607b108e42..ba6508fa19 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -358,7 +358,14 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
 					var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
 					var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
 					var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-					var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
+					var text4_mr_file = "<?php 
+					if($config['language'] == 'es'){
+						echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+					}
+					else{
+						echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
+					}
+					?>";
 					var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
 					var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
 					var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";

From da3905a593d6f493cf1dd9c4172a594dfa9e788a Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 7 Sep 2017 13:25:39 +0200
Subject: [PATCH 02/27] Apply comfort displacement to update button in visual
 styles section - #1228

---
 pandora_console/godmode/setup/setup_visuals.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 2e18f50669..5eb4aae3b1 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -914,6 +914,23 @@ tinyMCE.init({
 });
 
 $(document).ready (function () {
+	
+	var comfort = 0;
+	
+	if(comfort == 0){
+		$(':input,:radio,:checkbox,:file').change(function(){
+			$('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+			var comfort = 1;
+		});
+		
+		$("*").keydown(function(){
+			$('#submit-update_button').css({'position':'fixed','right':'80px','bottom':'55px'});
+			var comfort = 1;
+		});
+		
+		$('#form_setup').after('<br>');	
+		}
+	
 	$("#form_setup #text-graph_color1").attachColorPicker();
 	$("#form_setup #text-graph_color2").attachColorPicker();
 	$("#form_setup #text-graph_color3").attachColorPicker();

From 8ca931f4c996bd5fd36c9e8b670828795e5a7dda Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 2 Oct 2017 18:57:13 +0200
Subject: [PATCH 03/27] Change default number of widgets when creating a
 dashboard - #1398

---
 pandora_console/include/constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index f039a90504..12fe752dbc 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -458,7 +458,7 @@ define("STATWIN_DEFAULT_CHART_WIDTH",	555);
 define("STATWIN_DEFAULT_CHART_HEIGHT",	245);
 
 /* Dashboard */
-define("DASHBOARD_DEFAULT_COUNT_CELLS",	4);
+define("DASHBOARD_DEFAULT_COUNT_CELLS",	1);
 
 define("OPTION_TEXT",					1);
 define("OPTION_SINGLE_SELECT",			2);

From 76ae95ead4ac1d79b5094cf92a4655bf9ab1dc0d Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Tue, 3 Oct 2017 11:52:26 +0200
Subject: [PATCH 04/27] Add new font sizes for visual console - #1388

---
 .../visual_console_builder.editor.php         |  7 +++
 .../visual_console_builder.elements.php       |  7 +++
 .../visual_console_builder.wizard.php         |  2 +-
 pandora_console/include/styles/pandora.css    | 32 ++++++++++++++
 .../include/styles/pandora_black.css          | 32 +++++++++++++-
 .../include/styles/pandora_green_old.css      | 44 +++++++++++++++++++
 6 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php
index 28307766fd..88ea386ee6 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php
@@ -196,11 +196,18 @@ ui_require_javascript_file ('encode_decode_base64');
 			"10pt=.visual_font_size_10pt, " +
 			"12pt=.visual_font_size_12pt, " +
 			"14pt=.visual_font_size_14pt, " +
+			"18pt=.visual_font_size_18pt, " +
 			"24pt=.visual_font_size_24pt, " +
+			"28pt=.visual_font_size_28pt, " +
 			"36pt=.visual_font_size_36pt, " +
+			"48pt=.visual_font_size_48pt, " +
+			"60pt=.visual_font_size_60pt, " +
 			"72pt=.visual_font_size_72pt, " +
+			"84pt=.visual_font_size_84pt, " +
 			"96pt=.visual_font_size_96pt, " +
+			"116pt=.visual_font_size_116pt, " +
 			"128pt=.visual_font_size_128pt, " +
+			"140pt=.visual_font_size_140pt, " +
 			"154pt=.visual_font_size_154pt, " +
 			"196pt=.visual_font_size_196pt",
 		theme_advanced_toolbar_location : "top",
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index 15134a9c1d..c7e63358fa 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -602,11 +602,18 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 				"10pt=.visual_font_size_10pt, " +
 				"12pt=.visual_font_size_12pt, " +
 				"14pt=.visual_font_size_14pt, " +
+				"18pt=.visual_font_size_18pt, " +
 				"24pt=.visual_font_size_24pt, " +
+				"28pt=.visual_font_size_28pt, " +
 				"36pt=.visual_font_size_36pt, " +
+				"48pt=.visual_font_size_48pt, " +
+				"60pt=.visual_font_size_60pt, " +
 				"72pt=.visual_font_size_72pt, " +
+				"84pt=.visual_font_size_84pt, " +
 				"96pt=.visual_font_size_96pt, " +
+				"116pt=.visual_font_size_116pt, " +
 				"128pt=.visual_font_size_128pt, " +
+				"140pt=.visual_font_size_140pt, " +
 				"154pt=.visual_font_size_154pt, " +
 				"196pt=.visual_font_size_196pt",
 			theme_advanced_toolbar_location : "top",
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index 67273ed795..42d6d608cd 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -144,7 +144,7 @@ $table->data["staticgraph_modulegraph"][1] .= '&nbsp;&nbsp;&nbsp;' .
 			 'leaguegothic' => 'League Gothic'
 	 	 );
 		 
-		 $fonts = array('4pt' => '4pt','6pt' => '6pt','8pt' => '8pt','10pt' => '10pt','12pt' => '12pt','14pt' => '14pt','24pt' => '24pt','36pt' => '36pt','72pt' => '72pt','96pt' => '96pt','128pt' => '128pt','154pt' => '154pt','196pt' => '196pt');
+		 $fonts = array('4pt' => '4pt','6pt' => '6pt','8pt' => '8pt','10pt' => '10pt','12pt' => '12pt','14pt' => '14pt','18pt' => '18pt','24pt' => '24pt','28pt' => '28pt','36pt' => '36pt','48pt' => '48pt','60pt' => '60pt','72pt' => '72pt','84pt' => '84pt','96pt' => '96pt','116pt' => '116pt','128pt' => '128pt','140pt' => '140pt','154pt' => '154pt','196pt' => '196pt');
 		 
 	/*	 
 		 $fontf = array('andale mono,times' => 'Andale Mono',
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 905f57d35a..a6a90d8063 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2399,29 +2399,61 @@ span#plugin_description {
 	font-size: 14pt !important;
 	line-height: 14pt;
 }
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt;
+}
+
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt;
 }
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt;
+}
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt;
 }
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt;
+}
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt;
+}
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
 
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
+
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt;
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt;
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt;
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt;
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 3dca8bdbf9..7633889626 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -2455,29 +2455,59 @@ span#plugin_description {
 	font-size: 14pt !important;
 	line-height: 14pt; 
 }
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt; 
+}
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt; 
 }
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt; 
+}
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt; 
 }
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt; 
+}
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt; 
+}
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
 
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt; 
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt; 
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt; 
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt;
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt; 
@@ -2485,7 +2515,7 @@ span#plugin_description {
 
 .visual_font_size_196pt, .visual_font_size_196pt > em, .visual_font_size_196pt > strong, .visual_font_size_196pt > strong > span, .visual_font_size_196pt > span, .visual_font_size_196pt > strong > em, .visual_font_size_196pt > em > strong, .visual_font_size_196pt em span, .visual_font_size_196pt span em   {
 	font-size: 196pt !important;
-	line-height: 196pt; 
+	line-height: 196pt;
 }
 
 
diff --git a/pandora_console/include/styles/pandora_green_old.css b/pandora_console/include/styles/pandora_green_old.css
index e983e6047d..a99a9a275d 100644
--- a/pandora_console/include/styles/pandora_green_old.css
+++ b/pandora_console/include/styles/pandora_green_old.css
@@ -2435,53 +2435,97 @@ span#plugin_description {
 #tinymce {
 	text-align: left;
 }
+
 .visual_font_size_4pt, .visual_font_size_4pt > em, .visual_font_size_4pt > strong, .visual_font_size_4pt > strong > span, .visual_font_size_4pt > span, .visual_font_size_4pt > strong > em, .visual_font_size_4pt > em > strong, .visual_font_size_4pt em span, .visual_font_size_4pt span em  {
 	font-size: 4pt !important;
 	line-height: 4pt;
 }
+
 .visual_font_size_6pt, .visual_font_size_6pt > em, .visual_font_size_6pt > strong, .visual_font_size_6pt > strong > span, .visual_font_size_6pt > span, .visual_font_size_6pt > strong > em, .visual_font_size_6pt > em > strong, .visual_font_size_6pt em span, .visual_font_size_6pt span em   {
 	font-size: 6pt !important;
 	line-height: 6pt;
 }
+
 .visual_font_size_8pt, .visual_font_size_8pt > em, .visual_font_size_8pt > strong, .visual_font_size_8pt > strong > span , .visual_font_size_8pt > span, .visual_font_size_8pt > strong > em, .visual_font_size_8pt > em > strong, .visual_font_size_8pt em span, .visual_font_size_8pt span em   {
 	font-size: 8pt !important;
 	line-height: 8pt;
 }
+
 .visual_font_size_10pt, .visual_font_size_10pt > em , .visual_font_size_10pt > strong, .visual_font_size_10pt > strong > em, .visual_font_size_10pt > em > strong, .visual_font_size_10pt em span, .visual_font_size_10pt span em   {
 	font-size: 10pt !important;
 	line-height: 10pt;
 }
+
 .visual_font_size_12pt, .visual_font_size_12pt > em , .visual_font_size_12pt > strong, .visual_font_size_12pt > strong > em, .visual_font_size_12pt > em > strong, .visual_font_size_12pt em span, .visual_font_size_12pt span em   {
 	font-size: 12pt !important;
 	line-height: 12pt;
 }
+
 .visual_font_size_14pt, .visual_font_size_14pt > em , .visual_font_size_14pt > strong, .visual_font_size_14pt > strong > span, .visual_font_size_14pt > span, .visual_font_size_14pt > strong > em, .visual_font_size_14pt > em > strong, .visual_font_size_14pt em span, .visual_font_size_14pt span em    {
 	font-size: 14pt !important;
 	line-height: 14pt;
 }
+
+.visual_font_size_18pt, .visual_font_size_18pt > em , .visual_font_size_18pt > strong, .visual_font_size_18pt > strong > span, .visual_font_size_18pt > span, .visual_font_size_18pt > strong > em, .visual_font_size_18pt > em > strong, .visual_font_size_18pt em span, .visual_font_size_18pt span em    {
+	font-size: 18pt !important;
+	line-height: 18pt;
+}
+
 .visual_font_size_24pt, .visual_font_size_24pt > em, .visual_font_size_24pt > strong, .visual_font_size_24pt > strong > span , .visual_font_size_24pt > span, .visual_font_size_24pt > strong > em, .visual_font_size_24pt > em > strong, .visual_font_size_24pt em span, .visual_font_size_24pt span em   {
 	font-size: 24pt !important;
 	line-height: 24pt;
 }
+
+.visual_font_size_28pt, .visual_font_size_28pt > em, .visual_font_size_28pt > strong, .visual_font_size_28pt > strong > span , .visual_font_size_28pt > span, .visual_font_size_28pt > strong > em, .visual_font_size_28pt > em > strong, .visual_font_size_28pt em span, .visual_font_size_28pt span em   {
+	font-size: 28pt !important;
+	line-height: 28pt;
+}
+
 .visual_font_size_36pt, .visual_font_size_36pt > em, .visual_font_size_36pt > strong, .visual_font_size_36pt > strong > span, .visual_font_size_36pt > span, .visual_font_size_36pt > strong > em, .visual_font_size_36pt > em > strong, .visual_font_size_36pt em span, .visual_font_size_36pt span em   {
 	font-size: 36pt !important;
 	line-height: 36pt;
 }
+
+.visual_font_size_48pt, .visual_font_size_48pt > em, .visual_font_size_48pt > strong, .visual_font_size_48pt > strong > span, .visual_font_size_48pt > span, .visual_font_size_48pt > strong > em, .visual_font_size_48pt > em > strong, .visual_font_size_48pt em span, .visual_font_size_48pt span em   {
+	font-size: 48pt !important;
+	line-height: 48pt;
+}
+
+.visual_font_size_60pt, .visual_font_size_60pt > em, .visual_font_size_60pt > strong, .visual_font_size_60pt > strong > span, .visual_font_size_60pt > span, .visual_font_size_60pt > strong > em, .visual_font_size_60pt > em > strong, .visual_font_size_60pt em span, .visual_font_size_60pt span em   {
+	font-size: 60pt !important;
+	line-height: 60pt;
+}
+
 .visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span, .visual_font_size_72pt > strong > em, .visual_font_size_72pt > em > strong, .visual_font_size_72pt em span, .visual_font_size_72pt span em   {
 	font-size: 72pt !important;
 	line-height: 72pt;
 }
 
+.visual_font_size_84pt, .visual_font_size_84pt > em, .visual_font_size_84pt > strong, .visual_font_size_84pt > strong > span, .visual_font_size_84pt > span, .visual_font_size_84pt > strong > em, .visual_font_size_84pt > em > strong, .visual_font_size_84pt em span, .visual_font_size_84pt span em   {
+	font-size: 84pt !important;
+	line-height: 84pt;
+}
+
 .visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span, .visual_font_size_96pt > strong > em, .visual_font_size_96pt > em > strong, .visual_font_size_96pt em span, .visual_font_size_96pt span em   {
 	font-size: 96pt !important;
 	line-height: 96pt; 
 }
 
+.visual_font_size_116pt, .visual_font_size_116pt > em, .visual_font_size_116pt > strong, .visual_font_size_116pt > strong > span, .visual_font_size_116pt > span, .visual_font_size_116pt > strong > em, .visual_font_size_116pt > em > strong, .visual_font_size_116pt em span, .visual_font_size_116pt span em   {
+	font-size: 116pt !important;
+	line-height: 116pt; 
+}
+
 .visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span, .visual_font_size_128pt > strong > em, .visual_font_size_128pt > em > strong, .visual_font_size_128pt em span, .visual_font_size_128pt span em   {
 	font-size: 128pt !important;
 	line-height: 128pt; 
 }
 
+.visual_font_size_140pt, .visual_font_size_140pt > em, .visual_font_size_140pt > strong, .visual_font_size_140pt > strong > span, .visual_font_size_140pt > span, .visual_font_size_140pt > strong > em, .visual_font_size_140pt > em > strong, .visual_font_size_140pt em span, .visual_font_size_140pt span em   {
+	font-size: 140pt !important;
+	line-height: 140pt; 
+}
+
 .visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span, .visual_font_size_154pt > strong > em, .visual_font_size_154pt > em > strong, .visual_font_size_154pt em span, .visual_font_size_154pt span em   {
 	font-size: 154pt !important;
 	line-height: 154pt; 

From 14095053cc05fb70c0a1e309ba2a2904f7729aee Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 4 Oct 2017 18:01:01 +0200
Subject: [PATCH 05/27] Added good size to form elements

---
 pandora_console/godmode/agentes/module_manager.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 1fbf08bf80..b22bc0f626 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -45,10 +45,10 @@ echo "<tr><td class='datos' style='width:20%; font-weight: bold;'>";
 echo __('Search') . ' ' .
 	html_print_input_text ('search_string', $search_string, '', 15, 255, true);
 echo "</td>";
-echo "<td class='datos' style='width:20%'>";
+echo "<td class='datos' style='width:10%'>";
 html_print_submit_button (__('Filter'), 'filter', false, 'class="sub search"');
 echo "</td>";
-echo "<td class='datos' style='width:20%'></td>";
+echo "<td class='datos' style='width:10%'></td>";
 echo '</form>';
 // Check if there is at least one server of each type available to assign that
 // kind of modules. If not, do not show server type in combo
@@ -119,7 +119,7 @@ if (($policy_page) || (isset($agent))) {
 		// Create module/type combo
 		echo '<form id="create_module_type" method="post" action="'.$url.'">';
 		if (!$policy_page) {
-			echo '<td class="datos" style="font-weight: bold;">';
+			echo '<td class="datos" style="font-weight: bold; width:20%;">';
 			echo __('Show in hierachy mode');
 			if ($checked == "true") {
 				$checked = true;
@@ -130,12 +130,12 @@ if (($policy_page) || (isset($agent))) {
 			html_print_checkbox ('status_hierachy_mode', "", $checked, false, false, "onChange=change_mod_filter();");
 			echo '</td>';
 		}
-		echo '<td class="datos" style="font-weight: bold;">';
+		echo '<td class="datos" style="font-weight: bold; width:20%;">';
 		echo __("Type");
 		html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' );
 		html_print_input_hidden ('edit_module', 1);
 		echo '</td>';
-		echo '<td class="datos">';
+		echo '<td class="datos" style="width:10%;">';
 		echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
 		echo '</td>';
 		echo '</tr>';

From 4ab4533fca419664b4fae6d83910a662b73f4c0a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 5 Oct 2017 10:48:14 +0200
Subject: [PATCH 06/27] Added new item to choose between line and area. Changed
 radio button to select.

---
 pandora_console/include/ajax/graph.ajax.php  |  5 +-
 pandora_console/operation/agentes/graphs.php | 88 ++++++++++++++++----
 2 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php
index 1b537f8a48..ac7decf965 100644
--- a/pandora_console/include/ajax/graph.ajax.php
+++ b/pandora_console/include/ajax/graph.ajax.php
@@ -64,7 +64,7 @@ if ($print_custom_graph) {
 	$ttl = (int) get_parameter('ttl', 1);
 	$dashboard = (bool) get_parameter('dashboard');
 	$vconsole = (bool) get_parameter('vconsole');
-	
+
 	echo custom_graphs_print($id_graph, $height, $width, $period, $stacked,
 		true, $date, $only_image, $background_color, $modules_param,
 		$homeurl, $name_list, $unit_list, $show_last, $show_max,
@@ -102,13 +102,14 @@ if ($print_sparse_graph) {
 	$percentil = get_parameter('percentil', null);
 	$dashboard = (bool) get_parameter('dashboard');
 	$vconsole = (bool) get_parameter('vconsole');
+	$type_g = get_parameter('type_g', $config['type_module_charts']);
 	
 	echo grafico_modulo_sparse($agent_module_id, $period, $show_events,
 		$width, $height , $title, $unit_name, $show_alerts, $avg_only,
 		$pure, $date, $unit, $baseline, $return_data, $show_title,
 		$only_image, $homeurl, $ttl, $projection, $adapt_key, $compare,
 		$show_unknown, $menu, $backgroundColor, $percentil,
-		$dashboard, $vconsole, $config['type_module_charts']);
+		$dashboard, $vconsole, $type_g);
 	return;
 }
 
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index ff1d7bf9e3..e33d499fe8 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -38,8 +38,8 @@ $start_date = get_parameter ("start_date", date("Y-m-d"));
 $draw_events = get_parameter ("draw_events", 0);
 $modules = get_parameter('modules', array());
 $filter = get_parameter('filter', 0);
-$combined = (bool)get_parameter('combined', 1);
-
+$combined = get_parameter('combined', 1);
+$option_type = get_parameter('option_type', 0);
 
 //----------------------------------------------------------------------
 // Get modules of agent sorted as:
@@ -159,7 +159,6 @@ $table->data[0][1] = html_print_select($list_modules, 'modules[]',
 $table->rowspan[2][0] = 7;
 $table->data[2][0] = "";
 
-
 $table->data[2][1] = __('Begin date');
 $table->data[2][2] = html_print_input_text ("start_date", substr ($start_date, 0, 10),'', 10, 40, true);
 $table->data[2][2] .= html_print_image ("images/calendar_view_day.png", true, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
@@ -174,12 +173,17 @@ $table->data[5][2] = __('Show alerts') .
 	ui_print_help_tip(__('the combined graph does not show the alerts into this graph'), true);
 $table->data[5][3] = html_print_checkbox ("draw_alerts", 1, (bool) $draw_alerts, true);
 $table->data[6][2] = __('Show as one combined graph');
-$table->data[6][3] = 
-	html_print_radio_button('combined', 1, __('one combined graph'),
-		$combined, true);
-$table->data[6][3] .= 
-	html_print_radio_button('combined', 0, __('several graphs for each module'),
-		$combined, true);
+$graph_option_one_or_several = array(0 => __('several graphs for each module'), 1 => __('One combined graph'));
+$table->data[6][3] = html_print_select($graph_option_one_or_several, 'combined', $combined, '', '', 1, true);
+
+$table->data[7][2] = __('Chart type');
+if ($combined == 1) {
+	$graph_option_type = array(0 => __('Area'), 1 => __('Area stack'), 2 => __('Line'), 3 => __('Line stack'));
+}
+else {
+	$graph_option_type = array(0 => __('Area'), 2 => __('Line'));
+}
+$table->data[7][3] = html_print_select($graph_option_type, 'option_type', $option_type, '', '', 1, true);
 
 $htmlForm = '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=graphs&id_agente=' . $id_agente . '" >';
 $htmlForm .= html_print_table($table, true);
@@ -321,6 +325,39 @@ echo "</div>";
 	
 	// Load graphs
 	$(document).ready(function() {
+		$('#combined').change(function () {
+			if ($('#combined').val() == 1) {
+				$('#option_type').empty();
+				$('#option_type').append($('<option>', {
+					value: 0,
+					text: "<?php echo __('Area'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 1,
+					text: "<?php echo __('Area stack'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 2,
+					text: "<?php echo __('Line'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 3,
+					text: "<?php echo __('Line stack'); ?>"
+				}));
+			}
+			else {
+				$('#option_type').empty();
+				$('#option_type').append($('<option>', {
+					value: 0,
+					text: "<?php echo __('Area'); ?>"
+				}));
+				$('#option_type').append($('<option>', {
+					value: 2,
+					text: "<?php echo __('Line'); ?>"
+				}));
+			}
+		});
+
 		var getModulesPHP = function () {
 			return <?php echo json_encode($modules); ?>;
 		}
@@ -353,7 +390,7 @@ echo "</div>";
 			});
 		}
 		
-		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit) {
+		var requestSparseGraph = function (moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g) {
 			return requestGraph('sparse', {
 				page: 'include/ajax/graph.ajax',
 				print_sparse_graph: 1,
@@ -366,7 +403,8 @@ echo "</div>";
 				show_alerts: showAlerts,
 				avg_only: avgOnly,
 				date: date,
-				unit: unit
+				unit: unit,
+				type_g: type_g
 			});
 		}
 		
@@ -380,15 +418,23 @@ echo "</div>";
 			var $container = $(element);
 			var $errorMessage = $('div#graph-error-message');
 			var period = $container.data('period');
-			var conf_stacked = '<?php echo $config['type_module_charts']; ?>';
+			var conf_stacked = parseInt($("#option_type").val());
+			
 			switch (conf_stacked) {
-				case 'area':
+				case 0:
 					var stacked = 0;
 					break;
-				case 'line':
+				case 1:
+					var stacked = 1;
+					break;
+				case 2:
 					var stacked = 2;
 					break;
+				case 3:
+					var stacked = 3;
+					break;
 			}
+
 			var date = $container.data('date');
 			var height = $container.data('height');
 			
@@ -426,6 +472,16 @@ echo "</div>";
 			var unit = $container.data('unit');
 			var date = $container.data('date');
 			var height = $container.data('height');
+			var conf_stacked = parseInt($("#option_type").val());
+			
+			switch (conf_stacked) {
+				case 0:
+					var type_g = 'area';
+					break;
+				case 2:
+					var type_g = 'line';
+					break;
+			}
 			
 			var width = $container.width() - 20;
 			
@@ -435,8 +491,8 @@ echo "</div>";
 			var handleError = function (xhr, textStatus, errorThrown) {
 				$container.html($errorMessage.html());
 			}
-			
-			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit)
+
+			requestSparseGraph(moduleId, period, showEvents, width, height, title, showAlerts, avgOnly, date, unit, type_g)
 				.done(handleSuccess)
 				.fail(handleError);
 		}

From c04d4ed08e4e4e8f132610bb6f420bc0ef4b3f7c Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 9 Oct 2017 12:03:19 +0200
Subject: [PATCH 07/27] Enable background color options for gauge charts -
 #1397

---
 pandora_console/include/functions_graph.php   |  2 +-
 pandora_console/include/graphs/fgraph.php     |  4 ++--
 .../include/graphs/flot/pandora.flot.js       | 21 +++++++++++++++++--
 .../include/graphs/functions_flot.php         |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index abf130c3a9..b250cf9767 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2119,7 +2119,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
 		case CUSTOM_GRAPH_PIE:
 			return ring_graph($flash_charts, $graph_values, $width, $height,
 				$others_str, $homeurl, $water_mark, $config['fontpath'],
-				($config['font_size']+1), $ttl, false, $color, false);
+				($config['font_size']+1), $ttl, false, $color, false,$background_color);
 			break;
 	}
 }
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index c36529b7f7..5002b13b7c 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -752,7 +752,7 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width,
 function ring_graph($flash_chart, $chart_data, $width,
 	$height, $others_str = "other", $homedir="", $water_mark = "",
 	$font = '', $font_size = '', $ttl = 1, $legend_position = false,
-	$colors = '', $hide_labels = false) {
+	$colors = '', $hide_labels = false,$background_color = 'white') {
 	
 	if (empty($chart_data)) {
 		return graph_nodata_image($width, $height, 'pie');
@@ -768,7 +768,7 @@ function ring_graph($flash_chart, $chart_data, $width,
 		return flot_custom_pie_chart ($flash_chart, $chart_data,
 		$width, $height, $colors, $module_name_list, $long_index,
 		$no_data, false, '', $water_mark, $font, $font_size,
-		$unit, $ttl, $homeurl, $background_color, $legend_position);
+		$unit, $ttl, $homeurl, $background_color, $legend_position,$background_color);
 	}
 	else {
 		$total_modules = $chart_data['total_modules'];
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index e036a9855e..bd15f5a94b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -119,7 +119,8 @@ function pandoraFlotPie(graph_id, values, labels, nseries, width, font_size, wat
 
 function pandoraFlotPieCustom(graph_id, values, labels, width,
 			font_size, font, water_mark, separator, legend_position, height,
-				colors,legend) {
+				colors,legend,background_color) {
+										
 	font = font.split("/").pop().split(".").shift();
 	var labels = labels.split(separator);
 	var legend = legend.split(separator);
@@ -211,8 +212,24 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 		$('.legend>table').css('right',($('.legend>div').height()*-1));
 	}
 	//$('.legend>table').css('border',"1px solid #E2E2E2");
-	$('.legend>table').css('background-color',"transparent");
 	
+	if(background_color == 'transparent'){
+		$('.legend>table').css('background-color',"");
+		$('.legend>div').css('background-color',"");
+		$('.legend>table').css('color',"#aaa");
+	}
+	else if (background_color == 'white') {
+		$('.legend>table').css('background-color',"white");
+		$('.legend>table').css('color',"black");
+	}
+	else if (background_color == 'black') {
+		$('.legend>table').css('background-color',"black");
+		$('.legend>table').css('color',"#aaa");
+	}
+	
+	$('.legend').over(function(){
+		return false;
+	});
 	
 	var pielegends = $('#'+graph_id+' .pieLabelBackground');
 	pielegends.each(function () {
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 319e69cab0..b76f4fd13c 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -666,7 +666,7 @@ function flot_custom_pie_chart ($flash_charts, $graph_values,
 	
 	$return .= "pandoraFlotPieCustom('$graph_id', '$values', '$labels',
 			'$width', $font_size, '$fontpath', $water_mark,
-			'$separator', '$legend_position', '$height', '$colors','$legend')";
+			'$separator', '$legend_position', '$height', '$colors','$legend','$background_color')";
 	
 	$return .= "</script>";
 	

From 739c507d770696ee395bbb79e0ac4351b03e2cef Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 9 Oct 2017 12:28:17 +0200
Subject: [PATCH 08/27] Added _server_ip_ and _server_name_ macros to alerts

---
 pandora_server/lib/PandoraFMS/Core.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 24bdfeea51..b88e9ab774 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1014,6 +1014,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
 				_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
 				_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',
+				_server_ip_ => (defined ($agent)) ? get_db_value($dbh, "SELECT ip_address FROM tserver WHERE name = ?", $agent->{'server_name'}) : '',
+				_server_name_ => (defined ($agent)) ? $agent->{'server_name'} : '',
 				_target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', 
 				_target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '', 
 				_policy_ => undef,

From 274fc2e15f71cf3694602079c27a5f296042bad6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 9 Oct 2017 12:35:46 +0200
Subject: [PATCH 09/27] Modified help to include _server_ip_ and _server_name_
 macros

---
 pandora_console/include/help/en/help_alert_config.php | 2 ++
 pandora_console/include/help/en/help_alert_macros.php | 2 ++
 pandora_console/include/help/es/help_alert_config.php | 2 ++
 pandora_console/include/help/es/help_alert_macros.php | 2 ++
 pandora_console/include/help/ja/help_alert_config.php | 2 ++
 pandora_console/include/help/ja/help_alert_macros.php | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index fec6b2a7bf..569242a5dc 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -58,6 +58,8 @@ Apart from the defined module macros, the following macros are also available:
 <li>_id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_target_ip_ : IP address of the target of the module.</li>
 <li>_target_port_ : Port number of the target of the module.</li>
 <li>_plugin_parameters_ : Plug-in Parameters of the module.</li>
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index 5382c502ab..bd303e9657 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -54,6 +54,8 @@ Besides the defined module macros, the following macros are available:
 <li>_target_ip_: IP address for the module’s target.</li>
 <li>_target_port_: Port number for the module’s target.</li>
 <li>_plugin_parameters_: Module’s Plugin parameters.</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_: Group’s contact information. Configured when the group is created.</li>
 <li>_groupcustomid_: Group’s custom ID.</li>
 <li>_groupother_: Other information about the group. Configured when the group is created.</li>
diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php
index 5ab70b784e..056de9bcc3 100644
--- a/pandora_console/include/help/es/help_alert_config.php
+++ b/pandora_console/include/help/es/help_alert_config.php
@@ -63,6 +63,8 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_target_ip_ : Dirección IP del objetivo del módulo.</li>
 <li>_target_port_ : Puerto del objetivo del módulo.</li>
 <li>_plugin_parameters_ : Parámetros del Plug-in del módulo.</li>
+<li>_server_ip_ : Ip del servidor al que el agente está asignado. </li>
+<li>_server_name_ : Nombre del servidor al que el agente está asignado. </li>
 <li>_groupcontact_ : Información de contacto del grupo.	Se configura al crear el grupo.</li>
 <li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
 <li>_email_tag_ : Emails asociados a los tags de módulos.</li>
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index 74efb4582b..19bc0b6f71 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -54,6 +54,8 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
 <li>_target_ip_: Dirección IP del objetivo del módulo.</li>
 <li>_target_port_: Puerto del objetivo del módulo.</li>
 <li>_plugin_parameters_: Parámetros del plugin del módulo.</li>
+<li>_server_ip_ : Ip del servidor al que el agente está asignado. </li>
+<li>_server_name_ : Nombre del servidor al que el agente está asignado. </li>
 <li>_groupcontact_: Información de contacto del grupo. Se configura al crear el grupo.</li>
 <li>_groupcustomid_: ID personalizado del grupo.</li>
 <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>
diff --git a/pandora_console/include/help/ja/help_alert_config.php b/pandora_console/include/help/ja/help_alert_config.php
index 592ed64ee3..fa6a68ffa2 100644
--- a/pandora_console/include/help/ja/help_alert_config.php
+++ b/pandora_console/include/help/ja/help_alert_config.php
@@ -62,6 +62,8 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
 <li>_target_ip_ : モジュールの対象IPアドレス</li>
 <li>_target_port_ : モジュールの対象ポート</li>
 <li>_plugin_parameters_ : モジュールのプラグインパラメータ</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_ : グループコンタクト情報。グループの作成時に設定されます。</li>
 <li>_groupother_ : グループに関するその他情報。グループの作成時に設定されます。</li>
 <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php
index c9729e6bfd..86e3a04c96 100644
--- a/pandora_console/include/help/ja/help_alert_macros.php
+++ b/pandora_console/include/help/ja/help_alert_macros.php
@@ -54,6 +54,8 @@
 <li>_target_ip_ : モジュールの対象IPアドレス</li>
 <li>_target_port_ : モジュールの対象ポート</li>
 <li>_plugin_parameters_ : モジュールのプラグインパラメータ</li>
+<li>_server_ip_ : Ip of server assigned to agent. </li>
+<li>_server_name_ : Name of server assigned to agent. </li>
 <li>_groupcontact_ : グループコンタクト情報。グループの作成時に設定されます。</li>
 <li>_groupcustomid_: グループカスタムID</li>
 <li>_groupother_ : グループに関するその他情報。グループの作成時に設定されます。</li>

From ce72e5a5afef41154c2d8083453a9d9d7cd16a4b Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 16 Oct 2017 16:10:59 +0200
Subject: [PATCH 10/27] Added structure to new item

---
 .../visual_console_builder.editor.js          | 51 +++++++++++++++++++
 pandora_console/include/constants.php         |  1 +
 .../include/functions_visual_map_editor.php   | 14 ++---
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 22c6c4d8d4..1e40c44279 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -434,6 +434,19 @@ function update_button_palette_callback() {
 
 			setEventsBar(idItem, values);
 			break;
+		case 'donut_graph':
+			if($('input[name=width]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
+			$("#image_" + idItem).attr("src", "images/spinner.gif");
+
+			setDonutsGraph(idItem, values);
+			break;
 		case 'simple_value':
 		//checkpoint
 			// if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || 
@@ -699,6 +712,12 @@ function create_button_palette_callback() {
 				validate = false;
 			}
 			break;
+		case 'donut_graph':
+			if ((values['agent'] == '')) {
+				alert($("#message_alert_no_agent").html());
+				validate = false;
+			}
+			break;
 		case 'label':
 			if ((values['label'] == '')) {
 				alert($("#message_alert_no_label").html());
@@ -975,6 +994,7 @@ function toggle_item_palette() {
 		activeToolboxButton('box_item', true);
 		activeToolboxButton('line_item', true);
 		activeToolboxButton('auto_sla_graph', true);
+		activeToolboxButton('donut_graph', true);
 
 		if (typeof(enterprise_activeToolboxButton) == 'function') {
 			enterprise_activeToolboxButton(true);
@@ -995,6 +1015,7 @@ function toggle_item_palette() {
 		activeToolboxButton('static_graph', false);
 		activeToolboxButton('module_graph', false);
 		activeToolboxButton('auto_sla_graph', false);
+		activeToolboxButton('donut_graph', false);
 		activeToolboxButton('simple_value', false);
 		activeToolboxButton('label', false);
 		activeToolboxButton('icon', false);
@@ -2348,6 +2369,17 @@ function createItem(type, values, id_data) {
 
 			setEventsBar(id_data, values);
 			break;
+		case 'donut_graph':
+			var sizeStyle = '';
+			var imageSize = '';
+			item = $('<div id="' + id_data + '" class="item donut_graph" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+							'<table><tr><td></td></tr><tr><td></td></tr><tr><td></td></tr></table>' +
+							'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+					'</div>'
+					);
+
+			setDonutsGraph(id_data, values);
+			break;
 		case 'percentile_bar':
 		case 'percentile_item':
 			var sizeStyle = '';
@@ -2679,6 +2711,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 		case 'icon':
 		case 'module_graph':
 		case 'auto_sla_graph':
+		case 'donut_graph':
 			if (type == 'simple_value') {
 				setModuleValue(idElement,
 					values.process_simple_value,
@@ -3093,6 +3126,15 @@ function eventsItems(drag) {
 				activeToolboxButton('delete_item', true);
 				activeToolboxButton('show_grid', false);
 			}
+			if ($(divParent).hasClass('donut_graph')) {
+				creationItem = null;
+				selectedItem = 'donut_graph';
+				idItem = $(divParent).attr('id');
+				activeToolboxButton('copy_item', true);
+				activeToolboxButton('edit_item', true);
+				activeToolboxButton('delete_item', true);
+				activeToolboxButton('show_grid', false);
+			}
 			if ($(divParent).hasClass('group_item')) {
 				creationItem = null;
 				selectedItem = 'group_item';
@@ -3293,6 +3335,9 @@ function eventsItems(drag) {
 			if ($(event.target).hasClass('auto_sla_graph')) {
 				selectedItem = 'auto_sla_graph';
 			}
+			if ($(event.target).hasClass('donut_graph')) {
+				selectedItem = 'donut_graph';
+			}
 			if ($(event.target).hasClass('group_item')) {
 				selectedItem = 'group_item';
 			}
@@ -3617,6 +3662,10 @@ function click_button_toolbox(id) {
 			toolbuttonActive = creationItem = 'auto_sla_graph';
 			toggle_item_palette();
 			break;
+		case 'donut_graph':
+			toolbuttonActive = creationItem = 'donut_graph';
+			toggle_item_palette();
+			break;
 		case 'simple_value':
 			toolbuttonActive = creationItem = 'simple_value';
 			toggle_item_palette();
@@ -3674,6 +3723,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('service', false);
 				activeToolboxButton('group_item', false);
 				activeToolboxButton('auto_sla_graph', false);
+				activeToolboxButton('donut_graph', false);
 				activeToolboxButton('copy_item', false);
 				activeToolboxButton('edit_item', false);
 				activeToolboxButton('delete_item', false);
@@ -3704,6 +3754,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('icon', true);
 				activeToolboxButton('group_item', true);
 				activeToolboxButton('auto_sla_graph', true);
+				activeToolboxButton('donut_graph', true);
 			}
 			break;
 		case 'save_visualmap':
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index f039a90504..8d0facabee 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -197,6 +197,7 @@ define('SERVICE',			10); //Enterprise Item.
 define('GROUP_ITEM',		11);
 define('BOX_ITEM',			12);
 define('LINE_ITEM',			13);
+define('DONUT_GRAPH',		17);
 //Some styles
 define('MIN_WIDTH',			300);
 define('MIN_HEIGHT',		120);
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 54db2d8008..ec9e06c9e8 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -54,6 +54,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'static_graph' => __('Static Graph'),
 				'percentile_item' => __('Percentile Item'),
 				'module_graph' => __('Graph'),
+				'donut_graph' => __('Donut graph'),
 				'auto_sla_graph' => __('Auto SLA Graph'),
 				'simple_value' => __('Simple value') . ui_print_help_tip(__("To use 'label'field, you should write
 					a text to replace '(_VALUE_)' and the value of the module will be printed at the end."), true),
@@ -277,7 +278,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['agent_row'] = array();
 			$form_items['agent_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'donut_graph');
 			$form_items['agent_row']['html'] = '<td align="left">' .
 				__('Agent') . '</td>';			
 			$params = array();
@@ -310,7 +311,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['module_row'] = array();
 			$form_items['module_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'donut_graph');
 			$form_items['module_row']['html'] = '<td align="left">' .
 				__('Module') . '</td>
 				<td align="left">' .
@@ -446,12 +447,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 					html_print_radio_button_extended('value_show', 'value', ('Value'), 'value', false, '', '', true) .
 					'</td>';
 			}
-
-
-			$form_items['period_row'] = array();
-			$form_items['period_row']['items'] = array('module_graph', 'simple_value', 'datos');
-			$form_items['period_row']['html'] = '<td align="left">' . __('Period') . '</td>
-				<td align="left">' .  html_print_extended_select_for_time ('period', SECONDS_5MINUTES, '', '', '', false, true) . '</td>';
 			
 			$form_items['show_statistics_row'] = array();
 			$form_items['show_statistics_row']['items'] = array('group_item');
@@ -530,7 +525,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['size_row']['items'] = array(
 				'group_item', 'background',
 				'static_graph', 'icon datos',
-				'auto_sla_graph');
+				'auto_sla_graph', 'donut_graph');
 			$form_items_advance['size_row']['html'] = '<td align="left">' .
 				__('Size') .
 				ui_print_help_tip (
@@ -674,6 +669,7 @@ function visual_map_editor_print_toolbox() {
 		visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
 		visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);
 		visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true);
+		visual_map_print_button_editor('donut_graph', __('Donut Graph'), 'left', false, 'donut_graph_min', true);
 		visual_map_print_button_editor('auto_sla_graph', __('Auto SLA Graph'), 'left', false, 'auto_sla_graph_min', true);
 		visual_map_print_button_editor('simple_value', __('Simple Value'), 'left', false, 'binary_min', true);
 		visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true);

From d18dded93aec519e15645ff959510ac5ad2fc896 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 17 Oct 2017 10:54:08 +0200
Subject: [PATCH 11/27] Added a lot of code to add donut graph to visual
 console. Print donut in progress.

---
 .../visual_console_builder.editor.js          | 60 ++++++++++++++----
 .../ajax/visual_console_builder.ajax.php      | 46 ++++++++++++++
 .../include/functions_visual_map.php          | 63 +++++++++++++++++++
 .../include/graphs/functions_d3.php           | 28 +++++++++
 pandora_console/include/graphs/pandora.d3.js  | 47 ++++++++++++++
 5 files changed, 231 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 1e40c44279..0825a97eb8 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -448,13 +448,6 @@ function update_button_palette_callback() {
 			setDonutsGraph(idItem, values);
 			break;
 		case 'simple_value':
-		//checkpoint
-			// if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || 
-			// $('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_') 
-			// && $('#data_image_check').html() != 'On'){
-			// 		alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.');
-			// 		return;
-			// }
 			$("#" + idItem).html(values['label']);
 			if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') 
 				&& (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){
@@ -469,12 +462,7 @@ function update_button_palette_callback() {
 				$("#" + idItem).html(
 					'<table><tbody><tr><td></td></tr><tr><td><span style="" id="text_21" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>'
 				)
-				
 			}
-		
-			
-			//$("#simplevalue_" + idItem)
-				//.html($('<img></img>').attr('src', "images/spinner.gif"));
 			setModuleValue(idItem,values['process_simple_value'], values['period'],values['width']);
 			break;
 		case 'label':
@@ -2011,6 +1999,53 @@ function setEventsBar(id_data, values) {
 	});
 }
 
+function setDonutsGraph (id_data, values) {
+	var url_hack_metaconsole = '';
+	if (is_metaconsole()) {
+		url_hack_metaconsole = '../../';
+	}
+
+	parameter = Array();
+
+	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
+	parameter.push ({name: "action", value: "get_module_type_string"});
+	parameter.push ({name: "id_agent", value: values['id_agent']});
+	parameter.push ({name: "id_agent_module", value: values['module']});
+	if (is_metaconsole()) {
+		parameter.push ({name: "id_metaconsole", value: id_metaconsole});
+	}
+	parameter.push ({name: "id_visual_console", value: id_visual_console});
+	jQuery.ajax({
+		url: get_url_ajax(),
+		data: parameter,
+		type: "POST",
+		dataType: 'json',
+		success: function (data) {
+			if (data['no_data'] == true) {
+				if (values['width'] == "0" || values['height'] == "0") {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				}
+				else {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+					$("#" + id_data + " img").css('width', values['width'] + 'px');
+					$("#" + id_data + " img").css('height', values['height'] + 'px');
+				}
+			}
+			else {
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				
+				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
+					// Image size
+				}
+				else{
+					$("#" + id_data + " img").css('width', $('#text-width').val()+'px');
+					$("#" + id_data + " img").css('height', $('#text-height').val()+'px');
+				}
+			}
+		}
+	});
+}
+
 function setPercentileBubble(id_data, values) {
 	metaconsole = $("input[name='metaconsole']").val();
 
@@ -2373,7 +2408,6 @@ function createItem(type, values, id_data) {
 			var sizeStyle = '';
 			var imageSize = '';
 			item = $('<div id="' + id_data + '" class="item donut_graph" style="text-align: left; position: absolute; display: inline-block; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
-							'<table><tr><td></td></tr><tr><td></td></tr><tr><td></td></tr></table>' +
 							'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
 					'</div>'
 					);
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index e854a31c49..bab30d680c 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -141,6 +141,36 @@ switch ($action) {
 		echo json_encode($return);
 		break;
 	
+	case 'get_module_type_string':
+		$data = array ();
+
+		if (!empty($id_metaconsole)) {
+			$connection = db_get_row_filter ('tmetaconsole_setup', $id_metaconsole);
+			if (metaconsole_load_external_db($connection) != NOERR) {
+				continue;
+			}
+		}
+
+		$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
+			array ('id_agente' => $id_agent,
+				'id_agente_modulo' => $id_module));
+		
+		if (!empty($id_metaconsole)) {
+			metaconsole_restore_db();
+		}
+
+		$return = array();
+		if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+			($is_string == 10) || ($is_string == 33)) {
+			$return['no_data'] = false;
+		}
+		else {
+			$return['no_data'] = true;
+		}
+
+		echo json_encode($return);
+		break;
+
 	case 'get_module_events':
 		$data = array ();
 		
@@ -465,6 +495,7 @@ switch ($action) {
 			case 'label':
 			case 'icon':
 			case 'auto_sla_graph':
+			case 'donut_graph':
 			default:
 				if ($type == 'label') {
 					$values['type'] = LABEL;
@@ -551,6 +582,15 @@ switch ($action) {
 							$values['height'] = $height;
 						}
 						break;
+					case 'donut_graph':
+						$values['type'] = DONUT_GRAPH;
+						if ($width !== null) {
+							$values['width'] = $width;
+						}
+						if ($height !== null) {
+							$values['height'] = $height;
+						}
+						break;
 					case 'box_item':
 						$values['border_width'] = $border_width;
 						$values['border_color'] = $border_color;
@@ -711,6 +751,7 @@ switch ($action) {
 			case 'label':
 			case 'icon':
 			case 'auto_sla_graph':
+			case 'donut_graph':
 				$elementFields = db_get_row_filter('tlayout_data',
 					array('id' => $id_element));
 				
@@ -929,6 +970,11 @@ switch ($action) {
 				$values['width'] = $width;
 				$values['height'] = $height;
 				break;
+			case 'donut_graph':
+				$values['type'] = DONUT_GRAPH;
+				$values['width'] = $width;
+				$values['height'] = $height;
+				break;
 			case 'percentile_item':
 			case 'percentile_bar': 
 				if ($type_percentile == 'percentile') {
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b06a0c6d5c..54cff753c3 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -379,6 +379,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 			case AUTO_SLA_GRAPH:
 				$link = true;
 				break;
+			case DONUT_GRAPH:
+				$link = true;
+				break;
 			default:
 				if (!empty($element_enterprise)) {
 					$link = $element_enterprise['link'];
@@ -487,6 +490,18 @@ function visual_map_print_item($mode = "read", $layoutData,
 						"&date_to=" . $date_to . "&time_to=" . $time_to . "&status=-1";
 				}
 				break;
+
+			case DONUT_GRAPH:
+				if (empty($layout_data['id_metaconsole'])) {
+					$url = $config['homeurl'] . "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				else {
+					$url = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				break;
+
 			case GROUP_ITEM:
 				$is_a_link_to_other_visualconsole = false;
 				if ($layoutData['id_layout_linked'] != 0) {
@@ -1121,6 +1136,44 @@ function visual_map_print_item($mode = "read", $layoutData,
 				metaconsole_restore_db();
 			}
 
+			$z_index = 2 + 1;
+			break;
+		
+		case DONUT_GRAPH:
+			$donut_data = get_donut_module_data($layoutData['id_agent'], $layoutData['id_agente_modulo']);
+
+			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
+				if($width == 0 || $height == 0){
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/module-events.png">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/module-events.png">';	
+					}
+				}
+				else{
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/module-events.png" style="width:'.$width.'px;height:'. $height.'px;">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/module-events.png" style="width:'.$width.'px;height:'. $height.'px;">';
+					}
+				}
+			}
+			else {
+				if ($width == 0 || $height == 0) {
+					$img = d3_donut_graph ($layoutData['id'], 200, 400, $donut_data);
+				}
+				else{
+					$img = d3_donut_graph ($layoutData['id'], $width, $height, $donut_data);
+				}
+			}
+		
+			//Restore db connection
+			if ($layoutData['id_metaconsole'] != 0) {
+				metaconsole_restore_db();
+			}
+
 			$z_index = 2 + 1;
 			break;
 	}
@@ -1133,6 +1186,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 		case AUTO_SLA_GRAPH:
 			$class .= "auto_sla_graph";
 			break;
+		case DONUT_GRAPH:
+			$class .= "donut_graph";
+			break;
 		case GROUP_ITEM:
 			$class .= "group_item";
 			break;
@@ -1575,6 +1631,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 				echo io_safe_output($text);
 			}
 			break;
+		case DONUT_GRAPH:
+			echo $img;
+			break;
 		case SIMPLE_VALUE:
 		case SIMPLE_VALUE_MAX:
 		case SIMPLE_VALUE_MIN:
@@ -1726,6 +1785,10 @@ function visual_map_print_item($mode = "read", $layoutData,
 	}
 }
 
+function get_donut_module_data ($id_agent, $id_module) {
+	
+}
+
 /**
  * The function to get simple value type from the value of process type in the form
  * 
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index f181492b7a..3106358217 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -309,4 +309,32 @@ function ux_console_phases_donut ($phases, $id, $return = false) {
 	
 	return $output;
 }
+
+function d3_donut_graph ($id, $width, $height, $module_data) {
+	global $config;
+
+	$module_data = json_encode($module_data);
+
+	$recipient_name = "donut_graph_" . $id;
+	$recipient_name_to_js = "#donut_graph_" . $id;
+
+	$output = "<div id=" . $recipient_name .  " style='overflow: hidden;'></div>";
+	$output .= include_javascript_d3(true);
+	$output .= "<style type=\"text/css\">
+					path {
+						stroke: #fff;
+						fill-rule: evenodd;
+					}
+				</style>";
+
+	$output .= "<script language=\"javascript\" type=\"text/javascript\">
+					print_donut_graph('" . $recipient_name_to_js . "', " . $width . ", " . $height . ", " . $module_data . ");
+				</script>";
+
+	if (!$return)
+		echo $output;
+	
+	return $output;
+}
+
 ?>
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 95a914104f..bf2d10b886 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1492,4 +1492,51 @@ function print_phases_donut (recipient, phases) {
 		polyline.exit()
 			.remove();
 	}
+}
+
+function print_donut_graph (recipient, width, height, module_data) {
+	var svg = d3.select(recipient)
+		.append("svg")
+			.attr("width", width)
+			.attr("height", height)
+		.append("g");
+
+	var radius = Math.min(width, height) / 2;
+
+	var pie = d3.layout.pie()
+		.sort(null)
+		.value(function(d) {
+			return parseFloat(d.label2);
+		});
+
+	svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+	/* ------- PIE SLICES -------*/
+	var slice = svg.select(".slices").selectAll("path.slice")
+		.data(module_data);
+
+	slice.enter()
+		.insert("path")
+		.style("fill", function(d) {
+			if (d.data.value == 0) {
+				return "#80BA27";
+			}
+			else {
+				return "#FC4444";
+			}
+		})
+		.attr("class", "slice");
+
+	slice.transition()
+			.duration(0)
+			.attrTween("d", function(d) {
+				this._current = this._current || d;
+				var interpolate = d3.interpolate(this._current, d);
+				this._current = interpolate(0);
+				return function(t) {
+					return arc(interpolate(t));
+				};
+			});
+
+	slice.exit().remove();
 }
\ No newline at end of file

From d35b420c36c185777233f57bd3cab5a474acdcb1 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 17 Oct 2017 12:09:55 +0200
Subject: [PATCH 12/27] Init d3 donut function

---
 .../include/functions_visual_map.php          | 25 ++++++++++++++++---
 .../include/graphs/functions_d3.php           |  3 ---
 pandora_console/include/graphs/pandora.d3.js  |  4 ++-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 54cff753c3..42d98f41ab 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -31,6 +31,7 @@ require_once ($config['homedir'].'/include/functions_agents.php');
 require_once ($config['homedir'].'/include/functions_modules.php');
 require_once ($config['homedir'].'/include/functions_users.php');
 require_once ($config['homedir'].'/include/functions.php');
+require_once ($config['homedir'].'/include/graphs/functions_d3.php');
 
 function visual_map_print_item_toolbox($idDiv, $text, $float) {
 	if ($float == 'left') {
@@ -1140,7 +1141,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			break;
 		
 		case DONUT_GRAPH:
-			$donut_data = get_donut_module_data($layoutData['id_agent'], $layoutData['id_agente_modulo']);
+			$donut_data = get_donut_module_data($layoutData['id_agente_modulo']);
 
 			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
 				if($width == 0 || $height == 0){
@@ -1168,7 +1169,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$img = d3_donut_graph ($layoutData['id'], $width, $height, $donut_data);
 				}
 			}
-		
+
 			//Restore db connection
 			if ($layoutData['id_metaconsole'] != 0) {
 				metaconsole_restore_db();
@@ -1632,6 +1633,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 			break;
 		case DONUT_GRAPH:
+			html_debug($img, true);
 			echo $img;
 			break;
 		case SIMPLE_VALUE:
@@ -1785,8 +1787,23 @@ function visual_map_print_item($mode = "read", $layoutData,
 	}
 }
 
-function get_donut_module_data ($id_agent, $id_module) {
-	
+function get_donut_module_data ($id_module) {
+	$mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module));
+
+	$values = explode(";", $mod_values);
+
+	$values_to_return = array();
+	$index = 0;
+	$total = 0;
+	foreach ($values as $val) {
+		$data = explode(":", $val);
+		$values_to_return[$index]['tag'] = $data[0];
+		$values_to_return[$index]['value'] = $data[1];
+		$index++;
+	}
+	$values_to_return['total'] = count($values_to_return);
+
+	return $values_to_return;
 }
 
 /**
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 3106358217..57414af522 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -331,9 +331,6 @@ function d3_donut_graph ($id, $width, $height, $module_data) {
 					print_donut_graph('" . $recipient_name_to_js . "', " . $width . ", " . $height . ", " . $module_data . ");
 				</script>";
 
-	if (!$return)
-		echo $output;
-	
 	return $output;
 }
 
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index bf2d10b886..921b64b5eb 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1495,6 +1495,8 @@ function print_phases_donut (recipient, phases) {
 }
 
 function print_donut_graph (recipient, width, height, module_data) {
+	console.log(module_data);
+
 	var svg = d3.select(recipient)
 		.append("svg")
 			.attr("width", width)
@@ -1511,7 +1513,6 @@ function print_donut_graph (recipient, width, height, module_data) {
 
 	svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
 
-	/* ------- PIE SLICES -------*/
 	var slice = svg.select(".slices").selectAll("path.slice")
 		.data(module_data);
 
@@ -1539,4 +1540,5 @@ function print_donut_graph (recipient, width, height, module_data) {
 			});
 
 	slice.exit().remove();
+
 }
\ No newline at end of file

From 13f0d4c1f7fb806f288fa7136c72ac6d0eb9aa96 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 17 Oct 2017 16:50:00 +0200
Subject: [PATCH 13/27] Added donut to visual console view

---
 .../include/functions_visual_map.php          | 38 ++++++--
 .../include/graphs/functions_d3.php           |  2 +-
 pandora_console/include/graphs/pandora.d3.js  | 88 +++++++++++++------
 3 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 42d98f41ab..98a36fface 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1163,7 +1163,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 			else {
 				if ($width == 0 || $height == 0) {
-					$img = d3_donut_graph ($layoutData['id'], 200, 400, $donut_data);
+					$img = d3_donut_graph ($layoutData['id'], 200, 300, $donut_data);
 				}
 				else{
 					$img = d3_donut_graph ($layoutData['id'], $width, $height, $donut_data);
@@ -1633,7 +1633,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 			break;
 		case DONUT_GRAPH:
-			html_debug($img, true);
 			echo $img;
 			break;
 		case SIMPLE_VALUE:
@@ -1792,16 +1791,41 @@ function get_donut_module_data ($id_module) {
 
 	$values = explode(";", $mod_values);
 
+	$colors = array();
+	$colors[] = "#aa3333";
+	$colors[] = "#045FB4";
+	$colors[] = "#8181F7";
+	$colors[] = "#F78181";
+	$colors[] = "#D0A9F5";
+	$colors[] = "#BDBDBD";
+	$colors[] = "#6AB277";
+
 	$values_to_return = array();
 	$index = 0;
 	$total = 0;
+	$max_elements = 6;
+	
 	foreach ($values as $val) {
-		$data = explode(":", $val);
-		$values_to_return[$index]['tag'] = $data[0];
-		$values_to_return[$index]['value'] = $data[1];
-		$index++;
+		if ($index < $max_elements) {
+			$data = explode(":", $val);
+			$values_to_return[$index]['tag_name'] = $data[0];
+			$values_to_return[$index]['color'] = $colors[$index];
+			$values_to_return[$index]['value'] = (int)$data[1];
+			$total += (int)$data[1];
+			$index++;
+		}
+		else {
+			$data = explode(":", $val);
+			$values_to_return[$index]['tag_name'] = __('Others');
+			$values_to_return[$index]['color'] = $colors[$index];
+			$values_to_return[$index]['value'] += (int)$data[1];
+			$total += (int)$data[1];
+		}
+	}
+
+	foreach ($values_to_return as $ind => $donut_data) {
+		$values_to_return[$ind]['percent'] = ($donut_data['value'] * 100) / $total;
 	}
-	$values_to_return['total'] = count($values_to_return);
 
 	return $values_to_return;
 }
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 57414af522..0e1a95f5f4 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -326,7 +326,7 @@ function d3_donut_graph ($id, $width, $height, $module_data) {
 						fill-rule: evenodd;
 					}
 				</style>";
-
+	
 	$output .= "<script language=\"javascript\" type=\"text/javascript\">
 					print_donut_graph('" . $recipient_name_to_js . "', " . $width . ", " . $height . ", " . $module_data . ");
 				</script>";
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 921b64b5eb..ba0216d53b 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1495,50 +1495,80 @@ function print_phases_donut (recipient, phases) {
 }
 
 function print_donut_graph (recipient, width, height, module_data) {
-	console.log(module_data);
-
 	var svg = d3.select(recipient)
 		.append("svg")
 			.attr("width", width)
 			.attr("height", height)
 		.append("g");
 
-	var radius = Math.min(width, height) / 2;
+	svg.append("g")
+		.attr("class", "slices");
+
+	var radius = 100;
+
+	var arc = d3.svg.arc()
+		.outerRadius(radius * 0.8)
+		.innerRadius(radius * 0.4);
+
+	var key = function(d){ return d.data.label; };
 
 	var pie = d3.layout.pie()
 		.sort(null)
 		.value(function(d) {
-			return parseFloat(d.label2);
+			return parseFloat(d.percent);
 		});
 
-	svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+	var increment_y = 0;
+	jQuery.each(module_data, function (key, m_d) {
+		svg.append("g")
+			.append("text")
+				.append("tspan")
+					.attr("dy", increment_y + ".8em")
+					.attr("dx", ".1em")
+					.text(m_d.tag_name + ", ")
+					.style("font-family", "Verdana")
+					.style("font-size", "15px")
+				.append("tspan")
+					.attr("dx", ".2em")
+					.text(m_d.value)
+					.style("font-family", "Verdana")
+					.style("font-size", "15px");
+		
+		increment_y += 1;
+	});
 
-	var slice = svg.select(".slices").selectAll("path.slice")
-		.data(module_data);
+	function donutData (){
+		return module_data.map(function(m_data){
+			return { label: m_data.tag_name, value: m_data.value , percent: m_data.percent, color : m_data.color}
+		});
+	}
 
-	slice.enter()
-		.insert("path")
-		.style("fill", function(d) {
-			if (d.data.value == 0) {
-				return "#80BA27";
-			}
-			else {
-				return "#FC4444";
-			}
-		})
-		.attr("class", "slice");
+	print_phases(donutData());
 
-	slice.transition()
-			.duration(0)
-			.attrTween("d", function(d) {
-				this._current = this._current || d;
-				var interpolate = d3.interpolate(this._current, d);
-				this._current = interpolate(0);
-				return function(t) {
-					return arc(interpolate(t));
-				};
-			});
+	function print_phases(data) {
+		var slice = svg.select(".slices").selectAll("path.slice")
+			.data(pie(data), key);
 
-	slice.exit().remove();
+		slice.enter()
+			.insert("path")
+			.style("fill", function(d) {
+				console.log(d);
+					return d.data.color;
+			})
+			.attr("class", "slice")
+			.attr("transform", "translate(" + width / 2 + "," + (height - radius) + ")");
 
+		slice.transition()
+				.duration(0)
+				.attrTween("d", function(d) {
+					this._current = this._current || d;
+					var interpolate = d3.interpolate(this._current, d);
+					this._current = interpolate(0);
+					return function(t) {
+						return arc(interpolate(t));
+					};
+				});
+ 
+		slice.exit().remove();
+	}
 }
\ No newline at end of file

From f6fca4e46dd3c8a4cfcd0b81456374382e0b08a2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 18 Oct 2017 11:40:40 +0200
Subject: [PATCH 14/27] Added donut to node visual consoles

---
 .../visual_console_builder.editor.js          |  27 +++----
 .../images/console/signes/donut-graph.png     | Bin 0 -> 10359 bytes
 .../console/signes/wrong_donut_graph.png      | Bin 0 -> 13944 bytes
 .../images/icono-quesito.disabled.png         | Bin 0 -> 563 bytes
 pandora_console/images/icono-quesito.png      | Bin 0 -> 562 bytes
 .../ajax/visual_console_builder.ajax.php      |  18 ++---
 .../include/functions_visual_map.php          |  70 ++++++++++++++----
 .../include/functions_visual_map_editor.php   |   4 +-
 pandora_console/include/graphs/pandora.d3.js  |  68 +++++++++++++----
 pandora_console/include/styles/pandora.css    |   6 ++
 10 files changed, 138 insertions(+), 55 deletions(-)
 create mode 100644 pandora_console/images/console/signes/donut-graph.png
 create mode 100644 pandora_console/images/console/signes/wrong_donut_graph.png
 create mode 100644 pandora_console/images/icono-quesito.disabled.png
 create mode 100644 pandora_console/images/icono-quesito.png

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 0825a97eb8..2911edc311 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -435,14 +435,6 @@ function update_button_palette_callback() {
 			setEventsBar(idItem, values);
 			break;
 		case 'donut_graph':
-			if($('input[name=width]').val() == ''){
-				alert('Undefined width');
-				return false;
-			}
-			if($('input[name=height]').val() == ''){
-				alert('Undefined height');
-				return false;
-			}
 			$("#image_" + idItem).attr("src", "images/spinner.gif");
 
 			setDonutsGraph(idItem, values);
@@ -2005,6 +1997,8 @@ function setDonutsGraph (id_data, values) {
 		url_hack_metaconsole = '../../';
 	}
 
+	width_percentile = values['width_percentile'];
+
 	parameter = Array();
 
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
@@ -2021,25 +2015,26 @@ function setDonutsGraph (id_data, values) {
 		type: "POST",
 		dataType: 'json',
 		success: function (data) {
+			console.log(data);
 			if (data['no_data'] == true) {
-				if (values['width'] == "0" || values['height'] == "0") {
-					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				if (values['width'] == "0") {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/wrong_donut_graph.png');
 				}
 				else {
-					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
-					$("#" + id_data + " img").css('width', values['width'] + 'px');
-					$("#" + id_data + " img").css('height', values['height'] + 'px');
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/wrong_donut_graph.png');
+					$("#" + id_data + " img").css('width', width_percentile + 'px');
+					$("#" + id_data + " img").css('height', width_percentile + 'px');
 				}
 			}
 			else {
-				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/donut-graph.png');
 				
 				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
 					// Image size
 				}
 				else{
-					$("#" + id_data + " img").css('width', $('#text-width').val()+'px');
-					$("#" + id_data + " img").css('height', $('#text-height').val()+'px');
+					$("#" + id_data + " img").css('width', $('#text-width_percentile').val()+'px');
+					$("#" + id_data + " img").css('height', $('#text-width_percentile').val()+'px');
 				}
 			}
 		}
diff --git a/pandora_console/images/console/signes/donut-graph.png b/pandora_console/images/console/signes/donut-graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..57a2d3eb2b93c9c8c7142bcc7053778d11e6094f
GIT binary patch
literal 10359
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

literal 0
HcmV?d00001

diff --git a/pandora_console/images/console/signes/wrong_donut_graph.png b/pandora_console/images/console/signes/wrong_donut_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..8005a9ac462ab0a60e2283b504138f0f6b05a3d7
GIT binary patch
literal 13944
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

literal 0
HcmV?d00001

diff --git a/pandora_console/images/icono-quesito.disabled.png b/pandora_console/images/icono-quesito.disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..8202e2040ba1993d7cc06b783d1a6a982ba5f647
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz)k#D_RCwBAV88}$-n#vt3B~}?00D$4
z4W;kHl=TBCLx2EcgmTUUDFc{lbv0E+26V%K?D-%*Ba*;-ASD3Af<PS~00IcByBN`o
zc>u%*zyfGyLtGC8iOAYnKyC!$^FS2}K)N2;Opw5RkeNW+6#)W>5zV^}Kx#j-7~E4x
zCIkSf^+;+0q5km);sB_aAi5U<fhKK0vkerM1t2yPn*Y~h36laSeE~Tr=L4w(2J9da
zXyXEa0Ae5(poat~6daI*76464gas~00m#Siu^99L<Y`c_!90bmXaNvA0`UZxhd{}J
z1sW?bU<lNG0m?oAlzRxIK|v+JgzQ@+MKJyZ7@LV$Uo%170`qkOS}4rNl_FuOG7%bE
z0x&Tq^i%@`3ed0=Kys@h6Iv3RfabJ9m>~cG#z@E$(BN}`+5`ij&^drBi!ov`L;xDj
z2}A^3BM`>}@kHccM^8iRkun4!PzcSZ0_Z6iIk}^hH?Z^uN>b>F0Vz7?W3g-kBOV3t
zlujVb@1un`Jk=>+QNNJLU|5JPg~DPJ9n=%yN>F&_<BWYAkpv3UM&y_!B83#9$9@9=
z7d8@*2Sw@uCbTTx0L>MJP*)NI9zYFa1Q`et0086S#vxqf0&oBT002ovPDHLkV1nGs
B%OL;&

literal 0
HcmV?d00001

diff --git a/pandora_console/images/icono-quesito.png b/pandora_console/images/icono-quesito.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1a0ed73ff4712e5b5a92148a8b023134b7f837a
GIT binary patch
literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz)Ja4^RCwBAV88~<%*_5X!5APKAb>EX
zq4a&2vVI_C2oOMwP|kTEWdKus>eMMl26V%K?D-%*Ba*;-ASD3Af<PS~00IcByBN`o
zc>u%*zyfGyLtGC8iOAYnKyC!$^FS2}K)N2;Opw5RkeNW+6#)W>5zV^}Kx#j-7~E4x
zCIkSf^+;+0q5km);sB_aAPbZMQy2&|X#<j`1<<f80OI#dX#QW1B}@vS^abRgoDZZD
z7_fsxpp6Rv0*HZFfF2T{P;fwYFVM6^Sm1&bfPDNOi$Nbi(E<uKn5U2xEdXLiAf5p8
z5GXmYKw||441u~YK-mX?au0ztD5wOOkbR4!2*#fPV>1!!YbK~$V7^X33x)Z(QY0)@
zCPHIN04BzSo@#(V0UDM9NN!bRLQ7&3(41BXGXx;O7zud-8hj2=n_vJGItOrNF-9zg
z2tdO*frx->1mbugo`@Xm=xJy@QidP|3ZeN_06hgGCwG+c2A1AHNeVqNAVueVES61R
z#G?S7(g}q5eYEg~r#b~J>K76j3=6TPP*`lDgL)!d2@21AoUxB1l0aeFh#a#-q>w`N
z*l!@<!bSq}ph!Kyh{Ib2Sdt4aLmxns(gBzN0Q=FSu$FN;YybcN07*qoM6N<$f|d!-
A^Z)<=

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index bab30d680c..4d32a885c3 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -153,12 +153,12 @@ switch ($action) {
 
 		$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
 			array ('id_agente' => $id_agent,
-				'id_agente_modulo' => $id_module));
+				'id_agente_modulo' => $id_agent_module));
 		
 		if (!empty($id_metaconsole)) {
 			metaconsole_restore_db();
 		}
-
+		
 		$return = array();
 		if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
 			($is_string == 10) || ($is_string == 33)) {
@@ -583,13 +583,11 @@ switch ($action) {
 						}
 						break;
 					case 'donut_graph':
+						if ($width_percentile !== null) {
+							$values['width'] = $width_percentile;
+							$values['height'] = $width_percentile;
+						}
 						$values['type'] = DONUT_GRAPH;
-						if ($width !== null) {
-							$values['width'] = $width;
-						}
-						if ($height !== null) {
-							$values['height'] = $height;
-						}
 						break;
 					case 'box_item':
 						$values['border_width'] = $border_width;
@@ -823,7 +821,9 @@ switch ($action) {
 							$elementFields['type_percentile'] = 'bubble';
 						}
 						break;
-					
+					case 'donut_graph':
+						$elementFields['width_percentile'] = $elementFields['width'];
+						break;
 					case 'module_graph':
 						$elementFields['width_module_graph'] = $elementFields['width'];
 						$elementFields['height_module_graph'] = $elementFields['height'];
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 98a36fface..199a1204f3 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1141,34 +1141,78 @@ function visual_map_print_item($mode = "read", $layoutData,
 			break;
 		
 		case DONUT_GRAPH:
-			$donut_data = get_donut_module_data($layoutData['id_agente_modulo']);
+			if (!empty($id_metaconsole)) {
+				$connection = db_get_row_filter ('tmetaconsole_setup', $id_metaconsole);
+				if (metaconsole_load_external_db($connection) != NOERR) {
+					continue;
+				}
+			}
 
-			if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
-				if($width == 0 || $height == 0){
+			$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
+				array ('id_agente' => $layoutData['id_agent'],
+					'id_agente_modulo' => $id_module));
+			
+			if (!empty($id_metaconsole)) {
+				metaconsole_restore_db();
+			}
+
+			if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+				($is_string == 10) || ($is_string == 33)) {
+				$no_data = false;
+			}
+			else {
+				$no_data = true;
+			}
+
+			if ($no_data) {
+				if($width == 0){
 					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/module-events.png">';
+						$img =  '<img src="../../images/console/signes/wrong_donut_graph.png">';
 					}
 					else{
-						$img =  '<img src="images/console/signes/module-events.png">';	
+						$img =  '<img src="images/console/signes/wrong_donut_graph.png">';	
 					}
 				}
 				else{
 					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/module-events.png" style="width:'.$width.'px;height:'. $height.'px;">';
+						$img =  '<img src="../../images/console/signes/wrong_donut_graph.png" style="width:'.$width.'px;height:'. $height.'px;">';
 					}
 					else{
-						$img =  '<img src="images/console/signes/module-events.png" style="width:'.$width.'px;height:'. $height.'px;">';
+						$img =  '<img src="images/console/signes/wrong_donut_graph.png" style="width:'.$width.'px;height:'. $height.'px;">';
 					}
 				}
 			}
 			else {
-				if ($width == 0 || $height == 0) {
-					$img = d3_donut_graph ($layoutData['id'], 200, 300, $donut_data);
+				$donut_data = get_donut_module_data($layoutData['id_agente_modulo']);
+
+				if ((get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap')) {
+					if($width == 0){
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/donut-graph.png">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/donut-graph.png">';	
+						}
+					}
+					else{
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/donut-graph.png" style="width:'.$width.'px;height:'. $height.'px;">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/donut-graph.png" style="width:'.$width.'px;height:'. $height.'px;">';
+						}
+					}
 				}
-				else{
-					$img = d3_donut_graph ($layoutData['id'], $width, $height, $donut_data);
+				else {
+					if ($width == 0) {
+						$img = d3_donut_graph ($layoutData['id'], 400, 400, $donut_data);
+					}
+					else{
+						$img = d3_donut_graph ($layoutData['id'], $width, $width, $donut_data);
+					}
 				}
 			}
+			
 
 			//Restore db connection
 			if ($layoutData['id_metaconsole'] != 0) {
@@ -1808,7 +1852,7 @@ function get_donut_module_data ($id_module) {
 	foreach ($values as $val) {
 		if ($index < $max_elements) {
 			$data = explode(":", $val);
-			$values_to_return[$index]['tag_name'] = $data[0];
+			$values_to_return[$index]['tag_name'] = $data[0] . ", " . $data[1];
 			$values_to_return[$index]['color'] = $colors[$index];
 			$values_to_return[$index]['value'] = (int)$data[1];
 			$total += (int)$data[1];
@@ -1816,7 +1860,7 @@ function get_donut_module_data ($id_module) {
 		}
 		else {
 			$data = explode(":", $val);
-			$values_to_return[$index]['tag_name'] = __('Others');
+			$values_to_return[$index]['tag_name'] = __('Others') . ", " . $data[1];
 			$values_to_return[$index]['color'] = $colors[$index];
 			$values_to_return[$index]['value'] += (int)$data[1];
 			$total += (int)$data[1];
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index ec9e06c9e8..4f0b730b74 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -397,7 +397,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			
 			
 			$form_items['percentile_bar_row_1'] = array();
-			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos');
+			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos', 'donut_graph');
 			$form_items['percentile_bar_row_1']['html'] = '<td align="left">' .
 				__('Width') . '</td>
 				<td align="left">' . html_print_input_text('width_percentile', 0, '', 3, 5, true) . '</td>';
@@ -525,7 +525,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['size_row']['items'] = array(
 				'group_item', 'background',
 				'static_graph', 'icon datos',
-				'auto_sla_graph', 'donut_graph');
+				'auto_sla_graph');
 			$form_items_advance['size_row']['html'] = '<td align="left">' .
 				__('Size') .
 				ui_print_help_tip (
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index ba0216d53b..b571732cd1 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1504,7 +1504,53 @@ function print_donut_graph (recipient, width, height, module_data) {
 	svg.append("g")
 		.attr("class", "slices");
 
-	var radius = 100;
+	var radius = 120;
+	var increment_y = 60;
+	var increment_y_padding = 25;
+	var text_size = 15;
+	var decrement_x_padding = 150;
+	if (width >= 500) {
+		radius = 160;
+		increment_y = 60;
+		text_size = 25;
+		increment_y_padding = 25;
+		decrement_x_padding = 75;
+	}
+	else if (width >= 400) {
+		radius = 120;
+		increment_y = 60;
+		text_size = 22;
+		increment_y_padding = 25;
+		decrement_x_padding = 75;
+	}
+	else if (width >= 300) {
+		radius = 80;
+		increment_y = 40;
+		text_size = 14;
+		increment_y_padding = 20;
+		decrement_x_padding = 60;
+	}
+	else if (width >= 200) {
+		radius = 50;
+		increment_y = 40;
+		text_size = 14;
+		increment_y_padding = 15;
+		decrement_x_padding = 45;
+	}
+	else if (width >= 100) {
+		radius = 20;
+		increment_y = 20;
+		text_size = 10;
+		increment_y_padding = 8;
+		decrement_x_padding = 25;
+	}
+	else {
+		radius = 10;
+		increment_y = 10;
+		text_size = 4;
+		increment_y_padding = 3;
+		decrement_x_padding = 5;
+	}
 
 	var arc = d3.svg.arc()
 		.outerRadius(radius * 0.8)
@@ -1518,28 +1564,20 @@ function print_donut_graph (recipient, width, height, module_data) {
 			return parseFloat(d.percent);
 		});
 
-	var increment_y = 0;
 	jQuery.each(module_data, function (key, m_d) {
 		svg.append("g")
 			.append("text")
-				.append("tspan")
-					.attr("dy", increment_y + ".8em")
-					.attr("dx", ".1em")
-					.text(m_d.tag_name + ", ")
-					.style("font-family", "Verdana")
-					.style("font-size", "15px")
-				.append("tspan")
-					.attr("dx", ".2em")
-					.text(m_d.value)
-					.style("font-family", "Verdana")
-					.style("font-size", "15px");
+				.attr("transform", "translate(" + (((width / 2) - (radius + decrement_x_padding))) + "," + (((height / 2) - radius) - increment_y) + ")")
+				.text(m_d.tag_name)
+				.style("font-family", "Verdana")
+				.style("font-size", text_size + "px");
 		
-		increment_y += 1;
+		increment_y -= increment_y_padding;
 	});
 
 	function donutData (){
 		return module_data.map(function(m_data){
-			return { label: m_data.tag_name, value: m_data.value , percent: m_data.percent, color : m_data.color}
+			return { label: m_data.tag_name, percent: m_data.percent, color : m_data.color}
 		});
 	}
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index fcf084085b..93bb7a5976 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -787,6 +787,12 @@ input.auto_sla_graph_min {
 input.auto_sla_graph_min[disabled] {
 	background: #fefefe url(../../images/auto_sla_graph.disabled.png) no-repeat center !important;
 }
+input.donut_graph_min {
+	background: #fefefe url(../../images/icono-quesito.png) no-repeat center !important;
+}
+input.donut_graph_min[disabled] {
+	background: #fefefe url(../../images/icono-quesito.disabled.png) no-repeat center !important;
+}
 input.binary_min {
 	background: #fefefe url(../../images/binary.png) no-repeat center !important;
 }

From b4c1e7d5fe037118c517469511cba32cd47f8523 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 18 Oct 2017 13:20:17 +0200
Subject: [PATCH 15/27] Changed filter

---
 pandora_console/include/functions_visual_map.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 199a1204f3..97ac64b8d4 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1834,7 +1834,12 @@ function get_donut_module_data ($id_module) {
 	$mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module));
 
 	$values = explode(";", $mod_values);
-
+	if (preg_match("/\r\n/", $mod_values)) {
+		$values = explode("\r\n", $mod_values);
+	}
+	elseif (preg_match("/\n/", $mod_values)) {
+		$values = explode("\n", $mod_values);
+	}
 	$colors = array();
 	$colors[] = "#aa3333";
 	$colors[] = "#045FB4";

From ddbe2a298c0dd8db49a50b7b7f0bd8af60f2c1fb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 18 Oct 2017 16:29:51 +0200
Subject: [PATCH 16/27] Adapts donut graph to meta

---
 .../reporting/visual_console_builder.editor.js        |  5 +----
 .../include/ajax/visual_console_builder.ajax.php      |  8 +++++---
 pandora_console/include/functions_visual_map.php      |  9 +++------
 pandora_console/include/graphs/functions_d3.php       | 11 ++++++++---
 pandora_console/include/graphs/pandora.d3.js          |  1 -
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 2911edc311..799c6a72b2 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -2005,9 +2005,7 @@ function setDonutsGraph (id_data, values) {
 	parameter.push ({name: "action", value: "get_module_type_string"});
 	parameter.push ({name: "id_agent", value: values['id_agent']});
 	parameter.push ({name: "id_agent_module", value: values['module']});
-	if (is_metaconsole()) {
-		parameter.push ({name: "id_metaconsole", value: id_metaconsole});
-	}
+	parameter.push ({name: "id_element", value: id_data});
 	parameter.push ({name: "id_visual_console", value: id_visual_console});
 	jQuery.ajax({
 		url: get_url_ajax(),
@@ -2015,7 +2013,6 @@ function setDonutsGraph (id_data, values) {
 		type: "POST",
 		dataType: 'json',
 		success: function (data) {
-			console.log(data);
 			if (data['no_data'] == true) {
 				if (values['width'] == "0") {
 					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/wrong_donut_graph.png');
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 4d32a885c3..a909206b53 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -144,8 +144,10 @@ switch ($action) {
 	case 'get_module_type_string':
 		$data = array ();
 
-		if (!empty($id_metaconsole)) {
-			$connection = db_get_row_filter ('tmetaconsole_setup', $id_metaconsole);
+		$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
+
+		if ($layoutData['id_metaconsole'] != 0) {
+			$connection = db_get_row_filter ('tmetaconsole_setup', $layoutData['id_metaconsole']);
 			if (metaconsole_load_external_db($connection) != NOERR) {
 				continue;
 			}
@@ -155,7 +157,7 @@ switch ($action) {
 			array ('id_agente' => $id_agent,
 				'id_agente_modulo' => $id_agent_module));
 		
-		if (!empty($id_metaconsole)) {
+		if ($layoutData['id_metaconsole'] != 0) {
 			metaconsole_restore_db();
 		}
 		
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 97ac64b8d4..e8a8d76bdb 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1141,8 +1141,8 @@ function visual_map_print_item($mode = "read", $layoutData,
 			break;
 		
 		case DONUT_GRAPH:
-			if (!empty($id_metaconsole)) {
-				$connection = db_get_row_filter ('tmetaconsole_setup', $id_metaconsole);
+			if ($layoutData['id_metaconsole'] != 0) {
+				$connection = db_get_row_filter ('tmetaconsole_setup', $layoutData['id_metaconsole']);
 				if (metaconsole_load_external_db($connection) != NOERR) {
 					continue;
 				}
@@ -1151,10 +1151,6 @@ function visual_map_print_item($mode = "read", $layoutData,
 			$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
 				array ('id_agente' => $layoutData['id_agent'],
 					'id_agente_modulo' => $id_module));
-			
-			if (!empty($id_metaconsole)) {
-				metaconsole_restore_db();
-			}
 
 			if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
 				($is_string == 10) || ($is_string == 33)) {
@@ -1831,6 +1827,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 }
 
 function get_donut_module_data ($id_module) {
+
 	$mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module));
 
 	$values = explode(";", $mod_values);
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 0e1a95f5f4..35b97240b1 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -24,9 +24,14 @@ function include_javascript_d3 ($return = false) {
 	if (!$is_include_javascript) {
 		$is_include_javascript = true;
 
-		$output .= '<script type="text/javascript" src="' . $config['homeurl'] . 'include/javascript/d3.3.5.14.js" charset="utf-8"></script>';
-		$output .= '<script type="text/javascript" src="' . $config['homeurl'] . 'include/graphs/pandora.d3.js" charset="utf-8"></script>';
-
+		if (is_metaconsole()) {
+			$output .= '<script type="text/javascript" src="' . '../../' . 'include/javascript/d3.3.5.14.js" charset="utf-8"></script>';
+			$output .= '<script type="text/javascript" src="' . '../../' . 'include/graphs/pandora.d3.js" charset="utf-8"></script>';
+		}
+		else {
+			$output .= '<script type="text/javascript" src="' . $config['homeurl'] . 'include/javascript/d3.3.5.14.js" charset="utf-8"></script>';
+			$output .= '<script type="text/javascript" src="' . $config['homeurl'] . 'include/graphs/pandora.d3.js" charset="utf-8"></script>';
+		}
 	}
 	if (!$return)
 		echo $output;
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index b571732cd1..b7382d01f9 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1590,7 +1590,6 @@ function print_donut_graph (recipient, width, height, module_data) {
 		slice.enter()
 			.insert("path")
 			.style("fill", function(d) {
-				console.log(d);
 					return d.data.color;
 			})
 			.attr("class", "slice")

From 20cccbc87fd6640efabcf607ef8fa343acf818b2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 19 Oct 2017 10:03:53 +0200
Subject: [PATCH 17/27] Added item to editor palette

---
 .../include/functions_visual_map_editor.php   | 30 +++++++++++++------
 pandora_console/include/styles/pandora.css    |  6 ++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 54db2d8008..250bc12dbc 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -146,7 +146,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'</td>';
 			
 			$form_items['module_graph_size_row'] = array();
-			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
+			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos', 'bars_graph');
 			$form_items['module_graph_size_row']['html'] = '<td align="left">' . __('Size') . '</td>
 				<td align="left">' .
 				html_print_input_text('width_module_graph', 300, '', 3, 5, true) . 
@@ -163,7 +163,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'simple_value',
 				'datos',
 				'group_item',
-				'auto_sla_graph');
+				'auto_sla_graph',
+				'bars_graph');
 			$form_items['label_row']['html'] =
 				'<td align="left" valign="top" style="">' . __('Label') . '
 				
@@ -214,7 +215,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'module_graph',
 				'simple_value',
 				'datos',
-				'icon');
+				'icon',
+				'bars_graph');
 				
 			if (!is_metaconsole())
 				$form_items['enable_link_row']['items'][] = 'group_item';
@@ -237,7 +239,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['background_color'] = array();
 			$form_items['background_color']['items'] = array(
 				'module_graph',
-				'datos');
+				'datos',
+				'bars_graph');
 			$form_items['background_color']['html'] = '<td align="left"><span>' .
 				__('Background color') . '</span></td>
 				<td align="left">'. html_print_select (
@@ -449,7 +452,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 
 
 			$form_items['period_row'] = array();
-			$form_items['period_row']['items'] = array('module_graph', 'simple_value', 'datos');
+			$form_items['period_row']['items'] = array('module_graph', 'simple_value', 'datos', 'bars_graph');
 			$form_items['period_row']['html'] = '<td align="left">' . __('Period') . '</td>
 				<td align="left">' .  html_print_extended_select_for_time ('period', SECONDS_5MINUTES, '', '', '', false, true) . '</td>';
 			
@@ -462,7 +465,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			
 			
 			$form_items['module_graph_size_row'] = array();
-			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
+			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos', 'bars_graph');
 			$form_items['module_graph_size_row']['html'] = '<td align="left">' . __('Size') . '</td>
 				<td align="left">' .
 				html_print_input_text('width_module_graph', 300, '', 3, 5, true) . 
@@ -494,6 +497,14 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true)  . '<span ="margin-right:10px;">&nbsp</span>' .
 				html_print_button(__('Create'), 'create_button', false, 'create_button_palette_callback();', 'class="sub wand"', true) . 
 				'</td>';
+
+			
+			$bars_graph_types = array('vertical' => __('Vertical'), 'horizontal' => __('Horizontal'));
+			$form_items['bars_graph_type'] = array();
+			$form_items['bars_graph_type']['items'] = array('bars_graph');
+			$form_items['bars_graph_type']['html'] = '<td align="left">' .
+				__('Background') . '</td>
+				<td align="left">' . html_print_select($bars_graph_types, 'bars_graph_type', 'vertical', '', '', '', true) . '</td>';
 			
 			
 			foreach ($form_items as $item => $item_options) {
@@ -518,7 +529,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['position_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
 				'simple_value', 'label', 'icon', 'datos', 'box_item',
-				'auto_sla_graph');
+				'auto_sla_graph', 'bars_graph');
 			$form_items_advance['position_row']['html'] = '
 				<td align="left">' . __('Position') . '</td>
 				<td align="left">(' . html_print_input_text('left', '0', '', 3, 5, true) .
@@ -547,7 +558,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['parent_row']['items'] = array(
 				'group_item', 'static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'label', 'icon', 'datos', 'auto_sla_graph');
+				'simple_value', 'label', 'icon', 'datos', 'auto_sla_graph',
+				'bars_graph');
 			$form_items_advance['parent_row']['html'] = '<td align="left">' .
 				__('Parent') . '</td>
 				<td align="left">' .
@@ -572,7 +584,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items_advance['line_case']['html'] = '
 				<td align="left">' . __('Lines haven\'t advanced options') . '</td>';
 
-
 			//Insert and modify before the buttons to create or update.
 			if (enterprise_installed()) {
 				enterprise_visual_map_editor_modify_form_items_advance_palette($form_items_advance);
@@ -674,6 +685,7 @@ function visual_map_editor_print_toolbox() {
 		visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
 		visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);
 		visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true);
+		visual_map_print_button_editor('bars_graph', __('Bars Graph'), 'left', false, 'bars_graph_min', true);
 		visual_map_print_button_editor('auto_sla_graph', __('Auto SLA Graph'), 'left', false, 'auto_sla_graph_min', true);
 		visual_map_print_button_editor('simple_value', __('Simple Value'), 'left', false, 'binary_min', true);
 		visual_map_print_button_editor('label', __('Label'), 'left', false, 'label_min', true);
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index fcf084085b..6194b87b78 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -769,6 +769,12 @@ input.graph_min {
 input.graph_min[disabled] {
 	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
 }
+input.bars_graph_min {
+	background: #fefefe url(../../images/chart_curve.png) no-repeat center !important;
+}
+input.bars_graph_min[disabled] {
+	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
+}
 input.percentile_min {
 	background: #fefefe url(../../images/chart_bar.png) no-repeat center !important;
 }

From 90e12d66c2275d7f62056b8ec780947bdd441cd6 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 19 Oct 2017 10:52:19 +0200
Subject: [PATCH 18/27] Added item form and code in js

---
 .../visual_console_builder.editor.js          | 168 ++++++++++++++++++
 .../ajax/visual_console_builder.ajax.php      |  33 ++++
 .../include/functions_visual_map_editor.php   |  21 ++-
 3 files changed, 211 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 22c6c4d8d4..af73a7365d 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -420,6 +420,42 @@ function update_button_palette_callback() {
 			$("#image_" + idItem).attr("src", "images/spinner.gif");
 			setModuleGraph(idItem);
 			break;
+		case 'bars_graph':
+			if($('#dir_items').html() == 'horizontal'){
+				if(parseInt($('#text-left').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))
+				|| parseInt($('#text-left').val()) + (parseInt($('input[name=width_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))){
+					
+					alert($('#count_items').html()+' joined graph items are wider than background');
+					return false;
+					
+				}
+			}
+			
+			if($('#dir_items').html() == 'vertical'){
+				if(parseInt($('#text-top').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('height'))){
+					alert($('#count_items').html()+' joined graph items are higher than background');
+					return false;
+					
+				}
+			}
+			
+			if($('input[name=width_module_graph]').val() == ''){
+				alert('Undefined width');
+				return false;
+			}
+			if($('input[name=height_module_graph]').val() == ''){
+				alert('Undefined height');
+				return false;
+			}
+			if($('#custom_graph_row').css('display') != 'none' && $("#custom_graph option:selected").html() == 'None'){
+				alert('Undefined graph');
+				return false;
+			}
+		
+			$("#text_" + idItem).html(values['label']);
+			$("#image_" + idItem).attr("src", "images/spinner.gif");
+			setBarsGraph(idItem, values);
+			break;
 		case 'auto_sla_graph':
 			if($('input[name=width]').val() == ''){
 				alert('Undefined width');
@@ -616,6 +652,7 @@ function readFields() {
 		}
 	}
 	values['height'] = $("input[name=height]").val();
+	values['bars_graph_type'] = $("select[name=bars_graph_type]").val();
 	values['parent'] = $("select[name=parent]").val();
 	values['map_linked'] = $("select[name=map_linked]").val();
 	values['width_percentile'] = $("input[name=width_percentile]").val();
@@ -766,6 +803,24 @@ function create_button_palette_callback() {
 				}
 			}
 			break;
+		case 'bars_graph':
+			if (values['width_module_graph'] == '') {
+				alert('Undefined width');
+				validate = false;
+			}
+			if (values['height_module_graph'] == '') {
+				alert('Undefined height');
+				validate = false;
+			}
+			if ((values['agent'] == '')) {
+				alert($("#message_alert_no_agent").html());
+				validate = false;
+			}
+			if ((values['module'] == 0)) {
+				alert($("#message_alert_no_module").html());
+				validate = false;
+			}
+			break;
 		case 'simple_value':
 			if ((values['agent'] == '')) {
 				alert($("#message_alert_no_agent").html());
@@ -967,6 +1022,7 @@ function toggle_item_palette() {
 
 		activeToolboxButton('static_graph', true);
 		activeToolboxButton('module_graph', true);
+		activeToolboxButton('bars_graph', true);
 		activeToolboxButton('simple_value', true);
 		activeToolboxButton('label', true);
 		activeToolboxButton('icon', true);
@@ -994,6 +1050,7 @@ function toggle_item_palette() {
 
 		activeToolboxButton('static_graph', false);
 		activeToolboxButton('module_graph', false);
+		activeToolboxButton('bars_graph', false);
 		activeToolboxButton('auto_sla_graph', false);
 		activeToolboxButton('simple_value', false);
 		activeToolboxButton('label', false);
@@ -1267,6 +1324,8 @@ function loadFieldsFromDB(item) {
 					$("input[name=width_module_graph]").val(val);
 				if (key == 'height_module_graph')
 					$("input[name=height_module_graph]").val(val);
+				if (key == 'bars_graph_type')
+					$("select[name=bars_graph_type]").val(val);
 
 				if (key == 'type_percentile') {
 					if (val == 'percentile') {
@@ -1527,6 +1586,9 @@ function hiddenFields(item) {
 	$("#module_graph_size_row").css('display', 'none');
 	$("#module_graph_size_row." + item).css('display', '');
 
+	$("#bars_graph_type").css('display', 'none');
+	$("#bars_graph_type." + item).css('display', '');
+
 	$("#background_color").css('display', 'none');
 	$("#background_color." + item).css('display', '');
 	
@@ -1743,6 +1805,57 @@ function set_image(type, idElement, image) {
 	});
 }
 
+function setBarsGraph(id_data, values) {
+	var url_hack_metaconsole = '';
+	if (is_metaconsole()) {
+		url_hack_metaconsole = '../../';
+	}
+
+	parameter = Array();
+
+	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
+	parameter.push ({name: "action", value: "get_module_type_string"});
+	parameter.push ({name: "id_agent", value: values['id_agent']});
+	parameter.push ({name: "id_agent_module", value: values['module']});
+	parameter.push ({name: "id_visual_console", value: id_visual_console});
+	jQuery.ajax({
+		url: get_url_ajax(),
+		data: parameter,
+		type: "POST",
+		dataType: 'json',
+		success: function (data) {
+			if (data['no_data'] == true) {
+				if (values['width'] == "0" || values['height'] == "0") {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				}
+				else {
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+					$("#" + id_data + " img").css('width', values['width'] + 'px');
+					$("#" + id_data + " img").css('height', values['height'] + 'px');
+				}
+			}
+			else {
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				
+				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
+					// Image size
+				}
+				else{
+					$("#" + id_data + " img").css('width', $('#text-width').val()+'px');
+					$("#" + id_data + " img").css('height', $('#text-height').val()+'px');
+				}
+			}
+
+			if($('#'+id_data+' table').css('float') == 'right' || $('#'+id_data+ ' table').css('float') == 'left'){
+				$('#'+id_data+ ' img').css('margin-top', 	parseInt($('#'+id_data).css('height'))/2 - parseInt($('#'+id_data+ ' img').css('height'))/2);	
+			}
+			else{
+				$('#'+id_data+ ' img').css('margin-left',parseInt($('#'+id_data).css('width'))/2 - parseInt($('#'+id_data+ ' img').css('width'))/2);		
+			}
+		}
+	});
+}
+
 function setModuleGraph(id_data) {
 	var parameter = Array();
 
@@ -2459,6 +2572,42 @@ function createItem(type, values, id_data) {
 			
 			setModuleGraph(id_data);
 			break;
+		case 'bars_graph':
+			sizeStyle = '';
+			imageSize = '';
+
+			if(values['label_position'] == 'up'){
+				item = $('<div id="' + id_data + '" class="item module_graph" style="text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+						'<table><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
+						'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+					'</div>'
+				);				
+			}
+			else if(values['label_position'] == 'down'){
+				item = $('<div id="' + id_data + '" class="item module_graph" style="text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+						'<img class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+						'<table><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
+					'</div>'
+				);				
+			}
+			else if(values['label_position'] == 'left'){
+				item = $('<div id="' + id_data + '" class="item module_graph" style="text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+						'<img style="float:right" class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+						'<table style="float:left;height:'+values['height_module_graph']+'px;"><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
+					'</div>'
+				);				
+			}
+			else if(values['label_position'] == 'right'){
+				item = $('<div id="' + id_data + '" class="item module_graph" style="text-align: left; position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
+						'<img style="float:left" class="image" id="image_' + id_data + '" src="images/spinner.gif" />' +
+						'<table style="float:right;height:'+values['height_module_graph']+'px;"><tr><td></td></tr><tr><td><span id="text_' + id_data + '" class="text">' + values['label'] + '</span></td></tr><tr><td></td></tr></table>' +
+					'</div>'
+				);				
+			}
+
+			
+			setBarsGraph(id_data, values);
+			break;
 		case 'simple_value':
 			sizeStyle = '';
 			imageSize = '';
@@ -2678,6 +2827,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
 		case 'label':
 		case 'icon':
 		case 'module_graph':
+		case 'bars_graph':
 		case 'auto_sla_graph':
 			if (type == 'simple_value') {
 				setModuleValue(idElement,
@@ -3120,6 +3270,15 @@ function eventsItems(drag) {
 				activeToolboxButton('delete_item', true);
 				activeToolboxButton('show_grid', false);
 			}
+			if ($(divParent).hasClass('bars_graph')) {
+				creationItem = null;
+				selectedItem = 'bars_graph';
+				idItem = $(divParent).attr('id');
+				activeToolboxButton('copy_item', true);
+				activeToolboxButton('edit_item', true);
+				activeToolboxButton('delete_item', true);
+				activeToolboxButton('show_grid', false);
+			}
 			if ($(divParent).hasClass('simple_value')) {
 				creationItem = null;
 				selectedItem = 'simple_value';
@@ -3302,6 +3461,9 @@ function eventsItems(drag) {
 			if ($(event.target).hasClass('module_graph')) {
 				selectedItem = 'module_graph';
 			}
+			if ($(event.target).hasClass('bars_graph')) {
+				selectedItem = 'bars_graph';
+			}
 			if ($(event.target).hasClass('simple_value')) {
 				selectedItem = 'simple_value';
 			}
@@ -3613,6 +3775,10 @@ function click_button_toolbox(id) {
 			toolbuttonActive = creationItem = 'module_graph';
 			toggle_item_palette();
 			break;
+		case 'bars_graph':
+			toolbuttonActive = creationItem = 'bars_graph';
+			toggle_item_palette();
+			break;
 		case 'auto_sla_graph':
 			toolbuttonActive = creationItem = 'auto_sla_graph';
 			toggle_item_palette();
@@ -3668,6 +3834,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('static_graph', false);
 				activeToolboxButton('percentile_item', false);
 				activeToolboxButton('module_graph', false);
+				activeToolboxButton('bars_graph', false);
 				activeToolboxButton('simple_value', false);
 				activeToolboxButton('label', false);
 				activeToolboxButton('icon', false);
@@ -3699,6 +3866,7 @@ function click_button_toolbox(id) {
 				activeToolboxButton('static_graph', true);
 				activeToolboxButton('percentile_item', true);
 				activeToolboxButton('module_graph', true);
+				activeToolboxButton('bars_graph', true);
 				activeToolboxButton('simple_value', true);
 				activeToolboxButton('label', true);
 				activeToolboxButton('icon', true);
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index e854a31c49..3894313b4f 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -140,6 +140,39 @@ switch ($action) {
 		$return['font'] = $config['fontpath'];
 		echo json_encode($return);
 		break;
+
+	case 'get_module_type_string':
+		$data = array ();
+
+		$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
+
+		if ($layoutData['id_metaconsole'] != 0) {
+			$connection = db_get_row_filter ('tmetaconsole_setup', $layoutData['id_metaconsole']);
+
+			if (metaconsole_load_external_db($connection) != NOERR) {
+				continue;
+			}
+		}
+
+		$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
+			array ('id_agente' => $id_agent,
+				'id_agente_modulo' => $id_module));
+		
+		if ($layoutData['id_metaconsole'] != 0) {
+			metaconsole_restore_db();
+		}
+
+		$return = array();
+		if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+			($is_string == 10) || ($is_string == 33)) {
+			$return['no_data'] = false;
+		}
+		else {
+			$return['no_data'] = true;
+		}
+
+		echo json_encode($return);
+		break;
 	
 	case 'get_module_events':
 		$data = array ();
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 250bc12dbc..edbf86ccd4 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -280,7 +280,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['agent_row'] = array();
 			$form_items['agent_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'bars_graph');
 			$form_items['agent_row']['html'] = '<td align="left">' .
 				__('Agent') . '</td>';			
 			$params = array();
@@ -313,7 +313,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$form_items['module_row'] = array();
 			$form_items['module_row']['items'] = array('static_graph',
 				'percentile_bar', 'percentile_item', 'module_graph',
-				'simple_value', 'datos', 'auto_sla_graph');
+				'simple_value', 'datos', 'auto_sla_graph', 'bars_graph');
 			$form_items['module_row']['html'] = '<td align="left">' .
 				__('Module') . '</td>
 				<td align="left">' .
@@ -452,7 +452,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 
 
 			$form_items['period_row'] = array();
-			$form_items['period_row']['items'] = array('module_graph', 'simple_value', 'datos', 'bars_graph');
+			$form_items['period_row']['items'] = array('module_graph', 'simple_value', 'datos');
 			$form_items['period_row']['html'] = '<td align="left">' . __('Period') . '</td>
 				<td align="left">' .  html_print_extended_select_for_time ('period', SECONDS_5MINUTES, '', '', '', false, true) . '</td>';
 			
@@ -475,6 +475,13 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'<span id="count_items">1</span> '.
 				'<span id="dir_items"></span> item/s				
 				</td>';
+
+			$bars_graph_types = array('vertical' => __('Vertical'), 'horizontal' => __('Horizontal'));
+			$form_items['bars_graph_type'] = array();
+			$form_items['bars_graph_type']['items'] = array('bars_graph');
+			$form_items['bars_graph_type']['html'] = '<td align="left">' .
+				__('Type') . '</td>
+				<td align="left">' . html_print_select($bars_graph_types, 'bars_graph_type', 'vertical', '', '', '', true) . '</td>';
 			
 			
 			//Insert and modify before the buttons to create or update.
@@ -497,14 +504,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true)  . '<span ="margin-right:10px;">&nbsp</span>' .
 				html_print_button(__('Create'), 'create_button', false, 'create_button_palette_callback();', 'class="sub wand"', true) . 
 				'</td>';
-
-			
-			$bars_graph_types = array('vertical' => __('Vertical'), 'horizontal' => __('Horizontal'));
-			$form_items['bars_graph_type'] = array();
-			$form_items['bars_graph_type']['items'] = array('bars_graph');
-			$form_items['bars_graph_type']['html'] = '<td align="left">' .
-				__('Background') . '</td>
-				<td align="left">' . html_print_select($bars_graph_types, 'bars_graph_type', 'vertical', '', '', '', true) . '</td>';
 			
 			
 			foreach ($form_items as $item => $item_options) {

From 1d3a082e5c59f5282cf8702809ea390f36b25e07 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 19 Oct 2017 12:22:01 +0200
Subject: [PATCH 19/27] Added item to editor

---
 .../agentes/module_manager_editor_common.php  |  18 ++++-----
 .../manage_network_components_form_common.php |   4 +-
 .../visual_console_builder.editor.js          |   6 +--
 .../images/console/signes/barras-no.png       | Bin 0 -> 9851 bytes
 .../images/console/signes/barras.png          | Bin 0 -> 3877 bytes
 .../images/icono-barras-arriba.disabled.png   | Bin 0 -> 315 bytes
 .../images/icono-barras-arriba.png            | Bin 0 -> 331 bytes
 .../ajax/visual_console_builder.ajax.php      |  33 +++++++++++++++
 pandora_console/include/constants.php         |   1 +
 .../include/functions_visual_map.php          |  38 ++++++++++++++++++
 pandora_console/include/styles/pandora.css    |   4 +-
 11 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 pandora_console/images/console/signes/barras-no.png
 create mode 100644 pandora_console/images/console/signes/barras.png
 create mode 100644 pandora_console/images/icono-barras-arriba.disabled.png
 create mode 100644 pandora_console/images/icono-barras-arriba.png

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index f66aa17296..9b9b96ffaf 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -291,7 +291,7 @@ if (modules_is_string_type($id_module_type) || $edit) {
 	$table_simple->data[4][1] .= '<br /><em>'.__('Inverse interval').'</em>';
 	$table_simple->data[4][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true, $disabledBecauseInPolicy);
 if (!modules_is_string_type($id_module_type) || $edit) {
-	$table_simple->data[4][2] = '<svg id="svg_dinamic" width="350" height="200" style="padding:40px; padding-left: 100px; margin-bottom: 60px;"> </svg>';
+	$table_simple->data[4][2] = '<svg id="svg_dinamic" width="350px" height="200px" style="padding:40px; padding-left: 100px; margin-bottom: 60px;"></svg>';
 	$table_simple->colspan[4][2] = 2;
 	$table_simple->rowspan[4][2] = 3;
 }
@@ -1323,8 +1323,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_normal")
 	       	.attr("x", 72)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
-	       	.attr("height", 10)
+	       	.attr("width", '10px')
+	       	.attr("height", '10px')
 	  		.style("fill", "#82B92E");
 
 	  	//legend Warning text
@@ -1343,8 +1343,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_warning")
 	       	.attr("x", 168)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
-	       	.attr("height", 10)
+	       	.attr("width", '10px')
+	       	.attr("height", '10px')
 	  		.style("fill", "#ffd731");
 
 	  	//legend Critical text
@@ -1363,8 +1363,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "legend_critical")
 	       	.attr("x", 258)
 	       	.attr("y", -30)
-	       	.attr("width", 10)
-	       	.attr("height", 10)
+	       	.attr("width", '10px')
+	       	.attr("height", '10px')
 	  		.style("fill", "#fc4444");
 
 		//styles for number and axes
@@ -1382,8 +1382,8 @@ function paint_graph_status(min_w, max_w, min_c, max_c, inverse_w, inverse_c, er
 			.attr("id", "warning_rect")
 	       	.attr("x", 3)
 	       	.attr("y", 0)
-	       	.attr("width", 300)
-	       	.attr("height", 200)
+	       	.attr("width", '300px')
+	       	.attr("height", '200px')
 	  		.style("fill", "#82B92E");
 	  	
 	  	//controls the inverse warning
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index 83b21b225b..b9cc96a468 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -473,8 +473,8 @@ $next_row++;
 				.attr("id", "legend_normal")
 		       	.attr("x", 72)
 		       	.attr("y", -30)
-		       	.attr("width", 10)
-		       	.attr("height", 10)
+		       	.attr("width", '10px')
+		       	.attr("height", '10px')
 		  		.style("fill", "#82B92E");
 
 		  	//legend Warning text
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index af73a7365d..e84c5d8c56 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1826,16 +1826,16 @@ function setBarsGraph(id_data, values) {
 		success: function (data) {
 			if (data['no_data'] == true) {
 				if (values['width'] == "0" || values['height'] == "0") {
-					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras-no.png');
 				}
 				else {
-					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras-no.png');
 					$("#" + id_data + " img").css('width', values['width'] + 'px');
 					$("#" + id_data + " img").css('height', values['height'] + 'px');
 				}
 			}
 			else {
-				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/module-events.png');
+				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras.png');
 				
 				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
 					// Image size
diff --git a/pandora_console/images/console/signes/barras-no.png b/pandora_console/images/console/signes/barras-no.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4545405e092841b8c59f6890baa991cb3d86870
GIT binary patch
literal 9851
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
Ks!Y<@@BaZb##c%J

literal 0
HcmV?d00001

diff --git a/pandora_console/images/console/signes/barras.png b/pandora_console/images/console/signes/barras.png
new file mode 100644
index 0000000000000000000000000000000000000000..be81fb22120087c594654b4f600583f5a51404b1
GIT binary patch
literal 3877
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
CiS_dU

literal 0
HcmV?d00001

diff --git a/pandora_console/images/icono-barras-arriba.disabled.png b/pandora_console/images/icono-barras-arriba.disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..94fb50dc5f52c644939895352cef42e34d0485a1
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy-AP12RCwBAV88_!LB!2lxBmmF0{{Vp
zDg_dS$}lh?2|54-5QZvjhB*T9eyE|1IIRZ=Ai@al0wALSgpnmNoCQ+Ngrs0UUb6uL
zh&l*4oKPGFb@6|6S3~9YL**P;aQPV<fGK_e4ciBp5yx-=N`C+dAO`vXkSEYR%0#SY
zCR|~N%jX1>3Jbd1@LG+QTJ{s8kf0mUW8?##*uoD00&M6YMpBauT4*<_tEo2NjC5$)
zswbp@lvtu9!S@3x10<nB7AgcG$Ux-OD!@WadPf3|MCUka1EwL9P5~wfdI7%WbtV7+
N002ovPDHLkV1iy-ZjS%}

literal 0
HcmV?d00001

diff --git a/pandora_console/images/icono-barras-arriba.png b/pandora_console/images/icono-barras-arriba.png
new file mode 100644
index 0000000000000000000000000000000000000000..4029c48c87494bc7553c3424a0c5aa237cc0eb38
GIT binary patch
literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq000#L000#T1^@s7-Vl`l0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy?MXyIRCwBAV88_!L4=u^*?%B)03d)+
zr9h%k83raKK?i^U!cc|HFh?NX4>hzAr}Y2<L>R$c0Aw_PFtQ|uvp}kukQD64Yc@at
zQ3oN16M9I1Tw4zcfm5eWHJ}9-C}cp6c4WcjXKVnb_yN>}2bdAZZ~;nx00<!JdzKkT
z2slVfOWy}##-~r89zcm2LVyWZ7~=9d!KA{1?l!zuqotPp#3&@_M)Vl@fG4)_1AqV<
zI*5_POyhtS+VDJrHPVqX6J8CZ#1bW0z8^>#APE(+P$38nphW@<2(S>7-jRSK(K(LV
dfN992QviD*M2>eq73lx~002ovPDHLkV1oN%b*2CS

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 3894313b4f..afa3e8d8ba 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -104,6 +104,7 @@ $width_percentile = get_parameter('width_percentile', null);
 $max_percentile = get_parameter('max_percentile', null);
 $height_module_graph = get_parameter('height_module_graph', null);
 $width_module_graph = get_parameter('width_module_graph', null);
+$bars_graph_type = get_parameter('bars_graph_type', null);
 $id_agent_module = get_parameter('id_agent_module', 0);
 $process_simple_value = get_parameter('process_simple_value', PROCESS_VALUE_NONE);
 $type_percentile = get_parameter('type_percentile', 'percentile');
@@ -498,6 +499,7 @@ switch ($action) {
 			case 'label':
 			case 'icon':
 			case 'auto_sla_graph':
+			case 'bars_graph':
 			default:
 				if ($type == 'label') {
 					$values['type'] = LABEL;
@@ -621,6 +623,20 @@ switch ($action) {
 							$values['id_custom_graph'] = $id_custom_graph;
 						}
 						break;
+					case 'bars_graph':
+						if ($height_module_graph !== null) {
+							$values['height'] = $height_module_graph;
+						}
+						if ($width_module_graph !== null) {
+							$values['width'] = $width_module_graph;
+						}
+						if ($bars_graph_type !== null) {
+							$values['type_graph'] = $id_custom_graph;
+						}
+						if ($background_color !== null) {
+							$values['image'] = $background_color;
+						}
+						break;
 					case 'percentile_item':
 					case 'percentile_bar':
 						if ($action == 'update') {
@@ -683,6 +699,10 @@ switch ($action) {
 							unset($values['image']);
 							unset($values['type_graph']);
 							break;
+						case 'bars_graph':
+							unset($values['image']);
+							unset($values['type_graph']);
+							break;
 						case 'box_item':
 							unset($values['border_width']);
 							unset($values['border_color']);
@@ -740,6 +760,7 @@ switch ($action) {
 			case 'static_graph':
 			case 'group_item':
 			case 'module_graph':
+			case 'bars_graph':
 			case 'simple_value':
 			case 'label':
 			case 'icon':
@@ -820,6 +841,11 @@ switch ($action) {
 						$elementFields['width_module_graph'] = $elementFields['width'];
 						$elementFields['height_module_graph'] = $elementFields['height'];
 						break;
+					case 'bars_graph':
+						$elementFields['width_module_graph'] = $elementFields['width'];
+						$elementFields['height_module_graph'] = $elementFields['height'];
+						$elementFields['bars_graph_type'] = $elementFields['type_graph'];
+						break;
 					case 'box_item':
 						$elementFields['width_box'] = $elementFields['width'];
 						$elementFields['height_box'] = $elementFields['height'];
@@ -956,6 +982,13 @@ switch ($action) {
 				}
 				$values['period'] = $period;
 				break;
+			case 'bars_graph':
+				$values['type'] = BARS_GRAPH;
+				$values['height'] = $height_module_graph;
+				$values['width'] = $width_module_graph;
+				$values['type_graph'] = $bars_graph_type;
+				$values['image'] = $background_color;
+				break;
 			case 'auto_sla_graph':
 				$values['type'] = AUTO_SLA_GRAPH;
 				$values['period'] = $event_max_time_row;
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index f039a90504..fd3ecc056e 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -197,6 +197,7 @@ define('SERVICE',			10); //Enterprise Item.
 define('GROUP_ITEM',		11);
 define('BOX_ITEM',			12);
 define('LINE_ITEM',			13);
+define('BARS_GRAPH',		18);
 //Some styles
 define('MIN_WIDTH',			300);
 define('MIN_HEIGHT',		120);
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b06a0c6d5c..355d6cbd1a 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -375,6 +375,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 					$link = true;
 				}
 				
+				break;
+			case BARS_GRAPH:
+				$link = true;
 				break;
 			case AUTO_SLA_GRAPH:
 				$link = true;
@@ -487,6 +490,17 @@ function visual_map_print_item($mode = "read", $layoutData,
 						"&date_to=" . $date_to . "&time_to=" . $time_to . "&status=-1";
 				}
 				break;
+
+			case BARS_GRAPH:
+				if (empty($layout_data['id_metaconsole'])) {
+					$url = $config['homeurl'] . "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				else {
+					$url = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=" . $layoutData['id_agent'] . 
+						"&tab=module&edit_module=1&id_agent_module=" . $layoutData['id_agente_modulo'];
+				}
+				break;
 			case GROUP_ITEM:
 				$is_a_link_to_other_visualconsole = false;
 				if ($layoutData['id_layout_linked'] != 0) {
@@ -1143,6 +1157,9 @@ function visual_map_print_item($mode = "read", $layoutData,
 		case MODULE_GRAPH:
 			$class .= "module_graph";
 			break;
+		case MODULE_GRAPH:
+			$class .= "bars_graph";
+			break;
 		case SIMPLE_VALUE:
 		case SIMPLE_VALUE_MAX:
 		case SIMPLE_VALUE_MIN:
@@ -1554,6 +1571,20 @@ function visual_map_print_item($mode = "read", $layoutData,
 			
 			echo $img;
 			
+			if ($layoutData['label_position']=='down') {
+				echo io_safe_output($text);
+			}	
+			elseif($layoutData['label_position']=='left' || $layoutData['label_position']=='right') {
+				echo io_safe_output($text);
+			}
+			break;
+		case BARS_GRAPH:
+			if ($layoutData['label_position']=='up') {
+				echo io_safe_output($text);
+			}
+			
+			echo $img;
+			
 			if ($layoutData['label_position']=='down') {
 				echo io_safe_output($text);
 			}	
@@ -2947,6 +2978,10 @@ function visual_map_create_internal_name_item($label = null, $type, $image, $age
 			case MODULE_GRAPH:
 				$text = __('Module graph');
 				break;
+			case 'bars_graph':
+			case BARS_GRAPH:
+				$text = __('Bars graph');
+				break;
 			case 'auto_sla_graph':
 			case AUTO_SLA_GRAPH:
 				$text = __('Auto SLA Graph');
@@ -3062,6 +3097,9 @@ function visual_map_type_in_js($type) {
 		case MODULE_GRAPH:
 			return 'module_graph';
 			break;
+		case BARS_GRAPH:
+			return 'bars_graph';
+			break;
 		case AUTO_SLA_GRAPH:
 			return 'auto_sla_graph';
 			break;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6194b87b78..94af9716a9 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -767,10 +767,10 @@ input.graph_min {
 	background: #fefefe url(../../images/chart_curve.png) no-repeat center !important;
 }
 input.graph_min[disabled] {
-	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
+	background: #fefefe url(../../images/icono-barras-arriba.disabled.png) no-repeat center !important;
 }
 input.bars_graph_min {
-	background: #fefefe url(../../images/chart_curve.png) no-repeat center !important;
+	background: #fefefe url(../../images/icono-barras-arriba.png) no-repeat center !important;
 }
 input.bars_graph_min[disabled] {
 	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;

From 05bbdecdd8c21cba353c3b11e386828db7d33feb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 23 Oct 2017 08:32:41 +0200
Subject: [PATCH 20/27] Added item to editor

---
 .../visual_console_builder.editor.js          |  94 ++++----------
 .../ajax/visual_console_builder.ajax.php      |  18 +--
 .../include/functions_visual_map.php          | 116 +++++++++++++++++-
 .../include/functions_visual_map_editor.php   |   2 +-
 4 files changed, 151 insertions(+), 79 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index e84c5d8c56..39eccab60e 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -421,39 +421,14 @@ function update_button_palette_callback() {
 			setModuleGraph(idItem);
 			break;
 		case 'bars_graph':
-			if($('#dir_items').html() == 'horizontal'){
-				if(parseInt($('#text-left').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))
-				|| parseInt($('#text-left').val()) + (parseInt($('input[name=width_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('width'))){
-					
-					alert($('#count_items').html()+' joined graph items are wider than background');
-					return false;
-					
-				}
-			}
-			
-			if($('#dir_items').html() == 'vertical'){
-				if(parseInt($('#text-top').val()) + (parseInt($('input[name=height_module_graph]').val() * $('#count_items').html())) > parseInt($('#background').css('height'))){
-					alert($('#count_items').html()+' joined graph items are higher than background');
-					return false;
-					
-				}
-			}
-			
-			if($('input[name=width_module_graph]').val() == ''){
+			if($('input[name=width_percentile]').val() == ''){
 				alert('Undefined width');
 				return false;
 			}
-			if($('input[name=height_module_graph]').val() == ''){
-				alert('Undefined height');
-				return false;
-			}
-			if($('#custom_graph_row').css('display') != 'none' && $("#custom_graph option:selected").html() == 'None'){
-				alert('Undefined graph');
-				return false;
-			}
 		
 			$("#text_" + idItem).html(values['label']);
 			$("#image_" + idItem).attr("src", "images/spinner.gif");
+			
 			setBarsGraph(idItem, values);
 			break;
 		case 'auto_sla_graph':
@@ -701,7 +676,7 @@ function readFields() {
 
 function create_button_palette_callback() {
 	var values = readFields();
-
+console.log(values);
 	//VALIDATE DATA
 	var validate = true;
 	switch (creationItem) {
@@ -804,14 +779,6 @@ function create_button_palette_callback() {
 			}
 			break;
 		case 'bars_graph':
-			if (values['width_module_graph'] == '') {
-				alert('Undefined width');
-				validate = false;
-			}
-			if (values['height_module_graph'] == '') {
-				alert('Undefined height');
-				validate = false;
-			}
 			if ((values['agent'] == '')) {
 				alert($("#message_alert_no_agent").html());
 				validate = false;
@@ -1811,6 +1778,8 @@ function setBarsGraph(id_data, values) {
 		url_hack_metaconsole = '../../';
 	}
 
+	width_percentile = values['width_percentile'];
+
 	parameter = Array();
 
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
@@ -1825,24 +1794,24 @@ function setBarsGraph(id_data, values) {
 		dataType: 'json',
 		success: function (data) {
 			if (data['no_data'] == true) {
-				if (values['width'] == "0" || values['height'] == "0") {
+				if (values['width'] == "0") {
 					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras-no.png');
 				}
 				else {
 					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras-no.png');
-					$("#" + id_data + " img").css('width', values['width'] + 'px');
-					$("#" + id_data + " img").css('height', values['height'] + 'px');
+					$("#" + id_data + " img").css('width', width_percentile + 'px');
+					$("#" + id_data + " img").css('height', width_percentile + 'px');
 				}
 			}
 			else {
 				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras.png');
 				
-				if($('#text-width').val() == 0 || $('#text-height').val() == 0){
+				if($('#text-width').val() == 0){
 					// Image size
 				}
 				else{
-					$("#" + id_data + " img").css('width', $('#text-width').val()+'px');
-					$("#" + id_data + " img").css('height', $('#text-height').val()+'px');
+					$("#" + id_data + " img").css('width', $('#text-width_percentile').val()+'px');
+					$("#" + id_data + " img").css('height', $('#text-width_percentile').val()+'px');
 				}
 			}
 
@@ -2344,34 +2313,23 @@ function createItem(type, values, id_data) {
 			}
 				
 			if(values['show_statistics'] != 1){
-				
-					if ((values['width'] == 0) || (values['height'] == 0)) {
-						// Do none
-						if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
-							$image.attr('width', '70')
-								.attr('height', '70');
-						}
-						else{
-							$image.attr('width', $('#preview > img')[0].naturalWidth)
-								.attr('height', $('#preview > img')[0].naturalHeight);
-						}			
-					}
-					else {
-						$image.attr('width', values['width'])
-							.attr('height', values['height']);
+				if ((values['width'] == 0) || (values['height'] == 0)) {
+					// Do none
+					if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
+						$image.attr('width', '70')
+							.attr('height', '70');
 					}
+					else{
+						$image.attr('width', $('#preview > img')[0].naturalWidth)
+							.attr('height', $('#preview > img')[0].naturalHeight);
+					}			
 				}
-				// else{
-				// 	$('#image_'+id_data).css('width', values['width']+'px');
-				// 	$('#image_'+id_data).css('height', values['height']+'px');
-				// }
-/*
-			var $span = $('<span></span>')
-				.attr('id', 'text_' + id_data)
-				.attr('class', 'text')
-				.append(values['label']);
-			
-*/
+				else {
+					$image.attr('width', values['width'])
+						.attr('height', values['height']);
+				}
+			}
+
 			var $input = $('<input></input>')
 				.attr('id', 'hidden-status_' + id_data)
 				.attr('type', 'hidden')
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index afa3e8d8ba..6fee42aa22 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -624,11 +624,8 @@ switch ($action) {
 						}
 						break;
 					case 'bars_graph':
-						if ($height_module_graph !== null) {
-							$values['height'] = $height_module_graph;
-						}
-						if ($width_module_graph !== null) {
-							$values['width'] = $width_module_graph;
+						if ($width_percentile !== null) {
+							$values['width'] = $width_percentile;
 						}
 						if ($bars_graph_type !== null) {
 							$values['type_graph'] = $id_custom_graph;
@@ -842,8 +839,7 @@ switch ($action) {
 						$elementFields['height_module_graph'] = $elementFields['height'];
 						break;
 					case 'bars_graph':
-						$elementFields['width_module_graph'] = $elementFields['width'];
-						$elementFields['height_module_graph'] = $elementFields['height'];
+						$elementFields['width_percentile'] = $elementFields['width'];
 						$elementFields['bars_graph_type'] = $elementFields['type_graph'];
 						break;
 					case 'box_item':
@@ -984,8 +980,12 @@ switch ($action) {
 				break;
 			case 'bars_graph':
 				$values['type'] = BARS_GRAPH;
-				$values['height'] = $height_module_graph;
-				$values['width'] = $width_module_graph;
+				if ($width_percentile == null) {
+					$values['width'] = 0;
+				}
+				else {
+					$values['width'] = $width_percentile;
+				}
 				$values['type_graph'] = $bars_graph_type;
 				$values['image'] = $background_color;
 				break;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 355d6cbd1a..84256db7fb 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1080,6 +1080,120 @@ function visual_map_print_item($mode = "read", $layoutData,
 			}
 
 			break;
+		
+		case BARS_GRAPH:
+		
+			$imgpos = '';
+						
+			if($layoutData['label_position']=='left'){
+				$imgpos = 'float:right';
+			}
+			else if($layoutData['label_position']=='right'){
+				$imgpos = 'float:left';
+			}
+		
+			if (!empty($proportion)) {
+				$width =
+					((integer)($proportion['proportion_width'] * $width));
+				$height =
+					((integer)($proportion['proportion_height'] * $height));
+			}
+			//Metaconsole db connection
+			if ($layoutData['id_metaconsole'] != 0) {
+				$connection = db_get_row_filter ('tmetaconsole_setup',
+					array('id' => $layoutData['id_metaconsole']));
+				if (metaconsole_load_external_db($connection) != NOERR) {
+					continue;
+				}
+			}
+			
+			if ($isExternalLink)
+				$homeurl = $config['homeurl'];
+			else
+				$homeurl = '';
+			
+			if ( (get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap') ) {
+				if($width == 0){
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';	
+					}
+				}
+				else{
+					if ($layoutData['id_metaconsole'] != 0) {
+						$img =  '<img src="../../images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+					}
+					else{
+						$img =  '<img src="images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+					}
+				}
+			}
+			else {
+				if ($width == 0) {
+					if ($layoutData['label_position']=='left') {
+						$img =  '<div style="float:right;height:'.$himg.'px;">'.
+						grafico_modulo_sparse($id_module, $period, 
+						0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, false, 0, 
+						modules_get_unit($id_module), 0, 0, true, $only_image, '', 1, false, '', 
+						false, false, false, $layoutData['image'], 
+						null, true, false, $type_graph) . '</div>';
+					}
+					elseif($layoutData['label_position']=='right') {
+						$img =  '<div style="float:left;height:'.$himg.'px;">' . 
+							grafico_modulo_sparse($id_module, 
+							$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 
+							1, false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+							1, false, '', false, false, false, 
+							$layoutData['image'], null, true, 
+							false, $type_graph) . '</div>';
+					}
+					else {
+						$img =  grafico_modulo_sparse($id_module, 
+						$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, 
+						false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+						1, false, '', false, false, false, 
+						$layoutData['image'], null, true, false, $type_graph);
+					}
+				}
+				else{
+					if ($layoutData['label_position']=='left') {
+						$img =  '<div style="float:right;height:'.$himg.'px;">' . 
+							grafico_modulo_sparse($id_module, $period, 
+						0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
+						false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+						1, false, '', false, false, false, 
+						$layoutData['image'], null, true, 
+						false, $type_graph) . '</div>';
+					}
+					elseif ($layoutData['label_position']=='right') {
+						$img =  '<div style="float:left;height:'.$himg.'px;">' . 
+							grafico_modulo_sparse($id_module, $period, 
+							0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
+							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, 
+							'', 1, false, modules_get_unit($id_module), false, false, false, 
+							$layoutData['image'], null, true, 
+							false, $type_graph) . '</div>';
+					}
+					else {
+						$img =  grafico_modulo_sparse($id_module, 
+							$period, 0, $width, $height, modules_get_agentmodule_name($id_module), null, 
+							false, 1, false, 0, modules_get_unit($id_module), 0, 0, true, 
+							$only_image, '', 1, false, '', false, 
+							false, false, $layoutData['image'], 
+							null, false, true, $type_graph);
+					}
+				}
+			}
+			
+			//Restore db connection
+			if ($layoutData['id_metaconsole'] != 0) {
+				metaconsole_restore_db();
+			}
+
+			break;
+
 		case LABEL:
 			$z_index = 4 + 1;
 			break;
@@ -1157,7 +1271,7 @@ function visual_map_print_item($mode = "read", $layoutData,
 		case MODULE_GRAPH:
 			$class .= "module_graph";
 			break;
-		case MODULE_GRAPH:
+		case BARS_GRAPH:
 			$class .= "bars_graph";
 			break;
 		case SIMPLE_VALUE:
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index edbf86ccd4..8fb0db1abe 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -399,7 +399,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			
 			
 			$form_items['percentile_bar_row_1'] = array();
-			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos');
+			$form_items['percentile_bar_row_1']['items'] = array('percentile_bar', 'percentile_item', 'datos', 'bars_graph');
 			$form_items['percentile_bar_row_1']['html'] = '<td align="left">' .
 				__('Width') . '</td>
 				<td align="left">' . html_print_input_text('width_percentile', 0, '', 3, 5, true) . '</td>';

From b5b976e41b1997af5368d92747f7a6d546f5ea1e Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 23 Oct 2017 13:54:30 +0200
Subject: [PATCH 21/27] Added some things to new item visualization

---
 .../include/functions_visual_map.php          | 200 +++++++++++++-----
 1 file changed, 147 insertions(+), 53 deletions(-)

diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 84256db7fb..ad5216b58a 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1112,77 +1112,127 @@ function visual_map_print_item($mode = "read", $layoutData,
 			else
 				$homeurl = '';
 			
+			$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
+				array ('id_agente' => $layoutData['id_agent'],
+					'id_agente_modulo' => $id_module));
+
 			if ( (get_parameter('action') == 'edit') || (get_parameter('operation') == 'edit_visualmap') ) {
 				if($width == 0){
-					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';
+					if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+					($is_string == 10) || ($is_string == 33)) {
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';	
+						}
 					}
-					else{
-						$img =  '<img src="images/console/signes/barras.png" style="width:400px;height:400px;'.$imgpos.'">';	
+					else {
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras-no.png" style="width:400px;height:400px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras-no.png" style="width:400px;height:400px;'.$imgpos.'">';	
+						}
 					}
 				}
 				else{
-					if ($layoutData['id_metaconsole'] != 0) {
-						$img =  '<img src="../../images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+					if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+					($is_string == 10) || ($is_string == 33)) {
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
 					}
-					else{
-						$img =  '<img src="images/console/signes/barras.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+					else {
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras-no.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras-no.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
 					}
 				}
 			}
 			else {
-				if ($width == 0) {
-					if ($layoutData['label_position']=='left') {
-						$img =  '<div style="float:right;height:'.$himg.'px;">'.
-						grafico_modulo_sparse($id_module, $period, 
-						0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, false, 0, 
-						modules_get_unit($id_module), 0, 0, true, $only_image, '', 1, false, '', 
-						false, false, false, $layoutData['image'], 
-						null, true, false, $type_graph) . '</div>';
+				if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
+				($is_string == 10) || ($is_string == 33)) {
+
+					$module_data = get_bars_module_data($id_module);
+html_debug($module_data, true);
+					if ($width == 0) {
+						if ($layoutData['label_position']=='left') {
+							$img =  '<div style="float:right;height:'.$himg.'px;">'.
+							grafico_modulo_sparse($id_module, $period, 
+							0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, false, 0, 
+							modules_get_unit($id_module), 0, 0, true, $only_image, '', 1, false, '', 
+							false, false, false, $layoutData['image'], 
+							null, true, false, $type_graph) . '</div>';
+						}
+						elseif($layoutData['label_position']=='right') {
+							$img =  '<div style="float:left;height:'.$himg.'px;">' . 
+								grafico_modulo_sparse($id_module, 
+								$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 
+								1, false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+								1, false, '', false, false, false, 
+								$layoutData['image'], null, true, 
+								false, $type_graph) . '</div>';
+						}
+						else {
+							$img =  grafico_modulo_sparse($id_module, 
+							$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, 
+							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+							1, false, '', false, false, false, 
+							$layoutData['image'], null, true, false, $type_graph);
+						}
 					}
-					elseif($layoutData['label_position']=='right') {
-						$img =  '<div style="float:left;height:'.$himg.'px;">' . 
-							grafico_modulo_sparse($id_module, 
-							$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 
-							1, false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
+					else{
+						if ($layoutData['label_position']=='left') {
+							$img =  '<div style="float:right;height:'.$himg.'px;">' . 
+								grafico_modulo_sparse($id_module, $period, 
+							0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
+							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
 							1, false, '', false, false, false, 
 							$layoutData['image'], null, true, 
 							false, $type_graph) . '</div>';
-					}
-					else {
-						$img =  grafico_modulo_sparse($id_module, 
-						$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, 
-						false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-						1, false, '', false, false, false, 
-						$layoutData['image'], null, true, false, $type_graph);
+						}
+						elseif ($layoutData['label_position']=='right') {
+							$img =  '<div style="float:left;height:'.$himg.'px;">' . 
+								grafico_modulo_sparse($id_module, $period, 
+								0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
+								false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, 
+								'', 1, false, modules_get_unit($id_module), false, false, false, 
+								$layoutData['image'], null, true, 
+								false, $type_graph) . '</div>';
+						}
+						else {
+							$img =  grafico_modulo_sparse($id_module, 
+								$period, 0, $width, $height, modules_get_agentmodule_name($id_module), null, 
+								false, 1, false, 0, modules_get_unit($id_module), 0, 0, true, 
+								$only_image, '', 1, false, '', false, 
+								false, false, $layoutData['image'], 
+								null, false, true, $type_graph);
+						}
 					}
 				}
-				else{
-					if ($layoutData['label_position']=='left') {
-						$img =  '<div style="float:right;height:'.$himg.'px;">' . 
-							grafico_modulo_sparse($id_module, $period, 
-						0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-						false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-						1, false, '', false, false, false, 
-						$layoutData['image'], null, true, 
-						false, $type_graph) . '</div>';
+				else {
+					if($width == 0){
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras-no.png" style="width:400px;height:400px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras-no.png" style="width:400px;height:400px;'.$imgpos.'">';	
+						}
 					}
-					elseif ($layoutData['label_position']=='right') {
-						$img =  '<div style="float:left;height:'.$himg.'px;">' . 
-							grafico_modulo_sparse($id_module, $period, 
-							0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, 
-							'', 1, false, modules_get_unit($id_module), false, false, false, 
-							$layoutData['image'], null, true, 
-							false, $type_graph) . '</div>';
-					}
-					else {
-						$img =  grafico_modulo_sparse($id_module, 
-							$period, 0, $width, $height, modules_get_agentmodule_name($id_module), null, 
-							false, 1, false, 0, modules_get_unit($id_module), 0, 0, true, 
-							$only_image, '', 1, false, '', false, 
-							false, false, $layoutData['image'], 
-							null, false, true, $type_graph);
+					else{
+						if ($layoutData['id_metaconsole'] != 0) {
+							$img =  '<img src="../../images/console/signes/barras-no.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
+						else{
+							$img =  '<img src="images/console/signes/barras-no.png" style="width:'.$width.'px;height:'.$width.'px;'.$imgpos.'">';
+						}
 					}
 				}
 			}
@@ -1871,6 +1921,50 @@ function visual_map_print_item($mode = "read", $layoutData,
 	}
 }
 
+function get_bars_module_data ($id_module) {
+	$mod_values = db_get_value_filter('datos', 'tagente_estado', array('id_agente_modulo' => $id_module));
+
+	if (preg_match("/\r\n/", $mod_values)) {
+		$values = explode("\r\n", $mod_values);
+	}
+	elseif (preg_match("/\n/", $mod_values)) {
+		$values = explode("\n", $mod_values);
+	}
+
+	$colors = array();
+	$colors[] = "#aa3333";
+	$colors[] = "#045FB4";
+	$colors[] = "#8181F7";
+	$colors[] = "#F78181";
+	$colors[] = "#D0A9F5";
+	$colors[] = "#BDBDBD";
+	$colors[] = "#6AB277";
+
+	$values_to_return = array();
+	$index = 0;
+	$color_index = 0;
+	$total = 0;
+	foreach ($values as $val) {
+		$data = explode(":", $val);
+		$values_to_return[$index]['tag_name'] = $data[0] . ", " . $data[1];
+		if ($color_index == 6) {
+			$color_index = 0;
+		}
+		$values_to_return[$index]['color'] = $colors[$color_index];
+		$values_to_return[$index]['value'] = (int)$data[1];
+		$total += (int)$data[1];
+		$index++;
+		$color_index++;
+	}
+
+	foreach ($values_to_return as $ind => $bar_data) {
+		$values_to_return[$ind]['percent'] = ($bar_data['value'] * 100) / $total;
+	}
+
+	return $values_to_return;
+}
+
+
 /**
  * The function to get simple value type from the value of process type in the form
  * 

From 9b01919342821e97f54e6d3a89240888cbc8c0ef Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 23 Oct 2017 14:58:02 +0200
Subject: [PATCH 22/27] Fixed function to get string type

---
 .../godmode/reporting/visual_console_builder.editor.js        | 2 +-
 pandora_console/include/ajax/visual_console_builder.ajax.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 39eccab60e..16e31a61a6 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1785,7 +1785,7 @@ function setBarsGraph(id_data, values) {
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
 	parameter.push ({name: "action", value: "get_module_type_string"});
 	parameter.push ({name: "id_agent", value: values['id_agent']});
-	parameter.push ({name: "id_agent_module", value: values['module']});
+	parameter.push ({name: "module", value: values['module']});
 	parameter.push ({name: "id_visual_console", value: id_visual_console});
 	jQuery.ajax({
 		url: get_url_ajax(),
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 6fee42aa22..27f58967fe 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -144,7 +144,7 @@ switch ($action) {
 
 	case 'get_module_type_string':
 		$data = array ();
-
+		
 		$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
 
 		if ($layoutData['id_metaconsole'] != 0) {
@@ -158,7 +158,7 @@ switch ($action) {
 		$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
 			array ('id_agente' => $id_agent,
 				'id_agente_modulo' => $id_module));
-		
+		html_debug($is_string, true);
 		if ($layoutData['id_metaconsole'] != 0) {
 			metaconsole_restore_db();
 		}

From 92633f21b4e8a1c17deb34d4e34945df18b344df Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 23 Oct 2017 16:19:11 +0200
Subject: [PATCH 23/27] Added element to view

---
 .../ajax/visual_console_builder.ajax.php      |   6 +-
 .../include/functions_visual_map.php          | 207 ++++++++++++------
 .../include/functions_visual_map_editor.php   |   4 +-
 .../include/graphs/flot/pandora.flot.js       |   2 +-
 .../include/graphs/functions_pchart.php       |   8 +-
 5 files changed, 152 insertions(+), 75 deletions(-)

diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 27f58967fe..e1b276d967 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -144,7 +144,7 @@ switch ($action) {
 
 	case 'get_module_type_string':
 		$data = array ();
-		
+
 		$layoutData = db_get_row_filter('tlayout_data', array('id' => $id_element));
 
 		if ($layoutData['id_metaconsole'] != 0) {
@@ -158,7 +158,7 @@ switch ($action) {
 		$is_string = db_get_value_filter ('id_tipo_modulo', 'tagente_modulo',
 			array ('id_agente' => $id_agent,
 				'id_agente_modulo' => $id_module));
-		html_debug($is_string, true);
+		
 		if ($layoutData['id_metaconsole'] != 0) {
 			metaconsole_restore_db();
 		}
@@ -628,7 +628,7 @@ switch ($action) {
 							$values['width'] = $width_percentile;
 						}
 						if ($bars_graph_type !== null) {
-							$values['type_graph'] = $id_custom_graph;
+							$values['type_graph'] = $bars_graph_type;
 						}
 						if ($background_color !== null) {
 							$values['image'] = $background_color;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index ad5216b58a..265e2506f7 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1160,60 +1160,164 @@ function visual_map_print_item($mode = "read", $layoutData,
 				if (($is_string == 17) || ($is_string == 23) || ($is_string == 3) ||
 				($is_string == 10) || ($is_string == 33)) {
 
+					$color = array();
+	
+					$color[0] = array('border' => '#000000',
+						'color' => $config['graph_color1'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[1] = array('border' => '#000000',
+						'color' => $config['graph_color2'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[2] = array('border' => '#000000',
+						'color' => $config['graph_color3'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[3] = array('border' => '#000000',
+						'color' => $config['graph_color4'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[4] = array('border' => '#000000',
+						'color' => $config['graph_color5'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[5] = array('border' => '#000000',
+						'color' => $config['graph_color6'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[6] = array('border' => '#000000',
+						'color' => $config['graph_color7'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[7] = array('border' => '#000000',
+						'color' => $config['graph_color8'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[8] = array('border' => '#000000',
+						'color' => $config['graph_color9'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[9] = array('border' => '#000000',
+						'color' => $config['graph_color10'],
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[11] = array('border' => '#000000',
+						'color' => COL_GRAPH9,
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[12] = array('border' => '#000000',
+						'color' => COL_GRAPH10,
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[13] = array('border' => '#000000',
+						'color' => COL_GRAPH11,
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[14] = array('border' => '#000000',
+						'color' => COL_GRAPH12,
+						'alpha' => CHART_DEFAULT_ALPHA);
+					$color[15] = array('border' => '#000000',
+						'color' => COL_GRAPH13,
+						'alpha' => CHART_DEFAULT_ALPHA);
+
 					$module_data = get_bars_module_data($id_module);
-html_debug($module_data, true);
+					$water_mark = array('file' => '/var/www/html/pandora_console/images/logo_vertical_water.png', 
+										'url' => 'http://localhost/pandora_console/images/logo_vertical_water.png');
+					
 					if ($width == 0) {
 						if ($layoutData['label_position']=='left') {
-							$img =  '<div style="float:right;height:'.$himg.'px;">'.
-							grafico_modulo_sparse($id_module, $period, 
-							0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, false, 0, 
-							modules_get_unit($id_module), 0, 0, true, $only_image, '', 1, false, '', 
-							false, false, false, $layoutData['image'], 
-							null, true, false, $type_graph) . '</div>';
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = '<div style="float:right;height:'.$himg.'px;">'.
+									hbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']) . '</div>';
+							}
+							else {
+								$img = '<div style="float:right;height:'.$himg.'px;">'. 
+									vbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true) . '</div>';
+							}
 						}
 						elseif($layoutData['label_position']=='right') {
-							$img =  '<div style="float:left;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, 
-								$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 
-								1, false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-								1, false, '', false, false, false, 
-								$layoutData['image'], null, true, 
-								false, $type_graph) . '</div>';
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = '<div style="float:left;height:'.$himg.'px;">'.
+									hbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']) . '</div>';
+							}
+							else {
+								$img = '<div style="float:left;height:'.$himg.'px;">'. 
+									vbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true) . '</div>';
+							}
 						}
 						else {
-							$img =  grafico_modulo_sparse($id_module, 
-							$period, 0, 300, 180, modules_get_agentmodule_name($id_module),null, false, 1, 
-							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-							1, false, '', false, false, false, 
-							$layoutData['image'], null, true, false, $type_graph);
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = hbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']);
+							}
+							else {
+								$img = vbar_graph(true, $module_data,
+									400, 400, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true);
+							}
 						}
 					}
 					else{
 						if ($layoutData['label_position']=='left') {
-							$img =  '<div style="float:right;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, $period, 
-							0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-							false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, '', 
-							1, false, '', false, false, false, 
-							$layoutData['image'], null, true, 
-							false, $type_graph) . '</div>';
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = '<div style="float:right;height:'.$himg.'px;">'.
+									hbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']) . '</div>';
+							}
+							else {
+								$img = '<div style="float:right;height:'.$himg.'px;">'. 
+									vbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true) . '</div>';
+							}
 						}
-						elseif ($layoutData['label_position']=='right') {
-							$img =  '<div style="float:left;height:'.$himg.'px;">' . 
-								grafico_modulo_sparse($id_module, $period, 
-								0, $width, $height, modules_get_agentmodule_name($id_module), null, false, 1, 
-								false, 0, modules_get_unit($id_module), 0, 0, true, $only_image, 
-								'', 1, false, modules_get_unit($id_module), false, false, false, 
-								$layoutData['image'], null, true, 
-								false, $type_graph) . '</div>';
+						elseif($layoutData['label_position']=='right') {
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = '<div style="float:left;height:'.$himg.'px;">'.
+									hbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']) . '</div>';
+							}
+							else {
+								$img = '<div style="float:left;height:'.$himg.'px;">'. 
+									vbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true) . '</div>';
+							}
 						}
 						else {
-							$img =  grafico_modulo_sparse($id_module, 
-								$period, 0, $width, $height, modules_get_agentmodule_name($id_module), null, 
-								false, 1, false, 0, modules_get_unit($id_module), 0, 0, true, 
-								$only_image, '', 1, false, '', false, 
-								false, false, $layoutData['image'], 
-								null, false, true, $type_graph);
+							if ($layoutData['type_graph'] == 'horizontal') {
+								$img = hbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image']);
+							}
+							else {
+								$img = vbar_graph(true, $module_data,
+									$width, $width, $color, array(), array(),
+									ui_get_full_url("images/image_problem.opaque.png", false, false, false),
+									"", "", $water_mark, $config['fontpath'], 6,
+									"", 0, $config['homeurl'], $layoutData['image'], true);
+							}
 						}
 					}
 				}
@@ -1931,34 +2035,13 @@ function get_bars_module_data ($id_module) {
 		$values = explode("\n", $mod_values);
 	}
 
-	$colors = array();
-	$colors[] = "#aa3333";
-	$colors[] = "#045FB4";
-	$colors[] = "#8181F7";
-	$colors[] = "#F78181";
-	$colors[] = "#D0A9F5";
-	$colors[] = "#BDBDBD";
-	$colors[] = "#6AB277";
-
 	$values_to_return = array();
 	$index = 0;
 	$color_index = 0;
 	$total = 0;
 	foreach ($values as $val) {
 		$data = explode(":", $val);
-		$values_to_return[$index]['tag_name'] = $data[0] . ", " . $data[1];
-		if ($color_index == 6) {
-			$color_index = 0;
-		}
-		$values_to_return[$index]['color'] = $colors[$color_index];
-		$values_to_return[$index]['value'] = (int)$data[1];
-		$total += (int)$data[1];
-		$index++;
-		$color_index++;
-	}
-
-	foreach ($values_to_return as $ind => $bar_data) {
-		$values_to_return[$ind]['percent'] = ($bar_data['value'] * 100) / $total;
+		$values_to_return[$data[0]] = array('g' =>$data[1]);
 	}
 
 	return $values_to_return;
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 8fb0db1abe..b1bae184ae 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -146,7 +146,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 				'</td>';
 			
 			$form_items['module_graph_size_row'] = array();
-			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos', 'bars_graph');
+			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
 			$form_items['module_graph_size_row']['html'] = '<td align="left">' . __('Size') . '</td>
 				<td align="left">' .
 				html_print_input_text('width_module_graph', 300, '', 3, 5, true) . 
@@ -465,7 +465,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			
 			
 			$form_items['module_graph_size_row'] = array();
-			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos', 'bars_graph');
+			$form_items['module_graph_size_row']['items'] = array('module_graph', 'datos');
 			$form_items['module_graph_size_row']['html'] = '<td align="left">' . __('Size') . '</td>
 				<td align="left">' .
 				html_print_input_text('width_module_graph', 300, '', 3, 5, true) . 
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index e036a9855e..9024424ab0 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -638,7 +638,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 			}
 			
 			format.push([i,
-				'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:-20px; max-width: 100px;font-size:'+font_size+'pt !important;">'
+				'<div class="'+font+'" title="'+title+'" style="word-break: normal; transform: rotate(-45deg); position:relative; top:+30px; left:0px; max-width: 100px;font-size:'+font_size+'pt !important;">'
 				+ label
 				+ '</div>']);
 		}
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index f5368ca4c5..a6637f04ba 100644
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -743,13 +743,7 @@ function pch_bar_graph ($graph_type, $index, $data, $width, $height, $font,
 	$myPicture->setGraphArea($margin_left, $margin_top, $width - $margin_right, $height - $margin_bottom);
 	
 	$myPicture->drawScale($scaleSettings);
-	/*
-	if (isset($legend)) {
-		/* Write the chart legend 
-		$size = $myPicture->getLegendSize(array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
-		$myPicture->drawLegend($width-$size['Width'],0,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL, "BoxWidth"=>10, "BoxHeight"=>10));
-	}
-	*/
+	
 	/* Turn on shadow computing */ 
 	$myPicture->setShadow(TRUE,array("X"=>0,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
 	

From 3c4331631d984850adc6634576f9c20d2a806a68 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 23 Oct 2017 16:24:40 +0200
Subject: [PATCH 24/27] Fixed width in js

---
 .../reporting/visual_console_builder.editor.js       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 16e31a61a6..4cecad235d 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1794,7 +1794,7 @@ function setBarsGraph(id_data, values) {
 		dataType: 'json',
 		success: function (data) {
 			if (data['no_data'] == true) {
-				if (values['width'] == "0") {
+				if (values['width_percentile'] == "0") {
 					$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras-no.png');
 				}
 				else {
@@ -1806,20 +1806,20 @@ function setBarsGraph(id_data, values) {
 			else {
 				$("#" + id_data + " img").attr('src', url_hack_metaconsole + 'images/console/signes/barras.png');
 				
-				if($('#text-width').val() == 0){
+				if (values['width_percentile'] == "0") {
 					// Image size
 				}
 				else{
-					$("#" + id_data + " img").css('width', $('#text-width_percentile').val()+'px');
-					$("#" + id_data + " img").css('height', $('#text-width_percentile').val()+'px');
+					$("#" + id_data + " img").css('width', width_percentile+'px');
+					$("#" + id_data + " img").css('height', width_percentile+'px');
 				}
 			}
 
 			if($('#'+id_data+' table').css('float') == 'right' || $('#'+id_data+ ' table').css('float') == 'left'){
-				$('#'+id_data+ ' img').css('margin-top', 	parseInt($('#'+id_data).css('height'))/2 - parseInt($('#'+id_data+ ' img').css('height'))/2);	
+				$('#'+id_data+ ' img').css('margin-top', parseInt($('#'+id_data).css('height'))/2 - parseInt($('#'+id_data+ ' img').css('height'))/2);	
 			}
 			else{
-				$('#'+id_data+ ' img').css('margin-left',parseInt($('#'+id_data).css('width'))/2 - parseInt($('#'+id_data+ ' img').css('width'))/2);		
+				$('#'+id_data+ ' img').css('margin-left', parseInt($('#'+id_data).css('width'))/2 - parseInt($('#'+id_data+ ' img').css('width'))/2);		
 			}
 		}
 	});

From 5fa51ceb6bd5167c4edd4f72890274489a9c6b85 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Tue, 24 Oct 2017 09:24:07 +0200
Subject: [PATCH 25/27] Fixed element in meta

---
 .../godmode/reporting/visual_console_builder.editor.js        | 3 ++-
 pandora_console/include/styles/pandora.css                    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 4cecad235d..2fedfc8e4a 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -1781,11 +1781,12 @@ function setBarsGraph(id_data, values) {
 	width_percentile = values['width_percentile'];
 
 	parameter = Array();
-
+	
 	parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
 	parameter.push ({name: "action", value: "get_module_type_string"});
 	parameter.push ({name: "id_agent", value: values['id_agent']});
 	parameter.push ({name: "module", value: values['module']});
+	parameter.push ({name: "id_element", value: id_data});
 	parameter.push ({name: "id_visual_console", value: id_visual_console});
 	jQuery.ajax({
 		url: get_url_ajax(),
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 94af9716a9..16c29af740 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -767,13 +767,13 @@ input.graph_min {
 	background: #fefefe url(../../images/chart_curve.png) no-repeat center !important;
 }
 input.graph_min[disabled] {
-	background: #fefefe url(../../images/icono-barras-arriba.disabled.png) no-repeat center !important;
+	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
 }
 input.bars_graph_min {
 	background: #fefefe url(../../images/icono-barras-arriba.png) no-repeat center !important;
 }
 input.bars_graph_min[disabled] {
-	background: #fefefe url(../../images/chart_curve.disabled.png) no-repeat center !important;
+	background: #fefefe url(../../images/icono-barras-arriba.disabled.png) no-repeat center !important;
 }
 input.percentile_min {
 	background: #fefefe url(../../images/chart_bar.png) no-repeat center !important;

From 1f20247ae388e1a7db2c2bb01326280745a12e20 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 26 Oct 2017 12:23:41 +0200
Subject: [PATCH 26/27] Added background color to bars charts

---
 pandora_console/include/graphs/fgraph.php     |  4 ++--
 .../include/graphs/flot/pandora.flot.js       | 19 +++++--------------
 .../include/graphs/functions_flot.php         | 12 ++++++------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index c36529b7f7..4e144bf08b 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -188,7 +188,7 @@ function vbar_graph($flash_chart, $chart_data, $width, $height,
 	if ($flash_chart) {
 		return flot_vcolumn_chart ($chart_data, $width, $height, $color,
 			$legend, $long_index, $homeurl, $unit, $water_mark_url,
-			$homedir,$font,$font_size, $from_ux, $from_wux);
+			$homedir,$font,$font_size, $from_ux, $from_wux, $backgroundColor);
 	}
 	else {
 		$graph = array();
@@ -636,7 +636,7 @@ function hbar_graph($flash_chart, $chart_data, $width, $height,
 	
 	if ($flash_chart) {
 		return flot_hcolumn_chart(
-			$chart_data, $width, $height, $water_mark_url, $font, $font_size);
+			$chart_data, $width, $height, $water_mark_url, $font, $font_size, $backgroundColor);
 	}
 	else {
 		$graph = array();
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 9024424ab0..277a060f43 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -309,7 +309,7 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
 }
 
 function pandoraFlotHBars(graph_id, values, labels, water_mark,
-	maxvalue, water_mark, separator, separator2, font, font_size) {
+	maxvalue, water_mark, separator, separator2, font, font_size, background_color) {
 
 	var colors_data = ['#FC4444','#FFA631','#FAD403','#5BB6E5','#F2919D','#80BA27'];
 	values = values.split(separator2);
@@ -355,7 +355,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
 			grid: {
 				hoverable: true,
 				borderWidth: 1,
-				backgroundColor: { colors: ["#FFF", "#FFF"] }
+				backgroundColor: { colors: [background_color, background_color] }
 				},
 			xaxis: {
 				axisLabelUseCanvas: true,
@@ -494,7 +494,7 @@ function showTooltip(x, y, color, contents) {
     }).appendTo("body").fadeIn(200);
 }
 
-function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux, from_wux) {
+function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux, from_wux, background_color) {
 	values = values.split(separator2);
 	legend = legend.split(separator);
 	font = font.split("/").pop().split(".").shift();
@@ -585,7 +585,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 		grid: {
 			hoverable: true,
 			borderWidth: 1,
-			backgroundColor: { colors: ["#FFF", "#FFF"] }
+			backgroundColor: { colors: [background_color, background_color] }
 		}
 	};
 	
@@ -608,16 +608,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 	$('#' + graph_id).VUseTooltip();
 	$('#' + graph_id).css("margin-left","auto");
 	$('#' + graph_id).css("margin-right","auto");
-	//~ $('#' + graph_id).find('div.legend-tooltip').tooltip({ track: true });
-	/*
-		$('#'+graph_id+' .xAxis .tickLabel')
-			.css('transform', 'rotate(-45deg)')
-			.css('max-width','100px')
-			.find('div')
-				.css('position', 'relative')
-				.css('top', '+10px')
-				.css('left', '-30px');
-	*/
+	
 	if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent))
 		$('#'+graph_id+' .xAxis .tickLabel')
 			.find('div')
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 319e69cab0..bfc7b37c3b 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -674,7 +674,7 @@ function flot_custom_pie_chart ($flash_charts, $graph_values,
 }
 
 // Returns a 3D column chart
-function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = '', $font_size = 7) {
+function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = '', $font_size = 7, $background_color = "white") {
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
@@ -755,7 +755,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font =
 	$return .= "<script type='text/javascript'>";
 	
 	$return .= "pandoraFlotHBars('$graph_id', '$values', '$labels',
-		false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size)";
+		false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color')";
 
 	$return .= "</script>";
 	
@@ -763,7 +763,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font =
 }
 
 // Returns a 3D column chart
-function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux, $from_wux) {
+function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux, $from_wux, $background_color = 'white') {
 	global $config;
 	
 	include_javascript_dependencies_flot_graph();
@@ -847,14 +847,14 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
 
 	if ($from_ux) {
 		if($from_wux){
-			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true)";
+			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true, '$background_color')";
 		}
 		else{
-			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, false)";
+			$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, false, '$background_color')";
 		}
 	}
 	else {
-		$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false)";
+		$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false, '$background_color')";
 	}
 
 	$return .= "</script>";

From 953aa53ce04ca1ad3834b9306640d3eb1fc591a3 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Thu, 26 Oct 2017 12:34:22 +0200
Subject: [PATCH 27/27] Add nano and xgettext to Dockerfile - #1508

---
 tests/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/Dockerfile b/tests/Dockerfile
index 70b0bf9f18..a2f7cf271a 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -66,6 +66,7 @@ RUN yum install -y \
 	cronie \
 	ntp \
 	wget \
+	nano \
 	curl \
 	xterm \
 	postfix \
@@ -96,5 +97,9 @@ RUN yum install -y \
 	net-snmp-utils \
 	perl-Test-Simple; yum clean all;
 
+RUN wget http://rpmfind.net/linux/centos/6.9/os/i386/Packages/gettext-0.17-18.el6.i686.rpm; \
+	yum localinstall -y gettext-0.17-18.el6.i686.rpm; \
+	rm -rf gettext-0.17-18.el6.i686.rpm;
+
 #Exposing ports for: HTTP, SNMP Traps, Tentacle protocol
 EXPOSE 80 162/udp 41121