diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 8859cd74..5a60ed19 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -360,9 +360,6 @@ class StockController extends BaseController
$data['approvedBy'] = $this->employeedetails_model->incomingSilicaSandApprovedBy($DesignationConfigID);
- // dd($data['testedBy']);
-
- // dd($data['approvedBy']);
$date = DateTime::createFromFormat('Y-m', $month);
diff --git a/app/Models/IncomingSilicaSandDetailsModel.php b/app/Models/IncomingSilicaSandDetailsModel.php
index 3c2198de..4138845e 100644
--- a/app/Models/IncomingSilicaSandDetailsModel.php
+++ b/app/Models/IncomingSilicaSandDetailsModel.php
@@ -15,7 +15,7 @@ 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',
+ 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark','testedBy','approvedBy' , 'clayOrLossOfIgnitionPercent',
'is_active','created_at','updated_at'];
protected bool $allowEmptyInserts = false;
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index 6a8632fc..582d829c 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -857,12 +857,12 @@
style="text-align: center !important;">
@@ -873,8 +873,9 @@
@@ -985,14 +986,10 @@
let remark = row.find('.sand-status').val();
let materialCode = row.find('td:eq(34)').text().trim();
let id = row.find('td:eq(35)').text().trim();
- let testedBy = row.find('td:eq(36)').text().trim();
- let approvedBy = row.find('td:eq(37)').text().trim();
- let clayOrLossOfIgnition = row.find('td:eq(38)').text().trim();
-
- console.log(sandType);
- console.log(testedBy);
- console.log(approvedBy);
- console.log(clayOrLossOfIgnition);
+ 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();
+
@@ -1133,8 +1130,28 @@
$('#salableQty').val(salableQty);
$('#testedBy').val(testedBy);
$('#approvedBy').val(approvedBy);
+ $('#testedById').val(testedBy);
+ $('#approvedById').val(approvedBy);
$('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition);
+
+
+ $('#testedById option').each(function () {
+
+ if ($(this).val().trim().toLowerCase() === testedBy.trim().toLowerCase()) {
+ $(this).prop('selected', true);
+ }
+ });
+
+ $('#approvedById option').each(function () {
+ if ($(this).val().trim().toLowerCase() === approvedBy.trim().toLowerCase()) {
+ $(this).prop('selected', true);
+ }
+ });
+
+ $('#testedById').trigger('change');
+ $('#approvedById').trigger('change');
+
// Show the modal
$('#downloadLabReportModel').modal('show');
@@ -1393,7 +1410,8 @@ $(document).ready(function() {
},
success: function(data){
alert("Data Saved Successfully..!!");
- window.location.reload();
+ console.log(data);
+ // window.location.reload();
},
error : function(xhr, status, error){
alert("An error occurred while processing the request. Please try again.");