mirror of
https://github.com/Telecominfraproject/oopt-gnpy-web-gui.git
synced 2025-11-03 03:27:52 +00:00
To remove the default values for fibers like connector losses, loss coefficient, length, and fiber type and validation
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -137,13 +137,13 @@
|
|||||||
"CD_coefficient": 5.0
|
"CD_coefficient": 5.0
|
||||||
},
|
},
|
||||||
"default": {
|
"default": {
|
||||||
"fiber_type": "SSMF",
|
"fiber_type": "",
|
||||||
"CD_coefficient": 16.7,
|
"CD_coefficient": 0.0,
|
||||||
"PMD_coefficient": 0.0400028124,
|
"PMD_coefficient": 0.0,
|
||||||
"Span_length": "1.0",
|
"Span_length": "0.0",
|
||||||
"Loss_coefficient": "0.25",
|
"Loss_coefficient": "0.0",
|
||||||
"Connector_in": "0.5",
|
"Connector_in": "0.0",
|
||||||
"Connector_out": "0.5",
|
"Connector_out": "0.0",
|
||||||
"Ageing_loss": "0.0",
|
"Ageing_loss": "0.0",
|
||||||
"Length_based_loss": false,
|
"Length_based_loss": false,
|
||||||
"Span_loss": "0.0"
|
"Span_loss": "0.0"
|
||||||
|
|||||||
@@ -1929,3 +1929,6 @@ select {
|
|||||||
/* max-height: calc(100vh - 10vh); */
|
/* max-height: calc(100vh - 10vh); */
|
||||||
/*margin-left: -3rem;*/
|
/*margin-left: -3rem;*/
|
||||||
}
|
}
|
||||||
|
.input_error{
|
||||||
|
border:solid 1px red;
|
||||||
|
}
|
||||||
|
|||||||
@@ -5260,7 +5260,7 @@ function deleteNode(nodeID) {
|
|||||||
network.body.data.nodes.remove(nodeID);
|
network.body.data.nodes.remove(nodeID);
|
||||||
$("#stepCreateTopology").click();
|
$("#stepCreateTopology").click();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
network.unselectAll();
|
network.unselectAll();
|
||||||
}
|
}
|
||||||
@@ -5411,6 +5411,22 @@ function singleFiberEdit(fiberID, callback) {
|
|||||||
$("#txtConnector_IN").val(edgeDetails.connector_in);
|
$("#txtConnector_IN").val(edgeDetails.connector_in);
|
||||||
$("#txtConnector_OUT").val(edgeDetails.connector_out);
|
$("#txtConnector_OUT").val(edgeDetails.connector_out);
|
||||||
$("#txtSpan_Loss").val(edgeDetails.span_loss);
|
$("#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');
|
openDrawer('singlefiber');
|
||||||
document.getElementById("btnSingleFiberUpdate").onclick = updateSingleFiber.bind(
|
document.getElementById("btnSingleFiberUpdate").onclick = updateSingleFiber.bind(
|
||||||
this,
|
this,
|
||||||
@@ -5431,11 +5447,22 @@ function updateSingleFiber(fiberID) {
|
|||||||
var connector_out = $("#txtConnector_OUT").val();
|
var connector_out = $("#txtConnector_OUT").val();
|
||||||
var span_loss = $("#txtSpan_Loss").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);
|
var spanlen = parseFloat(span_length);
|
||||||
if (spanlen <= 0) {
|
if (spanlen <= 0) {
|
||||||
showMessage(alertType.Error, 'Pleae enter valid span length.');
|
showMessage(alertType.Error, 'Pleae enter valid span length.');
|
||||||
|
$("#txtSpan_Length").addClass('input_error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
$("#txtSpan_Length").removeClass('input_error');
|
||||||
|
|
||||||
var fiberDetails = network.body.data.edges.get(fiberID);
|
var fiberDetails = network.body.data.edges.get(fiberID);
|
||||||
|
|
||||||
@@ -5471,6 +5498,10 @@ function clearSingleFiber() {
|
|||||||
$("#txtConnector_IN").val('');
|
$("#txtConnector_IN").val('');
|
||||||
$("#txtConnector_OUT").val('');
|
$("#txtConnector_OUT").val('');
|
||||||
$("#txtSpan_Loss").val('');
|
$("#txtSpan_Loss").val('');
|
||||||
|
|
||||||
|
$("#ddlSingleFiberType").removeClass('input_error');
|
||||||
|
$("#txtSpan_Length").removeClass('input_error');
|
||||||
|
|
||||||
$('#cbxLength_Based_Loss').prop('checked', false);
|
$('#cbxLength_Based_Loss').prop('checked', false);
|
||||||
closeDrawer('singlefiber');
|
closeDrawer('singlefiber');
|
||||||
network.unselectAll();
|
network.unselectAll();
|
||||||
@@ -6551,7 +6582,7 @@ function focusNode(nodeID) {
|
|||||||
data.nodes.off("*", change_history_back);
|
data.nodes.off("*", change_history_back);
|
||||||
data.edges.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.nodes.on("*", change_history_back);
|
||||||
data.edges.on("*", change_history_back);
|
data.edges.on("*", change_history_back);
|
||||||
@@ -6652,7 +6683,7 @@ function nodeValidationInEdge(cfrom, cto) {
|
|||||||
removeSpanInError(item);
|
removeSpanInError(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -6846,7 +6877,7 @@ function nodeRuleOnImportJSON() {
|
|||||||
toCount++;
|
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);
|
addNodeHighlight(item.id);
|
||||||
}
|
}
|
||||||
//if (connectedEdges.length <= 1) {
|
//if (connectedEdges.length <= 1) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ function nameLengthValidation(element) {
|
|||||||
//var maxDegree = Number(configData.node[$("#ddlNodeType").val()].max_degree);
|
//var maxDegree = Number(configData.node[$("#ddlNodeType").val()].max_degree);
|
||||||
//var regex = /^[1-9-+()]*$/;
|
//var regex = /^[1-9-+()]*$/;
|
||||||
//isDegreeValid = regex.test(document.getElementById("txtNodeDegree").value);
|
//isDegreeValid = regex.test(document.getElementById("txtNodeDegree").value);
|
||||||
var msg = "";
|
var msg = "";
|
||||||
|
|
||||||
if ($(elementID).val().trim() == '') {
|
if ($(elementID).val().trim() == '') {
|
||||||
msg = "Please enter the name";
|
msg = "Please enter the name";
|
||||||
|
|||||||
Reference in New Issue
Block a user