scottk/oopt-gnpy-web-gui
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy-web-gui.git synced 2025-11-02 11:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

When we are deleting multiple nodes, the paired fiber/patch also need to get deleted

Browse Source
This commit is contained in:
sakv2e10204
2022-05-25 17:27:25 +05:30
parent a354559acc
commit 494409ef1b
2 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/html_source/v16/.suo
View File

Binary file not shown.

73
js/Network Graph/stylenetwork.js
View File

@@ -6665,17 +6665,20 @@ function realUpdate_Transceiver(id, rtype) {
var removeNodeList = []; var removeNodeList = [];
function deleteNode(nodeList) { function deleteNode(nodeList) {
removeNodeList = []; removeNodeList = [];
var h_image;
for (var i = 0; i < nodeList.length; i++) { for (var i = 0; i < nodeList.length; i++) {
if (nodeList.length > 1) { if (nodeList.length > 1) {
if (network.body.data.nodes.get(nodeList[i]).image == DIR + roadmJSON.h_image) h_image = network.body.data.nodes.get(nodeList[i]).image;
if (h_image == DIR + roadmJSON.h_image || h_image == DIR + roadmJSON.fh_image)
removeNodes(nodeList[i], true); removeNodes(nodeList[i], true);
else if (network.body.data.nodes.get(nodeList[i]).image == DIR + fusedJSON.h_image) else if (h_image == DIR + fusedJSON.h_image || h_image == DIR + fusedJSON.fh_image)
removeNodes(nodeList[i], true); removeNodes(nodeList[i], true);
else if (network.body.data.nodes.get(nodeList[i]).image == DIR + transceiverJSON.h_image) else if (h_image == DIR + transceiverJSON.h_image || h_image == DIR + transceiverJSON.fh_image)
removeNodes(nodeList[i], true); removeNodes(nodeList[i], true);
else if (network.body.data.nodes.get(nodeList[i]).image == DIR + amplifierJSON.h_image) else if (h_image == DIR + amplifierJSON.h_image || h_image == DIR + amplifierJSON.fh_image)
removeNodes(nodeList[i], true); removeNodes(nodeList[i], true);
else if (network.body.data.nodes.get(nodeList[i]).image == DIR + ramanampJSON.h_image) else if (h_image == DIR + ramanampJSON.h_image || h_image == DIR + ramanampJSON.fh_image)
removeNodes(nodeList[i], true); removeNodes(nodeList[i], true);
} }
else { else {
@@ -6709,46 +6712,42 @@ function removeNodes(nodeID, isMutiple) {
document.getElementById("amplifierMenu").style.display = "none"; document.getElementById("amplifierMenu").style.display = "none";
document.getElementById("transceiverMenu").style.display = "none"; document.getElementById("transceiverMenu").style.display = "none";
if (network.getConnectedEdges(nodeID).length > 0) { //if (network.getConnectedEdges(nodeID).length > 0) {
showMessage(alertType.Error, "Unpair " + roadmJSON.component_type + " - " + nodeDetails.label + ", then try to delete"); // showMessage(alertType.Error, "Unpair " + roadmJSON.component_type + " - " + nodeDetails.label + ", then try to delete");
} else { //} else {
//nodes.remove(nodeID);
if (nodeDetails.node_type == transceiverJSON.node_type || nodeDetails.node_type == roadmJSON.node_type) { if (nodeDetails.node_type == transceiverJSON.node_type || nodeDetails.node_type == roadmJSON.node_type) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
}
else if (nodeDetails.node_type == amplifierJSON.node_type) {
if (nodeDetails.amp_category == amplifierJSON.amp_category) {
removeSpanInError(nodeID); removeSpanInError(nodeID);
removeSpanInError(nodeID, true); removeSpanInError(nodeID, true);
} }
else if (nodeDetails.node_type == amplifierJSON.node_type) { if (nodeDetails.amp_category == ramanampJSON.amp_category) {
if (nodeDetails.amp_category == amplifierJSON.amp_category) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
}
if (nodeDetails.amp_category == ramanampJSON.amp_category) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
removeSpanInError(nodeID, true);
}
}
else
removeSpanInError(nodeID); removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
//var tremove = network.body.data.nodes.get(nodeID) removeSpanInError(nodeID, true);
if (isMutiple) {
removeNodeList.push(nodeDetails);
} }
else {
nodeDetails.isDelete = true;
nodeDetails.isUpdate = false;
tempUndo.push(nodeDetails);
}
network.body.data.nodes.remove(nodeID);
} }
else
removeSpanInError(nodeID);
if (isMutiple) {
removeNodeList.push(nodeDetails);
}
else {
nodeDetails.isDelete = true;
nodeDetails.isUpdate = false;
tempUndo.push(nodeDetails);
}
network.body.data.nodes.remove(nodeID);
//}
} }
function dualFiberEdit(fiberID, callback) { function dualFiberEdit(fiberID, callback) {
document.getElementById("dualFiberMenu").style.display = "none"; document.getElementById("dualFiberMenu").style.display = "none";