tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-11-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* include/functions_graph.php 
	 include/graphs/fgraph.php
	 include/functions_reporting.php
	 operation/agentes/ver_agente.php: Modules in 'top_n' reports are 
	 sorted and graphs are displayed.
	 
	 Fixes: #3422013



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5113 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-04 12:03:13 +00:00
parent 660a61e8d3
commit ce8f293f4b
5 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2011-11-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
include/graphs/fgraph.php
include/functions_reporting.php
operation/agentes/ver_agente.php: Modules in 'top_n' reports are
sorted and graphs are displayed.
Fixes: #3422013
2011-11-03 Sancho Lerena <slerena@artica.es>
* include/functions_html.php: Skip config.php loading after load

4
pandora_console/include/functions_graph.php
View File

@ -1515,6 +1515,10 @@ function graph_custom_sql_graph ($id, $width, $height, $type = 'sql_graph_vbar',
$flash_charts = $config['flash_charts'];
if ($flash_charts){
include_flash_chart_script();
}
if ($only_image) {
$flash_charts = false;
}

4
pandora_console/include/functions_reporting.php
View File

@ -3489,7 +3489,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table->colspan[4][0] = 3;
$height = count($data_pie_graph)*20+35;
$data = array();
$data[0] = hbar_graph($config['flash_charts'], $data_hbar, 600, $height);
$data[0] = hbar_graph($config['flash_charts'], $data_hbar, 600, $height, array(), array(), "", "", true, "", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true);
array_push ($table->data, $data);
}
@ -3772,7 +3772,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_hbar, 600, $height);
$data[0] = hbar_graph($config['flash_charts'], $data_hbar, 600, $height, array(), array(), "", "", true, "", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true);
array_push ($table->data, $data);
}

8
pandora_console/include/graphs/fgraph.php
View File

@ -341,10 +341,16 @@ function polar_graph($flash_chart, $chart_data, $width, $height, $no_data_image,
function hbar_graph($flash_chart, $chart_data, $width, $height, $color = array(),
$legend = array(), $xaxisname = "", $yaxisname = "", $force_height = true,
$homedir="", $water_mark = '', $font = '', $font_size = '', $force_steps = true, $ttl = 1) {
$homedir="", $water_mark = '', $font = '', $font_size = '', $force_steps = true, $ttl = 1, $return = false) {
if($flash_chart) {
include_flash_chart_script();
if ($return){
return fs_2d_hcolumn_chart ($chart_data, $width, $height);
}
else{
echo fs_2d_hcolumn_chart ($chart_data, $width, $height);
}
}
else {
$graph = array();
$graph['data'] = $chart_data;

3
pandora_console/operation/agentes/ver_agente.php
View File

@ -204,7 +204,8 @@ if (is_ajax ()) {
SELECT count(nombre)
FROM tagente_modulo t2
WHERE delete_pending = 0 AND t1.nombre = t2.nombre
AND id_agente IN (' . implode(',', $idAgents) . ')) = (' . count($idAgents) . ')');
AND id_agente IN (' . implode(',', $idAgents) . ')) = (' . count($idAgents) . ')
ORDER BY nombre');
if ($nameModules == false) {
$nameModules = array();