From 66dd75ce3a7ae95a821b808745dc742c0b56e932 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 25 Nov 2014 11:52:04 +0100 Subject: [PATCH] Working in the new elements for the visualmap. Ticket #1478 --- .../visual_console_builder.editor.js | 87 ++++++++++++------- .../visual_console_builder.editor.php | 1 + .../include/functions_visual_map.php | 39 +++++++++ .../include/functions_visual_map_editor.php | 6 +- 4 files changed, 99 insertions(+), 34 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index d34f034a25..f441122ffa 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -520,6 +520,7 @@ function toggle_item_palette() { activeToolboxButton('percentile_item', true); activeToolboxButton('group_item', true); activeToolboxButton('box_item', true); + activeToolboxButton('line_item', true); if (typeof(enterprise_activeToolboxButton) == 'function') { enterprise_activeToolboxButton(true); @@ -545,6 +546,7 @@ function toggle_item_palette() { activeToolboxButton('percentile_item', false); activeToolboxButton('group_item', false); activeToolboxButton('box_item', false); + activeToolboxButton('line_item', false); activeToolboxButton('copy_item', false); activeToolboxButton('edit_item', false); @@ -863,6 +865,7 @@ function setAspectRatioBackground(side) { } function hiddenFields(item) { + //The method to hidden and show is //a row have a id and multiple class //then the steps is @@ -872,100 +875,100 @@ function hiddenFields(item) { // or ... $(".title_panel_span").css('display', 'none'); - $("#title_panel_span_" + item).css('display', 'inline'); + $("#title_panel_span_" + item).css('display', 'inline'); $("#label_row").css('display', 'none'); - $("#label_row." + item).css('display', ''); + $("#label_row." + item).css('display', ''); $("#image_row").css('display', 'none'); - $("#image_row." + item).css('display', ''); + $("#image_row." + item).css('display', ''); $("#enable_link_row").css('display', 'none'); - $("#enable_link_row." + item).css('display', ''); + $("#enable_link_row." + item).css('display', ''); $("#preview_row").css('display', 'none'); - $("#preview_row." + item).css('display', ''); + $("#preview_row." + item).css('display', ''); $("#position_row").css('display', 'none'); - $("#position_row." + item).css('display', ''); + $("#position_row." + item).css('display', ''); $("#agent_row").css('display', 'none'); - $("#agent_row." + item).css('display', ''); + $("#agent_row." + item).css('display', ''); $("#module_row").css('display', 'none'); - $("#module_row." + item).css('display', ''); + $("#module_row." + item).css('display', ''); $("#group_row").css('display', 'none'); - $("#group_row." + item).css('display', ''); + $("#group_row." + item).css('display', ''); $("#process_value_row").css('display', 'none'); - $("#process_value_row." + item).css('display', ''); + $("#process_value_row." + item).css('display', ''); $("#background_row_1").css('display', 'none'); - $("#background_row_1." + item).css('display', ''); + $("#background_row_1." + item).css('display', ''); $("#background_row_2").css('display', 'none'); - $("#background_row_2." + item).css('display', ''); + $("#background_row_2." + item).css('display', ''); $("#background_row_3").css('display', 'none'); - $("#background_row_3." + item).css('display', ''); + $("#background_row_3." + item).css('display', ''); $("#background_row_4").css('display', 'none'); - $("#background_row_4." + item).css('display', ''); + $("#background_row_4." + item).css('display', ''); $("#percentile_bar_row_1").css('display', 'none'); - $("#percentile_bar_row_1." + item).css('display', ''); + $("#percentile_bar_row_1." + item).css('display', ''); $("#percentile_bar_row_2").css('display', 'none'); - $("#percentile_bar_row_2." + item).css('display', ''); + $("#percentile_bar_row_2." + item).css('display', ''); $("#percentile_item_row_3").css('display', 'none'); - $("#percentile_item_row_3." + item).css('display', ''); + $("#percentile_item_row_3." + item).css('display', ''); $("#percentile_item_row_4").css('display', 'none'); - $("#percentile_item_row_4." + item).css('display', ''); + $("#percentile_item_row_4." + item).css('display', ''); $("#period_row").css('display', 'none'); - $("#period_row." + item).css('display', ''); + $("#period_row." + item).css('display', ''); $("#size_row").css('display', 'none'); - $("#size_row." + item).css('display', ''); + $("#size_row." + item).css('display', ''); $("#parent_row").css('display', 'none'); - $("#parent_row." + item).css('display', ''); + $("#parent_row." + item).css('display', ''); $("#map_linked_row").css('display', 'none'); - $("#map_linked_row." + item).css('display', ''); + $("#map_linked_row." + item).css('display', ''); $("#module_graph_size_row").css('display', 'none'); - $("#module_graph_size_row." + item).css('display', ''); + $("#module_graph_size_row." + item).css('display', ''); $("#background_color").css('display', 'none'); - $("#background_color." + item).css('display', ''); + $("#background_color." + item).css('display', ''); $("#radio_choice_graph").css('display', 'none'); - $("#radio_choice_graph." + item).css('display', ''); + $("#radio_choice_graph." + item).css('display', ''); $("#custom_graph_row").css('display', 'none'); - $("#custom_graph_row." + item).css('display', ''); + $("#custom_graph_row." + item).css('display', ''); $("#box_size_row").css('display', 'none'); - $("#box_size_row." + item).css('display', ''); + $("#box_size_row." + item).css('display', ''); $("#border_color_row").css('display', 'none'); - $("#border_color_row." + item).css('display', ''); + $("#border_color_row." + item).css('display', ''); $("#border_width_row").css('display', 'none'); - $("#border_width_row." + item).css('display', ''); + $("#border_width_row." + item).css('display', ''); $("#fill_color_row").css('display', 'none'); - $("#fill_color_row." + item).css('display', ''); + $("#fill_color_row." + item).css('display', ''); $("#line_color_row").css('display', 'none'); - $("#line_color_row." + item).css('display', ''); + $("#line_color_row." + item).css('display', ''); $("#line_width_row").css('display', 'none'); - $("#line_width_row." + item).css('display', ''); + $("#line_width_row." + item).css('display', ''); @@ -2079,6 +2082,20 @@ function eventsItems(drag) { activeToolboxButton('delete_item', true); activeToolboxButton('show_grid', false); } + if ($(divParent).hasClass('handle_start')) { + creationItem = null; + selectedItem = 'handle_start'; + activeToolboxButton('edit_item', true); + activeToolboxButton('delete_item', true); + activeToolboxButton('show_grid', false); + } + if ($(divParent).hasClass('handle_end')) { + creationItem = null; + selectedItem = 'handle_end'; + activeToolboxButton('edit_item', true); + activeToolboxButton('delete_item', true); + activeToolboxButton('show_grid', false); + } //Maybe receive a click event any Enterprise item. if (typeof(enterprise_click_item_callback) == 'function') { @@ -2132,6 +2149,12 @@ function eventsItems(drag) { if ($(event.target).hasClass('icon')) { selectedItem = 'icon'; } + if ($(event.target).hasClass('handle_start')) { + selectedItem = 'handle_start'; + } + if ($(event.target).hasClass('handle_end')) { + selectedItem = 'handle_end'; + } if (selectedItem == null) { //Maybe receive a click event any Enterprise item. diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index f3129d14d7..0311119deb 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -87,6 +87,7 @@ foreach ($layoutDatas as $layoutData) { switch ($layoutData['type']) { case LINE_ITEM: + visual_map_print_user_line_handles($layoutData); visual_map_print_user_lines("write", $layoutData); break; default: diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 4d8a103050..8b9d2330bd 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -47,6 +47,45 @@ function visual_map_print_item_toolbox($idDiv, $text, $float) { echo ''; } +function visual_map_print_user_line_handles($layoutData) { + $id = $layoutData['id']; + + $start_x = $layoutData['pos_x']; + $start_y = $layoutData['pos_y']; + $end_x = $layoutData['width']; + $end_y = $layoutData['height']; + $z_index = 2; + + $sizeStyle = ""; + + $radious_handle = 12 / 2; + + + //Handle of start + echo '
'; + + html_print_image("images/dot_red.png"); + + echo "
"; + + //Handle of end + echo '
'; + + html_print_image("images/dot_green.png"); + + echo "
"; +} + function visual_map_print_item($mode = "read", $layoutData, $proportion = 1, $show_links = true) { global $config; diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 48ddd63b2c..686cf6b17b 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -78,7 +78,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items = array(); $form_items['line_width_row'] = array(); - $form_items['line_width_row']['items'] = array('datos', 'line_item'); + $form_items['line_width_row']['items'] = + array('datos', 'line_item', 'handle_start', 'handle_end'); $form_items['line_width_row']['html'] = '' . __('Width') . ' ' . html_print_input_text('line_width', 3, '', 3, 5, true) . @@ -86,7 +87,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items['line_color_row'] = array(); - $form_items['line_color_row']['items'] = array('datos', 'line_item'); + $form_items['line_color_row']['items'] = + array('datos', 'line_item', 'handle_start', 'handle_end'); $form_items['line_color_row']['html'] = '' . __('Border color') .