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

Merge branch 'ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda' into 'develop'

Browse Source 
Schema, allow certain autoconfigurations being disabled on MC environments

See merge request artica/pandorafms!4682
This commit is contained in:
Daniel Rodriguez 2022-02-15 13:54:19 +00:00
commit 720c9be40f
7 changed files with 3671 additions and 3586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -3,4 +3,5 @@ variables:
test: test:
script: script:
- docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base /tmp/pandorafms/tests/test.sh - docker pull pandorafms/pandorafms-base:centos6
- docker run --rm -h pandorafms -t -v "$CI_PROJECT_DIR:/tmp/pandorafms" pandorafms/pandorafms-base:centos6 /tmp/pandorafms/tests/test.sh

2
pandora_console/extras/mr/52.sql
View File

@ -14,4 +14,6 @@ SOURCE procedures/alertEvents.sql;
CALL `migrateEventRanges`(); CALL `migrateEventRanges`();
DROP PROCEDURE `migrateEventRanges`; DROP PROCEDURE `migrateEventRanges`;
ALTER TABLE `tautoconfig` ADD COLUMN `disabled` TINYINT DEFAULT 0;
COMMIT; COMMIT;

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -2187,6 +2187,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig` (
`name` varchar(100) NOT NULL, `name` varchar(100) NOT NULL,
`order` int(11) NOT NULL DEFAULT '0', `order` int(11) NOT NULL DEFAULT '0',
`description` text, `description` text,
`disabled` TINYINT,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

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

@ -468,21 +468,12 @@ foreach ($listConnectionTemp as $connectionTemp) {
} }
$table->data[1][0] = __('Add Map connection').$iconError; $table->data[1][0] = __('Add Map connection').$iconError;
$table->data[1][1] = "<table class='no-class' border='0' id='map_connection'> $table->data[1][1] = ".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
<tr> < / td > < td > < a href = 'javascript: addConnectionMap();' > ".html_print_image(
<td >
".html_print_select($listConnection, 'map_connection_list', '', '', '', '0', true)."
</td>
<td >
<a href='javascript: addConnectionMap();'>".html_print_image(
'images/add.png', 'images/add.png',
true, true,
['class' => 'invert_filter'] ['class' => 'invert_filter']
)."</a> )." < / a > < input type = 'hidden' name = 'map_connection_list' value = '' id = 'map_connection_list' / > < input type = 'hidden' name = 'layer_list' value = '' id = 'layer_list' / > < / td > < / tr > (".gis_add_conection_maps_in_form($map_connection_list).'
<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
<input type='hidden' name='layer_list' value='' id='layer_list' />
</td>
</tr> ".gis_add_conection_maps_in_form($map_connection_list).'
</table>'; </table>';
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
@ -558,9 +549,9 @@ $table->data = [];
$table->data[0][0] = '<h4>'.__('List of layers').'</h4>'; $table->data[0][0] = '<h4>'.__('List of layers').'</h4>';
$table->data[0][1] = '<div class="right">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add "', true).'</div>'; $table->data[0][1] = '<div class="right">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add "', true).'</div>';
$table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers"></table>'; $table->data[1][0] = '<table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_layers"></table>';
$table->data[1][1] = '<div id="form_layer" class="invisible"> $table->data[1][1] = '<div id="form_layer' class='invisible'>
<table id="form_layer_table" class="" border="0" cellpadding="4" cellspacing="4"> <table id='form_layer_table' class="" border='0' cellpadding='4' cellspacing='4">
<tr> <tr>
<td>'.__('Layer name').':</td> <td>'.__('Layer name').':</td>
<td>'.html_print_input_text('layer_name_form', '', '', 20, 40, true).'</td> <td>'.html_print_input_text('layer_name_form', '', '', 20, 40, true).'</td>
@ -603,7 +594,7 @@ $table->data[1][1] .= '</td>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<h4>'.__('List of Agents to be shown in the layer').'</h4> <h4>'.__('List of Agents to be shown in the layer').'</h4>
<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_agents"> <table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_agents">
</table> </table>
</td> </td>
</tr>'; </tr>';
@ -637,18 +628,18 @@ $table->data[1][1] .= '<tr><td colspan="4"><hr /></td></tr>
<td colspan="3">'.$agent_for_group_input.'</td> <td colspan="3">'.$agent_for_group_input.'</td>
</tr> </tr>
<tr> <tr>
<td colspan="4" align="right">'.$add_group_btn.'</td> <td colspan="4' align='right">'.$add_group_btn.'</td>
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<h4>'.__('List of groups to be shown in the layer').'</h4> <h4>'.__('List of groups to be shown in the layer').'</h4>
<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_groups"> <table class="databox' border='0' cellpadding='4' cellspacing='4' id='list_groups">
</table> </table>
</td> </td>
</tr>'; </tr>';
$table->data[1][1] .= '<tr> $table->data[1][1] .= '<tr>
<td align="right" colspan="4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).' <td align="right' colspan='4">'.html_print_button(__('Save Layer'), 'save_layer', false, 'javascript:saveNewLayer();', 'class="sub wand"', true).'
'.html_print_input_hidden('current_edit_layer_id', '', true).' '.html_print_input_hidden('current_edit_layer_id', '', true).'
</td> </td>
</tr> </tr>
@ -658,7 +649,7 @@ $table->data[1][1] .= '<tr>
html_print_table($table); html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action - buttons' style=')width: '.$table->width.'">';
switch ($action) { switch ($action) {
case 'save_new': case 'save_new':
case 'edit_map': case 'edit_map':
@ -683,12 +674,12 @@ echo '</form>';
// -------------------------INI CHUNKS--------------------------------------- // -------------------------INI CHUNKS---------------------------------------
?> ?>
<table style="visibility: hidden;"> <table style="visibility: hidden;('>
<tbody id="chunk_map_connection"> <tbody id='chunk_map_connection'>
<tr class="row_0"> <tr class='row_0">
<td><?php html_print_input_text('map_connection_name', $map_name, '', 20, 40, false, true); ?></td> <td><?php html_print_input_text('map_connection_name', $map_name, '', 20, 40, false, true); ?></td>
<td><?php html_print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', ''); ?></td> <td><?php html_print_radio_button_extended('map_connection_default', '', '', true, false, 'changeDefaultConection(this.value)', ''); ?></td>
<td><a id="delete_row" href="none"> <td><a id="delete_row' href='none">
<?php <?php
html_print_image( html_print_image(
'images/cross.png', 'images/cross.png',
@ -711,36 +702,43 @@ ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('json'); ui_require_jquery_file('json');
?> ?>
<script type="text/javascript"> <script type="text / javascript'>
function active_button_add_agent() { function active_button_add_agent() {
$("#button-add_agent").prop("disabled", false); $(')
// button-add_agent").prop("disabled", false);
} }
function addAgentClick (event) {
var $layerFormAgentIdInput = $("#hidden-agent_id"); function addAgentClick(event)
var $layerFormAgentAliasInput = $("#text-agent_alias"); {
var $layerFormAgentIdInput = $('#hidden-agent_id');
var $layerFormAgentAliasInput = $('#text-agent_alias');
var agentId = Number.parseInt($layerFormAgentIdInput.val()); var agentId = Number.parseInt($layerFormAgentIdInput.val());
var agentAlias = $layerFormAgentAliasInput.val(); var agentAlias = $layerFormAgentAliasInput.val();
var layerId = $("input#hidden-current_edit_layer_id").val(); var layerId = $('input#hidden-current_edit_layer_id').val();
if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) return; if (Number.isNaN(agentId) || agentId === 0 || agentAlias.length === 0) {
return;
}
addAgentRow(layerId, agentId, agentAlias); addAgentRow(layerId, agentId, agentAlias);
// Clear agent inputs // Clear agent inputs
$layerFormAgentIdInput.val(""); $layerFormAgentIdInput.val('');
$layerFormAgentAliasInput.val(""); $layerFormAgentAliasInput.val('');
$("#button-add_agent").prop("disabled", true); $('#button-add_agent').prop('disabled', true);
} }
function toggleAddGroupBtn () {
var groupId = Number.parseInt($("select#layer_group_id").val()); function toggleAddGroupBtn()
{
var groupId = Number.parseInt($('select#layer_group_id').val());
var existGroupId = $("table#list_groups tr.groups_list_item[data-group-id='" + groupId + "']").length > 0; var existGroupId = $("table#list_groups tr.groups_list_item[data-group-id='" + groupId + "']").length > 0;
var agentId = Number.parseInt($("input#hidden-agent_id_for_data").val()); var agentId = Number.parseInt($('input#hidden-agent_id_for_data').val());
var agentAlias = $("input#text-agent_alias_for_data").val(); var agentAlias = $('input#text-agent_alias_for_data').val();
var enabled = ( var enabled = (
!existGroupId !existGroupId
@ -751,17 +749,19 @@ function toggleAddGroupBtn () {
&& agentAlias.length > 0 && agentAlias.length > 0
); );
$("#button-add_group").prop("disabled", !enabled); $('#button-add_group').prop('disabled', !enabled);
} }
function addGroupClick (event) {
var $layerFormGroupIdInput = $("select#layer_group_id");
var $layerFormAgentIdInput = $("input#hidden-agent_id_for_data");
var $layerFormAgentAliasInput = $("input#text-agent_alias_for_data");
var layerId = $("input#hidden-current_edit_layer_id").val(); function addGroupClick(event)
{
var $layerFormGroupIdInput = $('select#layer_group_id');
var $layerFormAgentIdInput = $('input#hidden-agent_id_for_data');
var $layerFormAgentAliasInput = $('input#text-agent_alias_for_data');
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());
var agentAlias = $layerFormAgentAliasInput.val(); var agentAlias = $layerFormAgentAliasInput.val();
@ -774,46 +774,61 @@ function addGroupClick (event) {
&& agentAlias.length > 0 && agentAlias.length > 0
); );
if (!valid) return; if (!valid) {
return;
}
addGroupRow(layerId, groupId, groupName, agentId, agentAlias); addGroupRow(layerId, groupId, groupName, agentId, agentAlias);
// Clear inputs // Clear inputs
// $layerFormGroupIdInput.val(0); // $layerFormGroupIdInput.val(0);
$layerFormAgentIdInput.val(""); $layerFormAgentIdInput.val('');
$layerFormAgentAliasInput.val(""); $layerFormAgentAliasInput.val('');
$("#button-add_group").prop("disabled", true); $('#button-add_group').prop('disabled', true);
} }
function moveLayerRowUpOnClick (event) {
function moveLayerRowUpOnClick(event)
{
var $row = $(event.currentTarget).parent().parent(); var $row = $(event.currentTarget).parent().parent();
$row.insertBefore($row.prev()); $row.insertBefore($row.prev());
} }
function moveLayerRowDownOnClick (event) {
function moveLayerRowDownOnClick(event)
{
var $row = $(event.currentTarget).parent().parent(); var $row = $(event.currentTarget).parent().parent();
$row.insertAfter($row.next()); $row.insertAfter($row.next());
} }
function removeLayerRowOnClick (event) {
function removeLayerRowOnClick(event)
{
var $layerRow = $(event.currentTarget).parent().parent(); var $layerRow = $(event.currentTarget).parent().parent();
var layerRowId = $layerRow.find("input.layer_id").val(); var layerRowId = $layerRow.find('input.layer_id').val();
var layerEditorId = $("input#hidden-current_edit_layer_id").val(); var layerEditorId = $('input#hidden-current_edit_layer_id').val();
if (layerRowId == layerEditorId) hideLayerEditor(); if (layerRowId == layerEditorId) {
hideLayerEditor();
}
// Remove row // Remove row
$(event.currentTarget).parent().parent().remove(); $(event.currentTarget).parent().parent().remove();
} }
function hideLayerEditor () {
function hideLayerEditor()
{
// Clean editor // Clean editor
cleanLayerEditor(); cleanLayerEditor();
// Hide editor // Hide editor
$("div#form_layer").hide(); $('div#form_layer').hide();
} }
function showLayerEditor (layerId) {
var $layerSaveBtn = $("input#button-save_layer"); function showLayerEditor(layerId)
{
var $layerSaveBtn = $('input#button-save_layer');
// Clean editor // Clean editor
cleanLayerEditor(); cleanLayerEditor();
@ -837,33 +852,39 @@ function showLayerEditor (layerId) {
} }
// Show editor (if hidden) // Show editor (if hidden)
$("div#form_layer").show(); $('div#form_layer').show();
} }
function getLayerData (layerId) {
var $layerRow = $("tr#layer_row_" + layerId); function getLayerData(layerId)
var layerName = $layerRow.find("input.layer_name").val(); {
var layerVisible = $layerRow.find("input.layer_visible").val() == 1; var $layerRow = $('tr#layer_row_' + layerId);
var layerAgentsFromGroup = $layerRow.find("input.layer_agents_from_group").val(); var layerName = $layerRow.find('input.layer_name').val();
var layerAgents = $layerRow.find("input.layer_agent_alias").map(function () { var layerVisible = $layerRow.find('input.layer_visible').val() == 1;
var layerAgentsFromGroup = $layerRow.find('input.layer_agents_from_group').val();
var layerAgents = $layerRow.find('input.layer_agent_alias').map(
function () {
return { return {
"id": $(this).data("agent-id"), 'id': $(this).data('agent-id'),
"alias": $(this).val() 'alias': $(this).val()
}; };
}).get(); }
var layerGroups = $layerRow.find("input.layer_group_id").map(function () { ).get();
var layerGroups = $layerRow.find('input.layer_group_id').map(
function () {
var groupId = $(this).val(); var groupId = $(this).val();
var groupName = $(this).siblings("input.layer_group_name[data-group-id='" + groupId + "']").val(); var groupName = $(this).siblings(("input.layer_group_name[data-group-id='" + groupId + "']")).val();
var agentId = $(this).siblings("input.layer_agent_id_for_data[data-group-id='" + groupId + "']").val(); var agentId = $(this).siblings(("input.layer_agent_id_for_data[data-group-id='" + groupId + "']")).val();
var agentAlias = $(this).siblings("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']").val(); var agentAlias = $(this).siblings(("input.layer_agent_alias_for_data[data-group-id='" + groupId + "']")).val();
return { return {
"id": groupId, 'id': groupId,
"name": groupName, 'name': groupName,
"agentId": agentId, 'agentId': agentId,
"agentAlias": agentAlias 'agentAlias': agentAlias
}; };
}).get(); }
).get();
return { return {
id: layerId, id: layerId,
@ -875,142 +896,185 @@ function getLayerData (layerId) {
} }
} }
function setLayerEditorData (data) {
if (data == null) data = {}; function setLayerEditorData(data)
{
if (data == null) {
data = {};
}
// Set defaults // Set defaults
data = { data = {
id: data.id || 0, id: data.id || 0,
name: data.name || "", name: data.name || '',
visible: data.visible != null ? !!data.visible : true, visible: data.visible != null ? !!data.visible : true,
agentsFromGroup: data.agentsFromGroup || -1, agentsFromGroup: data.agentsFromGroup || -1,
agents: data.agents || [], agents: data.agents || [],
groups: data.groups || [] groups: data.groups || []
} }
var $layerFormIdInput = $("input#hidden-current_edit_layer_id"); var $layerFormIdInput = $('input#hidden-current_edit_layer_id');
var $layerFormNameInput = $("input#text-layer_name_form"); var $layerFormNameInput = $('input#text-layer_name_form');
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form"); var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
var $layerFormAgentsFromGroupSelect = $("#layer_group_form"); var $layerFormAgentsFromGroupSelect = $('#layer_group_form');
var $layerFormAgentInput = $("input#text-agent_alias"); var $layerFormAgentInput = $('input#text-agent_alias');
var $layerFormAgentButton = $("input#button-add_agent"); var $layerFormAgentButton = $('input#button-add_agent');
var $layerFormAgentsListItems = $("tr.agents_list_item"); var $layerFormAgentsListItems = $('tr.agents_list_item');
var $layerFormGroupsListItems = $("tr.groups_list_item"); var $layerFormGroupsListItems = $('tr.groups_list_item');
$layerFormIdInput.val(data.id); $layerFormIdInput.val(data.id);
$layerFormNameInput.val(data.name); $layerFormNameInput.val(data.name);
$layerFormVisibleCheckbox.prop("checked", data.visible); $layerFormVisibleCheckbox.prop('checked', data.visible);
$(`#layer_group_form option[value=${data.agentsFromGroup}]`).attr('selected', 'selected'); $(`#layer_group_form option[value=${data.agentsFromGroup
}]`).attr('selected', 'selected');
$(`#layer_group_form`).trigger('change'); $(`#layer_group_form`).trigger('change');
$layerFormAgentInput.val(""); $layerFormAgentInput.val('');
$layerFormAgentButton.prop("disabled", true); $layerFormAgentButton.prop('disabled', true);
$layerFormAgentsListItems.remove(); $layerFormAgentsListItems.remove();
$layerFormGroupsListItems.remove(); $layerFormGroupsListItems.remove();
var $tableAgents = $("table#list_agents"); var $tableAgents = $('table#list_agents');
data.agents.forEach(function (agent) { data.agents.foreach (function (agent) {
addAgentRow(data.id, agent.id, agent.alias); addAgentRow(data.id, agent.id, agent.alias);
}); }) {
}
var $tableGroups = $("table#list_groups"); var $tableGroups = $('table#list_groups');
data.groups.forEach(function (group) { data.groups.foreach (function (group) {
addGroupRow(data.id, group.id, group.name, group.agentId, group.agentAlias); addGroupRow(data.id, group.id, group.name, group.agentId, group.agentAlias);
}); }) {
} }
function newLayer () { }
function newLayer()
{
showLayerEditor(null); showLayerEditor(null);
} }
function saveNewLayer () {
var $layerFormNameInput = $("input#text-layer_name_form");
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
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, { function saveNewLayer()
{
var $layerFormNameInput = $('input#text-layer_name_form');
var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
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,
{
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(), }
groups: $layerFormGroupsListItems.map(function () { ).get(),
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 cleanLayerEditor () {
function cleanLayerEditor()
{
// Clear editor events // Clear editor events
unbindLayerEditorEvents(); unbindLayerEditorEvents();
// Add default data to the editor // Add default data to the editor
setLayerEditorData(); setLayerEditorData();
} }
function bindLayerEditorEvents (layerId) {
var $layerFormNameInput = $("input#text-layer_name_form");
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
var $layerRow = $("tr#layer_row_" + layerId); function bindLayerEditorEvents(layerId)
{
var $layerFormNameInput = $('input#text-layer_name_form');
var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
if ($layerRow.length === 0) return; var $layerRow = $('tr#layer_row_' + layerId);
$layerFormNameInput.bind("change", function (event) { if ($layerRow.length === 0) {
return;
}
$layerFormNameInput.bind(
'change',
function (event) {
var name = event.currentTarget.value; var name = event.currentTarget.value;
$layerRow.find("span.layer_name").html(name); $layerRow.find('span.layer_name').html(name);
$layerRow.find("input.layer_name").val(name); $layerRow.find('input.layer_name').val(name);
}); }
$layerFormVisibleCheckbox.bind("click", function (event) { );
var visible = $(event.currentTarget).prop("checked"); $layerFormVisibleCheckbox.bind(
$layerRow.find("input.layer_visible").val(visible ? 1 : 0); 'click',
}); function (event) {
$layerFormAgentsFromGroupSelect.bind("change", function (event) { var visible = $(event.currentTarget).prop('checked');
$layerRow.find('input.layer_visible').val(visible ? 1 : 0);
}
);
$layerFormAgentsFromGroupSelect.bind(
'change',
function (event) {
var group = event.currentTarget.value; var group = event.currentTarget.value;
$layerRow.find("input.layer_agents_from_group").val(group); $layerRow.find('input.layer_agents_from_group').val(group);
}); }
} );
}
function unbindLayerEditorEvents () {
var $layerFormNameInput = $("input#text-layer_name_form");
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
var $layerFormAgentsFromGroupSelect = $("select#layer_group_form");
$layerFormNameInput.unbind("change"); function unbindLayerEditorEvents()
$layerFormVisibleCheckbox.unbind("click"); {
var $layerFormNameInput = $('input#text-layer_name_form');
var $layerFormVisibleCheckbox = $('input#checkbox-layer_visible_form');
var $layerFormAgentsFromGroupSelect = $('select#layer_group_form');
$layerFormNameInput.unbind('change');
$layerFormVisibleCheckbox.unbind('click');
$layerFormAgentsFromGroupSelect.val('-1'); $layerFormAgentsFromGroupSelect.val('-1');
} }
function getAgentRow (layerId, agentId, agentAlias) {
var $row = $("<tr class=\"agents_list_item\" />");
var $nameCol = $("<td />");
var $deleteCol = $("<td />");
var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>"); function getAgentRow(layerId, agentId, agentAlias)
var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/cross.png', false, ['class' => 'invert_filter']); ?> </a>'); {
var $row = $('<tr class="agents_list_item" />');
var $nameCol = $('<td />');
var $deleteCol = $('<td />');
$removeBtn.click(function (event) { var $agentAlias = $('<span class="agent_alias" data-agent-id="' + agentId + '">' + agentAlias + '</span>');
var $layerRow = $("tr#layer_row_" + layerId); var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images / cross.png', false, ['class' => 'invert_filter']); ?> </a>');
$removeBtn.click(
function (event) {
var $layerRow = $('tr#layer_row_' + layerId);
if ($layerRow.length > 0) { if ($layerRow.length > 0) {
$layerRow.find("input.layer_agent_id[data-agent-id='" + agentId + "']").remove(); $layerRow.find(("input.layer_agent_id[data-agent-id='" + agentId + "']")).remove();
$layerRow.find("input.layer_agent_alias[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();
$agentListItemRow.remove(); $agentListItemRow.remove();
}); }
);
$nameCol.append($agentAlias); $nameCol.append($agentAlias);
$deleteCol.append($removeBtn); $deleteCol.append($removeBtn);
@ -1018,57 +1082,66 @@ function getAgentRow (layerId, agentId, agentAlias) {
$row.append($nameCol).append($deleteCol); $row.append($nameCol).append($deleteCol);
return $row; return $row;
}
function addAgentRow (layerId, agentId, agentAlias) {
if (agentId == null || agentId == 0 || agentAlias.length === 0) return;
var $layerRow = $("tr#layer_row_" + layerId);
if ($layerRow && $layerRow.find("input.layer_agent_id[value='" + agentId + "']").length === 0) {
$layerRow
.find("td:first-child")
.append(getLayerAgentIdInput(layerId, agentId))
.append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
} }
$("table#list_agents").append(getAgentRow(layerId, agentId, agentAlias));
}
function getLayerAgentIdInput (layerId, agentId) { function addAgentRow(layerId, agentId, agentAlias)
return $("<input class=\"layer_agent_id\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][id]\" value=\"" + agentId + "\">"); {
} if (agentId == null || agentId == 0 || agentAlias.length === 0) {
return;
}
function getLayerAgentAliasInput (layerId, agentId, agentAlias) { var $layerRow = $('tr#layer_row_' + layerId);
return $("<input class=\"layer_agent_alias\" type=\"hidden\" data-agent-id=\"" + agentId + "\" name=\"layers[" + layerId + "][agents][" + agentId + "][alias]\" value=\"" + agentAlias + "\">"); if ($layerRow && $layerRow.find(("input.layer_agent_id[value='" + agentId + "']")).length === 0) {
} $layerRow.find('td:first-child').append(getLayerAgentIdInput(layerId, agentId)).append(getLayerAgentAliasInput(layerId, agentId, agentAlias));
}
function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) { $('table#list_agents').append(getAgentRow(layerId, agentId, agentAlias));
var $row = $("<tr class=\"groups_list_item\" data-group-id=\"" + groupId + "\" data-group-name=\"" + groupName + "\" data-agent-id=\"" + agentId + "\" data-agent-alias=\"" + agentAlias + "\" />"); }
var $nameCol = $("<td />");
var $deleteCol = $("<td />");
var $groupName = $("<span class=\"group_desc\">"
function getLayerAgentIdInput(layerId, agentId)
{
return $('<input class="layer_agent_id" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][id]" value="' + agentId + '">');
}
function getLayerAgentAliasInput(layerId, agentId, agentAlias)
{
return $('<input class="layer_agent_alias" type="hidden" data-agent-id="' + agentId + '" name="layers[' + layerId + '][agents][' + agentId + '][alias]" value="' + agentAlias + '">');
}
function getGroupRow(layerId, groupId, groupName, agentId, agentAlias)
{
var $row = $('<tr class="groups_list_item" data-group-id="' + groupId + '" data-group-name="' + groupName + '" data-agent-id="' + agentId + '" data-agent-alias="' + agentAlias + '" />');
var $nameCol = $('<td />');
var $deleteCol = $('<td />');
var $groupName = $('<span class="group_desc">'
+ groupName + groupName
+ " (" + ' ('
+ "<?php echo __('Using data from'); ?> " + "<?php echo __('Using data from'); ?> "
+ "<i>" + agentAlias + "</i>" + '<i>' + agentAlias + '</i>'
+ ")" + ')'
+ "</span>"); + '</span>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>'); var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
$removeBtn.click(function (event) { $removeBtn.click(
var $layerRow = $("tr#layer_row_" + layerId); function (event) {
var $layerRow = $('tr#layer_row_' + layerId);
if ($layerRow.length > 0) { if ($layerRow.length > 0) {
$layerRow.find("input.layer_group_id[data-group-id='" + groupId + "']").remove(); $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_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_id_for_data[data-group-id='" + groupId + "']")).remove();
$layerRow.find("input.layer_agent_alias_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();
$groupListItemRow.remove(); $groupListItemRow.remove();
}); }
);
$nameCol.append($groupName); $nameCol.append($groupName);
$deleteCol.append($removeBtn); $deleteCol.append($removeBtn);
@ -1076,134 +1149,146 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
$row.append($nameCol).append($deleteCol); $row.append($nameCol).append($deleteCol);
return $row; return $row;
}
function addGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
if (
groupId == null ||
groupId == 0 ||
groupName.length === 0 ||
agentId == null ||
agentId == 0 ||
agentAlias.length === 0
) return;
var $layerRow = $("tr#layer_row_" + layerId);
if ($layerRow && $layerRow.find("input.layer_group_id[value='" + groupId + "']").length === 0) {
$layerRow
.find("td:first-child")
.append(getLayerGroupIdInput(layerId, groupId))
.append(getLayerGroupNameInput(layerId, groupId, groupName))
.append(getLayerAgentIdForDataInput(layerId, groupId, agentId))
.append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
} }
$("table#list_groups").append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
}
function getLayerGroupIdInput (layerId, groupId) { function addGroupRow(layerId, groupId, groupName, agentId, agentAlias)
return $("<input class=\"layer_group_id\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][id]\" value=\"" + groupId + "\">"); {
} if (groupId == null
|| groupId == 0
|| groupName.length === 0
|| agentId == null
|| agentId == 0
|| agentAlias.length === 0
) {
return;
}
function getLayerGroupNameInput (layerId, groupId, groupName) { var $layerRow = $('tr#layer_row_' + layerId);
return $("<input class=\"layer_group_name\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][name]\" value=\"" + groupName + "\">"); if ($layerRow && $layerRow.find(("input.layer_group_id[value='" + groupId + "']")).length === 0) {
} $layerRow.find('td:first-child').append(getLayerGroupIdInput(layerId, groupId)).append(getLayerGroupNameInput(layerId, groupId, groupName)).append(getLayerAgentIdForDataInput(layerId, groupId, agentId)).append(getLayerAgentAliasForDataInput(layerId, groupId, agentAlias));
}
function getLayerAgentIdForDataInput (layerId, groupId, agentId) { $('table#list_groups').append(getGroupRow(layerId, groupId, groupName, agentId, agentAlias));
return $("<input class=\"layer_agent_id_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_id]\" value=\"" + agentId + "\">"); }
}
function getLayerAgentAliasForDataInput (layerId, groupId, agentAlias) {
return $("<input class=\"layer_agent_alias_for_data\" type=\"hidden\" data-group-id=\"" + groupId + "\" name=\"layers[" + layerId + "][groups][" + groupId + "][agent_alias]\" value=\"" + agentAlias + "\">");
}
function getLayerRow (layerId, layerData) { function getLayerGroupIdInput(layerId, groupId)
var $row = $("<tr id=\"layer_row_" + layerId + "\" class=\"layer_row\" />"); {
var $nameCol = $("<td />"); return $('<input class="layer_group_id" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][id]" value="' + groupId + '">');
var $sortCol = $("<td />"); }
var $editCol = $("<td />");
var $deleteCol = $("<td />");
var $layerIdInput = $("<input class=\"layer_id\" type=\"hidden\" name=\"layer_ids[]\" value=\"" + layerId + "\">");
var $layerNameInput = $("<input class=\"layer_name\" type=\"hidden\" name=\"layers[" + layerId + "][name]\" value=\"" + layerData.name + "\">");
var $layerVisibleInput = $("<input class=\"layer_visible\" type=\"hidden\" name=\"layers[" + layerId + "][visible]\" value=\"" + (layerData.visible ? 1 : 0) + "\">");
var $layerAgentsFromGroupInput = $("<input class=\"layer_agents_from_group\" type=\"hidden\" name=\"layers[" + layerId + "][agents_from_group]\" value=\"" + layerData.agentsFromGroup + "\">");
var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>"); function getLayerGroupNameInput(layerId, groupId, groupName)
var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />"); {
var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />"); return $('<input class="layer_group_name" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][name]" value="' + groupName + '">');
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/config.png', true, ['class' => 'invert_filter']); ?></a>'); }
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
function getLayerAgentIdForDataInput(layerId, groupId, agentId)
{
return $('<input class="layer_agent_id_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_id]" value="' + agentId + '">');
}
function getLayerAgentAliasForDataInput(layerId, groupId, agentAlias)
{
return $('<input class="layer_agent_alias_for_data" type="hidden" data-group-id="' + groupId + '" name="layers[' + layerId + '][groups][' + groupId + '][agent_alias]" value="' + agentAlias + '">');
}
function getLayerRow(layerId, layerData)
{
var $row = $('<tr id="layer_row_' + layerId + '" class="layer_row" />');
var $nameCol = $('<td />');
var $sortCol = $('<td />');
var $editCol = $('<td />');
var $deleteCol = $('<td />');
var $layerIdInput = $('<input class="layer_id" type="hidden" name="layer_ids[]" value="' + layerId + '">');
var $layerNameInput = $('<input class="layer_name" type="hidden" name="layers[' + layerId + '][name]" value="' + layerData.name + '">');
var $layerVisibleInput = $('<input class="layer_visible" type="hidden" name="layers[' + layerId + '][visible]" value="' + (layerData.visible ? 1 : 0) + '">');
var $layerAgentsFromGroupInput = $('<input class="layer_agents_from_group" type="hidden" name="layers[' + layerId + '][agents_from_group]" value="' + layerData.agentsFromGroup + '">');
var $layerName = $('<span class="layer_name">' + layerData.name + '</span>');
var $sortUpBtn = $('<a class="up_arrow" href="javascript:;" />');
var $sortDownBtn = $('<a class="down_arrow" href="javascript:;" />');
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images / config.png', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images / cross.png', true, ['class' => 'invert_filter']); ?></a>');
$sortUpBtn.click(moveLayerRowUpOnClick); $sortUpBtn.click(moveLayerRowUpOnClick);
$sortDownBtn.click(moveLayerRowDownOnClick); $sortDownBtn.click(moveLayerRowDownOnClick);
$editBtn.click(function () { showLayerEditor(layerId); }); $editBtn.click(
function () {
showLayerEditor(layerId);
}
);
$removeBtn.click(removeLayerRowOnClick); $removeBtn.click(removeLayerRowOnClick);
$nameCol $nameCol.append($layerName).append($layerIdInput).append($layerNameInput).append($layerVisibleInput).append($layerAgentsFromGroupInput);
.append($layerName)
.append($layerIdInput)
.append($layerNameInput)
.append($layerVisibleInput)
.append($layerAgentsFromGroupInput);
if (layerData.agents && layerData.agents.length > 0) { if (layerData.agents && layerData.agents.length > 0) {
layerData.agents.forEach(function (agent) { layerData.agents.foreach (function (agent) {
$nameCol.append(getLayerAgentIdInput(layerId, agent.id)); $nameCol.append(getLayerAgentIdInput(layerId, agent.id));
$nameCol.append(getLayerAgentAliasInput(layerId, agent.id, agent.alias)); $nameCol.append(getLayerAgentAliasInput(layerId, agent.id, agent.alias));
}); }) {
}
} }
if (layerData.groups && layerData.groups.length > 0) { if (layerData.groups && layerData.groups.length > 0) {
layerData.groups.forEach(function (group) { layerData.groups.foreach (function (group) {
$nameCol.append(getLayerGroupIdInput(layerId, group.id)); $nameCol.append(getLayerGroupIdInput(layerId, group.id));
$nameCol.append(getLayerGroupNameInput(layerId, group.id, group.name)); $nameCol.append(getLayerGroupNameInput(layerId, group.id, group.name));
$nameCol.append(getLayerAgentIdForDataInput(layerId, group.id, group.agentId)); $nameCol.append(getLayerAgentIdForDataInput(layerId, group.id, group.agentId));
$nameCol.append(getLayerAgentAliasForDataInput(layerId, group.id, group.agentAlias)); $nameCol.append(getLayerAgentAliasForDataInput(layerId, group.id, group.agentAlias));
}); }) {
}
} }
$sortCol $sortCol.append($sortUpBtn).append($sortDownBtn);
.append($sortUpBtn) $editCol.append($editBtn);
.append($sortDownBtn); $deleteCol.append($removeBtn);
$editCol
.append($editBtn);
$deleteCol
.append($removeBtn);
$row $row.append($nameCol).append($sortCol).append($editCol).append($deleteCol);
.append($nameCol)
.append($sortCol)
.append($editCol)
.append($deleteCol);
return $row; return $row;
} }
function addLayerRow (layerId, layerData) {
$("table#list_layers").append(getLayerRow(layerId, layerData)); function addLayerRow(layerId, layerData)
{
$('table#list_layers').append(getLayerRow(layerId, layerData));
showLayerEditor(layerId); showLayerEditor(layerId);
} }
function hightlightRow (layerId) {
var highlightColor = "#E9F3D2";
$("tr.layer_row").css("background", "");
$("tr#layer_row_" + layerId).css("background", highlightColor);
}
function existInvalidLayerNames () { function hightlightRow(layerId)
{
var highlightColor = '#E9F3D2';
$('tr.layer_row').css('background', '');
$('tr#layer_row_' + layerId).css('background', highlightColor);
}
function existInvalidLayerNames()
{
var exist = false; var exist = false;
$("table#list_layers input.layer_name").each(function () { $('table#list_layers input.layer_name').each(
function () {
if ($(this).val().trim().length === 0) { if ($(this).val().trim().length === 0) {
exist = true; exist = true;
return false; // Break jQuery object each return false;
// Break jQuery object each
} }
}); }
);
return exist; return exist;
} }
function onFormSubmit (event) {
function onFormSubmit(event)
{
// Validate layer names // Validate layer names
if (existInvalidLayerNames()) { if (existInvalidLayerNames()) {
event.preventDefault(); event.preventDefault();
@ -1211,25 +1296,31 @@ function onFormSubmit (event) {
alert("<?php echo __('Empty layer names are not supported'); ?>"); alert("<?php echo __('Empty layer names are not supported'); ?>");
return false; return false;
} }
// Save connection list // Save connection list
$('#map_connection_list').val(connectionMaps.toString()); $('#map_connection_list').val(connectionMaps.toString());
} }
function onLayerGroupIdChange (event) {
function onLayerGroupIdChange(event)
{
// Clear agent inputs // Clear agent inputs
$("input#hidden-agent_id_for_data").val(0); $('input#hidden-agent_id_for_data').val(0);
$("input#text-agent_alias_for_data").val(""); $('input#text-agent_alias_for_data').val('');
toggleAddGroupBtn(); toggleAddGroupBtn();
} }
// Bind events
$("form#form_setup").submit(onFormSubmit);
$("input#button-add_agent").click(addAgentClick);
$("select#layer_group_id").change(onLayerGroupIdChange);
$("input#button-add_group").click(addGroupClick);
// Populate layer list // Bind events
var layers = <?php echo json_encode($layer_list); ?>; $('form#form_setup').submit(onFormSubmit);
$('input#button-add_agent').click(addAgentClick);
$('select#layer_group_id').change(onLayerGroupIdChange);
$('input#button-add_group').click(addGroupClick);
// Populate layer list
var layers = < ? php echo json_encode($layer_list);
?>
;
layers.forEach(function (layer) { layers.forEach(function (layer) {
$("table#list_layers").append( $("table#list_layers").append(
getLayerRow(layer["id"], { getLayerRow(layer["id"], {

6
pandora_console/include/javascript/fullcalendar/main.js
View File

@ -2249,7 +2249,8 @@ var FullCalendar = (function(exports) {
return currentRes; return currentRes;
}; };
} }
function memoizeArraylike(workerFunc, resEquality, teardownFunc) { // used at all? function memoizeArraylike(workerFunc, resEquality, teardownFunc) {
// used at all?
var _this = this; var _this = this;
var currentArgSets = []; var currentArgSets = [];
var currentResults = []; var currentResults = [];
@ -2281,7 +2282,8 @@ var FullCalendar = (function(exports) {
return currentResults; return currentResults;
}; };
} }
function memoizeHashlike(workerFunc, resEquality, teardownFunc) { // used? function memoizeHashlike(workerFunc, resEquality, teardownFunc) {
// used?
var _this = this; var _this = this;
var currentArgHash = {}; var currentArgHash = {};
var currentResHash = {}; var currentResHash = {};

5044
pandora_console/pandoradb.sql
View File

File diff suppressed because it is too large Load Diff