From 75f2e793c6017a2cdfcf61103cd8a6702c2bb214 Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Thu, 10 Aug 2017 14:50:41 +0530 Subject: [PATCH] MRIR Rejected Status Implemetation --- .../views/Editmaterialinspectionreport.php | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/application/views/Editmaterialinspectionreport.php b/application/views/Editmaterialinspectionreport.php index d19152ef..89bbeda2 100755 --- a/application/views/Editmaterialinspectionreport.php +++ b/application/views/Editmaterialinspectionreport.php @@ -361,7 +361,17 @@ function validate() var RejectedQuantity = parseFloat( $('#RejectQuantity'+k).val() == '' ? '0.00' : $('#RejectQuantity'+k).val()); - if(AcceptQuantity != '0.00') + if(AcceptQuantity != '0.00' && RejectedQuantity == '0.00') + { + + if(ActualQty < (AcceptQuantity+RejectedQuantity)) + { + isExceed = 1; + return false; + } + Noval = 1; + } + if(AcceptQuantity == '0.00' && RejectedQuantity != '0.00') { if(ActualQty < (AcceptQuantity+RejectedQuantity)) @@ -402,14 +412,14 @@ function validate() function setaccept(rowId) { - var accept = parseFloat($('#AcceptQuantity'+rowId).val()); + var accept = parseFloat( $('#AcceptQuantity'+rowId).val() == '' ? '0.00' : $('#AcceptQuantity'+rowId).val()); var tr= document.getElementById(rowId); var Actulqty = 0.0; var cellval = tr.cells; - Actulqty = parseFloat(cellval[6].innerHTML); + Actulqty = parseFloat( cellval[6].innerHTML == '' ? '0.00' : cellval[6].innerHTML); var qtyAsperchellan = parseFloat($('#QuantityAsPerInvoice'+rowId).val()); @@ -453,13 +463,31 @@ function setaccept(rowId) function setreject(rowId) { + + var accept = parseFloat( $('#AcceptQuantity'+rowId).val() == '' ? '0.00' : $('#AcceptQuantity'+rowId).val()); var tr= document.getElementById(rowId); var Actulqty = 0.0; var cellval = tr.cells; - Actulqty = parseFloat(cellval[6].innerHTML); + Actulqty = parseFloat( cellval[6].innerHTML == '' ? '0.00' : cellval[6].innerHTML); + + + var qtyAsperchellan = parseFloat($('#QuantityAsPerInvoice'+rowId).val()); + var rejected = (Actulqty - accept); + + $('#RejectQuantity'+rowId).val(rejected) ; + $('#QuantityRejected'+rowId).val(rejected) ; + $('#QuantityAccepted'+rowId).val(accept) ; + + // var tr= document.getElementById(rowId); + // var Actulqty = 0.0; + + + // var cellval = tr.cells; + + // Actulqty = parseFloat(cellval[6].innerHTML); var reject = parseFloat($('#RejectQuantity'+rowId).val()); if(reject > Actulqty ) {