From 36429616f30cc465eb4eb05c37094eccdea7a692 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 22 Jan 2018 15:46:23 +0100 Subject: [PATCH] fixed minor error combined graph fullscale --- pandora_console/include/functions_graph.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 5639d24d67..1505fd3a5b 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1321,7 +1321,6 @@ function graphic_combined_module ($module_list, $weight_list, $period, $data = array (); } - // Uncompressed module data if ($uncompressed_module) { $min_necessary = 1; @@ -2387,8 +2386,9 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p $array_percentil = array(); } + $previous_data = modules_get_previous_data ($value_module, $datelimit); $data_uncompress = db_uncompress_module_data($value_module, $datelimit, $date); - + foreach ($data_uncompress as $key_data => $value_data) { foreach ($value_data['data'] as $k => $v) { if($flash_charts) { @@ -2398,6 +2398,13 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p $real_date = $v['utimestamp']; } + if(!isset($v['datos'])){ + $v['datos'] = $previous_data; + } + else{ + $previous_data = $v['datos']; + } + if (!is_null($percentil) && $percentil) { $array_percentil[] = $v['datos']; }