tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1099-Anadir_TIP_para_graficas_de_interfaz_rev_1' into 'develop'

Browse Source 
fixed minor errors tips

See merge request !842
This commit is contained in:
vgilc 2017-09-22 09:30:35 +02:00
commit a42e2eae4c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions_graph.php
View File

@ -2125,6 +2125,7 @@ function fullscale_data_combined($module_list, $period, $date){
$data_prev = array();
ksort($data_all);
foreach ($data_all as $key => $value) {
foreach ($module_list as $key_module => $value_module) {
if(!isset($value[$key_module])){
@ -4287,7 +4288,7 @@ function fullscale_data ( &$chart_data, &$chart_extra_data, &$long_index,
$timestamp_second = $value['utimestamp'];
foreach ($events as $key => $val) {
if( $val['utimestamp'] >= $timestamp_first &&
if( $val['utimestamp'] > $timestamp_first &&
$val['utimestamp'] <= $timestamp_second ){
if ($show_events == 1) {
$event_ids[] = $val['id_evento'];