From 8e2a0e79dc907fce9965fdba92fe6377517a2e54 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Mon, 11 May 2026 10:33:43 +0530 Subject: [PATCH] Updated report column view and filter logic with validations --- .../TempClassCharacteristicResource.php | 82 +++++++++++++------ 1 file changed, 58 insertions(+), 24 deletions(-) diff --git a/app/Filament/Resources/TempClassCharacteristicResource.php b/app/Filament/Resources/TempClassCharacteristicResource.php index 8f31706..4db6d17 100644 --- a/app/Filament/Resources/TempClassCharacteristicResource.php +++ b/app/Filament/Resources/TempClassCharacteristicResource.php @@ -5,28 +5,27 @@ namespace App\Filament\Resources; use App\Filament\Exports\TempClassCharacteristicExporter; use App\Filament\Imports\TempClassCharacteristicImporter; use App\Filament\Resources\TempClassCharacteristicResource\Pages; -use App\Filament\Resources\TempClassCharacteristicResource\RelationManagers; use App\Models\Item; use App\Models\Machine; use App\Models\Plant; use App\Models\TempClassCharacteristic; use Filament\Facades\Filament; use Filament\Forms; +use Filament\Forms\Components\DateTimePicker; +use Filament\Forms\Components\Section; +use Filament\Forms\Components\Select; +use Filament\Forms\Components\TextInput; use Filament\Forms\Form; +use Filament\Forms\Get; use Filament\Resources\Resource; use Filament\Tables; -use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; -use Filament\Forms\Components\Section; -use Filament\Forms\Get; -use Illuminate\Validation\Rule; use Filament\Tables\Actions\ExportAction; use Filament\Tables\Actions\ImportAction; use Filament\Tables\Filters\Filter; -use Filament\Forms\Components\DateTimePicker; -use Filament\Forms\Components\Select; -use Filament\Forms\Components\TextInput; +use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\SoftDeletingScope; +use Illuminate\Validation\Rule; class TempClassCharacteristicResource extends Resource { @@ -1029,6 +1028,10 @@ class TempClassCharacteristicResource extends Resource ->alignCenter() ->searchable() ->sortable(), + Tables\Columns\TextColumn::make('model_type') + ->label('MODEL TYPE') + ->alignCenter() + ->sortable(), Tables\Columns\TextColumn::make('aufnr') ->label('AUFNR') ->alignCenter() @@ -1055,10 +1058,6 @@ class TempClassCharacteristicResource extends Resource ->alignCenter() ->searchable() ->sortable(), - Tables\Columns\TextColumn::make('model_type') - ->label('MODEL TYPE') - ->alignCenter() - ->sortable(), Tables\Columns\TextColumn::make('zz1_cn_bill_ord') ->label('ZZ1 CN BILL ORD') ->alignCenter() @@ -1181,6 +1180,7 @@ class TempClassCharacteristicResource extends Resource ->sortable(), Tables\Columns\TextColumn::make('zmm_ratedpower') ->label('ZMM RATEDPOWER') + ->alignCenter() ->sortable(), Tables\Columns\TextColumn::make('zmm_region') ->label('ZMM REGION') @@ -1577,14 +1577,12 @@ class TempClassCharacteristicResource extends Resource Tables\Columns\TextColumn::make('winded_serial_number') ->label('WINDED SERIAL NUMBER') ->alignCenter() + ->searchable() ->sortable(), - Tables\Columns\TextColumn::make('part_validation_1') - ->label('PART VALIDATION 1') - ->alignCenter() - ->sortable(), - Tables\Columns\TextColumn::make('part_validation_2') - ->label('PART VALIDATION 2') + Tables\Columns\TextColumn::make('model_type') + ->label('MODEL TYPE') ->alignCenter() + ->searchable() ->sortable(), Tables\Columns\TextColumn::make('has_work_flow_id') ->label('HAS WORK FLOW ID') @@ -1599,14 +1597,28 @@ class TempClassCharacteristicResource extends Resource }; }), Tables\Columns\TextColumn::make('created_at') + ->label('CREATED AT') + ->alignCenter() + ->dateTime() + ->sortable(), + Tables\Columns\TextColumn::make('created_by') + ->label('CREATED BY') + ->alignCenter() + ->sortable(), + Tables\Columns\TextColumn::make('updated_at') + ->label('UPDATED AT') + ->alignCenter() ->dateTime() ->sortable() ->toggleable(isToggledHiddenByDefault: true), - Tables\Columns\TextColumn::make('updated_at') - ->dateTime() + Tables\Columns\TextColumn::make('updated_by') + ->label('UPDATED BY') + ->alignCenter() ->sortable() ->toggleable(isToggledHiddenByDefault: true), Tables\Columns\TextColumn::make('deleted_at') + ->label('DELETED AT') + ->alignCenter() ->dateTime() ->sortable() ->toggleable(isToggledHiddenByDefault: true), @@ -1690,6 +1702,12 @@ class TempClassCharacteristicResource extends Resource TextInput::make('gernr') ->label('Serial Number') ->placeholder('Enter Serial Number'), + TextInput::make('zmm_heading') + ->label('Heading') + ->placeholder('Enter Heading'), + TextInput::make('model_type') + ->label('Model Type') + ->placeholder('Enter Model Type'), Select::make('work_flow_status') ->label('Work Flow Status') ->placeholder('Select Work Flow Status') @@ -1711,7 +1729,7 @@ class TempClassCharacteristicResource extends Resource ]) ->query(function ($query, array $data) { // Hide all records initially if no filters are applied - if (empty($data['Plant']) && empty($data['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['gernr']) && empty($data['created_from']) && empty($data['created_to']) && !array_key_exists('work_flow_status', $data)) { + if (empty($data['Plant']) && empty($data['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['gernr']) && empty($data['zmm_heading']) && empty($data['model_type']) && empty($data['created_from']) && empty($data['created_to'])) { return $query->whereRaw('1 = 0'); } @@ -1741,6 +1759,14 @@ class TempClassCharacteristicResource extends Resource $query->where('gernr', 'like', '%'.$data['gernr'].'%'); } + if (! empty($data['zmm_heading'])) { + $query->where('zmm_heading', 'like', '%'.$data['zmm_heading'].'%'); + } + + if (! empty($data['model_type'])) { + $query->where('model_type', 'like', '%'.$data['model_type'].'%'); + } + if (array_key_exists('work_flow_status', $data) && $data['work_flow_status'] != '') { $query->where('has_work_flow_id', $data['work_flow_status']); } @@ -1782,6 +1808,14 @@ class TempClassCharacteristicResource extends Resource $indicators[] = 'Serial Number: '.$data['gernr']; } + if (! empty($data['zmm_heading'])) { + $indicators[] = 'Heading: '.$data['zmm_heading']; + } + + if (! empty($data['model_type'])) { + $indicators[] = 'Model Type: '.$data['model_type']; + } + if (array_key_exists('work_flow_status', $data) && $data['work_flow_status'] != '') { $statusMap = [ '1' => 'Pending Approval', @@ -1789,7 +1823,7 @@ class TempClassCharacteristicResource extends Resource '0' => 'Approved', ]; - $indicators[] = 'Work Flow Status: ' . ($statusMap[$data['work_flow_status']] ?? ''); + $indicators[] = 'Work Flow Status: '.($statusMap[$data['work_flow_status']] ?? ''); } if (! empty($data['created_from'])) {