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

Error fix in report - automatic combined graphs

This commit is contained in:
fbsanchez 2022-02-17 11:02:23 +01:00
parent d56fa44210
commit 3150df98c6
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/graphs.php
View File

@ -376,7 +376,7 @@ $table_aux = new stdClass();
false, false,
false, false,
'', '',
'class="check_deletemrgn_lft_2px"', 'class="check_delete mrgn_lft_2px"',
true true
); );
} }

23
pandora_console/include/functions_reporting.php
View File

@ -326,7 +326,7 @@ function reporting_make_reporting_data(
$items_label['id_agent_module'] = $content['id_agent_module']; $items_label['id_agent_module'] = $content['id_agent_module'];
$items_label['modules'] = $modules_to_macro; $items_label['modules'] = $modules_to_macro;
$items_label['agents'] = $agents_to_macro; $items_label['agents'] = $agents_to_macro;
$items_label['visual_format'] = $visual_format; $items_label['visual_format'] = null;
$items_label['agent_description'] = agents_get_description( $items_label['agent_description'] = agents_get_description(
$content['id_agent'] $content['id_agent']
@ -346,27 +346,16 @@ function reporting_make_reporting_data(
$modules_server_array = $content['id_agent_module']; $modules_server_array = $content['id_agent_module'];
$modules_array = []; $modules_array = [];
foreach ($modules_server_array as $value) { foreach ($modules_server_array as $value) {
$modules_array[] = $value['module']; if (is_array($value) === true) {
$modules_array[] = $value['module'];
} else {
$modules_array[] = $value;
}
} }
$content['id_agent_module'] = $modules_array; $content['id_agent_module'] = $modules_array;
} }
$modules = agents_get_modules(
$agent_value,
[
'id_agente_modulo',
'nombre',
'descripcion',
],
[
'id_agente_modulo' => $content['id_agent_module'],
]
);
$items_label['module_name'] = $modules[$content['id_agent_module']]['nombre'];
$items_label['module_description'] = $modules[$content['id_agent_module']]['descripcion'];
if (is_array($content['id_agent']) if (is_array($content['id_agent'])
&& count($content['id_agent']) != 1 && count($content['id_agent']) != 1
) { ) {

4
pandora_console/include/styles/pandora.css
View File

@ -142,6 +142,10 @@ body {
font-family: "lato"; font-family: "lato";
} }
body.body-report {
display: block;
}
input, input,
textarea { textarea {
padding: 5px; padding: 5px;