From 8a71b5b4ae1d78db3e55ec5bf753c81cc4b36932 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 15 Sep 2009 10:20:38 +0000 Subject: [PATCH] 2009-09-14 Miguel de Dios * godmode/reporting/map_builder.php: change (at the moment) the ajax for delete elements by html static form with select, because sometimes (when you try delete elements with bigger dimensions fail). Fixes: 2815063 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1941 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 ++ .../godmode/reporting/map_builder.php | 106 +++++++++++++----- 2 files changed, 83 insertions(+), 30 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 40990363de..ad70f055a8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-09-14 Miguel de Dios + + * godmode/reporting/map_builder.php: change (at the moment) the ajax for + delete elements by html static form with select, because sometimes (when you + try delete elements with bigger dimensions fail). + Fixes: 2815063 + 2009-09-14 Miguel de Dios * godmode/agentes/modificar_agente.php: fix the pagination when it has diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 21d25c8ac0..9f78cd6ebb 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -232,15 +232,23 @@ if ($update_layout_data_coords) { } if ($delete_layout_data) { - $ids_layout_data = (array) get_parameter ('ids_layout_data'); + //delete_element + + $delete_element = get_parameter('delete_element',0); + $id_layout = get_parameter('id_layout'); - foreach ($ids_layout_data as $id_layout_data) { - process_sql_update ('tlayout_data', array ('parent_item' => 0), - array ('parent_item' => $id_layout_data)); - $sql = sprintf ('DELETE FROM tlayout_data WHERE id = %d', - $id_layout_data); - process_sql_delete ('tlayout_data', array ('id' => $id_layout_data)); - } + process_sql_delete ('tlayout_data', array ('id' => $delete_element)); + + +// $ids_layout_data = (array) get_parameter ('ids_layout_data'); +// +// foreach ($ids_layout_data as $id_layout_data) { +// process_sql_update ('tlayout_data', array ('parent_item' => 0), +// array ('parent_item' => $id_layout_data)); +// $sql = sprintf ('DELETE FROM tlayout_data WHERE id = %d', +// $id_layout_data); +// process_sql_delete ('tlayout_data', array ('id' => $id_layout_data)); +// } if (is_ajax ()) { return; @@ -400,14 +408,38 @@ if (! $edit_layout && ! $id_layout) { echo '
'; echo '
'; echo '

'.__('Map element trash').'

'; - echo __('Drag an element here to delete from the map'); + // DISABLE UNTIL FIX THE BUG WITH ELEMENTS WITH BIG DIMENSIONS +// echo __('Drag an element here to delete from the map'); echo ' '; + print_input_hidden ('delete_layout_data', 1); print_input_hidden ('id_layout', $id_layout); +// echo '
'; +// print_submit_button (__('Delete'), 'delete_buttons', true, 'class="sub delete"'); +// echo '
'; + + echo __('Select a element to delete:'); + + echo "

"; + $elements = get_db_all_rows_sql("SELECT t1.id, t1.label, + (SELECT t2.nombre + FROM tagente AS t2 + WHERE t2.id_agente = t1.id_agent) AS name_agent, + (SELECT t3.nombre + FROM tagente_modulo AS t3 + WHERE t3.id_agente_modulo = t1.id_agente_modulo) AS name_module + FROM tlayout_data AS t1 + WHERE t1.id_layout = $id_layout"); + $tempArraySelect = array(); + foreach ($elements as $element) { + $tempArraySelect[$element['id']] = $element['label'] . " - " . + $element['name_agent'] . " - " . $element['name_module']; + } + print_select($tempArraySelect, 'delete_element', '', '', __('None'), 0); + print " "; + print_submit_button (__('Delete'), 'delete_buttons', false, 'class="sub delete"'); + echo "

"; - echo '
'; - print_submit_button (__('Delete'), 'delete_buttons', true, 'class="sub delete"'); - echo '
'; echo '
'; echo '
'; @@ -607,7 +639,17 @@ $(document).ready (function () { $('#text-height').keyup (function () { $("#layout_map").css ('height', this.value + 'px'); }); - $(".layout-data").draggable ({helper: 'clone'}); + +// POSSIBLE FIX THE BUG WITH ELEMENTS WITH BIG DIMENSIONS + +// function testHelper() { +// obj = $('
').attr('id','helper_prueba2').attr('style','width: 100px; height: 100px; background: red;'); +// return obj; +// } +// $(".layout-data").draggable ({helper: testHelper}); + + $(".layout-data").draggable ({helper: 'clone'}); + $("#layout_map").droppable ({ accept: ".layout-data", drop: function (ev, ui) { @@ -713,23 +755,27 @@ $(document).ready (function () { ); } }); - $("#layout_trash_drop").droppable ({ - accept: ".layout-data", - drop: function (ev, ui) { - image = $('#'+ ui.draggable[0].id + " img").eq (0); - total = $("img", this).length; - - id = ui.draggable[0].id.split ("-").pop (); - $(ui.draggable[0]).clone ().css ('margin-left', 60 * total). - css ('margin-top', 0). attr ('id', 'delete-layout-data-' + id). - appendTo ("#"+this.id + " #elements"); - $(ui.draggable[0]).remove (); - $('').attr ('value', id). - appendTo ($("#form_layout_data_trash")); - $("#form_layout_data_trash #submit-delete_buttons").removeAttr ('disabled'); - setTimeout (function() { refresh_lines (lines, 'layout_map'); }, 1000); - } - }); + +// DISABLE UNTIL FIX THE BUG WITH ELEMENTS WITH BIG DIMENSIONS + +// $("#layout_trash_drop").droppable ({ +// accept: ".layout-data", +// drop: function (ev, ui) { +// image = $('#'+ ui.draggable[0].id + " img").eq (0); +// total = $("img", this).length; +// +// id = ui.draggable[0].id.split ("-").pop (); +// $(ui.draggable[0]).clone ().css ('margin-left', 60 * total). +// css ('margin-top', 0). attr ('id', 'delete-layout-data-' + id). +// appendTo ("#"+this.id + " #elements"); +// $(ui.draggable[0]).remove (); +// $('').attr ('value', id). +// appendTo ($("#form_layout_data_trash")); +// $("#form_layout_data_trash #submit-delete_buttons").removeAttr ('disabled'); +// setTimeout (function() { refresh_lines (lines, 'layout_map'); }, 1000); +// } +// }); + $("#form_layout_data_editor #image").change (function () { $("#image_preview").empty (); if (this.value != '') {