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

Fixed reporting custom graph

This commit is contained in:
danielmaya 2017-12-18 13:12:29 +01:00
parent ee1b915735
commit b65d649750
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_graph.php
View File

@ -2181,7 +2181,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
} }
if(!$modules_series) { if(!$modules_series) {
if(is_null($percentil)) { if(empty($percentil)) {
array_splice($module_name_list,0,count($module_name_list)); array_splice($module_name_list,0,count($module_name_list));
} else { } else {
array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2)); array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
@ -2189,7 +2189,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>'); array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>'); array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
} else { } else {
if(is_null($percentil)) { if(empty($percentil)) {
array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>'); array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>'); array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
} else { } else {
@ -2209,14 +2209,14 @@ function graphic_combined_module ($module_list, $weight_list, $period,
} }
if(!$modules_series) { if(!$modules_series) {
if(is_null($percentil)) { if(empty($percentil)) {
array_splice($module_name_list,0,count($module_name_list)); array_splice($module_name_list,0,count($module_name_list));
} else { } else {
array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2)); array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
} }
array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>'); array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
} else { } else {
if(is_null($percentil)) { if(empty($percentil)) {
array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>'); array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
} else { } else {
array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>'); array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('summatory'). '</span>');
@ -2234,14 +2234,14 @@ function graphic_combined_module ($module_list, $weight_list, $period,
} }
if(!$modules_series) { if(!$modules_series) {
if(is_null($percentil)) { if(empty($percentil)) {
array_splice($module_name_list,0,count($module_name_list)); array_splice($module_name_list,0,count($module_name_list));
} else { } else {
array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2)); array_splice($module_name_list,0,count($module_name_list)-(count($module_name_list)/2));
} }
array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>'); array_unshift($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
} else { } else {
if(is_null($percentil)) { if(empty($percentil)) {
array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>'); array_push($module_name_list,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');
} else { } else {
array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>'); array_splice($module_name_list,(count($module_name_list)/2),0,'<span style=\"font-size:' . ($config['font_size']) . 'pt;font-family: smallfontFont;\" >' . __('average'). '</span>');

8
pandora_console/include/functions_reporting.php
View File

@ -6513,7 +6513,13 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$labels, $labels,
false, false,
false, false,
$graph["percentil"] $graph["percentil"],
false,
false,
false,
$graph["summatory_series"],
$graph["average_series"],
$graph["modules_series"]
); );
break; break;
case 'data': case 'data':