tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-25 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_graph.php: cleaned source code style.
	
	* include/functions_reporting.php: added subtype into the title
	in "Top N".
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-06-25 17:14:33 +00:00
parent 8d965c519c
commit f73aed8d7b
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: cleaned source code style.
* include/functions_reporting.php: added subtype into the title
in "Top N".
Merged from 4.0.2
2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_visual_map.php * include/functions_visual_map.php

23
pandora_console/include/functions_reporting.php
View File

@ -3602,10 +3602,29 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
} }
break; break;
case 'top_n': case 'top_n':
reporting_header_content($mini, $content, $report, $table, __('Top').' '.$content['top_n_value']); $top_n = $content['top_n'];
switch ($top_n) {
//Max
case 1:
$type_top_n = __('Max');
break;
//Min
case 2:
$type_top_n = __('Min');
break;
//Nothing or Average
case 0: //If nothing is selected then it will be shown the average data
case 3:
$type_top_n = __('Avg');
break;
}
reporting_header_content($mini, $content, $report, $table,
__('Top').' '.$content['top_n_value'] . '<br>' . $type_top_n);
$order_uptodown = $content['order_uptodown']; $order_uptodown = $content['order_uptodown'];
$top_n = $content['top_n'];
$top_n_value = $content['top_n_value']; $top_n_value = $content['top_n_value'];
$show_graph = $content['show_graph']; $show_graph = $content['show_graph'];