Updated report column view and filter logic with validations
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

This commit is contained in:
dhanabalan
2026-05-11 10:33:43 +05:30
parent 63c1cc14b2
commit 8e2a0e79dc

View File

@@ -5,28 +5,27 @@ namespace App\Filament\Resources;
use App\Filament\Exports\TempClassCharacteristicExporter; use App\Filament\Exports\TempClassCharacteristicExporter;
use App\Filament\Imports\TempClassCharacteristicImporter; use App\Filament\Imports\TempClassCharacteristicImporter;
use App\Filament\Resources\TempClassCharacteristicResource\Pages; use App\Filament\Resources\TempClassCharacteristicResource\Pages;
use App\Filament\Resources\TempClassCharacteristicResource\RelationManagers;
use App\Models\Item; use App\Models\Item;
use App\Models\Machine; use App\Models\Machine;
use App\Models\Plant; use App\Models\Plant;
use App\Models\TempClassCharacteristic; use App\Models\TempClassCharacteristic;
use Filament\Facades\Filament; use Filament\Facades\Filament;
use Filament\Forms; 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\Form;
use Filament\Forms\Get;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; 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\ExportAction;
use Filament\Tables\Actions\ImportAction; use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Filters\Filter; use Filament\Tables\Filters\Filter;
use Filament\Forms\Components\DateTimePicker; use Filament\Tables\Table;
use Filament\Forms\Components\Select; use Illuminate\Database\Eloquent\Builder;
use Filament\Forms\Components\TextInput; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Illuminate\Validation\Rule;
class TempClassCharacteristicResource extends Resource class TempClassCharacteristicResource extends Resource
{ {
@@ -1029,6 +1028,10 @@ class TempClassCharacteristicResource extends Resource
->alignCenter() ->alignCenter()
->searchable() ->searchable()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('model_type')
->label('MODEL TYPE')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('aufnr') Tables\Columns\TextColumn::make('aufnr')
->label('AUFNR') ->label('AUFNR')
->alignCenter() ->alignCenter()
@@ -1055,10 +1058,6 @@ class TempClassCharacteristicResource extends Resource
->alignCenter() ->alignCenter()
->searchable() ->searchable()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('model_type')
->label('MODEL TYPE')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('zz1_cn_bill_ord') Tables\Columns\TextColumn::make('zz1_cn_bill_ord')
->label('ZZ1 CN BILL ORD') ->label('ZZ1 CN BILL ORD')
->alignCenter() ->alignCenter()
@@ -1181,6 +1180,7 @@ class TempClassCharacteristicResource extends Resource
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('zmm_ratedpower') Tables\Columns\TextColumn::make('zmm_ratedpower')
->label('ZMM RATEDPOWER') ->label('ZMM RATEDPOWER')
->alignCenter()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('zmm_region') Tables\Columns\TextColumn::make('zmm_region')
->label('ZMM REGION') ->label('ZMM REGION')
@@ -1577,14 +1577,12 @@ class TempClassCharacteristicResource extends Resource
Tables\Columns\TextColumn::make('winded_serial_number') Tables\Columns\TextColumn::make('winded_serial_number')
->label('WINDED SERIAL NUMBER') ->label('WINDED SERIAL NUMBER')
->alignCenter() ->alignCenter()
->searchable()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('part_validation_1') Tables\Columns\TextColumn::make('model_type')
->label('PART VALIDATION 1') ->label('MODEL TYPE')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('part_validation_2')
->label('PART VALIDATION 2')
->alignCenter() ->alignCenter()
->searchable()
->sortable(), ->sortable(),
Tables\Columns\TextColumn::make('has_work_flow_id') Tables\Columns\TextColumn::make('has_work_flow_id')
->label('HAS WORK FLOW ID') ->label('HAS WORK FLOW ID')
@@ -1599,14 +1597,28 @@ class TempClassCharacteristicResource extends Resource
}; };
}), }),
Tables\Columns\TextColumn::make('created_at') 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() ->dateTime()
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('updated_at') Tables\Columns\TextColumn::make('updated_by')
->dateTime() ->label('UPDATED BY')
->alignCenter()
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('deleted_at') Tables\Columns\TextColumn::make('deleted_at')
->label('DELETED AT')
->alignCenter()
->dateTime() ->dateTime()
->sortable() ->sortable()
->toggleable(isToggledHiddenByDefault: true), ->toggleable(isToggledHiddenByDefault: true),
@@ -1690,6 +1702,12 @@ class TempClassCharacteristicResource extends Resource
TextInput::make('gernr') TextInput::make('gernr')
->label('Serial Number') ->label('Serial Number')
->placeholder('Enter 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') Select::make('work_flow_status')
->label('Work Flow Status') ->label('Work Flow Status')
->placeholder('Select Work Flow Status') ->placeholder('Select Work Flow Status')
@@ -1711,7 +1729,7 @@ class TempClassCharacteristicResource extends Resource
]) ])
->query(function ($query, array $data) { ->query(function ($query, array $data) {
// Hide all records initially if no filters are applied // 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'); return $query->whereRaw('1 = 0');
} }
@@ -1741,6 +1759,14 @@ class TempClassCharacteristicResource extends Resource
$query->where('gernr', 'like', '%'.$data['gernr'].'%'); $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'] != '') { if (array_key_exists('work_flow_status', $data) && $data['work_flow_status'] != '') {
$query->where('has_work_flow_id', $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']; $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'] != '') { if (array_key_exists('work_flow_status', $data) && $data['work_flow_status'] != '') {
$statusMap = [ $statusMap = [
'1' => 'Pending Approval', '1' => 'Pending Approval',
@@ -1789,7 +1823,7 @@ class TempClassCharacteristicResource extends Resource
'0' => 'Approved', '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'])) { if (! empty($data['created_from'])) {