From 78267bcda4865576328da5fe567be41aff25eb4c Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Fri, 24 Apr 2015 11:51:46 +0200
Subject: [PATCH] Working in the refactoring the code of reports (inventory).

---
 .../include/functions_reporting.php           | 44 +++++++++
 .../include/functions_reporting_html.php      | 95 ++++++++++++-------
 2 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 4478cb963d..55da92ab4a 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -387,12 +387,56 @@ function reporting_make_reporting_data($id_report, $date, $time,
 					$report,
 					$content);
 				break;
+			case 'inventory':
+				$report['contents'][] = reporting_inventory(
+					$report,
+					$content);
+				break;
 		}
 	}
 	
 	return reporting_check_structure_report($report);
 }
 
+function reporting_inventory($report, $content) {
+	global $config;
+	
+	$es = json_decode($content['external_source'], true);
+	
+	$return['type'] = 'inventory';
+	
+	if (empty($content['name'])) {
+		$content['name'] = __('Inventory');
+	}
+	
+	$return['title'] = $content['name'];
+	$return["description"] = $content["description"];
+	$return["date"] = reporting_get_date_text($report, $content);
+	
+	$es = json_decode($content['external_source'], true);
+	
+	$id_agent = $es['id_agents'];
+	$module_name = $es['inventory_modules'];
+	if (empty($module_name)) {
+		$module_name = array(0 => 0);
+	}
+	$date = $es['date'];
+	$description = $content['description'];
+	
+	$inventory_data = inventory_get_data(
+		(array)$id_agent, (array)$module_name, $date, '', false,
+		'hash');
+	
+	if ($inventory_data == ERR_NODATA) {
+		$return['failed'] = __('No data found.');
+	}
+	else {
+		$return['data'] = $inventory_data;
+	}
+	
+	return reporting_check_structure_content($return);
+}
+
 function reporting_agent_module($report, $content) {
 	global $config;
 	
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index a516412760..4e7dd331be 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -240,6 +240,9 @@ function reporting_html_print_report($report, $mini = false) {
 			case 'agent_module':
 				reporting_html_agent_module($table, $item);
 				break;
+			case 'inventory':
+				reporting_html_inventory($table, $item);
+				break;
 		}
 		
 		if ($item['type'] == 'agent_module')
@@ -252,6 +255,63 @@ function reporting_html_print_report($report, $mini = false) {
 	}
 }
 
+function reporting_html_inventory($table, $item) {
+	if (!empty($item['failed'])) {
+		$table->colspan['failed']['cell'] = 3;
+		$table->cellstyle['failed']['cell'] = 'text-align: center;';
+		$table->data['failed']['cell'] = $item['failed'];
+	}
+	else {
+		foreach ($item['data'] as $module_item) {
+			$table1 = null;
+			$table1->width = '99%';
+			
+			$first = reset($module_item['data']);
+			$count_columns = count($first);
+			
+			
+			$table1->cellstyle[0][0] =
+				'background: #373737; color: #FFF;';
+			$table1->data[0][0] = $module_item['agent_name'];
+			if ($count_columns == 1)
+				$table1->colspan[0][0] = $count_columns + 1; // + columm date
+			else
+				$table1->colspan[0][0] = $count_columns;
+			
+			
+			$table1->cellstyle[1][0] =
+			$table1->cellstyle[1][1] =
+				'background: #373737; color: #FFF;';
+			$table1->data[1][0] = $module_item['name'];
+			if ($count_columns - 1 > 0)
+				$table1->colspan[1][0] = $count_columns - 1;
+			$table1->data[1][1] = $module_item['timestamp'];
+			
+			
+			$table1->cellstyle[2] = array_pad(
+				array(),
+				$count_columns,
+				'background: #373737; color: #FFF;');
+			$table1->data[2] = array_keys($first);
+			if ($count_columns - 1 == 0) {
+				$table1->colspan[2][0] = $count_columns + 1; // + columm date; 
+			}
+			
+			$table1->data = array_merge($table1->data, $module_item['data']);
+			
+			
+			$table->colspan[
+				$module_item['name'] . "_" .$module_item['id_agente']]['cell'] = 3;
+			$table->data[
+				$module_item['name'] . "_" .$module_item['id_agente']]['cell'] =
+				html_print_table($table1, true);
+			
+			
+		}
+	}
+	
+}
+
 function reporting_html_agent_module($table, $item) {
 	$table->colspan['agent_module']['cell'] = 3;
 	$table->cellstyle['agent_module']['cell'] = 'text-align: center;';
@@ -4808,40 +4868,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
 			}
 			break;
 		
-		case 'inventory':
-			if (empty($item_title)) {
-				$item_title = __('Inventory');
-			}
-			reporting_header_content($mini, $content, $report, $table, $item_title);
-			
-			$es = json_decode($content['external_source'], true);
-			
-			$id_agent = $es['id_agents'];
-			$module_name = $es['inventory_modules'];
-			if (empty($module_name)) {
-				$module_name = array(0 => 0);
-			}
-			$date = $es['date'];
-			$description = $content['description'];
-			
-			$data = array ();
-			$table->colspan[1][0] = 2;
-			$table->colspan[2][0] = 2;
-			if ($description != '') {
-				$data[0] = $description;
-				array_push ($table->data, $data);
-			}
-			
-			$inventory_data = inventory_get_data((array)$id_agent,(array)$module_name,$date,'',false);
-			
-			if ($inventory_data == ERR_NODATA) {
-				$inventory_data = "<div class='nf'>".__('No data found.')."</div>";
-				$inventory_data .= "&nbsp;</td></tr><tr><td>";
-			}
-			
-			$data[0] = $inventory_data;
-			array_push ($table->data, $data);
-			break;
+		
 		case 'inventory_changes':
 			if (empty($item_title)) {
 				$item_title = __('Inventory changes');