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

fixed errors in forecast charts

Browse Source
This commit is contained in:
daniel 2018-07-11 13:47:00 +02:00
parent 6d04b2450b
commit 000e8b6457
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_graph.php
View File

@ -265,7 +265,7 @@ function grafico_modulo_sparse_data_chart (
$data_module_graph['id_module_type'] == 9 || $data_module_graph['id_module_type'] == 9 ||
$data_module_graph['id_module_type'] == 31 || $data_module_graph['id_module_type'] == 31 ||
$data_module_graph['id_module_type'] == 100 || $data_module_graph['id_module_type'] == 100 ||
$params['baseline'] $params['baseline'] || $params['projection']
){ ){
$data = db_get_all_rows_filter ( $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'] == 18 ||
$data_module_graph['id_module_type'] == 9 || $data_module_graph['id_module_type'] == 9 ||
$data_module_graph['id_module_type'] == 31 || $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 ( $array_data = grafico_modulo_sparse_data_chart (
$agent_module_id, $agent_module_id,
$date_array, $date_array,
@ -899,6 +900,10 @@ function grafico_modulo_sparse ($params) {
$params['type_mode_graph'] = $config['type_mode_graph']; $params['type_mode_graph'] = $config['type_mode_graph'];
} }
if(!isset($params['projection'])){
$params['projection'] = false;
}
//XXXX Configurable //XXXX Configurable
$params['grid_color'] = '#C1C1C1'; $params['grid_color'] = '#C1C1C1';
$params['legend_color'] = '#636363'; $params['legend_color'] = '#636363';
@ -1214,6 +1219,7 @@ function graphic_combined_module (
} }
else{ else{
$params['stacked'] = 'area'; $params['stacked'] = 'area';
$params['projection'] = $params_combined['projection'];
} }
if(!isset($params_combined['labels'])){ if(!isset($params_combined['labels'])){