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

To implement real-time of the error messages

Browse Source
This commit is contained in:
sakv2e10204
2022-04-07 11:56:58 +05:30
parent d99cc40d67
commit 6c108f0c78
8 changed files with 409 additions and 176 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.

20
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/Data/ConfigurationData.json
View File

@@ -49,7 +49,8 @@
"node_type": "Amplifier",
"amp_category": "Amplifier",
"pre_amp_type": "",
"component_type": "node"
"component_type": "node",
"amp_type": ""
}
},
"RamanAmplifier": {
@@ -61,7 +62,8 @@
"node_type": "Amplifier",
"amp_category": "RamanAmplifier",
"pre_amp_type": "",
"component_type": "node"
"component_type": "node",
"amp_type": ""
}
},
"Fused": {
@@ -137,13 +139,13 @@
"CD_coefficient": 5.0
},
"default": {
"fiber_type": "SSMF",
"CD_coefficient": 16.7,
"PMD_coefficient": 0.0400028124,
"Span_length": "1.0",
"Loss_coefficient": "0.25",
"Connector_in": "0.5",
"Connector_out": "0.5",
"fiber_type": "",
"CD_coefficient": 0.0,
"PMD_coefficient": 0.0,
"Span_length": "0.0",
"Loss_coefficient": "0.0",
"Connector_in": "0.0",
"Connector_out": "0.0",
"Ageing_loss": "0.0",
"Length_based_loss": false,
"Span_loss": "0.0"

7
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/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",

3
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/css/Style.css
View File

@@ -1929,3 +1929,6 @@ select {
/* max-height: calc(100vh - 10vh); */
/*margin-left: -3rem;*/
}
.input_error{
border:solid 1px red;
}

512
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/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,
@@ -4888,6 +4915,35 @@ function updateRoadm(nodeID) {
network.body.data.nodes.update({
id: id, label: label, roadm_type: $("#ddlRoadmType").val()
});
var roadmtype = $("#ddlRoadmType").val();
var connectedEges = network.getConnectedEdges(id);
var tempEdge = [];
$.each(connectedEges, function (index, item) {
if (network.body.data.edges.get(item).component_type != serviceJSON.component_type) {
tempEdge.push(item);
}
});
var fromCount = 0;
var toCount = 0;
for (i = 0; i < tempEdge.length; i++) {
edgeDetails = network.body.data.edges.get(tempEdge[i]);
if (edgeDetails.from == id)
fromCount++;
else if (edgeDetails.to == id)
toCount++;
}
if (fromCount != toCount || (fromCount == 0 && toCount == 0)) {
//addNodeHighlight(item);
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
}
else {
if (roadmtype != "")
removeSpanInError(id, true);
}
}
clearRoadm();
}
@@ -5043,6 +5099,30 @@ function updateAmplifier(nodeID) {
network.body.data.nodes.update({
id: id, label: label, amp_type: $("#ddlAmplifierType").val(),
});
var amptype = $("#ddlAmplifierType").val();
var connectedEdges;
var fromCount;
var toCount;
connectedEdges = network.getConnectedEdges(id);
fromCount = 0;
toCount = 0;
for (i = 0; i < connectedEdges.length; i++) {
edgeDetails = network.body.data.edges.get(connectedEdges[i]);
if (edgeDetails.from == id)
fromCount++;
else if (edgeDetails.to == id)
toCount++;
}
if (fromCount == 1 && toCount == 1) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
if (amptype != "")
removeSpanInError(id, true);
}
clearAmplifier();
}
@@ -5086,6 +5166,30 @@ function updateRamanAmp(nodeID) {
network.body.data.nodes.update({
id: id, label: label, amp_type: $("#ddlRamanAmpType").val(), category: $("#ddlRamanAmpCategory").val()
});
var amptype = $("#ddlAmplifierType").val();
var connectedEdges;
var fromCount;
var toCount;
connectedEdges = network.getConnectedEdges(id);
fromCount = 0;
toCount = 0;
for (i = 0; i < connectedEdges.length; i++) {
edgeDetails = network.body.data.edges.get(connectedEdges[i]);
if (edgeDetails.from == id)
fromCount++;
else if (edgeDetails.to == id)
toCount++;
}
if (fromCount == 1 && toCount == 1) {
removeID = "#spanTF" + id.replace(/\s/g, '');
$(removeID).remove();
if (amptype != "")
removeSpanInError(id, true);
}
clearRamanAmp();
}
@@ -5225,46 +5329,46 @@ function deleteNode(nodeID) {
if (nodeDetails.node_type == ILAJSON.node_type)
node_type = nodeDetails.amp_category;
Swal.fire({
icon: 'warning',
title: '',
text: 'Do you want to delete ' + node_type + ' : ' + nodeDetails.label + ' ?',
showCancelButton: true,
confirmButtonText: "OK",
closeOnConfirm: true,
confirmButtonColor: '#49508a',
width: 375,
height: 200,
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";
//Swal.fire({
// icon: 'warning',
// title: '',
// text: 'Do you want to delete ' + node_type + ' : ' + nodeDetails.label + ' ?',
// showCancelButton: true,
// confirmButtonText: "OK",
// closeOnConfirm: true,
// confirmButtonColor: '#49508a',
// width: 375,
// height: 200,
// 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";
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);
network.body.data.nodes.remove(nodeID);
$("#stepCreateTopology").click();
}
network.unselectAll();
if (nodeDetails.node_type == transceiverJSON.node_type) {
removeSpanInError(nodeID);
removeSpanInError(nodeID, true);
}
});
else
removeSpanInError(nodeID);
network.body.data.nodes.remove(nodeID);
$("#stepCreateTopology").click();
}
network.unselectAll();
// }
//});
}
@@ -5411,6 +5515,22 @@ function singleFiberEdit(fiberID, callback) {
$("#txtConnector_IN").val(edgeDetails.connector_in);
$("#txtConnector_OUT").val(edgeDetails.connector_out);
$("#txtSpan_Loss").val(edgeDetails.span_loss);
var span_length = $("#txtSpan_Length").val();
var spanlen = parseFloat(span_length);
if (spanlen <= 0) {
$("#txtSpan_Length").addClass('input_error');
}
else
$("#txtSpan_Length").removeClass('input_error');
if ($("#ddlSingleFiberType").val() == null) {
$("#ddlSingleFiberType").addClass('input_error');
}
else
$("#ddlSingleFiberType").removeClass('input_error');
openDrawer('singlefiber');
document.getElementById("btnSingleFiberUpdate").onclick = updateSingleFiber.bind(
this,
@@ -5431,11 +5551,22 @@ function updateSingleFiber(fiberID) {
var connector_out = $("#txtConnector_OUT").val();
var span_loss = $("#txtSpan_Loss").val();
if ($("#ddlSingleFiberType").val() == null) {
showMessage(alertType.Error, 'Pleae select fiber type');
$("#ddlSingleFiberType").addClass('input_error');
return;
}
else
$("#ddlSingleFiberType").removeClass('input_error');
var spanlen = parseFloat(span_length);
if (spanlen <= 0) {
showMessage(alertType.Error, 'Pleae enter valid span length.');
$("#txtSpan_Length").addClass('input_error');
return;
}
else
$("#txtSpan_Length").removeClass('input_error');
var fiberDetails = network.body.data.edges.get(fiberID);
@@ -5447,7 +5578,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);
@@ -5471,6 +5602,10 @@ function clearSingleFiber() {
$("#txtConnector_IN").val('');
$("#txtConnector_OUT").val('');
$("#txtSpan_Loss").val('');
$("#ddlSingleFiberType").removeClass('input_error');
$("#txtSpan_Length").removeClass('input_error');
$('#cbxLength_Based_Loss').prop('checked', false);
closeDrawer('singlefiber');
network.unselectAll();
@@ -5490,60 +5625,60 @@ function deleteFiber(fiberID) {
if (fiber.label.trim() == "")
fiberLabel = fiber.text
Swal.fire({
icon: 'warning',
title: '',
text: 'Do you want to delete ' + fiber.fiber_category + ' : ' + fiberLabel + ' ?',
showCancelButton: true,
confirmButtonText: "OK",
closeOnConfirm: true,
confirmButtonColor: '#49508a',
width: 375,
height: 200,
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);
//Swal.fire({
// icon: 'warning',
// title: '',
// text: 'Do you want to delete ' + fiber.fiber_category + ' : ' + fiberLabel + ' ?',
// showCancelButton: true,
// confirmButtonText: "OK",
// closeOnConfirm: true,
// confirmButtonColor: '#49508a',
// width: 375,
// height: 200,
// 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);
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
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
});
network.body.data.edges.remove(fiberID);
multipleFiberService(fiber.from, fiber.to);
nodeValidationInEdge(fiber.from, fiber.to);
network.unselectAll();
enableEdgeIndicator();
}
_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));
_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();
// }
//});
@@ -5649,30 +5784,30 @@ function deletePatch(patchID) {
if (patchDetails.label.trim() == "")
patchLabel = patchDetails.text
Swal.fire({
icon: 'warning',
title: '',
text: 'Do you want to delete ' + patchDetails.patch_category + ' : ' + patchLabel + ' ?',
showCancelButton: true,
confirmButtonText: "OK",
closeOnConfirm: true,
confirmButtonColor: '#49508a',
width: 375,
height: 200,
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();
}
});
//Swal.fire({
// icon: 'warning',
// title: '',
// text: 'Do you want to delete ' + patchDetails.patch_category + ' : ' + patchLabel + ' ?',
// showCancelButton: true,
// confirmButtonText: "OK",
// closeOnConfirm: true,
// confirmButtonColor: '#49508a',
// width: 375,
// height: 200,
// 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();
// }
//});
}
@@ -5780,30 +5915,30 @@ function updateService(serviceID) {
function deleteService(serviceID) {
var serviceDetails = network.body.data.edges.get(serviceID);
var serviceLabel = serviceDetails.label;
if (serviceDetails.label.trim() == "")
serviceLabel = serviceDetails.text
//var serviceLabel = serviceDetails.label;
//if (serviceDetails.label.trim() == "")
// serviceLabel = serviceDetails.text
Swal.fire({
icon: 'warning',
title: '',
text: 'Do you want to delete ' + serviceDetails.component_type + ' : ' + serviceLabel + ' ?',
showCancelButton: true,
confirmButtonText: "OK",
closeOnConfirm: true,
confirmButtonColor: '#49508a',
width: 375,
height: 200,
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();
}
});
//Swal.fire({
// icon: 'warning',
// title: '',
// text: 'Do you want to delete ' + serviceDetails.component_type + ' : ' + serviceLabel + ' ?',
// showCancelButton: true,
// confirmButtonText: "OK",
// closeOnConfirm: true,
// confirmButtonColor: '#49508a',
// width: 375,
// height: 200,
// 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();
// }
//});
}
@@ -6471,11 +6606,11 @@ function checkMisLink() {
return { message: message, flag: flag };
}
function checkTransForce() {
function checkTypeForce() {
var transList = network.body.data.nodes.get({
filter: function (item) {
return (item.node_type == transceiverJSON.node_type);
return (item.node_type == transceiverJSON.node_type || item.node_type == amplifierJSON.node_type || item.node_type == roadmJSON.node_type);
}
});
@@ -6483,10 +6618,36 @@ function checkTransForce() {
var msg = [];
var flag = false;
$.each(transList, function (index, item) {
if (item.transceiver_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + transceiverJSON.node_type + ' forcing option is missing.</p>');
flag = true;
if (item.node_type == transceiverJSON.node_type) {
if (item.transceiver_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + transceiverJSON.node_type + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == roadmJSON.node_type) {
if (item.roadm_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + roadmJSON.node_type.toUpperCase() + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == amplifierJSON.node_type) {
if (item.amp_category == amplifierJSON.amp_category) {
if (item.amp_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + amplifierJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.amp_category == ramanampJSON.amp_category) {
if (item.amp_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + ramanampJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
}
}
});
@@ -6514,7 +6675,7 @@ function topologyValidation(isTime) {
message.push("<span id=spanMisLink>" + response.message + "</span>");
}
response = checkTransForce();
response = checkTypeForce();
if (response.flag) {
flag = true;
message.push("<span id=spanTransForce>" + response.message + "</span>");
@@ -6548,8 +6709,13 @@ function focusNode(nodeID) {
else if (nodeDetails.amp_category == ramanampJSON.amp_category)
image = ramanampJSON.err_image;
network.body.data.nodes.update([{ id: nodeID, pre_image: nodeDetails.image, image: DIR + image, size:roadmJSON.err_size, is_error: true }]);
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
network.body.data.nodes.update([{ id: nodeID, pre_image: nodeDetails.image, image: DIR + image, size: roadmJSON.err_size, is_error: true }]);
data.nodes.on("*", change_history_back);
data.edges.on("*", change_history_back);
}
function removeHighlight() {
@@ -6572,10 +6738,13 @@ function removeHighlight() {
// image = amplifierJSON.image;
//else if (nodeDetails.amp_category == ramanampJSON.amp_category)
// image = ramanampJSON.image;
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
network.body.data.nodes.update({
id: nodeDetails.id, image: nodeDetails.pre_image, size: roadmJSON.size, is_error: false
});
data.nodes.on("*", change_history_back);
data.edges.on("*", change_history_back);
}
}
@@ -6611,8 +6780,17 @@ function nodeValidationInEdge(cfrom, cto) {
addNodeHighlight(item);
}
else {
removeSpanInError(item);
if (network.body.data.nodes.get(item).roadm_type != "") {
removeSpanInError(item, true);
removeSpanInError(item);
}
else {
var removeID = "#span" + item.replace(/\s/g, '');
$(removeID).remove();
}
}
});
// end
@@ -6641,10 +6819,24 @@ function nodeValidationInEdge(cfrom, cto) {
addNodeHighlight(item);
}
else {
removeSpanInError(item);
if (network.body.data.nodes.get(item).node_type == amplifierJSON.node_type) {
if (network.body.data.nodes.get(item).amp_type != "") {
removeSpanInError(item, true);
removeSpanInError(item);
}
else {
var removeID = "#span" + item.replace(/\s/g, '');
$(removeID).remove();
}
}
else {
removeSpanInError(item);
}
}
});
//
@@ -6714,10 +6906,16 @@ function removeSpanInError(item, transUpdate) {
else if (nodeDetails.amp_category == ramanampJSON.amp_category)
image = ramanampJSON.image;
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
network.body.data.nodes.update({
id: nodeDetails.id, image: DIR + image, size: roadmJSON.size, is_error: false
});
data.nodes.on("*", change_history_back);
data.edges.on("*", change_history_back);
var removeID;
if (transUpdate)
@@ -6760,8 +6958,14 @@ function addNodeHighlight(nodeID) {
else if (nodeDetails.amp_category == ramanampJSON.amp_category)
image = ramanampJSON.w_image;
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
network.body.data.nodes.update([{ id: nodeID, size: roadmJSON.size, image: DIR + image }]);
data.nodes.on("*", change_history_back);
data.edges.on("*", change_history_back);
}
function nodeRuleOnImportJSON() {
@@ -6801,6 +7005,9 @@ function nodeRuleOnImportJSON() {
if (item.node_type == transceiverJSON.node_type && item.transceiver_type == "") {
addNodeHighlight(item.id);
}
else if (item.node_type == roadmJSON.node_type && item.roadm_type == "") {
addNodeHighlight(item.id);
}
}
});
@@ -6826,9 +7033,14 @@ function nodeRuleOnImportJSON() {
toCount++;
}
if (fromCount != toCount || (fromCount == 0 && toCount == 0) || fromCount>1 || toCount>1) {
if (fromCount != toCount || (fromCount == 0 && toCount == 0) || fromCount > 1 || toCount > 1) {
addNodeHighlight(item.id);
}
else {
if (item.node_type == amplifierJSON.node_type && item.amp_type == "") {
addNodeHighlight(item.id);
}
}
//if (connectedEdges.length <= 1) {
// addNodeHighlight(item.id);
//}

2
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/PubTmp/Out/wwwroot/js/validation.js
View File

@@ -6,7 +6,7 @@ function nameLengthValidation(element) {
//var maxDegree = Number(configData.node[$("#ddlNodeType").val()].max_degree);
//var regex = /^[1-9-+()]*$/;
//isDegreeValid = regex.test(document.getElementById("txtNodeDegree").value);
var msg = "";
var msg = "";
if ($(elementID).val().trim() == '') {
msg = "Please enter the name";

6
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/css/Style.css
View File

@@ -628,7 +628,7 @@ ul {
width: 100%;
max-width: 25%;
position: absolute;
z-index: 1000;
z-index: 9999;
/* z-index:-1;
right:0; */
right: -27%;
@@ -1356,14 +1356,14 @@ select {
width: 100%;
max-width: 25%;
position: absolute;
z-index: 1000;
z-index: 9999;
display: none;
right: 0;
}
.d-visible {
display: block;
/* z-index: 9999; */
/*z-index: 9999;*/
}
}

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

@@ -3441,7 +3441,7 @@ function pasteNode(nodeId) {
realUpdate();
document.getElementById("pasteMenu").style.display = "none";
$("#stepCreateTopology").click();
}
@@ -4350,6 +4350,8 @@ function addNodes(data, callback) {
data.view = $("#ddlNetworkView").val();
callback(data);
realUpdate();
if (nodeMode == nodeType.ROADM || nodeMode == nodeType.ILA || nodeMode == nodeType.Attenuator || nodeMode == nodeType.Transceiver || nodeMode == nodeType.Amplifier || nodeMode == nodeType.RamanAmplifier)
network.addNodeMode();
@@ -4641,7 +4643,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
if (node_type == roadmJSON.node_type) {
network.body.data.nodes.add({
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + roadmJSON.image, number: nodelength,
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + roadmJSON.w_image, number: nodelength,
shape: roadmJSON.shape, color: roadmJSON.color,
font: roadmJSON.font,
size: roadmJSON.size,
@@ -4662,7 +4664,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
}
else if (node_type == transceiverJSON.node_type) {
network.body.data.nodes.add({
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + transceiverJSON.image, number: nodelength,
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + transceiverJSON.w_image, number: nodelength,
shape: transceiverJSON.shape, color: transceiverJSON.color,
//font: transceiverJSON.font,
size: transceiverJSON.size,
@@ -4673,7 +4675,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
}
else if (node_type == amplifierJSON.amp_category) {
network.body.data.nodes.add({
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + amplifierJSON.image, number: nodelength,
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + amplifierJSON.w_image, number: nodelength,
shape: amplifierJSON.shape, color: amplifierJSON.color,
//font: amplifierJSON.font,
size: amplifierJSON.size,
@@ -4686,7 +4688,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
}
else if (node_type == ramanampJSON.amp_category) {
network.body.data.nodes.add({
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + ramanampJSON.image, number: nodelength,
id: nodeID, label: nodeLabel, x: insertNodeX, y: insertNodeY, image: DIR + ramanampJSON.w_image, number: nodelength,
shape: ramanampJSON.shape, color: ramanampJSON.color,
//font: ramanampJSON.font,
size: ramanampJSON.size,
@@ -4697,7 +4699,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
category: nodeDetails.default.category
});
}
data.nodes.off("*", change_history_back);
data.edges.off("*", change_history_back);
@@ -4843,6 +4845,7 @@ function singleFiberInsertNode(fiberID, node_type, callback) {
document.getElementById("singleFiberMenu").style.display = "none";
data.nodes.on("*", change_history_back);
data.edges.on("*", change_history_back);
realUpdate();
enableEdgeIndicator();
}
@@ -6553,7 +6556,7 @@ function checkLink() {
}
if (fromCount != toCount || (fromCount == 0 && toCount == 0)) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'span' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> must have an even number of links with an equal number of incoming and outgoing links.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'span' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> must have an even number of links with an equal number of incoming and outgoing links.</p>');
flag = true;
}
});
@@ -6592,7 +6595,7 @@ function checkMisLink() {
}
if (fromCount != toCount || (fromCount == 0 && toCount == 0) || fromCount > 1 || toCount > 1) {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'span' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> One or more links to <b>' + item.label + '</b> is missing.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'span' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> One or more links to <b>' + item.label + '</b> is missing.</p>');
flag = true;
}
@@ -6621,27 +6624,27 @@ function checkTypeForce() {
if (item.node_type == transceiverJSON.node_type) {
if (item.transceiver_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + transceiverJSON.node_type + ' type not entered by the user.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + transceiverJSON.node_type + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == roadmJSON.node_type) {
if (item.roadm_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + roadmJSON.node_type.toUpperCase() + ' type not entered by the user.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + roadmJSON.node_type.toUpperCase() + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.node_type == amplifierJSON.node_type) {
if (item.amp_category == amplifierJSON.amp_category) {
if (item.amp_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + amplifierJSON.amp_category + ' type not entered by the user.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + amplifierJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
}
else if (item.amp_category == ramanampJSON.amp_category) {
if (item.amp_type == "") {
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img id="img_src" width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + ramanampJSON.amp_category + ' type not entered by the user.</p>');
msg.push('<p class="focusNode" title="Click here to focus the node" id=\'spanTF' + item.id.replace(/\s/g, '') + '\' onClick="focusNode(\'' + item.id + '\')"><img width="25" src="./Assets/img/error-listing-icon.png"> <b>' + item.label + '</b> - ' + ramanampJSON.amp_category + ' type not entered by the user.</p>');
flag = true;
}
}
@@ -6885,7 +6888,7 @@ function nodeValidationInEdge(cfrom, cto) {
}
});
// end
realUpdate();
checkErrorFree();
//end
@@ -7128,3 +7131,9 @@ function edgeStyleOnImportJSON() {
//data.edges.on("*", change_history_back);
}
function realUpdate() {
if ($("#div_toaster").is(":visible") && !$("#img_src").is(":visible")) {
$("#btnValidation").click();
}
}