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

Compare commits

base: poc:734ab9dfdc56fea164a0207fa8f69e48597b2ea9
Branches Tags
poc:master poc:ranjith-dev poc:renovate/althinect-filament-spatie-roles-permissions-3.x poc:renovate/barryvdh-laravel-debugbar-4.x poc:renovate/livewire-livewire-4.x poc:renovate/filament-filament-5.x poc:jothi-patch-1 poc:renovate/vite-7.x poc:renovate/tpetry-laravel-postgresql-enhanced-3.x poc:renovate/tailwindcss-4.x poc:actions/gemini-pr-review-patch poc:dhana-dev poc:renovate/laravel-framework-12.x poc:renovate/laravel-vite-plugin-2.x poc:renovate/alperenersoy-filament-export-4.x poc:qds poc:gha-test
...
compare: poc:b864bda85e6f306cf977b9c1c538de022cd913c8
Branches Tags
poc:master poc:ranjith-dev poc:renovate/althinect-filament-spatie-roles-permissions-3.x poc:renovate/barryvdh-laravel-debugbar-4.x poc:renovate/livewire-livewire-4.x poc:renovate/filament-filament-5.x poc:jothi-patch-1 poc:renovate/vite-7.x poc:renovate/tpetry-laravel-postgresql-enhanced-3.x poc:renovate/tailwindcss-4.x poc:actions/gemini-pr-review-patch poc:dhana-dev poc:renovate/laravel-framework-12.x poc:renovate/laravel-vite-plugin-2.x poc:renovate/alperenersoy-filament-export-4.x poc:qds poc:gha-test

2 Commits
734ab9dfdc ... b864bda85e

Author SHA1 Message Date
jothi
b864bda85e Merge pull request 'Refactor characteristic value form validation' (#345) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details 
Reviewed-on: #345
 2026-02-18 04:47:00 +00:00
dhanabalan
87cfe556ae Refactor characteristic value form validation
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details
Gemini PR Review / Gemini PR Review (pull_request) Has been cancelled
Details
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Has been cancelled
Details
Laravel Larastan / larastan (pull_request) Has been cancelled
Details
Laravel Pint / pint (pull_request) Has been cancelled
Details
2026-02-18 10:14:52 +05:30
1 changed files with 65 additions and 22 deletions
Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ use Filament\Tables\Filters\Filter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Illuminate\Validation\Rule;
use Str; use Str;
class CharacteristicValueResource extends Resource class CharacteristicValueResource extends Resource
@@ -41,6 +42,7 @@ class CharacteristicValueResource extends Resource
->schema([ ->schema([
Forms\Components\Select::make('plant_id') Forms\Components\Select::make('plant_id')
->label('Plant') ->label('Plant')
->searchable()
->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;
@@ -50,9 +52,14 @@ class CharacteristicValueResource extends Resource
->reactive() ->reactive()
->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('line_id', null); $set('line_id', null);
$set('item_id', null);
$set('machine_id', null); $set('machine_id', null);
$set('process_order', null);
$set('coil_number', null);
$set('observed_value', null);
$set('status', 'NotOk');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
@@ -65,6 +72,7 @@ class CharacteristicValueResource extends Resource
->required(), ->required(),
Forms\Components\Select::make('line_id') Forms\Components\Select::make('line_id')
->label('Line') ->label('Line')
->searchable()
->options(function (callable $get) { ->options(function (callable $get) {
if (! $get('plant_id')) { if (! $get('plant_id')) {
return []; return [];
@@ -78,7 +86,13 @@ class CharacteristicValueResource extends Resource
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('item_id', null); $set('item_id', null);
$set('machine_id', null); $set('machine_id', null);
$set('process_order', null);
$set('coil_number', null);
$set('observed_value', null);
$set('status', 'NotOk');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('line_id', null);
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
@@ -86,6 +100,7 @@ class CharacteristicValueResource extends Resource
->required(), ->required(),
Forms\Components\Select::make('item_id') Forms\Components\Select::make('item_id')
->label('Item') ->label('Item')
->searchable()
->options(function (callable $get) { ->options(function (callable $get) {
if (! $get('plant_id') || ! $get('line_id')) { if (! $get('plant_id') || ! $get('line_id')) {
return []; return [];
@@ -98,15 +113,21 @@ class CharacteristicValueResource extends Resource
->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);
$set('process_order', null);
$set('coil_number', null);
$set('observed_value', null);
$set('status', 'NotOk');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('item_id', null);
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
->reactive() ->reactive()
->required() ->required(),
->searchable(),
Forms\Components\Select::make('machine_id') Forms\Components\Select::make('machine_id')
->label('Machine') ->label('Machine')
->searchable()
->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 [];
@@ -121,8 +142,11 @@ class CharacteristicValueResource extends Resource
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('process_order', null); $set('process_order', null);
$set('coil_number', null); $set('coil_number', null);
$set('status', null); $set('observed_value', null);
$set('status', 'NotOk');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('machine_id', null);
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
@@ -134,8 +158,11 @@ class CharacteristicValueResource extends Resource
->afterStateUpdated(function ($state, $set, callable $get) { ->afterStateUpdated(function ($state, $set, callable $get) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$set('coil_number', null); $set('coil_number', null);
$set('status', null); $set('observed_value', null);
$set('status', 'NotOk');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('process_order', null);
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} }
}) })
@@ -145,7 +172,7 @@ class CharacteristicValueResource extends Resource
// ->reactive() // ->reactive()
// ->afterStateUpdated(function ($state, $set, callable $get) { // ->afterStateUpdated(function ($state, $set, callable $get) {
// $plantId = $get('plant_id'); // $plantId = $get('plant_id');
// $set('status', null); // $set('status', 'NotOk');
// if (! $plantId) { // if (! $plantId) {
// $set('poPlantError', 'Please select a plant first.'); // $set('poPlantError', 'Please select a plant first.');
// } // }
@@ -153,37 +180,48 @@ class CharacteristicValueResource extends Resource
// ->required(), // ->required(),
->label('Coil Number') ->label('Coil Number')
->default('0') ->default('0')
->numeric()
->reactive() ->reactive()
->afterStateUpdated(function ($state, $set, callable $get, $livewire) { ->afterStateUpdated(function ($state, $set, callable $get, $livewire) {
$plantId = $get('plant_id'); $plantId = $get('plant_id');
$processOrder = $get('process_order'); $processOrder = $get('process_order');
$coilNo = $get('coil_number'); // $coilNo = $get('coil_number');
$set('poPlantError', null);
$set('observed_value', null);
$set('status', 'NotOk');
$set('coilNumberError', null);
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId) { if (! $plantId) {
$set('coil_number', null);
$set('poPlantError', 'Please select a plant first.'); $set('poPlantError', 'Please select a plant first.');
} elseif (! $processOrder) { } elseif (! $processOrder) {
$set('coil_number', null); $set('coil_number', null);
$set('poPlantError', null);
} elseif ($coilNo || $coilNo == '0') {
$existing = CharacteristicValue::where('plant_id', $plantId)
->where('process_order', $processOrder)
->where('coil_number', $coilNo)
->first();
if ($existing) {
$set('poPlantError', null);
$set('coil_number', null);
$set('coilNumberError', "Duplicate Coil : '{$coilNo}' found!");
} else {
$set('poPlantError', null);
$set('coilNumberError', null);
}
} }
// elseif ($coilNo || $coilNo == '0') {
// $existing = CharacteristicValue::where('plant_id', $plantId)
// ->where('process_order', $processOrder)
// ->where('coil_number', $coilNo)
// ->first();
// if ($existing && ! $get('id')) {
// // $set('coil_number', null);
// $set('coilNumberError', "Duplicate Coil : '{$coilNo}' found!");
// } else {
// $set('coilNumberError', null);
// }
// }
}) })
->extraAttributes(fn ($get) => [ ->extraAttributes(fn ($get) => [
'class' => $get('coilNumberError') ? 'border-red-500' : '', 'class' => $get('coilNumberError') ? 'border-red-500' : '',
]) ])
->hint(fn ($get) => $get('coilNumberError') ? $get('coilNumberError') : null) ->hint(fn ($get) => $get('coilNumberError') ? $get('coilNumberError') : null)
->hintColor('danger') ->hintColor('danger')
->rule(function (callable $get) {
return Rule::unique('characteristic_values', 'coil_number')
->where('plant_id', $get('plant_id'))
->where('process_order', $get('process_order'))
->ignore($get('id')); // Ignore current record during updates
})
->required(), ->required(),
Forms\Components\TextInput::make('observed_value') Forms\Components\TextInput::make('observed_value')
->label('Observed Value') ->label('Observed Value')
@@ -193,8 +231,10 @@ class CharacteristicValueResource extends Resource
$itemId = $get('item_id'); $itemId = $get('item_id');
$lineId = $get('line_id'); $lineId = $get('line_id');
$machineId = $get('machine_id'); $machineId = $get('machine_id');
$set('updated_by', Filament::auth()->user()?->name);
if (! $plantId || ! $itemId || ! $lineId || ! $machineId) { if (! $plantId || ! $itemId || ! $lineId || ! $machineId) {
$set('observed_value', null);
$set('status', 'NotOk'); $set('status', 'NotOk');
return; return;
@@ -260,6 +300,9 @@ class CharacteristicValueResource extends Resource
Forms\Components\Hidden::make('updated_by') Forms\Components\Hidden::make('updated_by')
->label('Updated By') ->label('Updated By')
->default(Filament::auth()->user()?->name), ->default(Filament::auth()->user()?->name),
Forms\Components\TextInput::make('id')
->hidden()
->readOnly(),
]); ]);
} }