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

Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop'

Browse Source 
fix chart area

See merge request artica/pandorafms!4546
This commit is contained in:
Daniel Rodriguez 2021-11-24 14:45:39 +00:00
commit eb4666e2c2
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/operation/reporting/graph_viewer.php
View File

@ -48,7 +48,7 @@ if ($id_graph !== 0) {
} }
} }
// Delete module SQL code // Delete module SQL code.
if ($delete_graph) { if ($delete_graph) {
if (check_acl($config['id_user'], 0, 'AW')) { if (check_acl($config['id_user'], 0, 'AW')) {
$res = db_process_sql_delete('tgraph_source', ['id_graph' => $id_graph]); $res = db_process_sql_delete('tgraph_source', ['id_graph' => $id_graph]);
@ -239,7 +239,7 @@ if ($view_graph) {
] ]
).'</a>'; ).'</a>';
// In full screen, the manage options are not available // In full screen, the manage options are not available.
$options = [ $options = [
'view' => $options['view'], 'view' => $options['view'],
'screen' => $options['screen'], 'screen' => $options['screen'],
@ -277,6 +277,12 @@ if ($view_graph) {
'fullscale' => $fullscale, 'fullscale' => $fullscale,
]; ];
if ($stacked === CUSTOM_GRAPH_AREA || $stacked === CUSTOM_GRAPH_STACKED_AREA) {
$params['type_graph'] = 'area';
} else if ($stacked === CUSTOM_GRAPH_LINE || $stacked === CUSTOM_GRAPH_STACKED_LINE) {
$params['type_graph'] = 'line';
}
$params_combined = [ $params_combined = [
'stacked' => $stacked, 'stacked' => $stacked,
'id_graph' => $id_graph, 'id_graph' => $id_graph,