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

To remove the default values for fibers like connector losses, loss coefficient, length, and fiber type and validation

Browse Source
This commit is contained in:
sakv2e10204
2022-04-05 10:45:39 +05:30
parent 41ca9d5085
commit 9e22d87af5
6 changed files with 46 additions and 12 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.

BIN
TelecomInfraProject-V1/TelecomInfraProject/obj/Release/netcoreapp2.2/TelecomInfraProject.csproj.AssemblyReference.cache
View File

Binary file not shown.

14
TelecomInfraProject-V1/TelecomInfraProject/wwwroot/Data/ConfigurationData.json
View File

@@ -137,13 +137,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"

3
TelecomInfraProject-V1/TelecomInfraProject/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;
}

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

@@ -5411,6 +5411,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 +5447,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);
@@ -5471,6 +5498,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();
@@ -6551,7 +6582,7 @@ function focusNode(nodeID) {
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 }]);
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);
@@ -6846,7 +6877,7 @@ 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);
}
//if (connectedEdges.length <= 1) {