From 000e8b6457bb183c10fb829891b40e11ebf2a8c1 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 11 Jul 2018 13:47:00 +0200 Subject: [PATCH] fixed errors in forecast charts --- pandora_console/include/functions_graph.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 5db1914089..06d965d939 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -265,7 +265,7 @@ function grafico_modulo_sparse_data_chart ( $data_module_graph['id_module_type'] == 9 || $data_module_graph['id_module_type'] == 31 || $data_module_graph['id_module_type'] == 100 || - $params['baseline'] + $params['baseline'] || $params['projection'] ){ $data = db_get_all_rows_filter ( @@ -421,7 +421,8 @@ function grafico_modulo_sparse_data( $data_module_graph['id_module_type'] == 18 || $data_module_graph['id_module_type'] == 9 || $data_module_graph['id_module_type'] == 31 || - $data_module_graph['id_module_type'] == 100 ){ + $data_module_graph['id_module_type'] == 100 || + $params['projection'] ){ $array_data = grafico_modulo_sparse_data_chart ( $agent_module_id, $date_array, @@ -899,6 +900,10 @@ function grafico_modulo_sparse ($params) { $params['type_mode_graph'] = $config['type_mode_graph']; } + if(!isset($params['projection'])){ + $params['projection'] = false; + } + //XXXX Configurable $params['grid_color'] = '#C1C1C1'; $params['legend_color'] = '#636363'; @@ -1214,6 +1219,7 @@ function graphic_combined_module ( } else{ $params['stacked'] = 'area'; + $params['projection'] = $params_combined['projection']; } if(!isset($params_combined['labels'])){