From 09880cadf1d28721fdec1136610d8ae894d25591 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Thu, 7 Mar 2024 17:58:56 +0100 Subject: [PATCH 1/4] #12999 fixed modal resize --- pandora_console/include/functions_graph.php | 34 ++++++++++ .../operation/agentes/stat_win.php | 64 ++++--------------- 2 files changed, 48 insertions(+), 50 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index d81e2bc1d6..4dbfa743bd 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -5614,6 +5614,24 @@ function draw_form_stat_win(array $form_data, string $tab_active) false, false ).''; + + $table->data[7][0] = __('Type graph'); + $table->data[7][1] = '
'.html_print_select( + [ + 'tabs-chart-module-graph' => __('Module Graph'), + 'tabs-chart-period-graph' => __('Sliced'), + ], + 'graph_tab', + $form_data['graph_tab'], + '', + '', + 0, + true, + false, + false + ).'
'; + $table->data[7][2] = ''; + $table->data[7][3] = ''; } } else { $table->data[0][0] = __('Refresh time'); @@ -5786,6 +5804,22 @@ function draw_form_stat_win(array $form_data, string $tab_active) 7, true ).''; + + $table->data[8][0] = __('Type graph'); + $table->data[8][1] = '
'.html_print_select( + [ + 'tabs-chart-module-graph' => __('Module Graph'), + 'tabs-chart-period-graph' => __('Sliced'), + ], + 'graph_tab', + $form_data['graph_tab'], + '', + '', + 0, + true, + false, + false + ).'
'; } $form_table = html_print_table($table, true); diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index e945797529..d8a675ecb6 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -209,6 +209,8 @@ ui_print_message_dialog( $period_slice_chart = get_parameter('period_slice_chart', SECONDS_1HOUR); $period_mode = get_parameter('period_mode', CUSTOM_GRAPH_VBARS); + $graph_tab = get_parameter('graph_tab', 'tabs-chart-module-graph'); + $time_compare = false; if ($time_compare_separated) { @@ -297,6 +299,7 @@ ui_print_message_dialog( 'period_summatory' => $period_summatory, 'period_slice_chart' => $period_slice_chart, 'period_mode' => $period_mode, + 'graph_tab' => $graph_tab, ]; $params = [ @@ -329,47 +332,14 @@ ui_print_message_dialog( 'period_summatory' => $period_summatory, 'period_slice_chart' => $period_slice_chart, 'period_mode' => $period_mode, + 'graph_tab' => $graph_tab, ]; if ($histogram === false) { - $output = '
'; - $output .= ''; - - $output .= '
'; - $output .= draw_container_chart_stat_win('tabs-chart-module-graph'); + $output = '
'; + $output .= '
'; + $output .= draw_container_chart_stat_win($graph_tab); $output .= '
'; - - $output .= '
'; - $output .= draw_container_chart_stat_win('tabs-chart-period-graph'); - $output .= '
'; - $output .= '
'; } else { // Graph. @@ -408,18 +378,8 @@ ui_include_time_picker(true); var histogram = ""; var period_graph = ""; if(histogram == 0) { - $("#tabs-chart-modal").tabs({ - create: function( event, ui ) { - var tab_active = ui.tab.children(":first").attr('id'); - get_ajax_module(url, graph_data, form_data, serverId, tab_active); - }, - activate: function( event, ui ) { - var tab_active = ui.newTab.children(":first").attr('id'); - change_tabs_periodicity(tab_active); - get_ajax_module(url, graph_data, form_data, serverId, tab_active); - }, - active: period_graph - }); + var tab_active = ''; + get_ajax_module(url, graph_data, form_data, serverId, tab_active); } else { get_ajax_module(url, graph_data, form_data, serverId, null); } @@ -443,7 +403,7 @@ ui_include_time_picker(true); function get_ajax_module(url, graph_data, form_data, serverId, id) { let active = 'stat-win-module-graph'; if(id != null) { - active = $("#"+id).parent().attr('aria-controls'); + active = id; } $("#tabs-chart-module-graph-content").empty(); $("#tabs-chart-period-graph-content").empty(); @@ -463,6 +423,10 @@ ui_include_time_picker(true); success: function (data) { $("#"+active+"-spinner").hide(); $("#"+active+"-content").append(data); + if (active === 'tabs-chart-module-graph' || active === 'tabs-chart-period-graph') { + window.resizeTo(800, ($('#chart-modal').height() + 100)); + } + let pg = 0; if (active === 'tabs-chart-period-graph') { pg = 1; From 749fd9243c48db155fd15d9991c44440e35eccfb Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 8 Mar 2024 09:21:09 +0100 Subject: [PATCH 2/4] #12999 resize window when change scale --- pandora_console/operation/agentes/stat_win.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index d8a675ecb6..33d0f56625 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -424,7 +424,10 @@ ui_include_time_picker(true); $("#"+active+"-spinner").hide(); $("#"+active+"-content").append(data); if (active === 'tabs-chart-module-graph' || active === 'tabs-chart-period-graph') { - window.resizeTo(800, ($('#chart-modal').height() + 100)); + var browserZoomLevel = (Math.round(window.devicePixelRatio * 100)/100); + let height = ($('#chart-modal').height() + 50) * browserZoomLevel; + let width = 800 * browserZoomLevel; + window.resizeTo(width, height); } let pg = 0; From df92200c092e3bff344f2bf315e13af8d010021b Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 8 Mar 2024 09:40:40 +0100 Subject: [PATCH 3/4] #12999 fixed margin height --- pandora_console/operation/agentes/stat_win.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 33d0f56625..1812121253 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -425,7 +425,7 @@ ui_include_time_picker(true); $("#"+active+"-content").append(data); if (active === 'tabs-chart-module-graph' || active === 'tabs-chart-period-graph') { var browserZoomLevel = (Math.round(window.devicePixelRatio * 100)/100); - let height = ($('#chart-modal').height() + 50) * browserZoomLevel; + let height = ($('#chart-modal').height() + 100) * browserZoomLevel; let width = 800 * browserZoomLevel; window.resizeTo(width, height); } From b96cd85b095a320254b5c9b52b72bde0da35e8dd Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Fri, 8 Mar 2024 10:02:22 +0100 Subject: [PATCH 4/4] #12999 fixed window in firefox --- pandora_console/operation/agentes/stat_win.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1812121253..a944588040 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -424,8 +424,15 @@ ui_include_time_picker(true); $("#"+active+"-spinner").hide(); $("#"+active+"-content").append(data); if (active === 'tabs-chart-module-graph' || active === 'tabs-chart-period-graph') { + let margin = 100; + if (navigator.userAgent.indexOf("Chrome") != -1) { + margin = 100; + } else if (navigator.userAgent.indexOf("Firefox") != -1) { + margin = 50; + } + var browserZoomLevel = (Math.round(window.devicePixelRatio * 100)/100); - let height = ($('#chart-modal').height() + 100) * browserZoomLevel; + let height = ($('#chart-modal').height() + margin) * browserZoomLevel; let width = 800 * browserZoomLevel; window.resizeTo(width, height); }