tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

This commit is contained in:
vanessa gil 2017-03-08 13:26:53 +01:00
parent 469c276512 1b1ab69edc
commit d79f2b421a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

@ -1903,10 +1903,17 @@ function add_interface_link_js () {
} }
function refresh_holding_area() { function refresh_holding_area() {
holding_pos_x = d3.select("#holding_area_" + networkmap_id).attr("x");
holding_pos_y = d3.select("#holding_area_" + networkmap_id).attr("y");
var pos_x = parseInt(holding_pos_x) + parseInt(node_radius);
var pos_y = parseInt(holding_pos_y) + parseInt(node_radius);
if (enterprise_installed) { if (enterprise_installed) {
var params = []; var params = [];
params.push("refresh_holding_area=1"); params.push("refresh_holding_area=1");
params.push("id=" + networkmap_id); params.push("id=" + networkmap_id);
params.push("x=" + pos_x);
params.push("y=" + pos_y);
params.push("page=enterprise/operation/agentes/pandora_networkmap.view"); params.push("page=enterprise/operation/agentes/pandora_networkmap.view");
jQuery.ajax ({ jQuery.ajax ({
data: params.join ("&"), data: params.join ("&"),
@ -1914,6 +1921,7 @@ function refresh_holding_area() {
type: 'POST', type: 'POST',
url: action="ajax.php", url: action="ajax.php",
success: function (data) { success: function (data) {
if (data['correct']) { if (data['correct']) {
window.holding_area = data['holding_area']; window.holding_area = data['holding_area'];
@ -1932,7 +1940,7 @@ function refresh_holding_area() {
temp_node['y'] = node['y']; temp_node['y'] = node['y'];
temp_node['z'] = 0; temp_node['z'] = 0;
temp_node['fixed'] = true; temp_node['fixed'] = true;
temp_node['state'] = node['state']; temp_node['state'] = 'holding_area';
temp_node['type'] = 0; temp_node['type'] = 0;
temp_node['color'] = node['color']; temp_node['color'] = node['color'];
temp_node['shape'] = node['shape']; temp_node['shape'] = node['shape'];
@ -2142,11 +2150,15 @@ function init_drag_and_drop() {
var selection = d3.selectAll('.node_selected'); var selection = d3.selectAll('.node_selected');
if (enterprise_installed) { if (enterprise_installed) {
holding_pos_x = d3.select("#holding_area_" + networkmap_id).attr("x");
holding_pos_y = d3.select("#holding_area_" + networkmap_id).attr("y");
selection selection
.each(function(d) { .each(function(d) {
var params = []; var params = [];
params.push("update_node=1"); params.push("update_node=1");
params.push("node=" + JSON.stringify(d)); params.push("node=" + JSON.stringify(d));
params.push("x=" + holding_pos_x);
params.push("y=" + holding_pos_y);
params.push("page=enterprise/operation/agentes/pandora_networkmap.view"); params.push("page=enterprise/operation/agentes/pandora_networkmap.view");
jQuery.ajax ({ jQuery.ajax ({
data: params.join ("&"), data: params.join ("&"),
@ -2159,14 +2171,13 @@ function init_drag_and_drop() {
if (data['state'] == "") { if (data['state'] == "") {
//Remove the style of nodes and links //Remove the style of nodes and links
//in holding area //in holding area
d3.select("#id_node_" + d.id + networkmap_id) d3.select("#id_node_" + d.id + networkmap_id)
.classed("holding_area", false); .classed("holding_area", false);
d3.select(".source_" + d.id + networkmap_id) d3.select(".source_" + d.id + networkmap_id)
.classed("holding_area_link", false); .classed("holding_area_link", false);
d3.select(".target_" + d.id + networkmap_id) d3.select(".target_" + d.id + networkmap_id)
.classed("holding_area_link", false); .classed("holding_area_link", false);
graph.nodes[d.id].state = "";
} }
} }
} }