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

fixed error automatic combined graph

Browse Source
This commit is contained in:
daniel 2018-11-08 15:05:57 +01:00
parent 19fc5863d0
commit c4c0cc59d4
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pandora_console/include/functions_reporting.php
View File

@ -6303,42 +6303,45 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']); $graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
$return = array(); $return = array();
$return['type'] = 'custom_graph'; $return['type'] = 'custom_graph';
if (empty($content['name'])) { if (empty($content['name'])) {
if ($type_report == "custom_graph") { if($type_report == "custom_graph"){
$content['name'] = __('Custom graph'); $content['name'] = __('Custom graph');
$graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']); } else if($type_report == "automatic_graph"){
$id_graph = $content['id_gs'];
}
else if($type_report == "automatic_graph"){
$content['name'] = __('Automatic combined graph'); $content['name'] = __('Automatic combined graph');
$graphs[0]["stacked"] = ''; } else {
$graphs[0]["summatory_series"] = ''; $content['name'] ='';
$graphs[0]["average_series"] = ''; }
$graphs[0]["modules_series"] = ''; }
$graphs[0]["fullscale"] = $content['style']['fullscale'];
if(is_array($content['id_agent_module'])){ if ($type_report == "custom_graph") {
foreach ($content['id_agent_module'] as $key => $value) { $graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']);
if($content['each_agent']){ $id_graph = $content['id_gs'];
$modules[] = $value; }
} else if($type_report == "automatic_graph"){
else{ $graphs[0]["stacked"] = '';
$modules[] = $value['module']; $graphs[0]["summatory_series"] = '';
} $graphs[0]["average_series"] = '';
$graphs[0]["modules_series"] = '';
$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 { else{
$content['name'] = __('Simple graph'); $modules[] = $content['id_agent_module'];
}
} else {
if ($type_report == "custom_graph") {
$graphs = db_get_all_rows_field_filter ("tgraph", "id_graph", $content['id_gs']);
$id_graph = $content['id_gs'];
} }
$id_graph = 0;
}
else {
$content['name'] = __('Simple graph');
} }
$return['title'] = $content['name']; $return['title'] = $content['name'];