Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop'

fixed error automatic combined graph

See merge request artica/pandorafms!1707
This commit is contained in:
vgilc 2018-08-21 10:58:57 +02:00
commit 281dbb4784
1 changed files with 12 additions and 6 deletions

View File

@ -6303,14 +6303,20 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$graphs[0]["summatory_series"] = '';
$graphs[0]["average_series"] = '';
$graphs[0]["modules_series"] = '';
foreach ($content['id_agent_module'] as $key => $value) {
if($content['each_agent']){
$modules[] = $value;
}
else{
$modules[] = $value['module'];
$graphs[0]["fullscale"] = $content['style']['fullscale'];
if(is_array($content['id_agent_module'])){
foreach ($content['id_agent_module'] as $key => $value) {
if($content['each_agent']){
$modules[] = $value;
}
else{
$modules[] = $value['module'];
}
}
}
else{
$modules[] = $content['id_agent_module'];
}
$id_graph = 0;
}
else {