Merge branch 'ent-13453-Widget-Netflow-varios-problemillas' into 'develop'

Ent 13453 widget netflow varios problemillas

See merge request artica/pandorafms!7240
This commit is contained in:
Diego Muñoz-Reja 2024-04-24 14:16:25 +00:00
commit 56c09561f1
3 changed files with 15 additions and 13 deletions

View File

@ -1389,6 +1389,7 @@ function netflow_draw_item(
$show_summary=true, $show_summary=true,
$show_table=true $show_table=true
) { ) {
global $config;
$aggregate = $filter['aggregate']; $aggregate = $filter['aggregate'];
$interval = ($end_date - $start_date); $interval = ($end_date - $start_date);
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
@ -1568,13 +1569,20 @@ function netflow_draw_item(
$data_top_n $data_top_n
); );
// Theme.
$theme = $config['style'];
$text_color = ($theme !== 'pandora_black') ? '#333' : '#fff';
$graph_output = pie_graph( $graph_output = pie_graph(
$pie_data, $pie_data,
[ [
'width' => 200, 'width' => 200,
'height' => 200, 'height' => 200,
'ttl' => ($output === 'PDF') ? 2 : 1, 'ttl' => ($output === 'PDF') ? 2 : 1,
'dataLabel' => ['display' => 'auto'], 'dataLabel' => [
'display' => 'auto',
'color' => $text_color,
],
'layout' => [ 'layout' => [
'padding' => [ 'padding' => [
'top' => 15, 'top' => 15,

View File

@ -2566,19 +2566,13 @@ function menuActionButtonResizing() {
function check_period_warning(time, title, message) { function check_period_warning(time, title, message) {
var period = time.value; var period = time.value;
var times = 0;
if (period >= 2592000 && period < 7776000) { if (period >= 2592000 && period < 7776000) {
WarningPeriodicityModal(title, message); WarningPeriodicityModal(title, message);
} else if (period >= 7776000 && period < 15552000) { } else if (period >= 7776000 && period < 15552000) {
do { WarningPeriodicityModal(title, message);
WarningPeriodicityModal(title, message);
times = times + 1;
} while (times < 2);
} else if (period >= 15552000) { } else if (period >= 15552000) {
do { WarningPeriodicityModal(title, message);
WarningPeriodicityModal(title, message);
times = times + 1;
} while (times < 3);
} }
} }

View File

@ -367,8 +367,8 @@ class Netflow extends Widget
'', '',
'HTML', 'HTML',
0, 0,
($size['width'] - 50), ($size['width'] + 120),
($size['height'] - 20), ($size['height'] + 120),
), ),
], ],
true true
@ -463,7 +463,7 @@ class Netflow extends Widget
public function getSizeModalConfiguration(): array public function getSizeModalConfiguration(): array
{ {
$size = [ $size = [
'width' => 400, 'width' => 600,
'height' => 530, 'height' => 530,
]; ];