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

Merge branch '1198-errors-in-boolean-chart-fourth-time-dev' into 'develop' 

Added a change to boolean charts

See merge request !799
This commit is contained in:
vgilc 2017-09-07 16:34:19 +02:00
parent 5f4f397901 598b04c2db
commit 191d6bb0d4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_graph.php
View File

@ -3952,8 +3952,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$k++; $k++;
} }
} }
html_debug($data2);
html_debug($data);
$data = array_merge($data2, $data); $data = array_merge($data2, $data);
$resolution += $previus_datas_cont; $resolution += $previus_datas_cont;
} }
@ -3963,7 +3962,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
for ($i = 0; $i <= $resolution; $i++) { for ($i = 0; $i <= $resolution; $i++) {
$timestamp = $datelimit + ($interval * $i); $timestamp = $datelimit + ($interval * $i);
if ($fullscale && ($resolution > ($config['graph_res'] * 50))) { if ($fullscale) {
$timestamp = $data[$i]['utimestamp']; $timestamp = $data[$i]['utimestamp'];
} }
@ -4046,7 +4045,7 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
} }
elseif ($period < SECONDS_1MONTH) { elseif ($period < SECONDS_1MONTH) {
$time_format = 'M d H\h'; $time_format = 'M d H\h';
} }
else { else {
$time_format = 'M d H\h'; $time_format = 'M d H\h';
} }