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

Added a lot of changes to networkmaps

This commit is contained in:
Arturo Gonzalez 2017-03-28 14:37:40 +02:00
parent bcb8968bec
commit a8b7f055f4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions_pandora_networkmap.php
View File

@ -1280,6 +1280,9 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations =
<img id="image_hide_show_labels" src="images/icono_borrar.png" /> <img id="image_hide_show_labels" src="images/icono_borrar.png" />
</a> </a>
</div>'; </div>';
echo '<div id="holding_spinner_' . $networkmap['id'] . '" style="display: none; position: absolute; right: 50px; top: 20px;">
<img id="image_hide_show_labels" src="images/spinner.gif" />
</div>';
echo '</div>'; echo '</div>';

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

@ -928,7 +928,7 @@ function add_agent_node(agents) {
graph.nodes.push(temp_node); graph.nodes.push(temp_node);
jQuery.each(data['rel'], function(i, relation) { /*jQuery.each(data['rel'], function(i, relation) {
var temp_link = {}; var temp_link = {};
if (i == 0) { if (i == 0) {
var found = 0; var found = 0;
@ -965,7 +965,7 @@ function add_agent_node(agents) {
temp_link['text_start'] = relation['text_start']; temp_link['text_start'] = relation['text_start'];
graph.links.push(temp_link); graph.links.push(temp_link);
}); });*/
draw_elements_graph(); draw_elements_graph();
init_drag_and_drop(); init_drag_and_drop();
@ -1972,6 +1972,7 @@ function refresh_holding_area() {
var pos_x = parseInt(holding_pos_x) + parseInt(node_radius); var pos_x = parseInt(holding_pos_x) + parseInt(node_radius);
var pos_y = parseInt(holding_pos_y) + parseInt(node_radius); var pos_y = parseInt(holding_pos_y) + parseInt(node_radius);
if (enterprise_installed) { if (enterprise_installed) {
$('#holding_spinner_' + networkmap_id).css("display", "");
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);
@ -1984,16 +1985,13 @@ 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'];
var length_nodes = graph.nodes.length;
jQuery.each(holding_area.nodes, function(i, node) { jQuery.each(holding_area.nodes, function(i, node) {
var temp_node = {}; var temp_node = {};
temp_node['id'] = length_nodes + node['id']; temp_node['id'] = graph.nodes.length;
holding_area.nodes[i]['id'] = temp_node['id']; holding_area.nodes[i]['id'] = temp_node['id'];
temp_node['id_db'] = node['id_db']; temp_node['id_db'] = node['id_db'];
@ -2070,7 +2068,12 @@ function refresh_holding_area() {
draw_elements_graph(); draw_elements_graph();
init_drag_and_drop(); init_drag_and_drop();
set_positions_graph(); set_positions_graph();
$('#holding_spinner_' + networkmap_id).css("display", "none");
} }
},
error: function(){
$('#holding_spinner_' + networkmap_id).css("display", "none");
} }
}); });
} }