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

Some fixes for two or more networkmaps in enterprise dashboard

Browse Source
This commit is contained in:
mdtrooper 2016-05-03 17:26:30 +02:00
parent 63306e0288
commit 0690e303e9
4 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/class/Map.class.php
View File

@ -109,13 +109,17 @@ abstract class Map {
abstract function printJSInit(); abstract function printJSInit();
public function writeJSGraph() { public function writeJSGraph() {
$nodes_name = "nodes_" . $this->id;
$edges_name = "edges_" . $this->id; $edges_name = "edges";
$filter_name = "filter_" . $this->id; $filter_name = "filter";
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var controller_map = null;
<?php <?php
echo "var nodes = " . json_encode($this->nodes) . ";"; echo "var " . $nodes_name . " = " . json_encode($this->nodes) . ";";
echo "var edges = " . json_encode($this->edges) . ";"; echo "var " . $edges_name . " = " . json_encode($this->edges) . ";";
echo "var filter = " . json_encode($this->filter) . ";"; echo "var " . $filter_name . " = " . json_encode($this->filter) . ";";
?> ?>
</script> </script>
<?php <?php

13
pandora_console/include/class/Networkmap.class.php
View File

@ -440,10 +440,12 @@ class Networkmap extends Map {
public function writeJSGraph() { public function writeJSGraph() {
parent::writeJSGraph(); parent::writeJSGraph();
$name_subtype = "controller_" . $this->id;
?> ?>
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
echo "var subtype = " . $this->subtype . ";"; echo "var " . $name_subtype . " = " . $this->subtype . ";";
?> ?>
</script> </script>
<?php <?php
@ -456,11 +458,16 @@ class Networkmap extends Map {
} }
public function printJSInit() { public function printJSInit() {
echo "<h1>Networkmap</h1>"; $name_object = "controller_" . $this->id;
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var <?php echo $name_object;?> = null
$(function() { $(function() {
// map = new js_networkmap(); <?php echo $name_object;?> = new NetworkmapController("#map",
<?php echo $this->source_period;?>);
<?php echo $name_object;?>.init_map();
}); });
</script> </script>
<?php <?php

88
pandora_console/include/javascript/map/MapController.js
View File

@ -223,6 +223,25 @@ MapController.prototype.init_map = function() {
self.events(); self.events();
} }
MapController.prototype.set_nodes_map = function(nodes) {
var self = this;
window["nodes_" + self._id] = nodes;
}
MapController.prototype.get_nodes_map = function() {
var self = this;
return window["nodes_" + self._id];
}
MapController.prototype.get_subtype_map = function() {
var self = this;
return window["subtype_" + self._id];
}
/** /**
* Function ini_selection_rectangle * Function ini_selection_rectangle
* Return void * Return void
@ -257,9 +276,10 @@ MapController.prototype.minimap_get_size = function() {
* This function returns a node * This function returns a node
*/ */
MapController.prototype.get_node = function(id_graph) { MapController.prototype.get_node = function(id_graph) {
var self = this;
var return_node = null; var return_node = null;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (node['graph_id'] == id_graph) { if (node['graph_id'] == id_graph) {
node['index_node'] = i; node['index_node'] = i;
@ -279,9 +299,11 @@ MapController.prototype.get_node = function(id_graph) {
* This function returns the node filter * This function returns the node filter
*/ */
MapController.prototype.get_node_filter = function(field, value) { MapController.prototype.get_node_filter = function(field, value) {
var self = this;
var return_node = null; var return_node = null;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (node[field] == value) { if (node[field] == value) {
return_node = node; return_node = node;
return false; return false;
@ -385,12 +407,13 @@ MapController.prototype.get_arrows_from_edges = function() {
* This function return a specific arrow * This function return a specific arrow
*/ */
MapController.prototype.get_arrow = function(id_to, id_from) { MapController.prototype.get_arrow = function(id_to, id_from) {
var self = this;
var arrow = {}; var arrow = {};
arrow['nodes'] = {}; arrow['nodes'] = {};
var count_nodes = 0; var count_nodes = 0;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (parseInt(node['graph_id']) == parseInt(id_to)) { if (parseInt(node['graph_id']) == parseInt(id_to)) {
arrow['nodes']['to'] = node; arrow['nodes']['to'] = node;
count_nodes++; count_nodes++;
@ -699,7 +722,7 @@ MapController.prototype.paint_items_minimap = function() {
self._minimap_viewport.selectAll(".node") self._minimap_viewport.selectAll(".node")
.data( .data(
nodes self.get_nodes_map()
.filter(function(d, i) { .filter(function(d, i) {
return self.filter_only_agents(d); return self.filter_only_agents(d);
})) }))
@ -798,7 +821,7 @@ MapController.prototype.paint_arrows = function() {
var arrow_layouts = self._viewport.selectAll(".arrow") var arrow_layouts = self._viewport.selectAll(".arrow")
.data( .data(
nodes self.get_nodes_map()
.filter(function(d, i) { .filter(function(d, i) {
if (d.type == ITEM_TYPE_EDGE_NETWORKMAP) { if (d.type == ITEM_TYPE_EDGE_NETWORKMAP) {
if (self.exists_edge(d['graph_id'])) if (self.exists_edge(d['graph_id']))
@ -839,14 +862,14 @@ MapController.prototype.paint_arrows = function() {
return false; return false;
})[0]; })[0];
var to_node = nodes.filter(function(d2) { var to_node = self.get_nodes_map().filter(function(d2) {
if (d2['graph_id'] == node_arrow['to']) if (d2['graph_id'] == node_arrow['to'])
return true; return true;
else else
return false; return false;
})[0]; })[0];
var from_node = nodes.filter(function(d2) { var from_node = self.get_nodes_map().filter(function(d2) {
if (d2['graph_id'] == node_arrow['from']) if (d2['graph_id'] == node_arrow['from'])
return true; return true;
else else
@ -874,7 +897,7 @@ MapController.prototype.paint_nodes = function() {
self._viewport.selectAll(".node") self._viewport.selectAll(".node")
.data( .data(
nodes self.get_nodes_map()
.filter(function(d, i) { .filter(function(d, i) {
return self.filter_only_agents(d); return self.filter_only_agents(d);
})) }))
@ -1067,7 +1090,7 @@ MapController.prototype.paint_resize_square = function(item, wait) {
d3.xml("images/maps/square_selection.svg", "application/xml", function(xml) { d3.xml("images/maps/square_selection.svg", "application/xml", function(xml) {
var nodes = xml var nodes = xml
.evaluate("//*[@id='square_selection']/*", xml, null, XPathResult.ANY_TYPE, null); .evaluate("//*[@id='square_selection']/*", xml, null, XPathResult.ANY_TYPE, null);
var result = nodes.iterateNext(); var result = self.get_nodes_map().iterateNext();
resize_square resize_square
.append("g").attr("class", "square_selection") .append("g").attr("class", "square_selection")
@ -1238,14 +1261,14 @@ MapController.prototype.event_resize = function(action, item, handler) {
var x = transform_viewport.translate[0]; var x = transform_viewport.translate[0];
var y = transform_viewport.translate[1]; var y = transform_viewport.translate[1];
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (node['graph_id'] != item['graph_id']) if (node['graph_id'] != item['graph_id'])
return 1; // Continue return 1; // Continue
nodes[i].x = x; self.get_nodes_map()[i].x = x;
nodes[i].y = y; self.get_nodes_map()[i].y = y;
nodes[i].width = width; self.get_nodes_map()[i].width = width;
nodes[i].height = height; self.get_nodes_map()[i].height = height;
}); });
self.resize_node_save(item['graph_id']); self.resize_node_save(item['graph_id']);
@ -1635,7 +1658,7 @@ MapController.prototype.events_for_nodes = function(id_node) {
self._dragging = true; self._dragging = true;
self._dragged_nodes = {}; self._dragged_nodes = {};
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_draggable(node)) if (!self.is_draggable(node))
return 1; // Continue return 1; // Continue
@ -1662,7 +1685,7 @@ MapController.prototype.events_for_nodes = function(id_node) {
self._dragging = true; self._dragging = true;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_draggable(node)) if (!self.is_draggable(node))
return 1; // Continue return 1; // Continue
@ -1680,8 +1703,8 @@ MapController.prototype.events_for_nodes = function(id_node) {
transform.translate[0] += delta_x; transform.translate[0] += delta_x;
transform.translate[1] += delta_y; transform.translate[1] += delta_y;
nodes[i].x = transform.translate[0]; self.get_nodes_map()[i].x = transform.translate[0];
nodes[i].y = transform.translate[1]; self.get_nodes_map()[i].y = transform.translate[1];
d3.select(".minimap #node_" + node.graph_id) d3.select(".minimap #node_" + node.graph_id)
.attr("transform", transform.toString()); .attr("transform", transform.toString());
@ -1995,7 +2018,7 @@ MapController.prototype.events = function() {
self._last_mouse_position = [x, y]; self._last_mouse_position = [x, y];
if (self._relationship_in_progress) { if (self._relationship_in_progress) {
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_relationshipy(node)) if (!self.is_relationshipy(node))
return 1; // Continue return 1; // Continue
@ -2060,7 +2083,7 @@ MapController.prototype.set_as_children = function() {
MapController.prototype.start_relationship_nodes = function(type) { MapController.prototype.start_relationship_nodes = function(type) {
var self = this; var self = this;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_relationshipy(node)) if (!self.is_relationshipy(node))
return 1; // Continue return 1; // Continue
@ -2195,7 +2218,7 @@ MapController.prototype.remove_temp_arrows = function() {
MapController.prototype.apply_temp_arrows = function(target_id) { MapController.prototype.apply_temp_arrows = function(target_id) {
var self = this; var self = this;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_relationshipy(node)) if (!self.is_relationshipy(node))
return 1; // Continue return 1; // Continue
@ -2304,7 +2327,7 @@ MapController.prototype.add_fictional_node = function() {
new_node['x'] = x; new_node['x'] = x;
new_node['y'] = y; new_node['y'] = y;
nodes.push(new_node); self.get_nodes_map().push(new_node);
self.paint_nodes(); self.paint_nodes();
self.paint_items_minimap(); self.paint_items_minimap();
@ -2322,7 +2345,7 @@ MapController.prototype.get_last_graph_id = function() {
var return_var = 0; var return_var = 0;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (node['graph_id'] > return_var) { if (node['graph_id'] > return_var) {
return_var = parseInt(node['graph_id']); return_var = parseInt(node['graph_id']);
} }
@ -2451,7 +2474,7 @@ MapController.prototype.multiple_selection_select_nodes = function() {
selection_box_dimensions["height"] = selection_box_dimensions["height"] =
selection_box_dimensions["height"] / zoom.scale[1]; selection_box_dimensions["height"] / zoom.scale[1];
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_selecty(node)) if (!self.is_selecty(node))
return 1; // Continue return 1; // Continue
@ -2467,7 +2490,7 @@ MapController.prototype.multiple_selection_select_nodes = function() {
width = node_bbox['x'] + node_bbox['width']; width = node_bbox['x'] + node_bbox['width'];
nodes[i].width = width; self.get_nodes_map()[i].width = width;
} }
else { else {
width = node.width; width = node.width;
@ -2482,7 +2505,7 @@ MapController.prototype.multiple_selection_select_nodes = function() {
height = node_bbox['y'] + node_bbox['height']; height = node_bbox['y'] + node_bbox['height'];
nodes[i].height = height; self.get_nodes_map()[i].height = height;
} }
else { else {
height = node.height; height = node.height;
@ -2508,7 +2531,7 @@ MapController.prototype.multiple_selection_select_nodes = function() {
MapController.prototype.remove_selection_nodes = function() { MapController.prototype.remove_selection_nodes = function() {
var self = this; var self = this;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_selecty(node)) if (!self.is_selecty(node))
return 1; // Continue return 1; // Continue
@ -2689,7 +2712,7 @@ MapController.prototype.editNode = function(self, target) {
MapController.prototype.deleteNode = function(self, target) { MapController.prototype.deleteNode = function(self, target) {
var self = this; var self = this;
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (!self.is_delety(node)) if (!self.is_delety(node))
return 1; // Continue return 1; // Continue
@ -2723,6 +2746,7 @@ MapController.prototype.deleteNode = function(self, target) {
* This function delete the edges of a node in the edges array * This function delete the edges of a node in the edges array
*/ */
MapController.prototype.deleteEdgesAndNode = function(arrowsToDelete, id_node) { MapController.prototype.deleteEdgesAndNode = function(arrowsToDelete, id_node) {
var self = this;
var temp; var temp;
arrowsToDelete.forEach(function(arrow) { arrowsToDelete.forEach(function(arrow) {
@ -2737,26 +2761,26 @@ MapController.prototype.deleteEdgesAndNode = function(arrowsToDelete, id_node) {
arrowsToDelete.forEach(function(arrow) { arrowsToDelete.forEach(function(arrow) {
temp = []; temp = [];
nodes.forEach(function(nodeOrEdge) { self.get_nodes_map().forEach(function(nodeOrEdge) {
var nodeToDel = "node_" + nodeOrEdge["graph_id"]; var nodeToDel = "node_" + nodeOrEdge["graph_id"];
if ((nodeOrEdge["graph_id"] != arrow['graph_id']) && (nodeToDel != id_node)) { if ((nodeOrEdge["graph_id"] != arrow['graph_id']) && (nodeToDel != id_node)) {
temp.push(nodeOrEdge); temp.push(nodeOrEdge);
} }
}); });
nodes = temp; self.set_nodes_map(temp);
}); });
if (arrowsToDelete.length == 0) { if (arrowsToDelete.length == 0) {
temp = []; temp = [];
nodes.forEach(function(nodeOrEdge) { self.get_nodes_map().forEach(function(nodeOrEdge) {
var nodeToDel = "node_" + nodeOrEdge["graph_id"]; var nodeToDel = "node_" + nodeOrEdge["graph_id"];
if (nodeToDel != id_node) { if (nodeToDel != id_node) {
temp.push(nodeOrEdge); temp.push(nodeOrEdge);
} }
}); });
nodes = temp; self.set_nodes_map(temp);
} }
} }

16
pandora_console/include/javascript/map/NetworkmapController.js
View File

@ -71,7 +71,7 @@ NetworkmapController.prototype.init_map = function() {
}); });
} }
if (subtype == MAP_SUBTYPE_GROUPS) { if (self.get_subtype_map() == MAP_SUBTYPE_GROUPS) {
var arrow_AG = self.get_arrow_AG(edge['to'], edge['from']); var arrow_AG = self.get_arrow_AG(edge['to'], edge['from']);
if (arrow_AG !== null) { if (arrow_AG !== null) {
if (!self.exists_arrow(clean_arrows, arrow_AG)) { if (!self.exists_arrow(clean_arrows, arrow_AG)) {
@ -86,7 +86,7 @@ NetworkmapController.prototype.init_map = function() {
} }
} }
if (subtype == MAP_SUBTYPE_POLICIES) { if (self.get_subtype_map() == MAP_SUBTYPE_POLICIES) {
var arrow_PA = self.get_arrow_PA(edge['to'], edge['from']); var arrow_PA = self.get_arrow_PA(edge['to'], edge['from']);
if (arrow_PA !== null) { if (arrow_PA !== null) {
if (!self.exists_arrow(clean_arrows, arrow_PA)) { if (!self.exists_arrow(clean_arrows, arrow_PA)) {
@ -930,7 +930,7 @@ NetworkmapController.prototype.paint_nodes = function() {
self._viewport.selectAll(".node") self._viewport.selectAll(".node")
.data( .data(
nodes self.get_nodes_map()
.filter(function(d, i) { .filter(function(d, i) {
return self.filter_only_agents(d); return self.filter_only_agents(d);
})) }))
@ -2245,7 +2245,7 @@ NetworkmapController.prototype.refresh_nodes = function() {
params["refresh_nodes_open"] = 1; params["refresh_nodes_open"] = 1;
params["id_map"] = self._id; params["id_map"] = self._id;
params["page"] = "include/ajax/map.ajax"; params["page"] = "include/ajax/map.ajax";
var agent_nodes = $.grep(nodes, var agent_nodes = $.grep(self.get_nodes_map(),
function(node) { function(node) {
if (node['type'] == 0) { if (node['type'] == 0) {
return true; return true;
@ -2266,13 +2266,13 @@ NetworkmapController.prototype.refresh_nodes = function() {
type: "POST", type: "POST",
url: "ajax.php", url: "ajax.php",
success: function (data) { success: function (data) {
$.each(nodes, function(i, node) { $.each(self.get_nodes_map(), function(i, node) {
if (node['type'] != ITEM_TYPE_AGENT_NETWORKMAP) if (node['type'] != ITEM_TYPE_AGENT_NETWORKMAP)
return true; return true;
if (typeof(data[node['id']]) != "undefined") { if (typeof(data[node['id']]) != "undefined") {
nodes[i]['status'] = data[node['id']]['status']; self.get_nodes_map()[i]['status'] = data[node['id']]['status'];
nodes[i]['color'] = data[node['id']]['color']; self.get_nodes_map()[i]['color'] = data[node['id']]['color'];
self.update_node(node['id']); self.update_node(node['id']);
} }
@ -2522,7 +2522,7 @@ NetworkmapController.prototype.apply_edit_node = function(data_graph_id) {
node['title'] = new_label; node['title'] = new_label;
node['shape'] = new_shape; node['shape'] = new_shape;
nodes[node['index_node']] = node; self.get_nodes_map()[node['index_node']] = node;
d3.selectAll(self._target + " #" + node_id + " *") d3.selectAll(self._target + " #" + node_id + " *")
.remove(); .remove();