From ce6bfb96f1b8d854ce2f233ceb5005d748b8cdfa Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Wed, 5 Sep 2018 10:04:35 +0200 Subject: [PATCH 1/2] Minor changes --- .../include/functions_visual_map_editor.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 5b8cc1c522..57a8a7e6c8 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -698,7 +698,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { 'percentile_item', 'module_graph', 'simple_value', 'icon', 'label', 'datos', 'donut_graph'); $form_items_advance['map_linked_row']['html'] = ''. - __('Map linked') . '' . + __('Linked map') . '' . '' . html_print_select_from_sql ( 'SELECT id, name FROM tlayout @@ -730,10 +730,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items_advance['map_linked_weight'] = array(); $form_items_advance['map_linked_weight']['items'] = array('static_graph'); $form_items_advance['map_linked_weight']['html'] = '' - . __('Map linked weight') . '' + . __('Linked map weight') . '' . '' . html_print_input_text( - 'map_linked_weight', 80, '', 3, 3, true, false, false, "", "type_number percentage" + 'map_linked_weight', 80, '', 5, 5, true, false, false, "", "type_number percentage" ) . '%' . ui_print_help_icon("linked_map_weight", true) @@ -745,7 +745,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { . __('Critical weight') . '' . '' . html_print_input_text( - 'linked_map_status_service_critical', 80, '', 3, 3, true, false, false, "", "type_number percentage" + 'linked_map_status_service_critical', 80, '', 5, 5, true, false, false, "", "type_number percentage" ) . '%' . ''; @@ -756,7 +756,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { . __('Warning weight') . '' . '' . html_print_input_text( - 'linked_map_status_service_warning', 50, '', 3, 3, true, false, false, "", "type_number percentage" + 'linked_map_status_service_warning', 50, '', 5, 5, true, false, false, "", "type_number percentage" ) . '%' . ''; From c20942f42508180f619ef594976a8b80dd6476b7 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Wed, 5 Sep 2018 15:25:19 +0200 Subject: [PATCH 2/2] 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'] = ''. __('Type of the status calculation of the linked map') . '' . '' @@ -728,7 +731,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { . ''; $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'] = '' . __('Linked map weight') . '' . '' @@ -740,7 +746,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { . ''; $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'] = '' . __('Critical weight') . '' . '' @@ -751,7 +760,10 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { . ''; $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'] = '' . __('Warning weight') . '' . ''