From 3a215820c174d256550b99c5bd606db95c4f9425 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 14 Oct 2013 11:48:51 +0000
Subject: [PATCH] 2013-10-14 Miguel de Dios <miguel.dedios@artica.es>

	* include/graphs/flot/pandora.flot.js,
	include/graphs/functions_flot.php, operation/agentes/stat_win.php:
	fixed the charts with negative values and a flot type.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8906 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  6 ++
 .../include/graphs/flot/pandora.flot.js       | 83 ++++++++++---------
 .../include/graphs/functions_flot.php         | 40 +++++++--
 .../operation/agentes/stat_win.php            |  1 +
 4 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 9297f279e3..cee94ae512 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-14 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/graphs/flot/pandora.flot.js,
+	include/graphs/functions_flot.php, operation/agentes/stat_win.php:
+	fixed the charts with negative values and a flot type.
+
 2013-10-14  Vanessa Gil <vanessa.gil@artica.es>
 
 	* include/languages/ar.mo
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 5592a0c644..b01c867e3f 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -546,12 +546,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 	// Prepared to turn series with a checkbox
 	// var showed = new Array();
 	
-	for(i=0;i<values.length;i++) {
+	for (i = 0; i < values.length; i++) {
 		var serie = values[i].split(separator);
 		var aux = new Array();
 		var critical_min = new Array();
 		var warning_min = new Array();
-		$.each(serie,function(i,v) {
+		$.each(serie, function(i, v) {
 			aux.push([i, v]);
 			if (threshold) {
 				critical_min.push([i,red_threshold]);
@@ -562,12 +562,12 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 		switch(serie_types[i]) {
 			case 'line':
 			default:
-					line_show = true;
-					points_show = false;
+				line_show = true;
+				points_show = false;
 				break;
 			case 'points':
-					line_show = false;
-					points_show = true;
+				line_show = false;
+				points_show = true;
 				break;
 		}
 		
@@ -601,12 +601,18 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 		
 		// Data
 		data_base.push({ 
-			id: 'serie_'+i,
+			id: 'serie_' + i,
 			data: aux, 
 			label: legend[i],
 			color: serie_color,
 			//threshold: [{ below: 80, color: "rgb(200, 20, 30)" } , { below: 65, color: "rgb(30, 200, 30)" }, { below: 50, color: "rgb(30, 200, 30)" }],
-			lines: { show: line_show, fill: filled, fillColor: { colors: [ { opacity: 0.9 }, { opacity: 0.9 } ]}, lineWidth:1, steps:false },
+			lines: { show: line_show,
+				fill: filled,
+				fillColor: {
+					colors: [ { opacity: 0.9 }, { opacity: 0.9 } ]
+				},
+				lineWidth: 1,
+				steps: false },
 			points: { show: points_show }
 		});
 		
@@ -642,14 +648,14 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 	var min_tick_pixels = 80;
 	var steps = parseInt( count_data / (width/min_tick_pixels));
 	
-	var options = { 
-			series: { 
+	var options = {
+			series: {
 				stack: stacked,
 				shadowSize: 0.1
 			},
 			crosshair: { mode: 'xy' },
 			selection: { mode: 'x', color: '#777' },
-			grid: { 
+			grid: {
 				hoverable: true, 
 				clickable: true, 
 				borderWidth:1,
@@ -657,27 +663,26 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 				tickColor: '#eee',
 				markings: markings
 				},
-			xaxes: [ { 
+			xaxes: [ {
 					tickFormatter: xFormatter,
 					minTickSize: steps,
 					color: '#000'
-					} ],
-			yaxes: [ { 
-					tickFormatter: yFormatter,
-					min: 0,
-					color: '#000'
+				} ],
+			yaxes: [ {
+						tickFormatter: yFormatter,
+						color: '#000'
 					},
 					{
-					  // align if we are to the right
-					  alignTicksWithAxis: 1,
-					  position: 'right'
-					  
-					  //tickFormatter: dFormatter
+						// align if we are to the right
+						alignTicksWithAxis: 1,
+						position: 'right'
+						
+						//tickFormatter: dFormatter
 					} ]
 					,
-			legend: { 
-				position: 'se', 
-				container: $('#legend_'+graph_id),
+			legend: {
+				position: 'se',
+				container: $('#legend_' + graph_id),
 				labelFormatter: lFormatter
 				}
 		};
@@ -700,20 +705,20 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 		},
 		grid: { borderWidth: 1, hoverable: true, autoHighlight: false},
 		xaxis: { },
-			xaxes: [ { 
+			xaxes: [ {
 				tickFormatter: xFormatter,
 				minTickSize: steps,
 				color: '#000'
 				} ],
-		yaxis: { ticks: [], min: 0, autoscaleMargin: 0.1 },
-		selection: { mode: 'x', color: '#777' },
+		yaxis: {ticks: [], autoscaleMargin: 0.1 },
+		selection: {mode: 'x', color: '#777' },
 		legend: {show: false},
-		crosshair: { mode: 'x' }
+		crosshair: {mode: 'x'}
 	});
 	
 	// Connection between plot and miniplot
 	
-	$('#'+graph_id).bind('plotselected', function (event, ranges) {
+	$('#' + graph_id).bind('plotselected', function (event, ranges) {
 		// do the zooming if exist menu to undo it
 		if (menu == 0) {
 			return;
@@ -723,9 +728,9 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 		
 		factor = dataInSelection / dataInPlot;
 		
-		new_steps = parseInt(factor*steps);
+		new_steps = parseInt(factor * steps);
 		
-		plot = $.plot($('#'+graph_id), datas,
+		plot = $.plot($('#' + graph_id), datas,
 			$.extend(true, {}, options, {
 				xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to},
 				xaxes: [ { 
@@ -736,18 +741,20 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 				legend: { show: false }
 			}));
 		
-		$('#menu_cancelzoom_'+graph_id).attr('src',homeurl+'/images/zoom_cross.png');
+		$('#menu_cancelzoom_' + graph_id)
+			.attr('src',homeurl + '/images/zoom_cross.png');
 		
 		currentRanges = ranges;
 		// don't fire event on the overview to prevent eternal loop
 		overview.setSelection(ranges, true);
 	});
 	
-	$('#overview_'+graph_id).bind('plotselected', function (event, ranges) {
-		plot.setSelection(ranges);
-	});
+	$('#overview_' + graph_id)
+		.bind('plotselected', function (event, ranges) {
+			plot.setSelection(ranges);
+		});
 	
-	var legends = $('#legend_'+graph_id+' .legendLabel');
+	var legends = $('#legend_' + graph_id + ' .legendLabel');
 	
 	var updateLegendTimeout = null;
 	var latestPosition = null;
@@ -991,7 +998,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, colors,
 			// cancel the zooming
 			plot = $.plot($('#'+graph_id), data_base,
 				$.extend(true, {}, options, {
-					xaxis: { min: 0, max: max_x },
+					xaxis: {max: max_x },
 					legend: { show: false }
 				}));
 			
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 4c92d84db0..1966b0ec78 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -163,12 +163,12 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
 			$colors[] = '';
 		}
 	}
-		
+	
 	foreach($chart_data as $label => $values) {
 		$labels[] = io_safe_output($label);
-			
+		
 		foreach($values as $key => $value) {
-			$jsvar = "data_".$graph_id."_".$key;
+			$jsvar = "data_" . $graph_id . "_" . $key;
 			
 			if (!isset($serie_types[$key])) {
 				$serie_types2[$jsvar] = 'line';
@@ -298,14 +298,42 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
 	else {
 		$force_integer = 'false';
 	}
-
+	
 	// Trick to get translated string from javascript
-	$return .= html_print_input_hidden('unknown_text', __('Unknown'), true);
+	$return .= html_print_input_hidden('unknown_text', __('Unknown'),
+		true);
 	
 	// Javascript code
 	$return .= "<script type='text/javascript'>";
 	$return .= "//<![CDATA[\n";
-	$return .= "pandoraFlotArea('$graph_id', '$values', '$labels', '$labels_long', '$legend', '$colors', '$type', '$serie_types', $watermark, $width, $max_x, '".$config['homeurl']."', '$unit', $font_size, $menu, '$events', '$event_ids', '$legend_events', '$alerts', '$alert_ids', '$legend_alerts', '$yellow_threshold', '$red_threshold', $force_integer, '$separator', '$separator2', '$series_suffix_str');";
+	$return .= "pandoraFlotArea(" .
+		"'$graph_id', " .
+		"'$values', " .
+		"'$labels', " .
+		"'$labels_long', " .
+		"'$legend', " .
+		"'$colors', " .
+		"'$type', " .
+		"'$serie_types', " .
+		"$watermark, " .
+		"$width, " .
+		"$max_x, " .
+		"'" . $config['homeurl'] . "', " .
+		"'$unit', " .
+		"$font_size, " .
+		"$menu, " .
+		"'$events', " .
+		"'$event_ids', " .
+		"'$legend_events', " .
+		"'$alerts', " .
+		"'$alert_ids', " .
+		"'$legend_alerts', " .
+		"'$yellow_threshold', " .
+		"'$red_threshold', " .
+		"$force_integer, " .
+		"'$separator', " .
+		"'$separator2', " .
+		"'$series_suffix_str');";
 	$return .= "\n//]]>";
 	$return .= "</script>";
 	
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 0e6d62356c..58af6cbc4b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -161,6 +161,7 @@ $label = base64_decode(get_parameter('label', ''));
 			echo '<div style="margin-left: 70px; padding-top: 10px;">';
 		else
 			echo '<div style="margin-left: 50px; padding-top: 10px;">';
+		
 		switch ($graph_type) {
 			case 'boolean':
 				echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,