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

Fixed bug in max, min and avg value in table of reports - #4545

This commit is contained in:
Tatiana Llorente 2019-09-11 17:57:16 +02:00
parent 3eadb07058
commit 3f49988a19
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_reporting.php
View File

@ -4876,15 +4876,15 @@ function reporting_value($report, $content, $type, $pdf=false)
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module'], true); $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module'], true);
$date_reference = getdate(); $date_reference = getdate();
for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) { for ($i = ($report['datetime'] - $content['period']); $i < $report['datetime']; $i += $content['lapse']) {
$value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>'; $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i + 1)).' to '.date('Y-m-d H:i:s', (($i + $content['lapse']) )).'</td><td>';
if ($i > $time_begin['utimestamp']) { if ($i > $time_begin['utimestamp']) {
$value .= format_for_graph( $value .= format_for_graph(
reporting_get_agentmodule_data_max( reporting_get_agentmodule_data_max(
$content['id_agent_module'], $content['id_agent_module'],
$content['lapse'], $content['lapse'],
$i ($i + $content['lapse'])
), ),
$config['graph_precision'] $config['graph_precision']
).' '.$unit.'</td></tr>'; ).' '.$unit.'</td></tr>';
@ -4983,15 +4983,15 @@ function reporting_value($report, $content, $type, $pdf=false)
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']); $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
$date_reference = getdate(); $date_reference = getdate();
for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) { for ($i = ($report['datetime'] - $content['period']); $i < $report['datetime']; $i += $content['lapse']) {
$value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>'; $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i + 1)).' to '.date('Y-m-d H:i:s', (($i + $content['lapse']) )).'</td><td>';
if ($i > $time_begin['utimestamp']) { if ($i > $time_begin['utimestamp']) {
$value .= format_for_graph( $value .= format_for_graph(
reporting_get_agentmodule_data_min( reporting_get_agentmodule_data_min(
$content['id_agent_module'], $content['id_agent_module'],
$content['lapse'], $content['lapse'],
$i ($i + $content['lapse'])
), ),
$config['graph_precision'] $config['graph_precision']
).' '.$unit.'</td></tr>'; ).' '.$unit.'</td></tr>';
@ -5090,15 +5090,15 @@ function reporting_value($report, $content, $type, $pdf=false)
$time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']); $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
$date_reference = getdate(); $date_reference = getdate();
for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) { for ($i = ($report['datetime'] - $content['period']); $i < $report['datetime']; $i += $content['lapse']) {
$value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>'; $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i + 1)).' to '.date('Y-m-d H:i:s', (($i + $content['lapse']) )).'</td><td>';
if ($i > $time_begin['utimestamp']) { if ($i > $time_begin['utimestamp']) {
$value .= format_for_graph( $value .= format_for_graph(
reporting_get_agentmodule_data_average( reporting_get_agentmodule_data_average(
$content['id_agent_module'], $content['id_agent_module'],
$content['lapse'], $content['lapse'],
$i ($i + $content['lapse'])
), ),
$config['graph_precision'] $config['graph_precision']
).' '.$unit.'</td></tr>'; ).' '.$unit.'</td></tr>';