RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock module latest today vadivel J 17-01-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-01-17 12:13:07 +05:30
parent c929246f54
commit eac34ac2af
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/StockController.php
View File

@ -360,9 +360,6 @@ class StockController extends BaseController
$data['approvedBy'] = $this->employeedetails_model->incomingSilicaSandApprovedBy($DesignationConfigID); $data['approvedBy'] = $this->employeedetails_model->incomingSilicaSandApprovedBy($DesignationConfigID);
// dd($data['testedBy']);
// dd($data['approvedBy']);
$date = DateTime::createFromFormat('Y-m', $month); $date = DateTime::createFromFormat('Y-m', $month);

2
app/Models/IncomingSilicaSandDetailsModel.php
View File

@ -15,7 +15,7 @@ class IncomingSilicaSandDetailsModel extends Model
protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition', protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition',
'_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300', '_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300',
'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual', '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']; 'is_active','created_at','updated_at'];
protected bool $allowEmptyInserts = false; protected bool $allowEmptyInserts = false;

46
app/Views/incomingSilicaSandDetails.php
View File

@ -858,10 +858,10 @@
<select class="test-or-approve select2" name="testedBy" id="testedById"> <select class="test-or-approve select2" name="testedBy" id="testedById">
<option value="0"> </option> <option value="0"> </option>
<?php foreach($testedBy as $each ){ <?php foreach($testedBy as $each ){ ?>
?> <option value = "<?php echo $each->FirstName." ".$each->LastName; ?>"
<option value="<?php echo $each->FirstName . $each->LastName; ?>"> >
<?php echo $each->FirstName . $each->LastName; ?> <?=$each->FirstName." ".$each->LastName; ?>
</option> </option>
<?php }?> <?php }?>
</select> </select>
@ -873,8 +873,9 @@
<select class="test-or-approve select2" name="approvedBy" id="approvedById"> <select class="test-or-approve select2" name="approvedBy" id="approvedById">
<option value="0"> </option> <option value="0"> </option>
<?php foreach($approvedBy as $each ){ ?> <?php foreach($approvedBy as $each ){ ?>
<option value="<?php echo $each->FirstName . $each->LastName; ?>" > <option value = "<?php echo $each->FirstName." ".$each->LastName; ?>"
<?php echo $each->FirstName . $each->LastName; ?> >
<?=$each->FirstName." ".$each->LastName; ?>
</option> </option>
<?php }?> <?php }?>
</select> </select>
@ -985,14 +986,10 @@
let remark = row.find('.sand-status').val(); let remark = row.find('.sand-status').val();
let materialCode = row.find('td:eq(34)').text().trim(); let materialCode = row.find('td:eq(34)').text().trim();
let id = row.find('td:eq(35)').text().trim(); let id = row.find('td:eq(35)').text().trim();
let testedBy = row.find('td:eq(36)').text().trim(); let clayOrLossOfIgnition = row.find('td:eq(36)').text().trim();
let approvedBy = row.find('td:eq(37)').text().trim(); let testedBy = row.find('td:eq(37)').text().trim();
let clayOrLossOfIgnition = row.find('td:eq(38)').text().trim(); let approvedBy = row.find('td:eq(38)').text().trim();
console.log(sandType);
console.log(testedBy);
console.log(approvedBy);
console.log(clayOrLossOfIgnition);
@ -1133,8 +1130,28 @@
$('#salableQty').val(salableQty); $('#salableQty').val(salableQty);
$('#testedBy').val(testedBy); $('#testedBy').val(testedBy);
$('#approvedBy').val(approvedBy); $('#approvedBy').val(approvedBy);
$('#testedById').val(testedBy);
$('#approvedById').val(approvedBy);
$('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition); $('#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 // Show the modal
$('#downloadLabReportModel').modal('show'); $('#downloadLabReportModel').modal('show');
@ -1393,7 +1410,8 @@ $(document).ready(function() {
}, },
success: function(data){ success: function(data){
alert("Data Saved Successfully..!!"); alert("Data Saved Successfully..!!");
window.location.reload(); console.log(data);
// window.location.reload();
}, },
error : function(xhr, status, error){ error : function(xhr, status, error){
alert("An error occurred while processing the request. Please try again."); alert("An error occurred while processing the request. Please try again.");