From 7ffe4988f0708bf39921ae1387bab8f6d9caeae2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 27 Feb 2017 14:04:49 +0100
Subject: [PATCH] Added new fields to log report. Ticket #337

---
 .../reporting_builder.item_editor.php         | 40 +++++++++++++++----
 .../godmode/reporting/reporting_builder.php   |  8 ++--
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 2758ebc41c..57496a6ac8 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -63,6 +63,7 @@ $order_uptodown = 0;
 $show_resume = 0;
 $show_address_agent = 0;
 $top_n = 0;
+$source = 0;
 $top_n_value = 10;
 $exception_condition = REPORT_EXCEPTION_CONDITION_EVERYTHING;
 $exception_condition_value = 10;
@@ -199,13 +200,7 @@ switch ($action) {
 					$description = $item['description'];
 					$es = json_decode($item['external_source'], true);
 					$id_agents = $es['id_agents'];
-					if ((count($es['module']) == 1) && ($es['module'][0] == 0)) {
-						$module = "";
-					}
-					else {
-						$module = $es['module'];
-					}
-					$idAgentModule = $module;
+					$source = $es['source'];
 					break;
 				case 'simple_graph':
 					$only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true;
@@ -882,6 +877,34 @@ You can of course remove the warnings, that's why we include the source and do n
 				?>
 			</td>
 		</tr>
+		<tr id="row_source" style="" class="datos">
+			<td style="font-weight:bold;"><?php echo __('Source');?></td>
+			<td style="">
+				<?php
+					$agents = agents_get_group_agents($group);
+					if ((empty($agents)) || $agents == -1) $agents = array();
+
+					$sql = 'SELECT source
+							FROM tagente,tagent_module_log
+							WHERE tagente.id_agente = tagent_module_log.id_agent ';
+					
+					if (!empty($agents)) {
+						$index = 0;
+						foreach ($agents as $key => $a) {
+							if ($index == 0) {
+								$sql .= ' AND (id_agente = ' . $key;
+							}
+							else {
+								$sql .= ' OR id_agente = ' . $key;
+							}
+							$index++;
+						}
+						$sql .= ")";
+					}
+					html_print_select_from_sql ($sql, 'source', $source, '', __('All'), '', false, false, false);
+				?>
+			</td>
+		</tr>
 		<tr id="row_module_group" style="" class="datos">
 			<td style="font-weight:bold;"><?php echo __('Module group');?></td>
 			<td style="">
@@ -2575,6 +2598,7 @@ function chooseType() {
 	$("#row_event_severity").hide();
 	$("#row_event_type").hide();
 	$("#row_event_status").hide();
+	$("#row_source").hide();
 	
 	// SLA list default state
 	$("#sla_list").hide();
@@ -2612,7 +2636,7 @@ function chooseType() {
 			$("#row_description").show();
 			$("#row_period").show();
 			$("#agents_row").show();
-			$("#modules_row").show();
+			$("#row_source").show();
 			break;
 		
 		case 'simple_graph':
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 4d5f6f2a25..65d1aa2eca 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -924,9 +924,9 @@ switch ($action) {
 								break;
 							case 'event_report_log':
 								$agents_to_report = get_parameter('id_agents2');
-								$modules_to_report = get_parameter('module', "");
+								$source = get_parameter('source', "");
 
-								$es['module'] = get_same_modules($agents_to_report, $modules_to_report);
+								$es['source'] = $source;
 								$es['id_agents'] = $agents_to_report;
 
 								$values['external_source'] = json_encode($es);
@@ -1278,9 +1278,9 @@ switch ($action) {
 								break;
 							case 'event_report_log':
 								$agents_to_report = get_parameter('id_agents2');
-								$modules_to_report = get_parameter('module', "");
+								$source = get_parameter('source', "");
 
-								$es['module'] = get_same_modules($agents_to_report, $modules_to_report);
+								$es['source'] = $source;
 								$es['id_agents'] = $agents_to_report;
 
 								$values['external_source'] = json_encode($es);