From 75f227ec9f33868b01b4152748e863ba09767065 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 6 Jun 2023 17:12:13 +0200 Subject: [PATCH] #11481 fixed widgets dashboard styles --- .../include/lib/Dashboard/Widgets/module_icon.php | 8 +++++--- .../include/lib/Dashboard/Widgets/module_status.php | 6 ++++-- .../include/lib/Dashboard/Widgets/module_value.php | 6 ++++-- .../include/lib/Dashboard/Widgets/sla_percent.php | 4 +++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php index 6790d70616..a58b046124 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php @@ -384,7 +384,7 @@ class ModuleIconWidget extends Widget 'agent_id' => $values['agentId'], 'metaconsole_id' => $values['metaconsoleId'], 'style' => 'width: inherit;', - 'filter_modules' => users_access_to_agent($values['agentId']) === false ? [$values['moduleId']] : [], + 'filter_modules' => (users_access_to_agent($values['agentId'], 'AR', false, is_metaconsole()) === false) ? [$values['moduleId']] : [], 'nothing' => __('None'), 'nothing_value' => 0, ], @@ -563,10 +563,12 @@ class ModuleIconWidget extends Widget $output .= '
'; $orientation = ''; + $margin_bottom = ''; if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; + $margin_bottom = 'mrgn_btn_15px'; } // General div. @@ -596,7 +598,7 @@ class ModuleIconWidget extends Widget // Div image. $style_icon = 'flex: 0 1 '.$sizeIcon.'px;'; - $output .= '
'; + $output .= '
'; $output .= html_print_image( 'images/console/icons/'.$icon.$color_icon.'.png', true, @@ -604,7 +606,7 @@ class ModuleIconWidget extends Widget ); $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; $output .= remove_right_zeros( number_format($data_module, $config['graph_precision'], $config['decimal_separator'], $config['thousand_separator']) ).$unit; diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_status.php b/pandora_console/include/lib/Dashboard/Widgets/module_status.php index a9e72fd528..c4980f253f 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_status.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_status.php @@ -375,7 +375,7 @@ class ModuleStatusWidget extends Widget 'agent_id' => $values['agentId'], 'metaconsole_id' => $values['metaconsoleId'], 'style' => 'width: inherit;', - 'filter_modules' => (users_access_to_agent($values['agentId']) === false) ? [$values['moduleId']] : [], + 'filter_modules' => (users_access_to_agent($values['agentId'], 'AR', false, is_metaconsole()) === false) ? [$values['moduleId']] : [], 'nothing' => __('None'), 'nothing_value' => 0, ], @@ -560,17 +560,19 @@ class ModuleStatusWidget extends Widget $output .= '
'; $orientation = ''; + $margin_bottom = ''; if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; + $margin_bottom = 'mrgn_btn_15px'; } // General div. $output .= '
'; // Div image. - $output .= '
'; + $output .= '
'; $output .= html_print_image( 'images/console/icons/'.$icon, true, diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php index 83521f6b25..cf2f0e0e4a 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php @@ -359,7 +359,7 @@ class ModuleValueWidget extends Widget 'agent_id' => $values['agentId'], 'metaconsole_id' => $values['metaconsoleId'], 'style' => 'width: inherit;', - 'filter_modules' => (users_access_to_agent($values['agentId']) === false) ? [$values['moduleId']] : [], + 'filter_modules' => (users_access_to_agent($values['agentId'], 'AR', false, is_metaconsole()) === false) ? [$values['moduleId']] : [], 'nothing' => __('None'), 'nothing_value' => 0, ], @@ -471,17 +471,19 @@ class ModuleValueWidget extends Widget $output .= '
'; $orientation = ''; + $margin_bottom = ''; if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; + $margin_bottom = 'mrgn_btn_20px'; } // General div. $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; if (is_numeric($data_module) === true) { $dataDatos = remove_right_zeros( diff --git a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php index 2e7483d58e..e6b334b779 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php +++ b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php @@ -516,16 +516,18 @@ class SLAPercentWidget extends Widget $output .= '
'; $orientation = ''; + $margin_bottom = ''; if ((int) $this->values['horizontal'] === 1) { $orientation = 'flex aligni_center'; } else { $orientation = 'grid'; + $margin_bottom = 'mrgn_btn_20px'; } // General div. $output .= '
'; // Div value. - $output .= '
'; + $output .= '
'; $output .= $sla_array['sla_fixed'].'%'; $output .= '
';