diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 1aa23683..61da8e2e 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -475,6 +475,9 @@ class StockController extends BaseController 'testedBy' => $postData['testedBy'], 'approvedBy' => $postData['approvedBy'], 'clayOrLossOfIgnitionPercent' => $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..58aa68fb 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' , 'clayOrLossOfIgnitionPercent','reportComments','gradeRange','reportTime', 'is_active','created_at','updated_at']; protected bool $allowEmptyInserts = false; diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index de2f692e..ceb0dec3 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -554,6 +554,21 @@ + + + + + + + + + + + + + + + - S.NO + total IGR No-xxx Invoice No-123 22-01-2025 @@ -625,31 +640,31 @@ - - - - - - +
total
+ - + - - - - - - - + - + - + - - - - - - - + - + - + - - - - - - - - - - - - - - - - - + + - + - + - + + - + + + + + + @@ -791,11 +806,13 @@ + Moisture Spec % + @@ -952,7 +969,7 @@ Remarks - + @@ -1032,6 +1049,9 @@ + + +
@@ -1099,6 +1119,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(); @@ -1112,6 +1135,9 @@ $('#dwnldSupplierNameId').text(supplierName); $('#dwnldVehicleNoId').text(vehicleNo); $('#dwnldQtyId').text(qty); + $('#dwnldReportCommentsId').text(reportComments); + $('#dwnldGradeId').text(gradeRange); + $('#dwnldTimeId').text(reportTime); if(sandType.trim().toLowerCase() == "silica sand"){ @@ -1244,6 +1270,9 @@ $('#testedById').val(testedBy); $('#approvedById').val(approvedBy); $('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition); + $('#reportComments').val(reportComments); + $('#gradeRange').val(gradeRange); + $('#reportTime').val(reportTime); @@ -1546,11 +1575,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.");