From 3878359f8129b64ca01152f6187c55546aad5149 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Wed, 23 Apr 2025 14:19:50 +0530 Subject: [PATCH] Added operator_id column, and searchable filter in view --- .../Resources/ProductionLineStopResource.php | 6 +++--- .../Resources/ProductionPlanResource.php | 10 ++++++++-- .../Resources/QualityValidationResource.php | 18 +++++++++++++++++- app/Models/QualityValidation.php | 1 + 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/Filament/Resources/ProductionLineStopResource.php b/app/Filament/Resources/ProductionLineStopResource.php index 0b637eb..fdbf2ad 100644 --- a/app/Filament/Resources/ProductionLineStopResource.php +++ b/app/Filament/Resources/ProductionLineStopResource.php @@ -376,6 +376,9 @@ class ProductionLineStopResource extends Resource Tables\Columns\TextColumn::make('plant.name') ->label('Plant') ->sortable(), + Tables\Columns\TextColumn::make('operator_id') + ->label('Operator ID') + ->sortable(), Tables\Columns\TextColumn::make('created_at') ->label('Created At') ->dateTime() @@ -407,7 +410,6 @@ class ProductionLineStopResource extends Resource }), //block - Select::make('Block') ->label('Select Block') ->options(fn (callable $get) => @@ -418,7 +420,6 @@ class ProductionLineStopResource extends Resource ->reactive(), //shift - Select::make('Shift') ->label('Select Shift') ->options(function (callable $get) { @@ -436,7 +437,6 @@ class ProductionLineStopResource extends Resource ->reactive(), //line - Select::make('line') ->label('Select line') ->options(function (callable $get) { diff --git a/app/Filament/Resources/ProductionPlanResource.php b/app/Filament/Resources/ProductionPlanResource.php index 27ef48c..57f5fe3 100644 --- a/app/Filament/Resources/ProductionPlanResource.php +++ b/app/Filament/Resources/ProductionPlanResource.php @@ -514,10 +514,16 @@ class ProductionPlanResource extends Resource ->numeric() ->sortable(), Tables\Columns\TextColumn::make('line.name') - ->sortable(), + ->sortable() + ->searchable(), Tables\Columns\TextColumn::make('shift.name') - ->sortable(), + ->sortable() + ->searchable(), Tables\Columns\TextColumn::make('plant.name') + ->sortable() + ->searchable(), + Tables\Columns\TextColumn::make('operator_id') + ->label('Operator ID') ->sortable(), Tables\Columns\TextColumn::make('created_at') ->dateTime() diff --git a/app/Filament/Resources/QualityValidationResource.php b/app/Filament/Resources/QualityValidationResource.php index 27a399d..7e7ff37 100644 --- a/app/Filament/Resources/QualityValidationResource.php +++ b/app/Filament/Resources/QualityValidationResource.php @@ -7,6 +7,7 @@ use App\Filament\Resources\QualityValidationResource\RelationManagers; use App\Models\QualityValidation; use Carbon\Carbon; use Closure; +use Filament\Facades\Filament; use Filament\Forms; use Filament\Forms\Components\DatePicker; use Filament\Forms\Components\DateTimePicker; @@ -21,6 +22,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\Relationship; use Illuminate\Database\Eloquent\SoftDeletingScope; use Filament\Tables\Filters\Filter; +use Illuminate\Database\Eloquent\Model; use Illuminate\Validation\ValidationException; @@ -37,7 +39,7 @@ class QualityValidationResource extends Resource public static function form(Form $form): Form { return $form - ->schema([ + ->schema(components: [ Forms\Components\Select::make('plant_id') ->relationship('plant', 'name') ->reactive() @@ -51,6 +53,8 @@ class QualityValidationResource extends Resource ->required(), Forms\Components\TextInput::make('production_order') ->required(), + Forms\Components\Hidden::make('operator_id') + ->default(Filament::auth()->user()->name), Forms\Components\TextInput::make('item_id') ->label('Item Code') @@ -1646,6 +1650,18 @@ class QualityValidationResource extends Resource ]); } + + // public static function mutateFormDataBeforeCreate(array $data): array + // { + // $user =Filament::auth()->user(); + // dd($user); + // if($user){ + // $data['operator_id'] = $user->name; + // } + // // $data['operator_id'] = Filament::auth()->user()->name; + // return $data; + // } + public static function getRelations(): array { return [ diff --git a/app/Models/QualityValidation.php b/app/Models/QualityValidation.php index 7eabfac..804865c 100644 --- a/app/Models/QualityValidation.php +++ b/app/Models/QualityValidation.php @@ -32,6 +32,7 @@ class QualityValidation extends Model 'part_validation3', 'part_validation4', 'part_validation5', + 'operator_id', ]; public function stickerMaster(): BelongsTo