tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes on the gis map layer configuration

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2018-08-17 14:10:47 +02:00
parent 8a5495a283
commit 3edd42a453
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -607,7 +607,7 @@ function addGroupClick (event) {
var $layerFormAgentIdInput = $("input#hidden-agent_id_for_data"); var $layerFormAgentIdInput = $("input#hidden-agent_id_for_data");
var $layerFormAgentAliasInput = $("input#text-agent_alias_for_data"); var $layerFormAgentAliasInput = $("input#text-agent_alias_for_data");
var layerId = Number.parseInt($("input#hidden-current_edit_layer_id").val()); var layerId = $("input#hidden-current_edit_layer_id").val();
var groupId = Number.parseInt($layerFormGroupIdInput.val()); var groupId = Number.parseInt($layerFormGroupIdInput.val());
var groupName = $layerFormGroupIdInput.find(":selected").text(); var groupName = $layerFormGroupIdInput.find(":selected").text();
var agentId = Number.parseInt($layerFormAgentIdInput.val()); var agentId = Number.parseInt($layerFormAgentIdInput.val());
@ -645,9 +645,21 @@ function moveLayerRowDownOnClick (event) {
} }
function removeLayerRowOnClick (event) { function removeLayerRowOnClick (event) {
var $layerRow = $(event.currentTarget).parent().parent();
var layerRowId = $layerRow.find("input.layer_id").val();
var layerEditorId = $("input#hidden-current_edit_layer_id").val();
if (layerRowId == layerEditorId) hideLayerEditor();
// Remove row
$(event.currentTarget).parent().parent().remove(); $(event.currentTarget).parent().parent().remove();
} }
function hideLayerEditor () {
// Clean editor
cleanLayerEditor();
// Hide editor
$("div#form_layer").hide();
}
function showLayerEditor (layerId) { function showLayerEditor (layerId) {
var $layerSaveBtn = $("input#button-save_layer"); var $layerSaveBtn = $("input#button-save_layer");
@ -838,11 +850,12 @@ function getAgentRow (layerId, agentId, agentAlias) {
$removeBtn.click(function (event) { $removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId); var $layerRow = $("tr#layer_row_" + layerId);
if ($layerRow.length === 0) return; if ($layerRow.length > 0) {
$layerRow.find("input.layer_agent_id[data-agent-id='" + agentId + "']").remove();
$layerRow.find("input.layer_agent_alias[data-agent-id='" + agentId + "']").remove();
}
var $agentListItemRow = $(event.currentTarget).parent().parent(); var $agentListItemRow = $(event.currentTarget).parent().parent();
$layerRow.find("input.layer_agent_id[data-agent-id='" + agentId + "']").remove();
$layerRow.find("input.layer_agent_alias[data-agent-id='" + agentId + "']").remove();
$agentListItemRow.remove(); $agentListItemRow.remove();
}); });
@ -893,13 +906,14 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
$removeBtn.click(function (event) { $removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId); var $layerRow = $("tr#layer_row_" + layerId);
if ($layerRow.length === 0) return; if ($layerRow.length > 0) {
$layerRow.find("input.layer_group_id[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_group_name[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").remove();
}
var $groupListItemRow = $(event.currentTarget).parent().parent(); var $groupListItemRow = $(event.currentTarget).parent().parent();
$layerRow.find("input.layer_group_id[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_group_name[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").remove();
$layerRow.find("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").remove();
$groupListItemRow.remove(); $groupListItemRow.remove();
}); });