From c20942f42508180f619ef594976a8b80dd6476b7 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Wed, 5 Sep 2018 15:25:19 +0200
Subject: [PATCH] Now the status calculation can be configured for every visual
console item
---
.../visual_console_builder.editor.js | 11 ++--------
.../include/functions_visual_map_editor.php | 20 +++++++++++++++----
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index cdde53af9f..f23da2d6bd 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -5178,7 +5178,7 @@ function multiDragMouse(eventDrag){
}
function linkedMapStatusCalculationTypeChanged ($linkedMapStatusCalcRow, value) {
- if ($linkedMapStatusCalcRow.length === 0 || !validRowOnSelectedItem($linkedMapStatusCalcRow)) return;
+ if ($linkedMapStatusCalcRow.length === 0) return;
switch (value) {
case "weight":
@@ -5215,7 +5215,7 @@ function linkedMapStatusCalculationTypeChanged ($linkedMapStatusCalcRow, value)
}
function linkedMapChanged ($linkedMapRow, value) {
- if ($linkedMapRow.length === 0 || !validRowOnSelectedItem($linkedMapRow)) return;
+ if ($linkedMapRow.length === 0) return;
if (value === 0) {
$linkedMapRow
@@ -5229,9 +5229,6 @@ function linkedMapChanged ($linkedMapRow, value) {
.hide();
} else {
var $linkedMapStatusCalcRow = $linkedMapRow.siblings("#linked_map_status_calculation_row");
-
- if (!validRowOnSelectedItem($linkedMapStatusCalcRow)) return;
-
var calcType = $linkedMapStatusCalcRow.find("select").val();
$linkedMapStatusCalcRow.show();
linkedMapStatusCalculationTypeChanged($linkedMapStatusCalcRow, calcType);
@@ -5249,7 +5246,3 @@ function onLinkedMapStatusCalculationTypeChange (event) {
var value = event.target.value || "default";
linkedMapStatusCalculationTypeChanged($linkedMapStatusCalcRow, value);
}
-
-function validRowOnSelectedItem ($element) {
- return $element.hasClass(selectedItem);
-}
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 57a8a7e6c8..3039e0dc97 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -710,7 +710,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
"service" => __("By critical elements")
);
$form_items_advance['linked_map_status_calculation_row'] = array();
- $form_items_advance['linked_map_status_calculation_row']['items'] = array('static_graph');
+ $form_items_advance['linked_map_status_calculation_row']['items'] = array(
+ 'group_item', 'static_graph', 'percentile_bar',
+ 'percentile_item', 'module_graph', 'simple_value',
+ 'icon', 'label', 'datos', 'donut_graph');
$form_items_advance['linked_map_status_calculation_row']['html'] = '<td align="left">'.
__('Type of the status calculation of the linked map') . '</td>'
. '<td align="left">'
@@ -728,7 +731,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
. '</td>';
$form_items_advance['map_linked_weight'] = array();
- $form_items_advance['map_linked_weight']['items'] = array('static_graph');
+ $form_items_advance['map_linked_weight']['items'] = array(
+ 'group_item', 'static_graph', 'percentile_bar',
+ 'percentile_item', 'module_graph', 'simple_value',
+ 'icon', 'label', 'datos', 'donut_graph');
$form_items_advance['map_linked_weight']['html'] = '<td align="left">'
. __('Linked map weight') . '</td>'
. '<td align="left">'
@@ -740,7 +746,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
. '</td>';
$form_items_advance['linked_map_status_service_critical_row'] = array();
- $form_items_advance['linked_map_status_service_critical_row']['items'] = array('static_graph');
+ $form_items_advance['linked_map_status_service_critical_row']['items'] = array(
+ 'group_item', 'static_graph', 'percentile_bar',
+ 'percentile_item', 'module_graph', 'simple_value',
+ 'icon', 'label', 'datos', 'donut_graph');
$form_items_advance['linked_map_status_service_critical_row']['html'] = '<td align="left">'
. __('Critical weight') . '</td>'
. '<td align="left">'
@@ -751,7 +760,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
. '</td>';
$form_items_advance['linked_map_status_service_warning_row'] = array();
- $form_items_advance['linked_map_status_service_warning_row']['items'] = array('static_graph');
+ $form_items_advance['linked_map_status_service_warning_row']['items'] = array(
+ 'group_item', 'static_graph', 'percentile_bar',
+ 'percentile_item', 'module_graph', 'simple_value',
+ 'icon', 'label', 'datos', 'donut_graph');
$form_items_advance['linked_map_status_service_warning_row']['html'] = '<td align="left">'
. __('Warning weight') . '</td>'
. '<td align="left">'