From 9cec6e39e85e26d0d4f397eddf9430dee334580d Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Thu, 23 Jan 2025 09:18:52 +0530 Subject: [PATCH] stock module latest today vadivel J 23-01-2025 --- app/Controllers/StockController.php | 2 +- app/Models/IncomingSilicaSandDetailsModel.php | 2 +- app/Views/incomingSilicaSandDetails.php | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 61da8e2e..5d134500 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -474,7 +474,7 @@ 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 58aa68fb..6061fc5f 100644 --- a/app/Models/IncomingSilicaSandDetailsModel.php +++ b/app/Models/IncomingSilicaSandDetailsModel.php @@ -16,7 +16,7 @@ class IncomingSilicaSandDetailsModel extends Model '_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','reportComments','gradeRange','reportTime', + 'testedBy','approvedBy' , 'clayOrLossOfIgnition','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 5b5ca57c..5520ac2a 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -539,6 +539,7 @@ + @@ -1048,7 +1049,7 @@ - + @@ -1144,6 +1145,8 @@ $('#dwnldLossOfIgnitionRowId').hide(); $('#dwnldClayRowId').show(); + console.log("inside silica sand"); + console.log(clayOrLossOfIgnition) $('#dwnldClayId').text(clayOrLossOfIgnition); @@ -1151,6 +1154,8 @@ $('#dwnldClayRowId').hide(); $('#dwnldLossOfIgnitionRowId').show(); + console.log("inside waste core"); + console.log(clayOrLossOfIgnition); $('#dwnldLossOfIgnitionId').text(clayOrLossOfIgnition); } @@ -1269,7 +1274,7 @@ $('#approvedBy').val(approvedBy); $('#testedById').val(testedBy); $('#approvedById').val(approvedBy); - $('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition); + $('#clayOrLossOfIgnition').val(clayOrLossOfIgnition); $('#reportComments').val(reportComments); $('#gradeRange').val(gradeRange); $('#reportTime').val(reportTime); @@ -1582,7 +1587,7 @@ $(document).ready(function() { }, 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.");