tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8596-Mal-funcionamiento-en-el-cálculo-de-estado-por-elementos-críticos-en-Consolas-Visuales' into 'develop' 

Ent 8596 mal funcionamiento en el cálculo de estado por elementos críticos en consolas visuales

See merge request artica/pandorafms!4745
This commit is contained in:
Daniel Rodriguez 2022-03-18 10:57:37 +00:00
parent e088c0e564 c2d60fafa9
commit 4c418f5979
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_visual_map.php
View File

@ -4139,7 +4139,7 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0)
if ($critical_percentage >= $status_data['linked_layout_status_as_service_critical'] && $critical_percentage !== 0) { if ($critical_percentage >= $status_data['linked_layout_status_as_service_critical'] && $critical_percentage !== 0) {
return VISUAL_MAP_STATUS_CRITICAL_BAD; return VISUAL_MAP_STATUS_CRITICAL_BAD;
} else if ($critical_percentage >= $status_data['linked_layout_status_as_service_warning'] && $warning_percentage !== 0) { } else if ($warning_percentage >= $status_data['linked_layout_status_as_service_warning'] && $warning_percentage !== 0) {
return VISUAL_MAP_STATUS_WARNING; return VISUAL_MAP_STATUS_WARNING;
} else { } else {
return VISUAL_MAP_STATUS_NORMAL; return VISUAL_MAP_STATUS_NORMAL;

5
pandora_console/include/lib/Dashboard/Widgets/module_icon.php
View File

@ -399,7 +399,10 @@ class ModuleIconWidget extends Widget
'class' => 'flex-row flex-end w100p', 'class' => 'flex-row flex-end w100p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
['label' => $image], [
'label' => $image,
'arguments' => ['type' => 'image-item'],
],
], ],
]; ];

5
pandora_console/include/lib/Dashboard/Widgets/module_status.php
View File

@ -389,7 +389,10 @@ class ModuleStatusWidget extends Widget
'class' => 'flex-row flex-end w100p', 'class' => 'flex-row flex-end w100p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
['label' => $image], [
'label' => $image,
'arguments' => ['type' => 'image-item'],
],
], ],
]; ];

5
pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
View File

@ -537,7 +537,10 @@ final class Group extends Item
'class' => 'flex-row flex-end w100p', 'class' => 'flex-row flex-end w100p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
['label' => $images], [
'label' => $images,
'arguments' => ['type' => 'image-item'],
],
], ],
]; ];

5
pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
View File

@ -190,7 +190,10 @@ final class Icon extends Item
'class' => 'flex-row flex-end w100p', 'class' => 'flex-row flex-end w100p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
['label' => $images], [
'label' => $images,
'arguments' => ['type' => 'image-item'],
],
], ],
]; ];

5
pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php
View File

@ -351,7 +351,10 @@ final class StaticGraph extends Item
'class' => 'flex-row flex-end w100p', 'class' => 'flex-row flex-end w100p',
'direct' => 1, 'direct' => 1,
'block_content' => [ 'block_content' => [
['label' => $images], [
'label' => $images,
'arguments' => ['type' => 'image-item'],
],
], ],
]; ];