diff --git a/app/Views/gasStockDetails.php b/app/Views/gasStockDetails.php index 9c69ce4e..50bfdab8 100644 --- a/app/Views/gasStockDetails.php +++ b/app/Views/gasStockDetails.php @@ -299,53 +299,53 @@ oninput="openingStockChange(this)" data-id="" - > + > + contenteditable="true"> + contenteditable="true"> + > + > + > + > - + - + - + - + - + - + @@ -392,48 +392,48 @@ oninput="openingStockChange(this)" data-id="" - > + > 0 + contenteditable="true"> 0 + contenteditable="true"> 0 + > 0 + > 0 - 0 + > + 0 - 0 + > + 0 + > 0 + > 0 + > @@ -615,12 +615,12 @@ const rowData = { date, - opening: rowCells.eq(1).text().trim()|| '0', - purchaseBharath: rowCells.eq(2).text().trim()|| '0', - purchaseIndian: rowCells.eq(3).text().trim()|| '0', - total: rowCells.eq(4).text().trim()|| '0', - consumption: rowCells.eq(5).text().trim()|| '0', - balanceStock: rowCells.eq(6).text().trim()|| '0' + opening: rowCells.eq(1).text().trim()|| ' ', + purchaseBharath: rowCells.eq(2).text().trim()|| ' ', + purchaseIndian: rowCells.eq(3).text().trim()|| ' ', + total: rowCells.eq(4).text().trim()|| ' ', + consumption: rowCells.eq(5).text().trim()|| ' ', + balanceStock: rowCells.eq(6).text().trim()|| ' ' }; rows.push(rowData); @@ -640,14 +640,14 @@ try{ let dataId = tdElement.getAttribute('data-id'); let date = dataId; - let openingStock = tdElement.innerText; - let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; - let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; - let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; + let openingStock = validateInput(tdElement.innerText); + let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText); + let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText); + let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[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.total[data-id="${dataId}"]`).innerText = totalGas; document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText= currentBalanceStock; updateStockValue( date,currentBalanceStock ) @@ -664,15 +664,15 @@ try{ let dataId = tdElement.getAttribute('data-id'); let date = dataId; - let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; - let purchaseBharathStock = tdElement.innerText; - let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; - let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; + let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText) ; + let purchaseBharathStock = validateInput(tdElement.innerText) ; + let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText) ; + let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[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; + document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas; + document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock; updateStockValue( date,currentBalanceStock ) @@ -684,17 +684,15 @@ } } - - function purchaseIndianStockChange(tdElement) { try{ let dataId = tdElement.getAttribute('data-id'); let date = dataId; - let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; - let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; - let purchaseIndianStock = tdElement.innerText; - let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; + let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText); + let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText); + let purchaseIndianStock = validateInput(tdElement.innerText); + let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption); @@ -718,25 +716,25 @@ 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 tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText); + let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText); + let trpGasConsumption = validateInput(document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText); + let rotaryGasConsumption = validateInput(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 openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText); + let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText); + let purchaseIndianStock = validateInput(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.consumption[data-id="${dataId}"]`).innerText =toatalGasConsumption ; + document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText = toatalGasConsumption ; document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock; updateStockValue( date,currentBalanceStock ) @@ -769,15 +767,15 @@ let dataId = `${otherDate}`; - document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText=currentBalanceStock; + document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText = currentBalanceStock; let openingStock = currentBalanceStock ; - let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; + let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText); - let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; + let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText); - let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; + let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); @@ -870,4 +868,28 @@ function convertToDate(dateString) { }); } + + + + \ No newline at end of file