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

Added hasMany relation on model files and Updated report filter functionality on resource file
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Details
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 12s
Details
Gemini PR Review / Gemini PR Review (pull_request) Failing after 18s
Details
Laravel Pint / pint (pull_request) Successful in 4m30s
Details
Laravel Larastan / larastan (pull_request) Failing after 5m17s
Details

Browse Source
This commit is contained in:
dhanabalan
2026-02-26 22:34:21 +05:30
parent 17fcaf8b20
commit b5973aa826
4 changed files with 92 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
app/Filament/Resources/CharacteristicValueResource.php
View File

@@ -17,6 +17,7 @@ use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Select; use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Actions\ExportAction; use Filament\Tables\Actions\ExportAction;
@@ -41,20 +42,22 @@ class CharacteristicValueResource extends Resource
return $form return $form
->schema([ ->schema([
Forms\Components\Select::make('plant_id') Forms\Components\Select::make('plant_id')
->label('Plant') ->label('Plant Name')
->nullable()
->searchable() ->searchable()
->reactive()
->relationship('plant', 'name') ->relationship('plant', 'name')
->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(); return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
}) })
->disabled(fn (Get $get) => ! empty($get('id')))
->default(function () { ->default(function () {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? $userHas : optional(CharacteristicValue::latest()->first())->plant_id; return ($userHas && strlen($userHas) > 0) ? $userHas : optional(CharacteristicValue::latest()->first())->plant_id;
}) })
->reactive()
->afterStateUpdated(function ($state, $set, callable $get) { ->afterStateUpdated(function ($state, $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('line_id', null); $set('line_id', null);
@@ -76,8 +79,10 @@ class CharacteristicValueResource extends Resource
->hintColor('danger') ->hintColor('danger')
->required(), ->required(),
Forms\Components\Select::make('line_id') Forms\Components\Select::make('line_id')
->label('Line') ->label('Line Name')
->nullable()
->searchable() ->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
if (! $get('plant_id')) { if (! $get('plant_id')) {
return []; return [];
@@ -87,6 +92,7 @@ class CharacteristicValueResource extends Resource
->pluck('name', 'id') ->pluck('name', 'id')
->toArray(); ->toArray();
}) })
->disabled(fn (Get $get) => ! empty($get('id')))
->afterStateUpdated(function ($state, $set, callable $get) { ->afterStateUpdated(function ($state, $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('item_id', null); $set('item_id', null);
@@ -101,11 +107,12 @@ class CharacteristicValueResource extends Resource
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
->reactive()
->required(), ->required(),
Forms\Components\Select::make('item_id') Forms\Components\Select::make('item_id')
->label('Item') ->label('Item Code')
->nullable()
->searchable() ->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
if (! $get('plant_id') || ! $get('line_id')) { if (! $get('plant_id') || ! $get('line_id')) {
return []; return [];
@@ -115,6 +122,7 @@ class CharacteristicValueResource extends Resource
->pluck('code', 'id') ->pluck('code', 'id')
->toArray(); ->toArray();
}) })
->disabled(fn (Get $get) => ! empty($get('id')))
->afterStateUpdated(function ($state, $set, callable $get) { ->afterStateUpdated(function ($state, $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('machine_id', null); $set('machine_id', null);
@@ -128,11 +136,12 @@ class CharacteristicValueResource extends Resource
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
->reactive()
->required(), ->required(),
Forms\Components\Select::make('machine_id') Forms\Components\Select::make('machine_id')
->label('Machine') ->label('Work Center')
->nullable()
->searchable() ->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
if (! $get('plant_id') || ! $get('line_id') || ! $get('item_id')) { if (! $get('plant_id') || ! $get('line_id') || ! $get('item_id')) {
return []; return [];
@@ -143,6 +152,7 @@ class CharacteristicValueResource extends Resource
->pluck('work_center', 'id') ->pluck('work_center', 'id')
->toArray(); ->toArray();
}) })
->disabled(fn (Get $get) => ! empty($get('id')))
->afterStateUpdated(function ($state, $set, callable $get) { ->afterStateUpdated(function ($state, $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('process_order', null); $set('process_order', null);
@@ -155,7 +165,6 @@ class CharacteristicValueResource extends Resource
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
->reactive()
->required(), ->required(),
Forms\Components\TextInput::make('process_order') Forms\Components\TextInput::make('process_order')
->label('Process Order') ->label('Process Order')
@@ -325,12 +334,12 @@ class CharacteristicValueResource extends Resource
return ($currentPage - 1) * $perPage + $rowLoop->iteration; return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}), }),
Tables\Columns\TextColumn::make('plant.name') Tables\Columns\TextColumn::make('plant.name')
->label('Plant') ->label('Plant Name')
->searchable() ->searchable()
->alignCenter() ->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('line.name') Tables\Columns\TextColumn::make('line.name')
->label('Line') ->label('Line Name')
->searchable() ->searchable()
->alignCenter() ->alignCenter()
->sortable(), ->sortable(),
@@ -340,12 +349,12 @@ class CharacteristicValueResource extends Resource
->alignCenter() ->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('item.description') Tables\Columns\TextColumn::make('item.description')
->label('Description') ->label('Item Description')
->searchable() ->searchable()
->alignCenter() ->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('machine.work_center') Tables\Columns\TextColumn::make('machine.work_center')
->label('Machine') ->label('Work Center')
->searchable() ->searchable()
->alignCenter() ->alignCenter()
->sortable(), ->sortable(),
@@ -427,39 +436,32 @@ class CharacteristicValueResource extends Resource
->label('Advanced Filters') ->label('Advanced Filters')
->form([ ->form([
Select::make('Plant') Select::make('Plant')
->label('Select Plant') ->label('Search by Plant Name')
->nullable() ->nullable()
->searchable()
->reactive()
->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('characteristicValues', 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();
}) })
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Item', null); $set('Item', null);
$set('Machine', null);
}), }),
Select::make('Line') Select::make('Line')
->label('Select Line') ->label('Search by Line Name')
->nullable()
->options(function (callable $get) {
$plantId = $get('Plant');
if (empty($plantId)) {
return [];
}
return Line::where('plant_id', $plantId)->pluck('name', 'id');
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Item', null);
}),
Select::make('Item')
->label('Item Code')
->nullable() ->nullable()
->searchable() ->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
@@ -467,17 +469,44 @@ class CharacteristicValueResource extends Resource
return []; return [];
} }
return Item::where('plant_id', $plantId)->pluck('code', 'id'); return Line::whereHas('characteristicValues', function ($query) use ($plantId) {
if ($plantId) {
$query->where('plant_id', $plantId);
}
})->pluck('name', 'id');
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : []; // return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
}) })
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Item', null);
$set('Machine', null);
}),
Select::make('Item')
->label('Search by Item Code')
->nullable()
->searchable()
->reactive() ->reactive()
->options(function (callable $get) {
$plantId = $get('Plant');
if (empty($plantId)) {
return [];
}
return Item::whereHas('characteristicValues', function ($query) use ($plantId) {
if ($plantId) {
$query->where('plant_id', $plantId);
}
})->pluck('code', 'id');
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
})
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('process_order', null); $set('process_order', null);
}), }),
Select::make('Machine') Select::make('Machine')
->label('Select Machine') ->label('Search by Work Center')
->nullable() ->nullable()
->searchable()
->reactive()
->options(function (callable $get) { ->options(function (callable $get) {
$plantId = $get('Plant'); $plantId = $get('Plant');
$lineId = $get('Line'); $lineId = $get('Line');
@@ -486,11 +515,13 @@ class CharacteristicValueResource extends Resource
return []; return [];
} }
return Machine::where('plant_id', $plantId)->where('line_id', $lineId)->pluck('work_center', 'id'); return Machine::whereHas('characteristicValues', function ($query) use ($plantId, $lineId) {
if ($plantId && $lineId) {
$query->where('plant_id', $plantId)->where('line_id', $lineId);
}
})->pluck('work_center', 'id');
// return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : []; // return $plantId ? Item::where('plant_id', $plantId)->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);
}), }),
@@ -546,11 +577,11 @@ class CharacteristicValueResource extends Resource
} }
if (! empty($data['process_order'])) { if (! empty($data['process_order'])) {
$query->where('process_order', $data['process_order']); $query->where('process_order', 'like', '%'.$data['process_order'].'%');
} }
if (! empty($data['coil_number'])) { if (! empty($data['coil_number'])) {
$query->where('coil_number', $data['coil_number']); $query->where('coil_number', 'like', '%'.$data['coil_number'].'%');
} }
if (! empty($data['status'])) { if (! empty($data['status'])) {
@@ -571,7 +602,7 @@ class CharacteristicValueResource extends Resource
$indicators = []; $indicators = [];
if (! empty($data['Plant'])) { if (! empty($data['Plant'])) {
$indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name'); $indicators[] = 'Plant Name: '.Plant::where('id', $data['Plant'])->value('name');
} else { } else {
$userHas = Filament::auth()->user()->plant_id; $userHas = Filament::auth()->user()->plant_id;
@@ -581,15 +612,15 @@ class CharacteristicValueResource extends Resource
} }
if (! empty($data['Line'])) { if (! empty($data['Line'])) {
$indicators[] = 'Line: '.Line::where('id', $data['Line'])->value('name'); $indicators[] = 'Line Name: '.Line::where('id', $data['Line'])->value('name');
} }
if (! empty($data['Item'])) { if (! empty($data['Item'])) {
$indicators[] = 'Item: '.Item::where('id', $data['Item'])->value('code'); $indicators[] = 'Item Code: '.Item::where('id', $data['Item'])->value('code');
} }
if (! empty($data['Machine'])) { if (! empty($data['Machine'])) {
$indicators[] = 'Machine: '.Machine::where('id', $data['Machine'])->value('work_center'); $indicators[] = 'Work Center: '.Machine::where('id', $data['Machine'])->value('work_center');
} }
if (! empty($data['process_order'])) { if (! empty($data['process_order'])) {

6
app/Models/Item.php
View File

@@ -3,7 +3,6 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
class Item extends Model class Item extends Model
@@ -60,6 +59,11 @@ class Item extends Model
return $this->hasMany(ProductCharacteristicsMaster::class); return $this->hasMany(ProductCharacteristicsMaster::class);
} }
public function characteristicValues()
{
return $this->hasMany(CharacteristicValue::class);
}
public function weightValidations() public function weightValidations()
{ {
return $this->hasMany(WeightValidation::class); return $this->hasMany(WeightValidation::class);

5
app/Models/Line.php
View File

@@ -61,6 +61,11 @@ class Line extends Model
return $this->hasMany(ProductCharacteristicsMaster::class); return $this->hasMany(ProductCharacteristicsMaster::class);
} }
public function characteristicValues()
{
return $this->hasMany(CharacteristicValue::class);
}
public function workGroup1() public function workGroup1()
{ {
return $this->belongsTo(WorkGroupMaster::class, 'work_group1_id', 'id'); return $this->belongsTo(WorkGroupMaster::class, 'work_group1_id', 'id');

5
app/Models/Plant.php
View File

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