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 '2450-Falsa_representacion_en_graficas_sin_TIP_6' into 'develop'

Browse Source 
fixed baseline graph

See merge request artica/pandorafms!1610
This commit is contained in:
vgilc 2018-07-11 14:40:03 +02:00
commit c9261ab2d8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_graph.php
View File

@ -264,7 +264,9 @@ function grafico_modulo_sparse_data_chart (
$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['baseline'] || $params['projection']
){
$data = db_get_all_rows_filter (
'tagente_datos',
@ -419,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,
@ -897,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';
@ -1212,6 +1219,7 @@ function graphic_combined_module (
}
else{
$params['stacked'] = 'area';
$params['projection'] = $params_combined['projection'];
}
if(!isset($params_combined['labels'])){