Change the data in the item general in the reports for to get the value and formated value

(cherry picked from commit db78f116f1e5f3a1c6a62bc26442ce9c31d61445)
This commit is contained in:
mdtrooper 2015-12-28 16:35:51 +01:00
parent bd9180338b
commit 010935b002
2 changed files with 5 additions and 4 deletions

5
pandora_console/include/functions_reporting.php Executable file → Normal file
View File

@ -3982,7 +3982,7 @@ function reporting_general($report, $content) {
if (modules_is_disable_agent($row['id_agent_module']) || if (modules_is_disable_agent($row['id_agent_module']) ||
modules_is_not_init($row['id_agent_module'])) { modules_is_not_init($row['id_agent_module'])) {
if (is_metaconsole()) { if (is_metaconsole()) {
//Restore db connection //Restore db connection
metaconsole_restore_db(); metaconsole_restore_db();
@ -4180,7 +4180,8 @@ function reporting_general($report, $content) {
$data['value'] = $d; $data['value'] = $d;
} }
else { else {
$data['value'] = format_for_graph($d, 2) . " " . $data['value'] = $d;
$data['formated_value'] = format_for_graph($d, 2) . " " .
$units[$i]; $units[$i];
} }
} }

4
pandora_console/include/functions_reporting_html.php Executable file → Normal file
View File

@ -1727,13 +1727,13 @@ function reporting_html_general(&$table, $item) {
$row['agent'], $row['agent'],
$row['module'], $row['module'],
$row['operator'], $row['operator'],
$row['value']); $row['formated_value']);
} }
else { else {
$table1->data[] = array( $table1->data[] = array(
$row['agent'], $row['agent'],
$row['module'], $row['module'],
$row['value']); $row['formated_value']);
} }
} }
break; break;