Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop'

Added type graph selection in container graph

See merge request artica/pandorafms!1113

pandora_console/extras/mr/12.sql

@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE tcontainer_item ADD COLUMN type_graph tinyint(1) unsigned default '0';
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1411,6 +1411,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` (
 	`agent` varchar(100) NOT NULL default '',
 	`module` varchar(100) NOT NULL default '',
 	`id_tag` integer(10) unsigned NOT NULL DEFAULT 0,
+	`type_graph` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`fullscale` tinyint(1) UNSIGNED NOT NULL default 0,
 	PRIMARY KEY(`id_ci`),
 	FOREIGN KEY (`id_container`) REFERENCES tcontainer(`id_container`)

pandora_console/godmode/reporting/create_container.php

@@ -37,16 +37,17 @@ if (is_ajax()){
 	$add_dynamic = (bool) get_parameter('add_dynamic',0);
 	$id_container2 = get_parameter('id_container',0);
 	
-    if($add_single){
+	if($add_single) {
 		$id_agent = get_parameter('id_agent');
 		$id_agent_module = get_parameter('id_agent_module');
 		$time_lapse = get_parameter('time_lapse');
 		$only_avg = get_parameter('only_avg');
+		$simple_type_graph = get_parameter('simple_type_graph');
 		$fullscale = get_parameter('fullscale');
+				
 		if($only_avg != 'false'){
 			$only_avg = 1;
-        }
+		} else{
-        else{
 			$only_avg = 0;   
 		}
 		
@@ -64,14 +65,14 @@ if (is_ajax()){
 			'id_agent_module' => $id_agent_module,
 			'time_lapse' => $time_lapse,
 			'only_average' => $only_avg,
-            'fullscale' => $fullscale
+			'type_graph' => $simple_type_graph,
-        );
+			'fullscale' => $fullscale);
 
 		$id_item = db_process_sql_insert('tcontainer_item', $values);
 		return;
 	}
     
-    if($add_custom){
+  if($add_custom) {
     $time_lapse = get_parameter('time_lapse');
     $id_custom = get_parameter('id_custom');
 		$fullscale = get_parameter('fullscale');
@@ -102,14 +103,14 @@ if (is_ajax()){
 		$module_name = get_parameter('module_name','');
 		$tag = get_parameter('tag',0);
     $only_avg = get_parameter('only_avg');
-        if($only_avg != 'false'){
+		$simple_type_graph2 = get_parameter('simple_type_graph2');
+		$fullscale = get_parameter('fullscale');
+		if($only_avg != 'false') {
 			$only_avg = 1;
-        }
+    } else {
-        else{
     	$only_avg = 0;   
     }
 		
-        $fullscale = get_parameter('fullscale');
 		if($fullscale != 'false'){
 				$fullscale = 1;
 		}
@@ -127,8 +128,9 @@ if (is_ajax()){
 			'module' => $module_name,
       'id_tag' => $tag,
       'only_average' => $only_avg,
-            'fullscale' => $fullscale
+			'type_graph' => $simple_type_graph2,
-        );
+			'fullscale' => $fullscale);
+
 		$id_item = db_process_sql_insert('tcontainer_item', $values);
 		return;
 	}
@@ -299,6 +301,10 @@ if($edit_container){
 	$periods[SECONDS_15DAYS] = __('15 days');
 	$periods[SECONDS_1MONTH] = __('1 month');
 	
+	$type_graphs = array();
+	$type_graphs[0] = __('Area');
+	$type_graphs[1] = __('Line');
+	
     $single_table = "<table width='100%' cellpadding=4 cellspacing=4>";
         $single_table .= "<tr id='row_time_lapse' style='' class='datos'>";
             $single_table .= "<td style='font-weight:bold;width: 13%;'>";
@@ -359,6 +365,16 @@ if($edit_container){
                 $single_table .= html_print_checkbox('only_avg', 1, true,true);
             $single_table .= "</td>";
         $single_table .= "</tr>";
+				
+				$single_table .= "<tr id='row_only_avg' style='' class='datos'>";
+						$single_table .= "<td style='font-weight:bold;'>";
+								$single_table .= __('Type of graph');
+						$single_table .= "</td>";
+						$single_table .= "<td>";
+								$single_table .= html_print_select ($type_graphs, 'simple_type_graph', "","","",0,true);
+						$single_table .= "</td>";
+				$single_table .= "</tr>";
+				
         $single_table .= "<tr id='row_fullscale' style='' class='datos'>";
             $single_table .= "<td style='font-weight:bold;'>";
                 $single_table .= __('Show full scale graph (TIP)') . ui_print_help_tip('This option may cause performance issues', true);
@@ -367,6 +383,7 @@ if($edit_container){
                 $single_table .= html_print_checkbox('fullscale', 1, false,true);
             $single_table .= "</td>";
         $single_table .= "</tr>";
+				
         $single_table .= "<tr>";
             $single_table .= "<td >";
             $single_table .= "</td>";
@@ -491,6 +508,12 @@ if($edit_container){
     $table->data[] = $data;
     $table->rowclass[] = '';
     
+		$data = array();
+		$data[0] =  __('Type of graph');
+		$data[1] = html_print_select ($type_graphs, 'simple_type_graph2', "","","",0,true);
+		$table->data[] = $data;
+    $table->rowclass[] = '';
+		
     $data = array();
     $data[0] =  __('Only average');
     $data[1] = html_print_checkbox('only_avg_2', 1, false,true);
@@ -613,6 +636,7 @@ echo html_print_input_hidden('id_agent', 0);
 						if(id_agent_module !== '0'){
 							var id_agent = $("#hidden-id_agent").attr('value');
 							var time_lapse = $("#hidden-period_single").attr('value');
+							var simple_type_graph = $("#simple_type_graph option:selected").attr('value');
 	            var only_avg = $("#checkbox-only_avg").prop("checked");
               var fullscale = $("#checkbox-fullscale").prop("checked");
 	            var id_container = <?php echo $id_container; ?>;
@@ -622,6 +646,7 @@ echo html_print_input_hidden('id_agent', 0);
 	                "id_agent" : id_agent,
 	                "id_agent_module" : id_agent_module,
 	                "time_lapse" : time_lapse,
+									"simple_type_graph": simple_type_graph,
 	                "only_avg" : only_avg,
                   "fullscale" : fullscale,
 	                "id_container" : id_container,
@@ -664,6 +689,7 @@ echo html_print_input_hidden('id_agent', 0);
 			var time_lapse = $("#hidden-period_dynamic").attr('value');
 			var group = $("#container_id_group1").val();
 			var module_group = $("#combo_modulegroup").val();
+			var simple_type_graph2 = $("#simple_type_graph2 option:selected").attr('value');
 			var tag = $("#tag").val();
       var only_avg = $("#checkbox-only_avg_2").prop("checked");
 	    var id_container = <?php echo $id_container; ?>;
@@ -676,6 +702,7 @@ echo html_print_input_hidden('id_agent', 0);
 				"module_group" : module_group,
 				"agent_alias" : agent_alias,
 				"module_name" : module_name,
+				"simple_type_graph2": simple_type_graph2,
 				"tag" : tag,
             	"id_container" : id_container,
                 "only_avg" : only_avg,

pandora_console/include/ajax/graph.ajax.php

@@ -159,6 +159,9 @@ if ($get_graphs){
 			if($period > 1){
 				$value['time_lapse'] = $period;
 			}
+			
+			$type_graph = ($value['type_graph'])? "line" : "area";
+			
 			switch ($value['type']) {
 				case 'simple_graph':
 					if ($contador > 0) {
@@ -195,9 +198,8 @@ if ($get_graphs){
 							null,
 							false,
 							false,
-							'area',
+							$type_graph,
-							$value['fullscale']
+							$value['fullscale']);
-						);
 						$contador --;
 					}
 					// $table .= "</br>";
@@ -339,9 +341,8 @@ if ($get_graphs){
 								null,
 								false,
 								false,
-								'area',
+								$type_graph,
-								$value['fullscale']
+								$value['fullscale']);
-							);
 							$contador --;
 						}
 					}

pandora_console/include/styles/pandora.css

@@ -4233,7 +4233,7 @@ div#footer_help{
 	left: 90% !important;
 }
 
-.graph_conteiner_inside > .parent_graph > .noresizevc{
+.graph_conteiner_inside > .parent_graph > .graph{
 	width: 90% !important;	
 }
 

pandora_console/pandoradb.sql

@@ -605,6 +605,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` (
 	`agent` varchar(100) NOT NULL default '',
 	`module` varchar(100) NOT NULL default '',
 	`id_tag` integer(10) unsigned NOT NULL DEFAULT 0,
+	`type_graph` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`fullscale` tinyint(1) UNSIGNED NOT NULL default 0,
 	PRIMARY KEY(`id_ci`),
 	FOREIGN KEY (`id_container`) REFERENCES tcontainer(`id_container`)