diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index 63640b21..f1120817 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -899,7 +899,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); var totalGasConsumption = $('#additionalEntryTotalGasConsumptionId').val(); var sandDriedQty = $('#additionalEntrySandDriedQtyId').val(); if (totalGasConsumption != '' && sandDriedQty != '') { - var gasPerTon = parseFloat(totalGasConsumption) / parseFloat(sandDriedQty); + var gasPerTon = (parseFloat(totalGasConsumption) / parseFloat(sandDriedQty)).toFixed(2); if (gasPerTon && gasPerTon != NaN && gasPerTon != Infinity) $('#additionalEntryGasPerTonId').val(gasPerTon); diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index b521274a..d0828867 100755 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -659,6 +659,14 @@ td { alert("Error"); } + }, + error : function (error){ + console.log("Error occured "); + console.error(error); + }, + complete(){ + $('#loader').hide(); + console.log("ajax call is completed..!!") } }); diff --git a/app/Views/gasStockDetails.php b/app/Views/gasStockDetails.php index 0d703ccb..0ccc81fd 100644 --- a/app/Views/gasStockDetails.php +++ b/app/Views/gasStockDetails.php @@ -319,13 +319,29 @@ - - - - - - - + + + + + + + + + + + + + + + " >0 0 + + 0 0 + 0 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 @@ -660,6 +689,46 @@ } } + + function gasConsumptionChange(tdElement) { + + try{ + let dataId = tdElement.getAttribute('data-id'); + let date = dataId; + + //total gas consumption + let tenTonGasConsumption = document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText; + let coatingGasConsumption = document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText; + let trpGasConsumption = document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText; + let rotaryGasConsumption = document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText; + + let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpGasConsumption) + Number(rotaryGasConsumption) ; + + + //total gas purchase and opening addition + let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; + let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; + let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; + + let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); + + let currentBalanceStock = Number(totalGas) - ( Number(toatalGasConsumption) ); + + document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas; + document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock; + + updateStockValue( date,currentBalanceStock ) + + } catch(error){ + console.error("There is an error updating stock ..!!" + error); + } + + } + + + + +