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

Merge branch '1469-graficas-tip-en-automatic-combined-graphs-y-custom-graphs-pdf-4261-vodat_rev' into 'develop' 

fixed minor error combined graph fullscale

See merge request artica/pandorafms!1257
This commit is contained in:
vgilc 2018-01-22 15:57:03 +01:00
parent d471b0889c 36429616f3
commit 7e70d22d0a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_graph.php
View File

@ -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'];
}