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

fixed several issues in item module graph of visual consoles

This commit is contained in:
alejandro.campos@artica.es 2021-07-08 10:03:57 +02:00
parent 1328b2055c
commit a484fb2408
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -735,7 +735,7 @@ function grafico_modulo_sparse($params)
$params['backgroundColor'] = 'white'; $params['backgroundColor'] = 'white';
} }
if (isset($params['only_image']) === true) { if (isset($params['only_image']) === true && $params['vconsole'] !== true) {
$params['backgroundColor'] = 'transparent'; $params['backgroundColor'] = 'transparent';
} }

2
pandora_console/include/graphs/functions_flot.php
View File

@ -170,7 +170,7 @@ function flot_area_graph(
// Set some containers to legend, graph, timestamp tooltip, etc. // Set some containers to legend, graph, timestamp tooltip, etc.
if ($params['show_legend']) { if ($params['show_legend']) {
$return .= '<p id="legend_'.$graph_id.'" style="text-align:left; width: '.$params['width'].'px;"></p>'; $return .= '<p id="legend_'.$graph_id.'" class="legend_background" style="text-align:left; width: '.$params['width'].'px;"></p>';
} }
if (isset($params['graph_combined']) === true && $params['graph_combined'] if (isset($params['graph_combined']) === true && $params['graph_combined']

14
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -1517,6 +1517,20 @@ class Item extends CachedModel
$result['border_color'] = $border_color; $result['border_color'] = $border_color;
} }
$id_custom_graph = static::parseIntOr(
static::issetInArray(
$data,
[
'customGraphId',
'id_custom_graph',
]
),
null
);
if ($id_custom_graph !== null) {
$result['id_custom_graph'] = $id_custom_graph;
}
$linked_layout_node_id = static::parseIntOr( $linked_layout_node_id = static::parseIntOr(
static::issetInArray( static::issetInArray(
$data, $data,

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

@ -356,10 +356,15 @@ class View extends \HTML
case MODULE_GRAPH: case MODULE_GRAPH:
$data['backgroundType'] = \get_parameter('backgroundType'); $data['backgroundType'] = \get_parameter('backgroundType');
$type = \get_parameter('choosetype');
$data['agentId'] = \get_parameter('agentId'); $data['agentId'] = \get_parameter('agentId');
$data['metaconsoleId'] = \get_parameter('metaconsoleId'); $data['metaconsoleId'] = \get_parameter('metaconsoleId');
$data['moduleId'] = \get_parameter('moduleId'); $data['moduleId'] = \get_parameter('moduleId');
$data['customGraphId'] = \get_parameter('customGraphId'); $data['customGraphId'] = \get_parameter('customGraphId');
if ($type === 'module') {
$data['customGraphId'] = 0;
}
$data['graphType'] = \get_parameter('graphType'); $data['graphType'] = \get_parameter('graphType');
$data['showLegend'] = \get_parameter_switch('showLegend'); $data['showLegend'] = \get_parameter_switch('showLegend');
$data['period'] = \get_parameter('period'); $data['period'] = \get_parameter('period');

7
pandora_console/include/styles/pandora_black.css
View File

@ -398,7 +398,7 @@ table#diagnostic_info tbody td div {
} }
.ui-widget-content, .ui-widget-content,
.ui-widget-content a { .ui-widget-content a {
color: #fff; color: #fff !important;
} }
.ui-widget-content.ui-autocomplete a { .ui-widget-content.ui-autocomplete a {
@ -1159,3 +1159,8 @@ a.pandora_pagination,
padding-right: 35px; padding-right: 35px;
background-color: #222; background-color: #222;
} }
.legend_background {
background-color: #222;
color: #fff !important;
}