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

New networkmaps in progress... (Fixed some problems)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-09-30 12:28:03 +02:00
parent 6f20c31560
commit c6665189d7
2 changed files with 8 additions and 2 deletions

7
pandora_console/include/functions_pandora_networkmap.php

@ -301,6 +301,8 @@ function networkmap_db_node_to_js_node($node, &$count, &$count_item_holding_area
$item['fixed'] = true;
$item['x'] = (int)$node['x'];
$item['y'] = (int)$node['y'];
$item['px'] = (int)$node['x'];
$item['py'] = (int)$node['y'];
$item['z'] = (int)$node['z'];
$item['state'] = $node['state'];
if ($item['state'] == 'holding_area') {
@ -444,6 +446,11 @@ function networkmap_links_to_js_links($relations, $nodes_graph) {
$id_source_module = $relation['id_child_source_data'];
}
else if (($relation['parent_type'] == 1) && ($relation['child_type'] == 0)) {
$id_target_module = $relation['id_parent_source_data'];
$id_source_agent = $relation['id_child_source_data'];
}
else if (($relation['parent_type'] == 0) && ($relation['child_type'] == 1)) {
html_debug($relation, true);
$id_target_agent = $relation['id_parent_source_data'];
$id_source_module = $relation['id_child_source_data'];
}

3
pandora_console/include/javascript/functions_pandora_networkmap.js

@ -1491,7 +1491,7 @@ function refresh_holding_area() {
temp_node['z'] = 0;
temp_node['fixed'] = true;
temp_node['state'] = node['state'];
temp_node['type'] = 'agent';
temp_node['type'] = 0;
temp_node['color'] = node['color'];
temp_node['shape'] = node['shape'];
temp_node['text'] = node['text'];
@ -1534,7 +1534,6 @@ function refresh_holding_area() {
}
});
graph.links.push(temp_link);
});