From c2e1fe7ff1599bc63a7c38a7cbfad04fe1919e4d Mon Sep 17 00:00:00 2001 From: sakv2e10204 Date: Thu, 28 Apr 2022 18:32:18 +0530 Subject: [PATCH] Added rule for fiber edit window --- .../DesignTimeBuild/.dtbcache.v2 | Bin 151157 -> 151157 bytes .../.vs/TelecomInfraProject/v16/.suo | Bin 200704 -> 200704 bytes .../wwwroot/js/Network Graph/stylenetwork.js | 31 +++++++++++++++++- .../wwwroot/js/validation.js | 31 ++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/TelecomInfraProject-V1/.vs/TelecomInfraProject/DesignTimeBuild/.dtbcache.v2 b/TelecomInfraProject-V1/.vs/TelecomInfraProject/DesignTimeBuild/.dtbcache.v2 index d338ff096fb9933942dffdd4c70a300672999eb1..7693a8e776ab980714322449ba93bb6e5ddb7428 100644 GIT binary patch delta 83 zcmWN>yAgmO5Cy=|%x>WExg)ay6FWfe=)=I=A*Ky0vIcV9U`Jm@U+#U4DOW}faAKI@ lCHgGEJ5esefOUrIp#>C@5^Dw_l2O?F=iS+^Ha%^Aw+~Cc8S?-D delta 83 zcmV~$u@QhE3;@8>j%^?iAe{@?xItpV9v1c6O`udJwT$FVn<$X4iDEJ!xcc3fx3Ay+1EO0ScK`qY diff --git a/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo b/TelecomInfraProject-V1/.vs/TelecomInfraProject/v16/.suo index 4370d1df4d7cb79b12ab88c0ae98f8a6de92e1b6..35946f59f2d9cc19f92b4904fea1bbf495bac856 100644 GIT binary patch delta 8194 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 delta 8535 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 diff --git a/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js b/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js index 44d5325..a486630 100644 --- a/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js +++ b/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/Network Graph/stylenetwork.js @@ -374,7 +374,21 @@ $(document).ready(function () { $('#cbxLength_Based_Loss').change(function () { if (this.checked) { - fiberLengthCal('txtSpan_Length', 'txtLoss_Coefficient', 'txtSpan_Loss'); + var span_length = $("#txtSpan_Length").val(); + var spanlen = parseFloat(span_length); + var loss_coeff = $("#txtLoss_Coefficient").val(); + var lossCoeff = parseFloat(loss_coeff); + if (isNaN(span_length) || spanlen <= 0 || span_length == "" || isNaN(loss_coeff) || lossCoeff <= 0 || loss_coeff == "") { + showMessage(alertType.Error, "Length based loss requires span length and loss coefficient to be entered"); + $("#txtLoss_Coefficient").addClass('input_error'); + } + else { + fiberLengthCal('txtSpan_Length', 'txtLoss_Coefficient', 'txtSpan_Loss'); + $("#txtLoss_Coefficient").removeClass('input_error'); + } + } + else { + $("#txtLoss_Coefficient").removeClass('input_error'); } }); $('#cbx_FiberALBL').change(function () { @@ -6237,6 +6251,8 @@ function clearCbxandAccordian() { } function singleFiberEdit(fiberID, callback) { + $("#txtLoss_Coefficient").removeClass('input_error'); + $('#cbxLength_Based_Loss').prop('checked', false); document.getElementById("singleFiberMenu").style.display = "none"; var edgeDetails = network.body.data.edges.get(fiberID); var connectedNode = network.getConnectedNodes(fiberID); @@ -6301,6 +6317,18 @@ function updateSingleFiber(fiberID) { else $("#txtSpan_Length").removeClass('input_error'); + if ($('#cbxLength_Based_Loss').is(":checked")) { + var loss_coeff = $("#txtLoss_Coefficient").val(); + var lossCoeff = parseFloat(loss_coeff); + if (isNaN(loss_coeff) || lossCoeff <= 0 || loss_coeff == "") { + showMessage(alertType.Error, "Length based loss requires span length and loss coefficient to be entered"); + $("#txtLoss_Coefficient").addClass('input_error'); + return; + } + else + $("#txtLoss_Coefficient").removeClass('input_error'); + } + var fiberDetails = network.body.data.edges.get(fiberID); if (nameLengthValidation("txtSinlgeFiberName")) { @@ -6343,6 +6371,7 @@ function clearSingleFiber() { $("#ddlSingleFiberType").removeClass('input_error'); $("#txtSpan_Length").removeClass('input_error'); + $("#txtLoss_Coefficient").removeClass('input_error'); $('#cbxLength_Based_Loss').prop('checked', false); closeDrawer('singlefiber'); diff --git a/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/validation.js b/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/validation.js index 5de9ed2..858b269 100644 --- a/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/validation.js +++ b/TelecomInfraProject-V1/TelecomInfraProject/wwwroot/js/validation.js @@ -9,7 +9,38 @@ else $("#txtSpan_Length").removeClass('input_error'); + if ($('#cbxLength_Based_Loss').is(":checked")) { + fiberCalc(); + + } }); + $("#txtLoss_Coefficient").change(function () { + if ($('#cbxLength_Based_Loss').is(":checked")) { + var span_length = $("#txtLoss_Coefficient").val().trim(); + var spanlen = parseFloat(span_length); + if (isNaN(span_length) || spanlen <= 0 || span_length == "") { + $("#txtLoss_Coefficient").addClass('input_error'); + return; + } + else + $("#txtLoss_Coefficient").removeClass('input_error'); + + fiberCalc(); + } + else + $("#txtLoss_Coefficient").removeClass('input_error'); + + + + }); + function fiberCalc() { + var span_length = $("#txtSpan_Length").val(); + var spanlen = parseFloat(span_length); + var loss_coeff = $("#txtLoss_Coefficient").val(); + var lossCoeff = parseFloat(loss_coeff); + if (!isNaN(span_length) || spanlen >= 0 || span_length != "" || !isNaN(loss_coeff) || lossCoeff >= 0 || loss_coeff != "") + fiberLengthCal('txtSpan_Length', 'txtLoss_Coefficient', 'txtSpan_Loss'); + } $("#ddlSingleFiberType").change(function () { if ($(this).val()=="") { $("#ddlSingleFiberType").addClass('input_error');