From 2345ee5f8ae3c0fc0a48b353f2a14066b00b32f5 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 10 Feb 2010 18:27:24 +0000 Subject: [PATCH] 2010-02-10 Miguel de Dios * include/functions_gis.php: in function "saveMap" now save the default connection. * operation/gis_maps/ajax.php: add option "get_data_conexion" for get by ajax the data connection when pass id_connection. * godmode/gis_maps/configure_gis_map.php: now you can set the default connection and too load the data by default for each connection. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 ++++ .../godmode/gis_maps/configure_gis_map.php | 51 +++++++++++++++---- pandora_console/include/functions_gis.php | 4 +- pandora_console/operation/gis_maps/ajax.php | 10 ++++ 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 24d6600b04..959140a9b5 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2010-02-10 Miguel de Dios + + * include/functions_gis.php: in function "saveMap" now save the default + connection. + + * operation/gis_maps/ajax.php: add option "get_data_conexion" for get by + ajax the data connection when pass id_connection. + + * godmode/gis_maps/configure_gis_map.php: now you can set the default + connection and too load the data by default for each connection. + 2010-02-10 Pablo de la Concepción * godmode/gis_maps/index.php: Fixed regresion, standarized using map_id diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 1979454045..283e93f161 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -45,14 +45,19 @@ switch ($action) { $map_default_altitude = get_parameter('map_default_altitude'); $map_group_id = get_parameter('map_group_id'); - $map_connection_list = explode(",",get_parameter('map_connection_list')); + $map_connection_list_temp = explode(",",get_parameter('map_connection_list')); $layer_list = explode(",",get_parameter('layer_list')); - foreach ($map_connection_list as $mapConnection) { - //TODO extract the default - } + $map_connection_default = get_parameter('map_connection_default'); - //debugPrint($map_connection_list); + $map_connection_list = array(); + foreach ($map_connection_list_temp as $idMapConnection) { + $default = false; + if ($map_connection_default == $idMapConnection) + $default = true; + + $map_connection_list[] = array('id_conection' => $idMapConnection, 'default' => $default); + } $arrayLayers = array(); @@ -64,8 +69,6 @@ switch ($action) { $map_initial_altitude, $map_zoom_level, $map_background, $map_default_longitude, $map_default_latitude, $map_default_altitude, $map_group_id, $map_connection_list, $arrayLayers); - - //debugPrint($arrayLayers); break; case 'new_map': print_input_hidden('action', 'save_new'); @@ -202,7 +205,7 @@ echo ""; - + @@ -463,6 +466,33 @@ function deleteConnectionMap(idConnectionMap) { } } +function setFieldsRequestAjax(id_conexion) { + if (confirm('')) { + jQuery.ajax ({ + data: "page=operation/gis_maps/ajax&opt=get_data_conexion&id_conection=" + idConnectionMap, + type: "GET", + dataType: 'json', + url: "ajax.php", + timeout: 10000, + success: function (data) { + if (data.correct) { + $("input[name=map_initial_longitude]").val(data.content.initial_longitude); + $("input[name=map_initial_latitude]").val(data.content.initial_latitude); + $("input[name=map_initial_altitude]").val(data.content.initial_altitude); + $("input[name=map_default_longitude]").val(data.content.default_longitude); + $("input[name=map_default_latitude]").val(data.content.default_latitude); + $("input[name=map_default_altitude]").val(data.content.default_altitude); + } + } + }); + } +} + +function changeDefaultConection(id) { + + setFieldsRequestAjax(id); +} + function addConnectionMap() { idConnectionMap = $("#map_connection :selected").val(); connectionMapName = $("#map_connection :selected").text(); @@ -480,10 +510,14 @@ function addConnectionMap() { tableRows = $("#chunk_map_connection").clone(); tableRows.attr('id','map_connection_' + idConnectionMap); + $("input[name=map_connection_default]",tableRows).val(idConnectionMap); if (connectionMaps.length == 0) { //The first is checked $("#radiobtn0001", tableRows).attr('checked', 'checked'); + + //Set the fields with conexion data (in ajax) + setFieldsRequestAjax(idConnectionMap); } connectionMaps.push(idConnectionMap); @@ -492,7 +526,6 @@ function addConnectionMap() { $("#text-map_connection_name", tableRows).attr('name', 'map_connection_name_' + idConnectionMap); $("#delete_row", tableRows).attr('href', "javascript: deleteConnectionMap(" + idConnectionMap + ")"); - $("#map_connection").append(tableRows); } diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php index 9d442b83cc..0154bcaa2e 100644 --- a/pandora_console/include/functions_gis.php +++ b/pandora_console/include/functions_gis.php @@ -556,8 +556,8 @@ function saveMap($map_name, $map_initial_longitude, $map_initial_latitude, process_sql_insert('tgis_map_has_tgis_map_connection', array( 'tgis_map_id_tgis_map' => $idMap, - 'tgis_map_connection_id_tmap_connection' => $map_connection, - 'default_map_connection' => false //TODO SET DEFAULT + 'tgis_map_connection_id_tmap_connection' => $map_connection['id_conection'], + 'default_map_connection' => $map_connection['default'] ) ); } diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php index 77bd2ac304..b8fc10913c 100644 --- a/pandora_console/operation/gis_maps/ajax.php +++ b/pandora_console/operation/gis_maps/ajax.php @@ -24,6 +24,16 @@ require_once ('include/functions_ui.php'); $opt = get_parameter('opt'); switch ($opt) { + case 'get_data_conexion': + $returnJSON['correct'] = 1; + $idConection = get_parameter('id_conection'); + + $row = get_db_row_filter('tgis_map_connection', array('id_tmap_connection' => $idConection)); + + $returnJSON['content'] = $row; + + echo json_encode($returnJSON); + break; case 'get_new_positions': $id_features = get_parameter('id_features', ''); $last_time_of_data = get_parameter('last_time_of_data');