Display and allow editing of waiting list configuration options (#4097)

WillShaw1100 · web-flow · commit 6ac469be4f40 · 2025-06-06T20:44:45.000+01:00
* Replace references to Member Services

* More options when creating waiting list

* Option to display manual flags in waiting list table

* lint all

* Generic Improvements

Make settings collapsible, improve readability, enable/disable roster flag, load flags to avoid multiple calls

* Display the Code instead of name

Better solution for those with the same name such as having multiple "Senior Controller" qualifications

* User friendly labels
diff --git a/app/Filament/Resources/WaitingListResource.php b/app/Filament/Resources/WaitingListResource.php
@@ -5,7 +5,10 @@
 use App\Filament\Resources\WaitingListResource\Pages;
 use App\Filament\Resources\WaitingListResource\RelationManagers\AccountsRelationManager;
 use App\Models\Training\WaitingList;
-use Filament\Forms;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationGroup;
 use Filament\Resources\Resource;
@@ -27,14 +30,68 @@ public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')->autofocus()->required()->live(onBlur: true)
+                TextInput::make('name')->autofocus()->required()->live(onBlur: true)
                     ->afterStateUpdated(fn ($state, callable $set) => $set('slug', Str::slug($state))),
-                Forms\Components\TextInput::make('slug')->required(),
+                TextInput::make('slug')->required(),
 
-                Forms\Components\Select::make('department')->options([
+                Select::make('department')->options([
                     'atc' => 'ATC Training',
                     'pilot' => 'Pilot Training',
                 ])->required(),
+
+                Section::make('Additional Settings')
+                    ->schema([
+                        Toggle::make('feature_toggles.check_atc_hours')
+                            ->label('Check ATC Hours')
+                            ->default(true),
+
+                        Toggle::make('feature_toggles.display_on_roster')
+                            ->label('Display Roster Membership')
+                            ->default(true),
+
+                        Toggle::make('feature_toggles.check_cts_theory_exam')
+                            ->label('Display CTS Theory Exam')
+                            ->default(true),
+
+                        Toggle::make('requires_roster_membership')
+                            ->label('Require Roster Membership')
+                            ->default(true),
+
+                        Toggle::make('self_enrolment_enabled')
+                            ->label('Enable Self-Enrolment')
+                            ->default(false)
+                            ->live(),
+
+                    ])
+                    ->collapsible()
+                    ->collapsed(),
+
+                Section::make('Self-Enrolment Requirements')
+                    ->schema([
+                        Select::make('self_enrolment_minimum_qualification_id')
+                            ->label('Minimum Rating')
+                            ->helperText('If the member has a rating lower than this, they cannot self-enrol.')
+                            ->relationship('minimumQualification', 'code')
+                            ->searchable()
+                            ->preload(),
+                        Select::make('self_enrolment_maximum_qualification_id')
+                            ->label('Maximum Rating')
+                            ->helperText('If the member has a rating higher than this, they cannot self-enrol.')
+                            ->relationship('maximumQualification', 'code')
+                            ->searchable()
+                            ->preload(),
+                        Select::make('self_enrolment_hours_at_qualification_id')
+                            ->label('Rating for Hour Check')
+                            ->helperText('Check if the member has a certain number of hours at this rating.')
+                            ->relationship('hoursAtQualification', 'code')
+                            ->searchable()
+                            ->preload(),
+                        TextInput::make('self_enrolment_hours_at_qualification_minimum_hours')
+                            ->label('Minimum Hours')
+                            ->helperText('Minimum hours required at the above rating to self-enrol.')
+                            ->integer()
+                            ->minValue(0),
+                    ])->collapsible()->collapsed()->visible(fn (callable $get) => $get('self_enrolment_enabled') === true),
             ]);
     }
 
diff --git a/app/Filament/Resources/WaitingListResource/Pages/ViewWaitingList.php b/app/Filament/Resources/WaitingListResource/Pages/ViewWaitingList.php
@@ -13,6 +13,7 @@
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
 use Filament\Resources\Pages\ViewRecord;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Arr;
@@ -76,6 +77,7 @@ protected function getHeaderActions(): array
                     $flag = WaitingListFlag::create([
                         'name' => $data['name'],
                         'position_group_id' => $data['position_group_id'],
+                        'display_in_table' => $data['display_in_table'] ?? false,
                     ]);
 
                     $this->record->addFlag($flag);
@@ -89,6 +91,10 @@ protected function getHeaderActions(): array
                     Select::make('position_group_id')->label('Position Group')->options(fn () => PositionGroup::all()->mapWithKeys(function ($item) {
                         return [$item['id'] => $item['name']];
                     }))->hint('If an option is chosen here, this will be an automated flag. This cannot be reversed.'),
+
+                    Toggle::make('display_in_table')
+                        ->label('Display in Waiting List Table')
+                        ->default(false),
                 ])
                 ->visible(fn () => auth()->user()->can('addFlags', $this->record)),
         ];
diff --git a/app/Filament/Resources/WaitingListResource/RelationManagers/AccountsRelationManager.php b/app/Filament/Resources/WaitingListResource/RelationManagers/AccountsRelationManager.php
@@ -85,14 +85,15 @@ public function form(Form $form): Form
     public function table(Table $table): Table
     {
         return $table
-            ->modifyQueryUsing(fn (Builder $query) => $query->with(['account', 'account.roster', 'waitingList']))
+            ->modifyQueryUsing(fn (Builder $query) => $query->with(['account', 'account.roster', 'waitingList', 'flags']))
             ->columns([
                 Tables\Columns\TextColumn::make('position')->getStateUsing(fn (WaitingListAccount $record) => $this->ownerRecord->positionOf($record) ?? '-')->label('Position'),
                 Tables\Columns\TextColumn::make('account_id')->label('CID')->searchable(),
                 Tables\Columns\TextColumn::make('account.name')->label('Name')->searchable(['name_first', 'name_last']),
                 Tables\Columns\IconColumn::make('on_roster')->boolean()->label('On Roster')->getStateUsing(fn (WaitingListAccount $record) => $record->account->onRoster())->visible(fn () => $this->ownerRecord->feature_toggles['display_on_roster'] ?? true),
                 Tables\Columns\TextColumn::make('created_at')->label('Added On')->dateTime('d/m/Y H:i:s'),
                 Tables\Columns\IconColumn::make('cts_theory_exam')->boolean()->label('CTS Theory Exam')->getStateUsing(fn (WaitingListAccount $record) => $record->theory_exam_passed)->visible(fn () => $this->ownerRecord->feature_toggles['check_cts_theory_exam'] ?? true),
+                ...$this->getFlagColumns(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make()
@@ -182,4 +183,22 @@ public static function removalReasonOptions(): array
     {
         return WaitingList\RemovalReason::formOptions();
     }
+
+    // Display All Manual Flags where display option is enabled
+    protected function getFlagColumns(): array
+    {
+        return $this->ownerRecord->flags()
+            ->where('display_in_table', true)
+            ->get()
+            ->map(function ($flag) {
+                return Tables\Columns\IconColumn::make("flag_{$flag->id}")
+                    ->label($flag->name)
+                    ->boolean()
+                    ->getStateUsing(function (WaitingListAccount $record) use ($flag) {
+                        $flagRecord = $record->flags->firstWhere('id', $flag->id);
+
+                        return $flagRecord?->pivot?->marked_at !== null;
+                    });
+            })->all();
+    }
 }
diff --git a/app/Models/Training/WaitingList.php b/app/Models/Training/WaitingList.php
@@ -87,7 +87,7 @@ protected static function boot()
 
     public $table = 'training_waiting_list';
 
-    protected $fillable = ['name', 'slug', 'department', 'feature_toggles'];
+    protected $fillable = ['name', 'slug', 'department', 'feature_toggles', 'requires_roster_membership', 'self_enrolment_enabled', 'self_enrolment_minimum_qualification_id', 'self_enrolment_maximum_qualification_id', 'self_enrolment_hours_at_qualification_id', 'self_enrolment_hours_at_qualification_minimum_hours'];
 
     const ATC_DEPARTMENT = 'atc';
 
@@ -103,6 +103,10 @@ protected static function boot()
         'deleted_at' => 'datetime',
         'requires_roster_membership' => 'boolean',
         'self_enrolment_enabled' => 'boolean',
+        'self_enrolment_minimum_qualification_id' => 'integer',
+        'self_enrolment_maximum_qualification_id' => 'integer',
+        'self_enrolment_hours_at_qualification_id' => 'integer',
+        'self_enrolment_hours_at_qualification_minimum_hours' => 'integer',
     ];
 
     /**
@@ -285,6 +289,21 @@ public function getFeatureTogglesFormattedAttribute(): object
         ];
     }
 
+    public function minimumQualification()
+    {
+        return $this->belongsTo(\App\Models\Mship\Qualification::class, 'self_enrolment_minimum_qualification_id');
+    }
+
+    public function maximumQualification()
+    {
+        return $this->belongsTo(\App\Models\Mship\Qualification::class, 'self_enrolment_maximum_qualification_id');
+    }
+
+    public function hoursAtQualification()
+    {
+        return $this->belongsTo(\App\Models\Mship\Qualification::class, 'self_enrolment_hours_at_qualification_id');
+    }
+
     public function __toString()
     {
         return (string) $this->name;
diff --git a/app/Models/Training/WaitingList/WaitingListFlag.php b/app/Models/Training/WaitingList/WaitingListFlag.php
@@ -14,6 +14,10 @@ class WaitingListFlag extends Model
 
     protected $table = 'training_waiting_list_flags';
 
+    protected $casts = [
+        'display_in_table' => 'boolean',
+    ];
+
     protected static function boot()
     {
         parent::boot();
diff --git a/database/migrations/2025_05_14_235710_training_display_manual_flags.php b/database/migrations/2025_05_14_235710_training_display_manual_flags.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('training_waiting_list_flags', function (Blueprint $table) {
+            $table->boolean('display_in_table')->default(false)->after('deleted_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('training_waiting_list_flags', function (Blueprint $table) {
+            $table->dropColumn('display_in_table');
+        });
+    }
+};

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ class WaitingListFlag extends Model`
`14`	`14`
`15`	`15`	`protected $table = 'training_waiting_list_flags';`
`16`	`16`
	`17`	`+ protected $casts = [`
	`18`	`+ 'display_in_table' => 'boolean',`
	`19`	`+ ];`
	`20`	`+`
`17`	`21`	`protected static function boot()`
`18`	`22`	`{`
`19`	`23`	`parent::boot();`