From 88fa70ad870efa82a73f8e7314a39eefa4f74851 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 24 Aug 2015 17:08:39 +0200
Subject: [PATCH] Fixed the charts (boolean and sparse) added lost time
 interval. TICKET: #2511

---
 pandora_console/include/functions_graph.php | 26 ++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 8f462b3403..32b12a5366 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -241,18 +241,21 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
 	$max_value = 0;
 	$min_value = null;
 	$flash_chart = $config['flash_charts'];
-		
+	
 	// Event iterator
 	$event_i = 0;
-			
+	
 	// Is unknown flag
 	$is_unknown = $start_unknown;
 	
 	// Calculate chart data
 	$last_known = $previous_data;
-	for ($i = 0; $i < $resolution; $i++) {
+	
+	
+	for ($i = 0; $i <= $resolution; $i++) {
 		$timestamp = $datelimit + ($interval * $i);
 		
+		
 		$total = 0;
 		$count = 0;
 		
@@ -510,6 +513,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 	
 	$flash_chart = $config['flash_charts'];
 	
+	
 	// Get event data (contains alert data too)
 	$events = array();
 	if ($show_unknown == 1 || $show_events == 1 || $show_alerts == 1) {
@@ -542,6 +546,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 			'order' => 'utimestamp ASC'),
 		array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
 	
+	
 	// Get module warning_min and critical_min
 	$warning_min = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$agent_module_id);
 	$critical_min = db_get_value('min_critical','tagente_modulo','id_agente_modulo',$agent_module_id);
@@ -610,7 +615,9 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 	if ($baseline) {
 		$baseline_data = array ();
 		if ($baseline == 1) {
-			$baseline_data = enterprise_hook ('reporting_enterprise_get_baseline', array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
+			$baseline_data = enterprise_hook(
+				'reporting_enterprise_get_baseline',
+				array ($agent_module_id, $period, $width, $height , $title, $unit_name, $date));
 			if ($baseline_data === ENTERPRISE_NOT_HOOK) {
 				$baseline_data = array ();
 			}
@@ -741,6 +748,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		$series_suffix_str = ' (' . __('Previous') . ')';
 		// Build the data of the previous period
 		
+		
+		
 		grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
 			$width, $height, $title, $unit_name,
 			$show_alerts, $avg_only,
@@ -748,6 +757,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$projection, $adapt_key, $compare,
 			$series_suffix, $series_suffix_str, $show_unknown);
 		
+		
+		
 		switch ($compare) {
 			case 'separated':
 				// Store the chart calculated
@@ -771,6 +782,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		}
 	}
 	
+	
 	// Build the data of the current period
 	$data_returned = grafico_modulo_sparse_data ($agent_module_id,
 		$period, $show_events,
@@ -779,6 +791,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		$date, $unit, $baseline, $return_data, $show_title,
 		$projection, $adapt_key, $compare, '', '', $show_unknown);
 	
+	
 	if ($return_data) {
 		return $data_returned;
 	}
@@ -802,7 +815,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	}
 	
 	$water_mark = array('file' =>
-		$config['homedir'] .  "/images/logo_vertical_water.png",
+		$config['homedir'] . "/images/logo_vertical_water.png",
 		'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false));
 	
 	if ($compare === 'separated') {
@@ -820,6 +833,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 	}
 	else {
 		// Color commented not to restrict serie colors
+		
 		return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
 			$long_index, ui_get_full_url("images/image_problem.opaque.png", false, false, false),
 			"", $unit, $homeurl, $water_mark, $config['fontpath'], $config['font_size'], $unit, $ttl, 
@@ -2935,7 +2949,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
 	
 	// Calculate chart data
 	$last_known = $previous_data;
-	for ($i = 0; $i < $resolution; $i++) {
+	for ($i = 0; $i <= $resolution; $i++) {
 		$timestamp = $datelimit + ($interval * $i);
 		
 		$zero = 0;