poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 10 Packages Projects Releases Wiki Activity

Added hasMany relation on model files and Updated report filter functionality (and plant order by code) on resource file
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Details

Browse Source
This commit is contained in:
dhanabalan
2026-02-26 22:11:36 +05:30
parent 6ff1718ca2
commit 17fcaf8b20
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Resources/ProcessOrderResource.php
View File

@@ -791,7 +791,7 @@ class ProcessOrderResource extends Resource
} else { } else {
return Plant::whereHas('processOrders', function ($query) { return Plant::whereHas('processOrders', function ($query) {
$query->whereNotNull('id'); $query->whereNotNull('id');
})->pluck('name', 'id'); })->orderBy('code')->pluck('name', 'id');
} }
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray(); // return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();

16
app/Filament/Resources/ProductCharacteristicsMasterResource.php
View File

@@ -432,7 +432,15 @@ class ProductCharacteristicsMasterResource extends Resource
->options(function (callable $get) { ->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray(); if ($userHas && strlen($userHas) > 0) {
Plant::where('id', $userHas)->pluck('name', 'id')->toArray();
} else {
return Plant::whereHas('productCharacteristicsMasters', function ($query) {
$query->whereNotNull('id');
})->orderBy('code')->pluck('name', 'id');
}
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
}) })
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Item', null); $set('Item', null);
@@ -463,6 +471,7 @@ class ProductCharacteristicsMasterResource extends Resource
->label('Search by Item Code') ->label('Search by Item Code')
->nullable() ->nullable()
->searchable() ->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
@@ -475,8 +484,7 @@ class ProductCharacteristicsMasterResource extends Resource
$query->where('plant_id', $plantId); $query->where('plant_id', $plantId);
} }
})->pluck('code', 'id'); })->pluck('code', 'id');
}) }),
->reactive(),
// ->afterStateUpdated(function ($state, callable $set, callable $get) { // ->afterStateUpdated(function ($state, callable $set, callable $get) {
// $set('process_order', null); // $set('process_order', null);
// }), // }),
@@ -517,7 +525,7 @@ class ProductCharacteristicsMasterResource extends Resource
} }
return Machine::whereHas('productCharacteristicsMasters', function ($query) use ($plantId, $lineId, $workGroupMasterId) { return Machine::whereHas('productCharacteristicsMasters', function ($query) use ($plantId, $lineId, $workGroupMasterId) {
if ($plantId && $lineId) { if ($plantId && $lineId && $workGroupMasterId) {
$query->where('plant_id', $plantId)->where('line_id', $lineId)->where('work_group_master_id', $workGroupMasterId); $query->where('plant_id', $plantId)->where('line_id', $lineId)->where('work_group_master_id', $workGroupMasterId);
} }
})->pluck('work_center', 'id'); })->pluck('work_center', 'id');

5
app/Models/Plant.php
View File

@@ -93,6 +93,11 @@ class Plant extends Model
return $this->hasMany(ProcessOrder::class); return $this->hasMany(ProcessOrder::class);
} }
public function productCharacteristicsMasters()
{
return $this->hasMany(ProductCharacteristicsMaster::class);
}
public function equipmentMasters() public function equipmentMasters()
{ {
return $this->hasMany(EquipmentMaster::class, 'plant_id', 'id'); return $this->hasMany(EquipmentMaster::class, 'plant_id', 'id');