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

Merge branch 'ent-11575-bug-en-edicion-de-layer-gis' into 'develop'

Browse Source 
Ent 11575 bug en edicion de layer gis

See merge request artica/pandorafms!6148
This commit is contained in:
Matias Didier 2023-06-27 11:51:38 +00:00
commit 5795196380
1 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,33 +941,66 @@ function newLayer () {
} }
function saveNewLayer () { function saveNewLayer () {
var $layerFormNameInput = $("input#text-layer_name_form"); if ($('#hidden-current_edit_layer_id').val()!=='0') {
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form"); updateLayer();
var $layerFormAgentsFromGroupSelect = $("select#layer_group_form"); } else {
var $layerFormAgentsListItems = $("tr.agents_list_item > td > span.agent_alias"); var $layerFormNameInput = $("input#text-layer_name_form");
var $layerFormGroupsListItems = $("tr.groups_list_item"); var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
var newLayerId = "new_" + ($("tr.layer_row").length + 1); var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
var $layerFormAgentsListItems = $("tr.agents_list_item > td > span.agent_alias");
var $layerFormGroupsListItems = $("tr.groups_list_item");
var newLayerId = "new_" + ($("tr.layer_row").length + 1);
addLayerRow(newLayerId, { addLayerRow(newLayerId, {
id: newLayerId, id: newLayerId,
name: $layerFormNameInput.val(), name: $layerFormNameInput.val(),
visible: $layerFormVisibleCheckbox.prop("checked"), visible: $layerFormVisibleCheckbox.prop("checked"),
agentsFromGroup: $layerFormAgentsFromGroupSelect.val(), agentsFromGroup: $layerFormAgentsFromGroupSelect.val(),
agents: $layerFormAgentsListItems.map(function () { agents: $layerFormAgentsListItems.map(function () {
return { return {
"id": $(this).data("agent-id"), "id": $(this).data("agent-id"),
"alias": $(this).text() "alias": $(this).text()
}; };
}).get(), }).get(),
groups: $layerFormGroupsListItems.map(function () { groups: $layerFormGroupsListItems.map(function () {
return { return {
"id": $(this).data("group-id"), "id": $(this).data("group-id"),
"name": $(this).data("group-name"), "name": $(this).data("group-name"),
"agentId": $(this).data("agent-id"), "agentId": $(this).data("agent-id"),
"agentAlias": $(this).data("agent-alias") "agentAlias": $(this).data("agent-alias")
}; };
}).get() }).get()
}); });
}
}
function updateLayer () {
var tr = $('#layer_row_'+$('#hidden-current_edit_layer_id').val());
var agent_alias = $("tr.agents_list_item > td > span.agent_alias").map(function () {
return {
"id": $(this).data("agent-id"),
"alias": $(this).text()
};
}).get();
var groups_list_item = $("tr.groups_list_item").map(function () {
return {
"id": $(this).data("group-id"),
"name": $(this).data("group-name"),
"agentId": $(this).data("agent-id"),
"agentAlias": $(this).data("agent-alias")
};
}).get();
tr.find('input.layer_name').val($("input#text-layer_name_form").val());
tr.find('input.layer_visible').val($("input#checkbox-layer_visible_form").prop("checked"));
tr.find('input.layer_agents_from_group').val($("select#layer_group_form").val());
tr.find('input.layer_agent_id').val(agent_alias[0]["id"]);
tr.find('input.layer_agent_alias').val(agent_alias[0]["alias"]);
tr.find('input.layer_group_id').val(groups_list_item[0]["id"]);
tr.find('input.layer_group_name').val(groups_list_item[0]["name"]);
tr.find('input.layer_agent_id_for_data').val(groups_list_item[0]["agentId"]);
tr.find('input.layer_agent_alias_for_data').val(groups_list_item[0]["agentAlias"]);
} }
function cleanLayerEditor () { function cleanLayerEditor () {