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

Updated functions_graph

Browse Source
This commit is contained in:
danielmaya 2017-12-11 09:29:24 +01:00
parent 61b33221bf
commit 1d3efb9d9e
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/include/functions_graph.php
View File

@ -2131,32 +2131,50 @@ function graphic_combined_module ($module_list, $weight_list, $period,
} }
//summatory and average series //summatory and average series
if($stacked == CUSTOM_GRAPH_AREA || $stacked == CUSTOM_GRAPH_LINE && $modules_series) { if($stacked == CUSTOM_GRAPH_AREA || $stacked == CUSTOM_GRAPH_LINE) {
if($summatory && $average){ if($summatory && $average) {
foreach ($graph_values as $key => $value) { foreach ($graph_values as $key => $value) {
$cont = count($value); $cont = count($value);
$summ = array_sum($value); $summ = array_sum($value);
array_push($value,$summ); array_push($value,$summ);
array_push($value,$summ/$cont); array_push($value,$summ/$cont);
$graph_values[$key] = $value; $graph_values[$key] = $value;
if(!$modules_series) {
array_splice($graph_values[$key],0,count($graph_values[$key])-2);
}
} }
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>');
if(!$modules_series){
array_splice($module_name_list,0,count($module_name_list)-2);
}
} elseif($summatory) { } elseif($summatory) {
foreach ($graph_values as $key => $value) { foreach ($graph_values as $key => $value) {
array_push($value,array_sum($value)); array_push($value,array_sum($value));
$graph_values[$key] = $value; $graph_values[$key] = $value;
if(!$modules_series){
array_splice($graph_values[$key],0,count($graph_values[$key])-1);
}
} }
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>');
if(!$modules_series){
array_splice($module_name_list,0,count($module_name_list)-1);
}
} elseif($average) { } elseif($average) {
foreach ($graph_values as $key => $value) { foreach ($graph_values as $key => $value) {
$summ = array_sum($value) / count($value); $summ = array_sum($value) / count($value);
array_push($value,$summ); array_push($value,$summ);
$graph_values[$key] = $value; $graph_values[$key] = $value;
if(!$modules_series){
array_splice($graph_values[$key],0,count($graph_values[$key])-1);
}
} }
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>');
if(!$modules_series){
array_splice($module_name_list,0,count($module_name_list)-1);
}
} }
} }