From f31e80b50dc0396057accc4665288d1f88191c1c Mon Sep 17 00:00:00 2001
From: zarzuelo <zarzuelo@gmail.com>
Date: Tue, 12 Apr 2011 16:03:07 +0000
Subject: [PATCH] 2011-04-12  Sergio Martin <sergio.martin@artica.es>

	* include/graphs/functions_fsgraph.php
	include/graphs/fgraph.php
	include/graphs/functions_utils.php: Created a function to
	include flash charts javascript file into abstraction.
	Clean code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4192 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            | 8 ++++++++
 pandora_console/include/graphs/fgraph.php            | 5 +++++
 pandora_console/include/graphs/functions_fsgraph.php | 4 ++--
 pandora_console/include/graphs/functions_utils.php   | 1 -
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c7c4bac5fa..8bb76d2202 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-12  Sergio Martin <sergio.martin@artica.es>
+
+	* include/graphs/functions_fsgraph.php
+	include/graphs/fgraph.php
+	include/graphs/functions_utils.php: Created a function to 
+	include flash charts javascript file into abstraction.
+	Clean code
+
 2011-04-12  Sergio Martin <sergio.martin@artica.es>
 
 	* include/graphs/functions_fsgraph.php
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 076c184a61..8da5b48323 100755
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -269,4 +269,9 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $oth
 function gantt_graph($project_name, $from, $to, $tasks, $milestones, $width, $height) {
 	return fs_gantt_chart ($project_name, $from, $to, $tasks, $milestones, $width, $height);
 }
+
+function include_flash_chart_script() {
+	echo '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
+}
+
 ?>
diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php
index 69b9401fb2..901ed759fa 100755
--- a/pandora_console/include/graphs/functions_fsgraph.php
+++ b/pandora_console/include/graphs/functions_fsgraph.php
@@ -157,7 +157,7 @@ function fs_stacked_graph($chart_data, $width, $height, $color, $legend, $long_i
 	$chart_id = 'chart_' . $random_number;
 		
 	$output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
-	$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
+	//$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
@@ -461,7 +461,7 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
 	
 	
 	$output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
-	$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
+	//$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
diff --git a/pandora_console/include/graphs/functions_utils.php b/pandora_console/include/graphs/functions_utils.php
index 768d284ea9..ed8bc002e0 100644
--- a/pandora_console/include/graphs/functions_utils.php
+++ b/pandora_console/include/graphs/functions_utils.php
@@ -69,7 +69,6 @@ function reverse_data($array) {
 	return $array2;
 }
 
-
 function stack_data(&$chart_data, &$legend = null, &$color = null) {
 	foreach ($chart_data as $val_x => $graphs) {
 		$prev_val = 0;