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

Visual Console Refactor: minor fixes 

Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-25 10:57:25 +02:00
parent 260a149668
commit 7d95151a5b
8 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/rest-api/models/VisualConsole/Items/BarsGraph.php
View File

@ -137,12 +137,12 @@ final class BarsGraph extends Item
global $config;
// Load side libraries.
include_once $config['homedir'].'/include/functions_ui.php';
include_once $config['homedir'].'/include/functions_visual_map.php';
include_once $config['homedir'].'/include/graphs/fgraph.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
// Extract needed properties.
@ -262,7 +262,12 @@ final class BarsGraph extends Item
$waterMark = [
'file' => $config['homedir'].'/images/logo_vertical_water.png',
'url' => \ui_get_full_url(false, false, false, false).'images/logo_vertical_water.png',
'url' => \ui_get_full_url(
'images/logo_vertical_water.png',
false,
false,
false
),
];
if ((int) $data['width'] === 0 || (int) $data['height'] === 0) {

1
pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
View File

@ -205,7 +205,6 @@ final class ColorCloud extends Item
include_once $config['homedir'].'/include/functions_modules.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
// Get the linked module Id.

3
pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
View File

@ -101,6 +101,9 @@ final class DonutGraph extends Item
global $config;
include_once $config['homedir'].'/include/functions_visual_map.php';
include_once $config['homedir'].'/include/graphs/functions_d3.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
}
// Extract needed properties.
$legendBackGroundColor = static::extractLegendBackgroundColor($data);

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

@ -152,7 +152,6 @@ final class Group extends Item
include_once $config['homedir'].'/include/functions_users.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
$groupId = static::extractGroupId($data);

1
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -166,7 +166,6 @@ final class ModuleGraph extends Item
include_once $config['homedir'].'/include/functions_modules.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
$imageOnly = false;

1
pandora_console/include/rest-api/models/VisualConsole/Items/Percentile.php
View File

@ -187,7 +187,6 @@ final class Percentile extends Item
include_once $config['homedir'].'/include/functions_io.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
// Get the linked module Id.

3
pandora_console/include/rest-api/models/VisualConsole/Items/SimpleValue.php
View File

@ -179,6 +179,9 @@ final class SimpleValue extends Item
// Load side libraries.
global $config;
include_once $config['homedir'].'/include/functions_visual_map.php';
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
}
// Get the linked module Id.
$linkedModule = static::extractLinkedModule($data);

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

@ -155,10 +155,8 @@ final class StaticGraph extends Item
include_once $config['homedir'].'/include/functions_io.php';
include_once $config['homedir'].'/include/functions_visual_map.php';
include_once $config['homedir'].'/include/functions_modules.php';
\enterprise_include_once('godmode/agentes/module_manager.php');
if (is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php');
}
// Get the linked module Id.
@ -232,7 +230,7 @@ final class StaticGraph extends Item
if (!$isBooleanModule
|| ($isBooleanModule && $showLastValueTooltip !== 'default')
) {
if (\is_numeric($value)) {
if (is_numeric($value)) {
$imgTitle .= __('Last value: ').\remove_right_zeros($value);
} else {
$imgTitle .= __('Last value: ').$value;