From 868700f9f15f79172cff1244dea13661d134abb0 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 25 Oct 2023 15:55:54 +0200 Subject: [PATCH] add sliced mode simple graph reports and CV pandora_enterprise#9640 --- pandora_console/general/header.php | 4 +- pandora_console/godmode/menu.php | 2 +- .../reporting_builder.item_editor.php | 167 ++++++++- .../godmode/reporting/reporting_builder.php | 18 + pandora_console/include/class/HTML.class.php | 1 + pandora_console/include/functions.php | 3 +- pandora_console/include/functions_graph.php | 1 + pandora_console/include/functions_html.php | 8 +- .../include/functions_reporting.php | 57 ++- pandora_console/include/graphs/fgraph.php | 1 + .../include/graphs/functions_flot.php | 16 +- pandora_console/include/javascript/pandora.js | 32 ++ .../javascript/pandora_visual_console.js | 11 + pandora_console/include/rest-api/index.php | 2 +- .../rest-api/models/VisualConsole/Item.php | 2 +- .../VisualConsole/Items/ModuleGraph.php | 353 ++++++++++++++++-- .../rest-api/models/VisualConsole/View.php | 7 + pandora_console/include/styles/pandora.css | 8 + .../visual-console-client/vc.main.min.js | 2 +- .../visual-console-client/vc.main.min.js.map | 2 +- .../operation/agentes/stat_win.php | 2 +- visual_console_client/src/Item.ts | 8 +- 22 files changed, 651 insertions(+), 56 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 28311371bf..8913adc96b 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -35,7 +35,7 @@ echo sprintf('
', $menuTypeClass); $notifications_numbers['last_id'] ).'
'; $header_welcome = ''; - if (check_acl($config['id_user'], $group, 'AW')) { + if (check_acl($config['id_user'], 0, 'AW')) { $header_welcome .= '
'; $header_welcome .= html_print_image( 'images/wizard@svg.svg', @@ -235,6 +235,7 @@ echo sprintf('
', $menuTypeClass); $header_autorefresh = ''; $header_autorefresh_counter = ''; + $header_setup = ''; if (($_GET['sec2'] !== 'operation/visual_console/render_view')) { if ($autorefresh_list !== null @@ -352,7 +353,6 @@ echo sprintf('
', $menuTypeClass); $display_counter = 'display:none'; } - $header_setup = ''; if ((bool) check_acl($config['id_user'], 0, 'PM') === true) { $header_setup .= '
'; $header_setup .= html_print_image( diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 94509ab820..f073b646b0 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -719,7 +719,7 @@ if ((bool) $config['pure'] === false) { echo '
'; // Need to be here because the translate string. -if (check_acl($config['id_user'], $group, 'AW')) { +if (check_acl($config['id_user'], 0, 'AW')) { ?>