diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 1aa23683..5d134500 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -474,7 +474,10 @@ class StockController extends BaseController 'salableQty' => $postData['salableQty'], 'testedBy' => $postData['testedBy'], 'approvedBy' => $postData['approvedBy'], - 'clayOrLossOfIgnitionPercent' => $postData['clayOrLossOfIgnition'], + 'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'], + 'reportComments' => $postData['reportComments'], + 'gradeRange' => $postData['gradeRange'], + 'reportTime' => $postData['reportTime'] ]; diff --git a/app/Models/IncomingSilicaSandDetailsModel.php b/app/Models/IncomingSilicaSandDetailsModel.php index 4138845e..6061fc5f 100644 --- a/app/Models/IncomingSilicaSandDetailsModel.php +++ b/app/Models/IncomingSilicaSandDetailsModel.php @@ -15,7 +15,8 @@ class IncomingSilicaSandDetailsModel extends Model protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition', '_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300', 'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual', - 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark','testedBy','approvedBy' , 'clayOrLossOfIgnitionPercent', + 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark', + 'testedBy','approvedBy' , 'clayOrLossOfIgnition','reportComments','gradeRange','reportTime', 'is_active','created_at','updated_at']; protected bool $allowEmptyInserts = false; diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index 0ee54f94..39d75714 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -104,22 +104,35 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); } - .celda_encabezado_general { + + + th.celda_encabezado_general { background-color: #00a65a; border: 1px solid #ccc; color: #ffffff; font-weight: bold; padding: 2px 4px; text-align: center; + min-width: 150px; /* Set a fixed width */ + max-width: 150px; /* Ensure it doesn't exceed this width */ + white-space: nowrap; /* Prevent text from wrapping */ + overflow: hidden; /* Hide overflowing content */ + text-overflow: ellipsis; /* Show "..." for overflow text */ } + .celda_encabezado_total { background-color:#ffffff; border: 1px solid #ccc; color: #ffffff; font-weight: bold; - padding: 6px 10px; + padding: 2px 4px; text-align: center; + min-width: 150px; /* Set a fixed width */ + max-width: 150px; /* Ensure it doesn't exceed this width */ + white-space: nowrap; /* Prevent text from wrapping */ + overflow: hidden; /* Hide overflowing content */ + text-overflow: ellipsis; /* Show "..." for overflow text */ } ._Separador { @@ -135,10 +148,14 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); } .celda_normal { - /*background-color: #fff;*/ - /* */ + border: 1px solid #ccc; padding: 2px 4px; + min-width: 150px; /* Set a fixed width */ + max-width: 150px; /* Ensure it doesn't exceed this width */ + white-space: nowrap; /* Prevent text from wrapping */ + overflow: hidden; /* Hide overflowing content */ + text-overflow: ellipsis; /* Show "..." for overflow text */ } /*style excel*/ @@ -170,23 +187,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); - #drierTable th:nth-child(1) { - position: sticky; - left: 0; - background-color: #00a65a; - z-index: 2; - border-right: 2px solid #ddd; - color: #ffffff; - } + #drierTable th:nth-child(1), + #drierTable td:nth-child(1), + #drierTableSummaryId th:nth-child(1), + #drierTableSummaryId td:nth-child(1) { + position: sticky; + left: 0; + background-color: #00a65a; + z-index: 2; + border-right: 2px solid #ddd; + color: #ffffff; +} - #drierTable td:nth-child(1) { - position: sticky; - left: 0; - background-color:#00a65a; - z-index: 2; - border-right: 2px solid #ddd; - color: #ffffff; - } diff --git a/app/Views/gasStockDetails.php b/app/Views/gasStockDetails.php index 9c69ce4e..c5fe15ab 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 diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 8236f19b..ce2cd1cc 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -350,6 +350,19 @@ $summary = [] ; + if (!isset($summary['Qty'])) { + + $summary['Qty'] = 0 ; + $summary['plus20Loss'] = 0 ; + $summary['moistureSpec'] = 0 ; + $summary['moistureActual'] = 0 ; + $summary['moistureLoss'] = 0 ; + $summary['moistureLossQty'] = 0 ; + $summary['sieveLossQty'] = 0 ; + $summary['salableQty'] = 0 ; + + } + foreach ($igrDetails as $record) { // dd($record); $row++; @@ -574,6 +587,7 @@ + @@ -589,26 +603,28 @@ + + + + + + + + + + + + + + + + @@ -628,7 +643,7 @@ - S.NO + total IGR No-xxx Invoice No-123 22-01-2025 @@ -660,31 +675,31 @@ - - - - - - +
total
+ - + - - - - - - - + - + - + - - - - - - - + - + - + - - - - - - - - - - - - - - - - - + + - + - + - + + - + + + + + + @@ -826,11 +841,13 @@ + Moisture Spec % + @@ -987,7 +1004,7 @@ Remarks - + @@ -1066,7 +1083,10 @@ - + + + +
@@ -1134,6 +1154,9 @@ let clayOrLossOfIgnition = row.find('td:eq(36)').text().trim(); let testedBy = row.find('td:eq(37)').text().trim(); let approvedBy = row.find('td:eq(38)').text().trim(); + let reportComments = row.find('td:eq(39)').text().trim(); + let gradeRange = row.find('td:eq(40)').text().trim(); + let reportTime = row.find('td:eq(41)').text().trim(); @@ -1147,12 +1170,17 @@ $('#dwnldSupplierNameId').text(supplierName); $('#dwnldVehicleNoId').text(vehicleNo); $('#dwnldQtyId').text(qty); + $('#dwnldReportCommentsId').text(reportComments); + $('#dwnldGradeId').text(gradeRange); + $('#dwnldTimeId').text(reportTime); if(sandType.trim().toLowerCase() == "silica sand"){ $('#dwnldLossOfIgnitionRowId').hide(); $('#dwnldClayRowId').show(); + console.log("inside silica sand"); + console.log(clayOrLossOfIgnition) $('#dwnldClayId').text(clayOrLossOfIgnition); @@ -1160,6 +1188,8 @@ $('#dwnldClayRowId').hide(); $('#dwnldLossOfIgnitionRowId').show(); + console.log("inside waste core"); + console.log(clayOrLossOfIgnition); $('#dwnldLossOfIgnitionId').text(clayOrLossOfIgnition); } @@ -1278,7 +1308,10 @@ $('#approvedBy').val(approvedBy); $('#testedById').val(testedBy); $('#approvedById').val(approvedBy); - $('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition); + $('#clayOrLossOfIgnition').val(clayOrLossOfIgnition); + $('#reportComments').val(reportComments); + $('#gradeRange').val(gradeRange); + $('#reportTime').val(reportTime); @@ -1581,11 +1614,14 @@ $(document).ready(function() { gradeCondition : $('#dwnldGradeId').text(), testedBy : $('#testedById').val(), approvedBy : $('#approvedById').val(), - clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() + clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() , + reportComments : $('#dwnldReportCommentsId').text(), + gradeRange : $('#dwnldGradeId').text(), + reportTime : $('#dwnldTimeId').text() }, success: function(data){ alert("Data Saved Successfully..!!"); - // window.location.reload(); + window.location.reload(); }, error : function(xhr, status, error){ alert("An error occurred while processing the request. Please try again.");