From 069497235d82dbb19cbc648eed593698b013e0e7 Mon Sep 17 00:00:00 2001 From: javilanz Date: Fri, 10 Jun 2011 10:55:20 +0000 Subject: [PATCH] 2011-06-10 Javier Lanz * include/graphs/functions_fsgraph.php: Updated a deprecated function call * include/functions_reporting.php: ixed a mistake using the wrong variable to print pie graph * godmode/agentes/module_manager_editor_prediction.php: Removed a html_debug_print call git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ .../agentes/module_manager_editor_prediction.php | 3 +-- pandora_console/include/functions_reporting.php | 10 ++++++++-- pandora_console/include/graphs/functions_fsgraph.php | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2c3e7e1d14..34ac60c94a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-06-10 Javier Lanz + + * include/graphs/functions_fsgraph.php: Updated a deprecated function + call + * include/functions_reporting.php: ixed a mistake using the wrong + variable to print pie graph + * godmode/agentes/module_manager_editor_prediction.php: Removed a + html_debug_print call + 2011-06-10 Juan Manuel Ramon * pandoradb.postgreSQL.sql diff --git a/pandora_console/godmode/agentes/module_manager_editor_prediction.php b/pandora_console/godmode/agentes/module_manager_editor_prediction.php index 7a787a3e96..cb77977849 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_prediction.php +++ b/pandora_console/godmode/agentes/module_manager_editor_prediction.php @@ -81,8 +81,7 @@ $data[1] .= html_print_label(__("Period"), 'custom_integer_2', true)."
"; $periods [0] = __('Weekly'); $periods [1] = __('Monthly'); $periods [2] = __('Daily'); -$data[1] .= html_print_select ($periods, 'custom_integer_2', $custom_integer_2, '', '', 0, true); //html_debug_print ($custom_integer_2); - +$data[1] .= html_print_select ($periods, 'custom_integer_2', $custom_integer_2, '', '', 0, true); $data[1] .= html_print_input_hidden ('id_agente', $id_agente, true); $data[1] .= ''; diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index f0b9a187be..02ecef366b 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -3284,7 +3284,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f if ($order_uptodown == 1 || $order_uptodown == 2) { $i = 0; $data_pie_graph = array(); + $data_hbar = array(); foreach ($data_top as $dt) { + $data_hbar[$agent_name[$i]]['g'] = $dt; $data_pie_graph[$agent_name[$i]] = $dt; if ($show_graph == 0 || $show_graph == 1) { $data = array(); @@ -3566,7 +3568,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f if ($order_uptodown == 1 || $order_uptodown == 2) { $j=0; $data_pie_graph = array(); + $data_hbar = array(); foreach ($data_exceptions as $dex) { + $data_hbar[$agent_name[$j]]['g'] = $dex; $data_pie_graph[$agent_name[$j]] = $dex; if ($show_graph == 0 || $show_graph == 1) { $data = array(); @@ -3581,7 +3585,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f else if ($order_uptodown == 0 || $order_uptodown == 3) { $j=0; $data_pie_graph = array(); + $data_hbar = array(); foreach ($agent_name as $an) { + $data_hbar[$an]['g'] = $data_exceptions[$j]; $data_pie_graph[$an] = $data_exceptions[$j]; if ($show_graph == 0 || $show_graph == 1) { $data = array(); @@ -3605,7 +3611,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $table->colspan[3][0] = 3; $data = array(); if ($show_graph == 1 || $show_graph == 2) { - $data[0] = pie3d_graph($config['flash_charts'], $data_graph, + $data[0] = pie3d_graph($config['flash_charts'], $data_pie_graph, 600, 150, __("other"), "", $config['homedir'] . "/images/logo_vertical_water.png", $config['fontpath'], $config['font_size']); array_push ($table->data, $data); @@ -3614,7 +3620,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $height = count($data_pie_graph)*20+35; $data = array(); - $data[0] = hbar_graph($config['flash_charts'], $data_horin_graph, 600, $height); + $data[0] = hbar_graph($config['flash_charts'], $data_hbar, 600, $height); array_push ($table->data, $data); } diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php index d3106d84fe..efc789b49f 100755 --- a/pandora_console/include/graphs/functions_fsgraph.php +++ b/pandora_console/include/graphs/functions_fsgraph.php @@ -667,7 +667,7 @@ function fs_2d_hcolumn_chart ($data, $width, $height) { $chart->setChartParams($params.';numVDivLines='.$num_vlines.($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '')); // Return the code - return get_chart_code ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Bar2D.swf'); + return get_chart_code2 ($chart, $width, $height, 'include/graphs/FusionCharts/FCF_Bar2D.swf'); } // Returns a 3D column chart