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

Merge branch '673-674-networkmap_visual_changes' into 'develop' 

Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
This commit is contained in:
vgilc 2017-04-03 13:53:17 +02:00
parent 4c8ebe44a3 5f29a8f831
commit 6fbd8b9978
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_pandora_networkmap.php
View File

@ -1428,6 +1428,13 @@ if (empty($list_networkmaps))
html_print_image('images/dot_green.png', true) . '</span>' .
'<span id="shape_icon_fail" style="display: none;">' .
html_print_image('images/dot_red.png', true) . '</span>';
$table->data["node_name"][0] = __('Name');
$table->data["node_name"][1] = html_print_input_text('edit_name_node',
'', __('name node'), '20', '50', true);
$table->data["node_name"][2] =
html_print_button(__('Update node'), '', false,
'', 'class="sub"', true);
$table->data["fictional_node_name"][0] = __('Name');
$table->data["fictional_node_name"][1] = html_print_input_text('edit_name_fictional_node',
'', __('name fictional node'), '20', '50', true);

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

@ -218,6 +218,43 @@ function update_fictional_node(id_db_node) {
}
}
function update_node_name (id_db_node) {
if (enterprise_installed) {
var name = $("input[name='edit_name_node']").val();
var params = [];
params.push("update_node_name=1");
params.push("networkmap_id=" + networkmap_id);
params.push("node_id=" + id_db_node);
params.push("name=" + name);
params.push("page=enterprise/operation/agentes/pandora_networkmap.view");
jQuery.ajax ({
data: params.join ("&"),
dataType: 'json',
type: 'POST',
url: action="ajax.php",
success: function (data) {
if (data['correct']) {
$("#dialog_node_edit").dialog("close");
jQuery.each(graph.nodes, function(i, element) {
if (element.id_db == id_db_node) {
graph.nodes[i].text = name;
$("#id_node_" + i + networkmap_id + " title").html(name);
$("#id_node_" + i + networkmap_id + " tspan").html(name);
}
});
draw_elements_graph();
set_positions_graph();
}
}
});
}
}
function change_shape(id_db_node) {
if (enterprise_installed) {
var shape = $("select[name='shape']").val();
@ -623,6 +660,9 @@ function edit_node(data, dblClick) {
"javascript: change_shape(" + data.id_db + ");");
$("#node_options-fictional_node_update_button-1 input")
.attr("onclick", "update_fictional_node(" + data.id_db + ");");
$("#node_options-node_name-2 input")
.attr("onclick", "update_node_name(" + data.id_db + ");");
$("#node_details-0-1").html('<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' + data["id_agent"] + '">' + data["text"] + '</a>');
var params = [];
@ -695,7 +735,7 @@ function edit_node(data, dblClick) {
dialog_node_edit_title.replace("%s", data.text));
$("#dialog_node_edit").dialog("open");
if (data.id_agent == -2) {
if (data.id_agent == undefined || data.id_agent == -2) {
//Fictional node
$("#node_options-fictional_node_name")
.css("display", "");
@ -707,14 +747,22 @@ function edit_node(data, dblClick) {
.val(data.networkmap_id);
$("#node_options-fictional_node_update_button")
.css("display", "");
$("#node_options-node_name")
.css("display", "none");
$("#node_options-node_update_button")
.css("display", "none");
}
else {
$("input[name='edit_name_node']")
.val(data.text);
$("#node_options-fictional_node_name")
.css("display", "none");
$("#node_options-fictional_node_networkmap_link")
.css("display", "none");
$("#node_options-fictional_node_update_button")
.css("display", "none");
$("#node_options-node_name")
.css("display", "");
}
//Clean
@ -2429,7 +2477,7 @@ function init_graph(parameter_object) {
if (typeof(parameter_object.node_radius) != "undefined") {
window.node_radius = parameter_object.node_radius;
}
window.interface_radius = 5;
window.interface_radius = 3;
window.disabled_drag_zoom = false;
window.key_multiple_selection = 17; //CTRL key
window.flag_multiple_selection = false;
@ -2648,7 +2696,7 @@ function init_graph(parameter_object) {
.attr("markerHeight", (node_radius / 2) + interface_radius)
.attr("orient", "auto")
.append("circle")
.attr("cx", (node_radius / 2) - (interface_radius / 2))
.attr("cx", (node_radius / 2.3) - (interface_radius / 2.3))
.attr("cy", interface_radius)
.attr("r", interface_radius)
.attr("style", function(d) {
@ -2660,7 +2708,7 @@ function init_graph(parameter_object) {
.enter()
.append("marker")
.attr("id", function(d) { return "interface_end_" + d.status_code; })
.attr("refX", (node_radius / 2) + (interface_radius / 2))
.attr("refX", (node_radius / 2.3) + (interface_radius / 2.3))
.attr("refY", interface_radius)
.attr("markerWidth", (node_radius / 2) + interface_radius)
.attr("markerHeight", (node_radius / 2) + interface_radius)