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

To apply rule for single fiber

Browse Source
This commit is contained in:
sakv2e10204
2022-04-05 13:23:10 +05:30
parent b7bd3ac076
commit 03c23e9a2e
3 changed files with 105 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo
View File

Binary file not shown.

7
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/Data/StyleData.json
View File

@@ -269,6 +269,13 @@
"fiber_category": "Single Fiber",
"width": 2,
"options": {
"w_color": {
"color": "gray",
"highlight": "gray",
"hover": "gray",
"inherit": false,
"opacity": 1
},
"color": {
"color": "blue",
"highlight": "blue",

169
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js
View File

@@ -1871,8 +1871,20 @@ function displayFiberHover(params) {
if (fiberDetails.span_loss)
span_loss = fiberDetails.span_loss;
hoverData += "Fiber type : " + fiber_type + "\n";
hoverData += "Span length(in km) : " + span_length + "\n";
//hoverData += "Fiber type : " + fiber_type + "\n";
//hoverData += "Span length(in km) : " + span_length + "\n";
if (fiber_type == "")
hoverData += "<span style='color:red;'>Fiber type : " + fiber_type + "</span>\n";
else
hoverData += "Fiber type : " + fiber_type + "\n";
var spanlen = parseFloat(span_length);
if (spanlen <= 0)
hoverData += "<span style='color:red;'>Span length(in km) : " + span_length + "</span>\n";
else
hoverData += "Span length(in km) : " + span_length + "\n";
//hoverData += "Loss Coefficient(dB/km) : " + loss_coefficient + "\n";
//hoverData += "Connector IN(dB) : " + connector_in + "\n";
//hoverData += "Connector OUT(dB) : " + connector_out + "\n";
@@ -2751,13 +2763,21 @@ function importNetwork() {
var loss_Coefficient = fiber_config.Loss_coefficient;;
span_Loss = parseFloat(span_Length * loss_Coefficient);
var tempColor;
if (fiber_Type == "" || parseFloat(span_Length) <= 0)
tempColor = singleFiberJSON.options.w_color;
else
tempColor = singleFiberJSON.options.color;
importEdges.push({
id: token(), from: item['source']['source-node'], to: item['destination']['dest-node'], label: labelvalue, text: labelvalue,
view: topologyView.Functional_View, hidden: false,
dashes: singleFiberJSON.dashes,
fiber_category: singleFiberJSON.fiber_category,
component_type: singleFiberJSON.component_type,
color: singleFiberJSON.options.color,
color: tempColor,
width: singleFiberJSON.width,
arrows: singleFiberJSON.options.arrows,
//font: singleFiberJSON.options.font,
@@ -3905,7 +3925,7 @@ function addFiberComponent(cmode, cfrom, cto, clabel, ctext, isImport) {
view: topologyView.Functional_View, hidden: false,
dashes: singleFiberJSON.dashes, fiber_category: singleFiberJSON.fiber_category,
component_type: singleFiberJSON.component_type,
color: singleFiberJSON.options.color,
color: singleFiberJSON.options.w_color,
width: singleFiberJSON.width,
background: singleFiberJSON.options.background,
arrows: singleFiberJSON.options.arrows,
@@ -4698,9 +4718,16 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
var elabel = "";
elabel = labelvalue;
var tempcolor;
if (fiberDetails.fiber_type != null && parseFloat(fiberDetails.span_length) > 0)
tempcolor = singleFiberJSON.options.color;
else
tempcolor = singleFiberJSON.options.w_color;
network.body.data.edges.add({
id: fiberID, from: fiberDetails.from, to: nodeID, label: elabel, text: labelvalue, dashes: singleFiberJSON.dashes, fiber_category: singleFiberJSON.fiber_category,
component_type: singleFiberJSON.component_type, color: singleFiberJSON.options.color, background: singleFiberJSON.options.background,
component_type: singleFiberJSON.component_type, color: tempcolor, background: singleFiberJSON.options.background,
arrows: singleFiberJSON.options.arrows,
//font: singleFiberJSON.options.font,
smooth: smooth,
@@ -4748,7 +4775,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
var fiber_config = configData[singleFiberJSON.fiber_category.replace(' ', '')].default;
network.body.data.edges.add({
id: newFiberID, from: nodeID, to: fiberDetails.to, label: elabel, text: labelvalue, dashes: singleFiberJSON.dashes, fiber_category: singleFiberJSON.fiber_category,
component_type: singleFiberJSON.component_type, color: singleFiberJSON.options.color, background: singleFiberJSON.options.background,
component_type: singleFiberJSON.component_type, color: singleFiberJSON.options.w_color, background: singleFiberJSON.options.background,
arrows: singleFiberJSON.options.arrows,
//font: singleFiberJSON.options.font,
smooth: smooth,
@@ -5238,31 +5265,31 @@ function deleteNode(nodeID) {
// allowOutsideClick: false
//}).then((result) => {
// if (result.value) {
document.getElementById("roadmMenu").style.display = "none";
document.getElementById("attenuatorMenu").style.display = "none";
document.getElementById("ILAMenu").style.display = "none";
document.getElementById("amplifierMenu").style.display = "none";
document.getElementById("transceiverMenu").style.display = "none";
document.getElementById("roadmMenu").style.display = "none";
document.getElementById("attenuatorMenu").style.display = "none";
document.getElementById("ILAMenu").style.display = "none";
document.getElementById("amplifierMenu").style.display = "none";
document.getElementById("transceiverMenu").style.display = "none";
if (network.getConnectedEdges(nodeID).length > 0) {
showMessage(alertType.Error, "Unpair " + roadmJSON.component_type + ", then try to delete");
if (network.getConnectedEdges(nodeID).length > 0) {
showMessage(alertType.Error, "Unpair " + roadmJSON.component_type + ", then try to delete");
} else {
//nodes.remove(nodeID);
} else {
//nodes.remove(nodeID);
if (nodeDetails.node_type == transceiverJSON.node_type) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
}
else
removeSpanInError(nodeID);
if (nodeDetails.node_type == transceiverJSON.node_type) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
}
else
removeSpanInError(nodeID);
network.body.data.nodes.remove(nodeID);
$("#stepCreateTopology").click();
network.body.data.nodes.remove(nodeID);
$("#stepCreateTopology").click();
}
network.unselectAll();
}
network.unselectAll();
// }
//});
@@ -5474,7 +5501,7 @@ function updateSingleFiber(fiberID) {
elabel = label;
network.body.data.edges.update({
id: id, label: elabel, text: label, fiber_type: fiber_type, span_length: span_length,
id: id, label: elabel, text: label, fiber_type: fiber_type, span_length: span_length, color: singleFiberJSON.options.color,
loss_coefficient: loss_coefficient, connector_in: connector_in, connector_out: connector_out, span_loss: span_loss
});
data.nodes.off("*", change_history_back);
@@ -5534,45 +5561,45 @@ function deleteFiber(fiberID) {
// allowOutsideClick: false
//}).then((result) => {
// if (result.value) {
var nodeDetails = network.body.data.nodes.get(fiber.from);
var toNodeDetails = network.body.data.nodes.get(fiber.to);
var nodeDetails = network.body.data.nodes.get(fiber.from);
var toNodeDetails = network.body.data.nodes.get(fiber.to);
if (checkFiberPatchServiceCon(fiber.from, fiber.to, fiber.component_type))
return;
if (checkFiberPatchServiceCon(fiber.from, fiber.to, fiber.component_type))
return;
document.getElementById("dualFiberMenu").style.display = "none";
document.getElementById("singleFiberMenu").style.display = "none";
//remove roadm list from from roadm node
document.getElementById("dualFiberMenu").style.display = "none";
document.getElementById("singleFiberMenu").style.display = "none";
//remove roadm list from from roadm node
arrRoadmTypePro = nodeDetails.roadm_type_pro ? nodeDetails.roadm_type_pro : [];
_roadmListDB.insert(JSON.stringify(arrRoadmTypePro));
arrRoadmTypePro = nodeDetails.roadm_type_pro ? nodeDetails.roadm_type_pro : [];
_roadmListDB.insert(JSON.stringify(arrRoadmTypePro));
_roadmListDB({
roadm_fiber_id: fiberID
}).remove();
arrRoadmTypePro = _roadmListDB().get();
network.body.data.nodes.update({
id: nodeDetails.id, roadm_type_pro: arrRoadmTypePro
});
//remove roadm list from to roadm node
_roadmListDB({
roadm_fiber_id: fiberID
}).remove();
arrRoadmTypePro = _roadmListDB().get();
network.body.data.nodes.update({
id: nodeDetails.id, roadm_type_pro: arrRoadmTypePro
});
//remove roadm list from to roadm node
arrRoadmTypePro = toNodeDetails.roadm_type_pro ? toNodeDetails.roadm_type_pro : [];
_roadmListDB.insert(JSON.stringify(arrRoadmTypePro));
arrRoadmTypePro = toNodeDetails.roadm_type_pro ? toNodeDetails.roadm_type_pro : [];
_roadmListDB.insert(JSON.stringify(arrRoadmTypePro));
_roadmListDB({
roadm_fiber_id: fiberID
}).remove();
arrRoadmTypePro = _roadmListDB().get();
network.body.data.nodes.update({
id: toNodeDetails.id, roadm_type_pro: arrRoadmTypePro
});
_roadmListDB({
roadm_fiber_id: fiberID
}).remove();
arrRoadmTypePro = _roadmListDB().get();
network.body.data.nodes.update({
id: toNodeDetails.id, roadm_type_pro: arrRoadmTypePro
});
network.body.data.edges.remove(fiberID);
multipleFiberService(fiber.from, fiber.to);
nodeValidationInEdge(fiber.from, fiber.to);
network.unselectAll();
enableEdgeIndicator();
network.body.data.edges.remove(fiberID);
multipleFiberService(fiber.from, fiber.to);
nodeValidationInEdge(fiber.from, fiber.to);
network.unselectAll();
enableEdgeIndicator();
// }
//});
@@ -5693,15 +5720,15 @@ function deletePatch(patchID) {
// allowOutsideClick: false
//}).then((result) => {
// if (result.value) {
if (checkFiberPatchServiceCon(patchDetails.from, patchDetails.to, patchDetails.component_type))
return;
document.getElementById("singlePatchMenu").style.display = "none";
document.getElementById("dualPatchMenu").style.display = "none";
network.body.data.edges.remove(patchID);
multipleFiberService(patchDetails.from, patchDetails.to);
nodeValidationInEdge(patchDetails.from, patchDetails.to);
network.unselectAll();
enableEdgeIndicator();
if (checkFiberPatchServiceCon(patchDetails.from, patchDetails.to, patchDetails.component_type))
return;
document.getElementById("singlePatchMenu").style.display = "none";
document.getElementById("dualPatchMenu").style.display = "none";
network.body.data.edges.remove(patchID);
multipleFiberService(patchDetails.from, patchDetails.to);
nodeValidationInEdge(patchDetails.from, patchDetails.to);
network.unselectAll();
enableEdgeIndicator();
// }
//});
@@ -5828,11 +5855,11 @@ function deleteService(serviceID) {
// allowOutsideClick: false
//}).then((result) => {
// if (result.value) {
document.getElementById("serviceMenu").style.display = "none";
network.body.data.edges.remove(serviceID);
multipleFiberService(serviceDetails.from, serviceDetails.to);
network.unselectAll();
enableEdgeIndicator();
document.getElementById("serviceMenu").style.display = "none";
network.body.data.edges.remove(serviceID);
multipleFiberService(serviceDetails.from, serviceDetails.to);
network.unselectAll();
enableEdgeIndicator();
// }
//});