Added pump testing result resource and exporter files and Updated pump testing entry report filter functionality
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
This commit is contained in:
@@ -464,7 +464,7 @@ class PumpTestingEntryResource extends Resource
|
||||
})
|
||||
->afterStateUpdated(function ($state, callable $set, callable $get) {
|
||||
$set('Item', null);
|
||||
$set('isi_type', null);
|
||||
$set('tested_type', null);
|
||||
$set('created_by', null);
|
||||
$set('updated_by', null);
|
||||
}),
|
||||
@@ -479,7 +479,7 @@ class PumpTestingEntryResource extends Resource
|
||||
->reactive()
|
||||
->native(false),
|
||||
Select::make('tested_type')
|
||||
->label('Tested Type')
|
||||
->label('Search by Tested Type')
|
||||
->nullable()
|
||||
->options(function (callable $get) {
|
||||
$plantId = $get('Plant');
|
||||
@@ -592,13 +592,13 @@ class PumpTestingEntryResource extends Resource
|
||||
}
|
||||
|
||||
if (! empty($data['Item']) && ! empty($data['Plant'])) {
|
||||
$itemIds = Item::where('id', $data['Item'])
|
||||
$pumpMasterIds = PumpTestingMaster::where('item_id', $data['Item'])
|
||||
->where('plant_id', $data['Plant'])
|
||||
->pluck('id')
|
||||
->toArray();
|
||||
|
||||
if (! empty($itemIds)) {
|
||||
$query->whereIn('item_id', $itemIds);
|
||||
if (! empty($pumpMasterIds)) {
|
||||
$query->whereIn('pump_testing_master_id', $pumpMasterIds);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -611,7 +611,14 @@ class PumpTestingEntryResource extends Resource
|
||||
})->pluck('id')->toArray();
|
||||
|
||||
if (! empty($descIds)) {
|
||||
$query->whereIn('item_id', $descIds);
|
||||
$pumpMasterIds = PumpTestingMaster::whereIn('item_id', $descIds)
|
||||
->where('plant_id', $data['Plant'])
|
||||
->pluck('id')
|
||||
->toArray();
|
||||
|
||||
if (! empty($pumpMasterIds)) {
|
||||
$query->whereIn('pump_testing_master_id', $pumpMasterIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user