Smart cascading filters, collapsible sidebar, wizard-only create entry

- Add cascading filters across all list pages (activity→program→group,
  program→trainer, direction→movement type)
- Make sidebar sections collapsible with auto-expand on active page
- Route all "Create" buttons to wizards instead of plain forms
- Fix low stock count mismatch between dashboard and product list
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

app/Livewire/Dashboard.php

@@ -12,7 +12,7 @@
 use App\Domain\Financial\Models\Payment;
 use App\Domain\HR\Enums\PayslipStatus;
 use App\Domain\HR\Models\Payslip;
-use App\Domain\Inventory\Models\InventoryLevel;
+use App\Domain\Inventory\Models\Product;
 use App\Domain\Participant\Models\Participant;
 use App\Domain\Shared\Traits\UsesBranchScope;
 use App\Domain\Training\Models\TrainingSession;
@@ -84,8 +84,11 @@ public function render()
         $pendingDocuments = Document::where('status', DocumentStatus::Pending)
             ->count();
 
-        $lowStockItems = InventoryLevel::whereHas('product', fn ($q) => $q->where('track_inventory', true)->where('is_active', true)->whereNotNull('min_stock_level')->where('min_stock_level', '>', 0))
-            ->whereRaw('quantity_on_hand < (SELECT min_stock_level FROM products WHERE products.id = inventory_levels.product_id)')
+        $lowStockItems = Product::where('track_inventory', true)
+            ->where('is_active', true)
+            ->whereNotNull('min_stock_level')
+            ->where('min_stock_level', '>', 0)
+            ->whereHas('inventoryLevels', fn ($q) => $q->whereRaw('quantity_on_hand <= (SELECT min_stock_level FROM products WHERE products.id = inventory_levels.product_id)'))
             ->count();
 
         $expiringMedicalCerts = Document::where('document_type', DocumentType::MedicalCertificate)

app/Livewire/Enrollments/EnrollmentList.php

@@ -5,6 +5,7 @@
 use App\Domain\Shared\Traits\UsesBranchScope;
 use App\Domain\Training\Models\Enrollment;
 use App\Domain\Training\Models\TrainingGroup;
+use App\Domain\Training\Models\TrainingProgram;
 use App\Domain\Training\Services\EnrollmentService;
 use App\Domain\Shared\Exceptions\DomainException;
 use App\Livewire\Concerns\AppliesRoleScope;
@@ -28,6 +29,9 @@ class EnrollmentList extends Component
     #[Url]
     public string $status = '';
 
+    #[Url]
+    public string $programFilter = '';
+
     public string $groupFilter = '';
     public string $paymentFilter = '';
 
@@ -41,6 +45,12 @@ public function updatedStatus(): void
         $this->resetPage();
     }
 
+    public function updatedProgramFilter(): void
+    {
+        $this->groupFilter = '';
+        $this->resetPage();
+    }
+
     public function updatedGroupFilter(): void
     {
         $this->resetPage();
@@ -84,15 +94,22 @@ public function render()
                 });
             })
             ->when($this->status, fn ($q) => $q->where('status', $this->status))
+            ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
             ->when($this->groupFilter, fn ($q) => $q->where('training_group_id', $this->groupFilter))
             ->when($this->paymentFilter, fn ($q) => $q->where('payment_status', $this->paymentFilter))
             ->orderByDesc('enrollment_date');
 
         $this->applyRoleScope($query);
 
+        $groups = TrainingGroup::whereIn('status', ['forming', 'active', 'full'])
+            ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
+            ->orderBy('name_ar')
+            ->get(['id', 'name_ar']);
+
         return view('livewire.enrollments.enrollment-list', [
             'enrollments' => $query->paginate(20),
-            'groups' => TrainingGroup::whereIn('status', ['forming', 'active', 'full'])->orderBy('name_ar')->get(['id', 'name_ar']),
+            'programs' => TrainingProgram::where('status', 'active')->orderBy('name_ar')->get(['id', 'name_ar']),
+            'groups' => $groups,
             'statusOptions' => [
                 'pending' => 'معلق',
                 'active' => 'نشط',

app/Livewire/Enrollments/WaitlistManager.php

@@ -46,6 +46,7 @@ public function updatedGroupFilter(): void
 
     public function updatedProgramFilter(): void
     {
+        $this->groupFilter = '';
         $this->resetPage();
     }
 
@@ -118,11 +119,14 @@ public function render()
             ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
             ->orderBy('enrollment_date');
 
+        $groups = TrainingGroup::whereIn('status', ['forming', 'active', 'full'])
+            ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
+            ->orderBy('name_ar')
+            ->get(['id', 'name_ar', 'current_count', 'max_capacity']);
+
         return view('livewire.enrollments.waitlist-manager', [
             'enrollments' => $query->paginate(20),
-            'groups' => TrainingGroup::whereIn('status', ['forming', 'active', 'full'])
-                ->orderBy('name_ar')
-                ->get(['id', 'name_ar', 'current_count', 'max_capacity']),
+            'groups' => $groups,
             'programs' => TrainingProgram::where('status', 'active')
                 ->orderBy('name_ar')
                 ->get(['id', 'name_ar']),

app/Livewire/Evaluations/EvaluationList.php

@@ -4,6 +4,8 @@
 
 use App\Domain\Training\Enums\EvaluationStatus;
 use App\Domain\Training\Models\Evaluation;
+use App\Domain\Training\Models\TrainingGroup;
+use App\Domain\Training\Models\TrainingProgram;
 use App\Livewire\Concerns\AppliesRoleScope;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
@@ -25,6 +27,9 @@ class EvaluationList extends Component
     #[Url]
     public string $status = '';
 
+    #[Url]
+    public string $programFilter = '';
+
     #[Url]
     public string $groupId = '';
 
@@ -43,6 +48,12 @@ public function updatedStatus(): void
         $this->resetPage();
     }
 
+    public function updatedProgramFilter(): void
+    {
+        $this->groupId = '';
+        $this->resetPage();
+    }
+
     public function updatedGroupId(): void
     {
         $this->resetPage();
@@ -51,18 +62,27 @@ public function updatedGroupId(): void
     public function render()
     {
         $query = Evaluation::query()
-            ->with(['participant.person', 'group', 'evaluator'])
+            ->with(['participant.person', 'group.program', 'evaluator'])
             ->when($this->search, fn ($q) => $q->whereHas('participant.person', fn ($pq) => $pq->where('name_ar', 'ilike', "%{$this->search}%")))
             ->when($this->status, fn ($q) => $q->where('status', $this->status))
+            ->when($this->programFilter, fn ($q) => $q->whereHas('group', fn ($gq) => $gq->where('training_program_id', $this->programFilter)))
             ->when($this->groupId, fn ($q) => $q->where('training_group_id', $this->groupId))
             ->orderByDesc('evaluation_date');
 
         $this->applyRoleScope($query);
 
-        $groups = \App\Domain\Training\Models\TrainingGroup::orderBy('name_ar')->get(['id', 'name_ar']);
+        $groups = TrainingGroup::query()
+            ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
+            ->orderBy('name_ar')
+            ->get(['id', 'name_ar']);
+
+        $programs = TrainingProgram::where('status', 'active')
+            ->orderBy('name_ar')
+            ->get(['id', 'name_ar']);
 
         return view('livewire.evaluations.evaluation-list', [
             'evaluations' => $query->paginate(20),
+            'programs' => $programs,
             'groups' => $groups,
             'statuses' => EvaluationStatus::cases(),
         ]);

app/Livewire/Groups/GroupList.php

@@ -4,6 +4,7 @@
 
 use App\Domain\Shared\Traits\UsesBranchScope;
 use App\Domain\Training\Enums\GroupStatus;
+use App\Domain\Training\Models\Activity;
 use App\Domain\Training\Models\TrainingGroup;
 use App\Domain\Training\Models\TrainingProgram;
 use App\Domain\Training\Services\TrainingGroupService;
@@ -30,6 +31,9 @@ class GroupList extends Component
     #[Url]
     public string $status = '';
 
+    #[Url]
+    public string $activityFilter = '';
+
     #[Url]
     public string $programFilter = '';
 
@@ -49,6 +53,12 @@ public function updatedStatus(): void
         $this->resetPage();
     }
 
+    public function updatedActivityFilter(): void
+    {
+        $this->programFilter = '';
+        $this->resetPage();
+    }
+
     public function updatedProgramFilter(): void
     {
         $this->resetPage();
@@ -110,14 +120,21 @@ public function render()
                     ->orWhere('code', 'ilike', "%{$this->search}%");
             }))
             ->when($this->status, fn ($q) => $q->where('status', $this->status))
+            ->when($this->activityFilter, fn ($q) => $q->whereHas('program', fn ($p) => $p->where('activity_id', $this->activityFilter)))
             ->when($this->programFilter, fn ($q) => $q->where('training_program_id', $this->programFilter))
             ->orderBy($this->sortBy, $this->sortDir);
 
         $this->applyRoleScope($query);
 
+        $programs = TrainingProgram::query()
+            ->when($this->activityFilter, fn ($q) => $q->where('activity_id', $this->activityFilter))
+            ->orderBy('name_ar')
+            ->get(['id', 'name_ar']);
+
         return view('livewire.groups.group-list', [
             'groups' => $query->paginate(15),
-            'programs' => TrainingProgram::orderBy('name_ar')->get(['id', 'name_ar']),
+            'activities' => Activity::where('is_active', true)->orderBy('name_ar')->get(['id', 'name_ar']),
+            'programs' => $programs,
             'statusOptions' => [
                 'forming' => 'قيد التشكيل',
                 'active' => 'نشطة',

app/Livewire/Inventory/MovementList.php

@@ -59,6 +59,7 @@ public function updatedMovementType(): void
 
     public function updatedDirection(): void
     {
+        $this->movementType = '';
         $this->resetPage();
     }
 
@@ -99,27 +100,38 @@ public function render()
             ->when($this->warehouseFilter, fn ($q) => $q->where('inventory_movements.warehouse_id', $this->warehouseFilter))
             ->orderByDesc('inventory_movements.created_at');
 
+        $allTypes = [
+            'purchase_received' => 'استلام مشتريات',
+            'sale' => 'بيع',
+            'transfer_out' => 'تحويل صادر',
+            'transfer_in' => 'تحويل وارد',
+            'return_to_stock' => 'مرتجع للمخزون',
+            'return_to_supplier' => 'مرتجع للمورد',
+            'adjustment_up' => 'تسوية بالزيادة',
+            'adjustment_down' => 'تسوية بالنقص',
+            'damage' => 'تلف',
+            'loss' => 'فقد',
+            'consumption' => 'استهلاك',
+            'kit_assembly' => 'تجميع طقم',
+            'kit_disassembly' => 'تفكيك طقم',
+            'initial_stock' => 'رصيد افتتاحي',
+            'count_adjustment_up' => 'تسوية جرد بالزيادة',
+            'count_adjustment_down' => 'تسوية جرد بالنقص',
+        ];
+
+        $inTypes = ['purchase_received', 'transfer_in', 'return_to_stock', 'adjustment_up', 'kit_disassembly', 'initial_stock', 'count_adjustment_up'];
+        $outTypes = ['sale', 'transfer_out', 'return_to_supplier', 'adjustment_down', 'damage', 'loss', 'consumption', 'kit_assembly', 'count_adjustment_down'];
+
+        $movementTypeOptions = match ($this->direction) {
+            'in' => array_intersect_key($allTypes, array_flip($inTypes)),
+            'out' => array_intersect_key($allTypes, array_flip($outTypes)),
+            default => $allTypes,
+        };
+
         return view('livewire.inventory.movement-list', [
             'movements' => $query->paginate(25),
             'warehouses' => Warehouse::active()->orderBy('name_ar')->get(['id', 'name_ar']),
-            'movementTypeOptions' => [
-                'purchase_received' => 'استلام مشتريات',
-                'sale' => 'بيع',
-                'transfer_out' => 'تحويل صادر',
-                'transfer_in' => 'تحويل وارد',
-                'return_to_stock' => 'مرتجع للمخزون',
-                'return_to_supplier' => 'مرتجع للمورد',
-                'adjustment_up' => 'تسوية بالزيادة',
-                'adjustment_down' => 'تسوية بالنقص',
-                'damage' => 'تلف',
-                'loss' => 'فقد',
-                'consumption' => 'استهلاك',
-                'kit_assembly' => 'تجميع طقم',
-                'kit_disassembly' => 'تفكيك طقم',
-                'initial_stock' => 'رصيد افتتاحي',
-                'count_adjustment_up' => 'تسوية جرد بالزيادة',
-                'count_adjustment_down' => 'تسوية جرد بالنقص',
-            ],
+            'movementTypeOptions' => $movementTypeOptions,
         ]);
     }
 }

app/Livewire/Inventory/ProductList.php

@@ -86,9 +86,10 @@ public function render()
             })
             ->when($this->stockFilter === 'low', function ($q) {
                 $q->where('track_inventory', true)
+                  ->where('is_active', true)
                   ->whereNotNull('min_stock_level')
                   ->where('min_stock_level', '>', 0)
-                  ->whereHas('inventoryLevels', fn ($il) => $il->whereRaw('quantity_on_hand < (SELECT min_stock_level FROM products WHERE products.id = inventory_levels.product_id)'));
+                  ->whereHas('inventoryLevels', fn ($il) => $il->whereRaw('quantity_on_hand <= (SELECT min_stock_level FROM products WHERE products.id = inventory_levels.product_id)'));
             })
             ->orderByDesc('created_at');
 

app/Livewire/Programs/ProgramList.php

@@ -9,6 +9,7 @@
 use App\Domain\Training\Services\TrainingProgramService;
 use App\Domain\Shared\Exceptions\DomainException;
 use App\Livewire\Concerns\AppliesRoleScope;
+use App\Models\User;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
 use Livewire\Attributes\Url;
@@ -32,6 +33,9 @@ class ProgramList extends Component
     #[Url]
     public string $activityFilter = '';
 
+    #[Url]
+    public string $trainerFilter = '';
+
     #[Url]
     public string $sortBy = 'created_at';
 
@@ -49,6 +53,12 @@ public function updatedStatus(): void
     }
 
     public function updatedActivityFilter(): void
+    {
+        $this->trainerFilter = '';
+        $this->resetPage();
+    }
+
+    public function updatedTrainerFilter(): void
     {
         $this->resetPage();
     }
@@ -101,13 +111,26 @@ public function render()
             }))
             ->when($this->status, fn ($q) => $q->where('status', $this->status))
             ->when($this->activityFilter, fn ($q) => $q->where('activity_id', $this->activityFilter))
+            ->when($this->trainerFilter, fn ($q) => $q->where('default_trainer_id', $this->trainerFilter))
             ->orderBy($this->sortBy, $this->sortDir);
 
         $this->applyRoleScope($query);
 
+        $trainers = User::query()
+            ->select('id', 'name_ar', 'name')
+            ->whereHas('roles', fn ($q) => $q->whereIn('slug', ['trainer', 'head_trainer']))
+            ->when($this->activityFilter, fn ($q) => $q->whereIn('id',
+                TrainingProgram::where('activity_id', $this->activityFilter)
+                    ->whereNotNull('default_trainer_id')
+                    ->pluck('default_trainer_id')
+            ))
+            ->orderBy('name_ar')
+            ->get();
+
         return view('livewire.programs.program-list', [
             'programs' => $query->paginate(15),
             'activities' => Activity::where('is_active', true)->orderBy('name_ar')->get(['id', 'name_ar']),
+            'trainers' => $trainers,
             'statusOptions' => [
                 'draft' => 'مسودة',
                 'active' => 'نشط',

app/Livewire/Schedule/WeeklySchedule.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Schedule;
 
 use App\Domain\Shared\Traits\UsesBranchScope;
+use App\Domain\Training\Models\TrainingGroup;
 use App\Domain\Training\Models\TrainingProgram;
 use App\Domain\Training\Models\TrainingSession;
 use App\Models\User;
@@ -47,6 +48,11 @@ public function nextWeek(): void
         $this->weekStart = Carbon::parse($this->weekStart)->addWeek()->format('Y-m-d');
     }
 
+    public function updatedProgramFilter(): void
+    {
+        $this->trainerFilter = '';
+    }
+
     public function goToToday(): void
     {
         $today = Carbon::today();
@@ -118,10 +124,15 @@ public function render()
             ->orderBy('name_ar')
             ->get();
 
-        // Trainers for filter
+        // Trainers for filter — cascade from program
         $trainers = User::query()
             ->select('id', 'name_ar', 'name')
             ->whereHas('roles', fn ($q) => $q->whereIn('slug', ['trainer', 'head_trainer']))
+            ->when($this->programFilter, fn ($q) => $q->whereIn('id',
+                TrainingGroup::where('training_program_id', $this->programFilter)
+                    ->whereNotNull('head_trainer_id')
+                    ->pluck('head_trainer_id')
+            ))
             ->orderBy('name_ar')
             ->get();
 

resources/views/components/layouts/sidebar.blade.php

@@ -205,27 +205,35 @@ class="flex items-center gap-3 px-3 py-2.5 rounded-lg text-sm font-medium transi
                     </a>
                 @endif
 
-            {{-- Section with items --}}
+            {{-- Section with items (collapsible) --}}
             @elseif(isset($item['section']))
                 @php
                     $visibleItems = collect($item['items'])->filter(function ($child) use ($itemVisible) {
                         return $itemVisible($child);
                     });
+                    $sectionActive = $visibleItems->contains(function ($child) {
+                        return request()->routeIs(Str::before($child['route'], '.index') . '.*');
+                    });
                 @endphp
 
                 @if($visibleItems->isNotEmpty())
-                    <div class="pt-5 pb-1">
-                        <p class="px-3 text-xs font-semibold uppercase tracking-wider" style="color: var(--brand-sidebar-text, #e2e8f0); opacity: 0.5;">{{ $item['section'] }}</p>
-                    </div>
+                    <div x-data="{ open: {{ $sectionActive ? 'true' : 'false' }} }" class="pt-3">
+                        <button @click="open = !open" class="w-full flex items-center justify-between px-3 py-1.5 rounded-lg hover:bg-white/5 transition-colors group">
+                            <p class="text-xs font-semibold uppercase tracking-wider" style="color: var(--brand-sidebar-text, #e2e8f0); opacity: 0.5;">{{ $item['section'] }}</p>
+                            <svg class="w-3.5 h-3.5 transition-transform duration-200" :class="open ? 'rotate-180' : ''" fill="none" stroke="currentColor" viewBox="0 0 24 24" style="color: var(--brand-sidebar-text, #e2e8f0); opacity: 0.4;"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/></svg>
+                        </button>
 
-                    @foreach($visibleItems as $child)
-                        <a href="{{ route($child['route']) }}"
-                           class="flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-all duration-150 hover:bg-white/10 active:bg-white/20 active:scale-[0.97]"
-                           style="{{ request()->routeIs(Str::before($child['route'], '.index') . '.*') ? 'background-color: var(--brand-sidebar-active, #2563eb); color: #fff;' : 'color: var(--brand-sidebar-text, #e2e8f0);' }}">
-                            <svg class="w-5 h-5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">{!! $icons[$child['icon']] ?? '' !!}</svg>
-                            <span>{{ $child['label'] }}</span>
-                        </a>
-                    @endforeach
+                        <div x-show="open" x-transition:enter="transition ease-out duration-150" x-transition:enter-start="opacity-0 -translate-y-1" x-transition:enter-end="opacity-100 translate-y-0" x-transition:leave="transition ease-in duration-100" x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" class="mt-1 space-y-0.5">
+                            @foreach($visibleItems as $child)
+                                <a href="{{ route($child['route']) }}"
+                                   class="flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-all duration-150 hover:bg-white/10 active:bg-white/20 active:scale-[0.97]"
+                                   style="{{ request()->routeIs(Str::before($child['route'], '.index') . '.*') ? 'background-color: var(--brand-sidebar-active, #2563eb); color: #fff;' : 'color: var(--brand-sidebar-text, #e2e8f0);' }}">
+                                    <svg class="w-5 h-5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">{!! $icons[$child['icon']] ?? '' !!}</svg>
+                                    <span>{{ $child['label'] }}</span>
+                                </a>
+                            @endforeach
+                        </div>
+                    </div>
                 @endif
             @endif
         @endforeach

resources/views/livewire/enrollments/enrollment-list.blade.php

@@ -25,7 +25,7 @@ class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-l
 
     {{-- Filters --}}
     <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-3 sm:p-4 mb-4">
-        <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3">
+        <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-3">
             <div class="col-span-2 md:col-span-1 lg:col-span-2">
                 <input type="text" wire:model.live.debounce.300ms="search"
                        placeholder="{{ __('بحث بالاسم أو رقم المشترك...') }}"
@@ -37,6 +37,12 @@ class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg focus:ring-2 f
                 <option value="{{ $value }}">{{ __($label) }}</option>
                 @endforeach
             </select>
+            <select wire:model.live="programFilter" class="text-sm px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                <option value="">{{ __('كل البرامج') }}</option>
+                @foreach($programs as $program)
+                <option value="{{ $program->id }}">{{ $program->name_ar }}</option>
+                @endforeach
+            </select>
             <select wire:model.live="groupFilter" class="text-sm px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
                 <option value="">{{ __('كل المجموعات') }}</option>
                 @foreach($groups as $group)

resources/views/livewire/enrollments/waitlist-manager.blade.php

@@ -29,18 +29,18 @@ class="inline-flex items-center gap-2 px-4 py-2 text-gray-600 bg-gray-100 rounde
                        placeholder="{{ __('بحث بالاسم أو رقم المشترك...') }}"
                        class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-purple-500">
             </div>
-            <select wire:model.live="groupFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-purple-500">
-                <option value="">{{ __('كل المجموعات') }}</option>
-                @foreach($groups as $group)
-                <option value="{{ $group->id }}">{{ $group->name_ar }} ({{ $group->current_count }}/{{ $group->max_capacity }})</option>
-                @endforeach
-            </select>
             <select wire:model.live="programFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-purple-500">
                 <option value="">{{ __('كل البرامج') }}</option>
                 @foreach($programs as $program)
                 <option value="{{ $program->id }}">{{ $program->name_ar }}</option>
                 @endforeach
             </select>
+            <select wire:model.live="groupFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-purple-500">
+                <option value="">{{ __('كل المجموعات') }}</option>
+                @foreach($groups as $group)
+                <option value="{{ $group->id }}">{{ $group->name_ar }} ({{ $group->current_count }}/{{ $group->max_capacity }})</option>
+                @endforeach
+            </select>
         </div>
     </div>
 

resources/views/livewire/evaluations/evaluation-list.blade.php

@@ -16,7 +16,7 @@ class="inline-flex items-center gap-2 px-4 py-2.5 bg-blue-600 text-white text-sm
 
     <!-- Filters -->
     <div class="mb-6 p-4 bg-white border border-gray-200 rounded-lg">
-        <div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
+        <div class="grid grid-cols-1 gap-4 sm:grid-cols-4">
             <!-- Search -->
             <div>
                 <label for="search" class="block text-sm font-medium text-gray-700 mb-1">{{ __('بحث بالمشترك') }}</label>
@@ -42,6 +42,20 @@ class="w-full rounded-lg border-gray-300 shadow-sm focus:border-blue-500 focus:r
                 </select>
             </div>
 
+            <!-- Program Filter -->
+            <div>
+                <label for="programFilter" class="block text-sm font-medium text-gray-700 mb-1">{{ __('البرنامج') }}</label>
+                <select
+                    id="programFilter"
+                    wire:model.live="programFilter"
+                    class="w-full rounded-lg border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 text-sm">
+                    <option value="">{{ __('الكل') }}</option>
+                    @foreach($programs as $program)
+                        <option value="{{ $program->id }}">{{ $program->name_ar }}</option>
+                    @endforeach
+                </select>
+            </div>
+
             <!-- Group Filter -->
             <div>
                 <label for="groupId" class="block text-sm font-medium text-gray-700 mb-1">{{ __('المجموعة') }}</label>

resources/views/livewire/facilities/facility-list.blade.php

@@ -2,7 +2,7 @@
     <div class="flex items-center justify-between mb-6">
         <h1 class="text-xl sm:text-2xl font-bold text-gray-800">{{ __('المنشآت') }}</h1>
         @permission('facilities.create')
-        <a href="{{ route('facilities.create') }}" wire:navigate
+        <a href="{{ route('facilities.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             {{ __('إضافة منشأة') }}

resources/views/livewire/groups/group-list.blade.php

@@ -2,7 +2,7 @@
     <div class="flex items-center justify-between mb-6">
         <h1 class="text-xl sm:text-2xl font-bold text-gray-800">{{ __('المجموعات التدريبية') }}</h1>
         @can('groups.create')
-        <a href="{{ route('groups.create') }}" wire:navigate
+        <a href="{{ route('groups.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             {{ __('إنشاء مجموعة') }}
@@ -19,16 +19,16 @@ class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-l
 
     {{-- Filters --}}
     <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-4 mb-4">
-        <div class="grid grid-cols-1 sm:grid-cols-4 gap-4">
+        <div class="grid grid-cols-1 sm:grid-cols-5 gap-4">
             <div class="sm:col-span-2">
                 <input type="text" wire:model.live.debounce.300ms="search"
                        placeholder="{{ __('بحث بالاسم أو الكود...') }}"
                        class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
             </div>
-            <select wire:model.live="status" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                <option value="">{{ __('كل الحالات') }}</option>
-                @foreach($statusOptions as $value => $label)
-                <option value="{{ $value }}">{{ __($label) }}</option>
+            <select wire:model.live="activityFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                <option value="">{{ __('كل الأنشطة') }}</option>
+                @foreach($activities as $activity)
+                <option value="{{ $activity->id }}">{{ $activity->name_ar }}</option>
                 @endforeach
             </select>
             <select wire:model.live="programFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
@@ -37,6 +37,12 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:rin
                 <option value="{{ $program->id }}">{{ $program->name_ar }}</option>
                 @endforeach
             </select>
+            <select wire:model.live="status" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                <option value="">{{ __('كل الحالات') }}</option>
+                @foreach($statusOptions as $value => $label)
+                <option value="{{ $value }}">{{ __($label) }}</option>
+                @endforeach
+            </select>
         </div>
     </div>
 
@@ -125,7 +131,7 @@ class="text-red-600 hover:text-red-800 text-sm">{{ __('حذف') }}</button>
                         <td colspan="7" class="px-4 py-12 text-center">
                             <p class="text-gray-500 text-sm">{{ __('لا توجد مجموعات') }}</p>
                             @can('groups.create')
-                            <a href="{{ route('groups.create') }}" wire:navigate class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium block">{{ __('إنشاء أول مجموعة') }}</a>
+                            <a href="{{ route('groups.wizard') }}" wire:navigate class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium block">{{ __('إنشاء أول مجموعة') }}</a>
                             @endcan
                         </td>
                     </tr>

resources/views/livewire/hr/employee-list.blade.php

@@ -3,7 +3,7 @@
     <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 mb-6">
         <h1 class="text-2xl font-bold text-gray-900">{{ __('الموظفين') }}</h1>
         @can('employees.create')
-        <a href="{{ route('employees.create') }}" wire:navigate
+        <a href="{{ route('employees.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2.5 bg-blue-600 text-white text-sm font-medium rounded-lg hover:bg-blue-700 transition-colors">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             {{ __('إضافة موظف') }}

resources/views/livewire/inventory/movement-list.blade.php

@@ -21,17 +21,17 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:rin
                        class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                        placeholder="{{ __('إلى تاريخ') }}">
             </div>
+            <select wire:model.live="direction" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                <option value="">{{ __('كل الاتجاهات') }}</option>
+                <option value="in">{{ __('وارد') }}</option>
+                <option value="out">{{ __('صادر') }}</option>
+            </select>
             <select wire:model.live="movementType" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
                 <option value="">{{ __('كل الأنواع') }}</option>
                 @foreach($movementTypeOptions as $value => $label)
                 <option value="{{ $value }}">{{ __($label) }}</option>
                 @endforeach
             </select>
-            <select wire:model.live="direction" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
-                <option value="">{{ __('كل الاتجاهات') }}</option>
-                <option value="in">{{ __('وارد') }}</option>
-                <option value="out">{{ __('صادر') }}</option>
-            </select>
         </div>
         <div class="mt-3">
             <select wire:model.live="warehouseFilter" class="px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">

resources/views/livewire/inventory/product-list.blade.php

@@ -2,7 +2,7 @@
     <div class="flex items-center justify-between mb-6">
         <h1 class="text-xl sm:text-2xl font-bold text-gray-800">{{ __('المنتجات') }}</h1>
         @can('inventory.create')
-        <a href="{{ route('inventory.products.create') }}" wire:navigate
+        <a href="{{ route('inventory.products.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             {{ __('إضافة منتج') }}
@@ -118,7 +118,7 @@ class="text-green-600 hover:text-green-800 text-sm">{{ __('تعديل') }}</a>
                                 </svg>
                                 <p class="text-gray-500 text-sm">{{ __('لا توجد منتجات') }}</p>
                                 @can('inventory.create')
-                                <a href="{{ route('inventory.products.create') }}" wire:navigate
+                                <a href="{{ route('inventory.products.wizard') }}" wire:navigate
                                    class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium">
                                     {{ __('إضافة أول منتج') }}
                                 </a>

resources/views/livewire/invoices/invoice-list.blade.php

@@ -8,7 +8,7 @@ class="inline-flex items-center gap-2 px-3 py-2 bg-green-600 text-white rounded-
                 {{ __('تصدير CSV') }}
             </a>
             @can('invoices.create')
-            <a href="{{ route('invoices.create') }}" wire:navigate
+            <a href="{{ route('invoices.wizard') }}" wire:navigate
                class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
                 <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
                 {{ __('إنشاء فاتورة') }}
@@ -127,7 +127,7 @@ class="text-blue-600 hover:text-blue-800 text-sm">{{ __('عرض') }}</a>
                                 </svg>
                                 <p class="text-gray-500 text-sm">{{ __('لا توجد فواتير') }}</p>
                                 @can('invoices.create')
-                                <a href="{{ route('invoices.create') }}" wire:navigate
+                                <a href="{{ route('invoices.wizard') }}" wire:navigate
                                    class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium">
                                     {{ __('إنشاء أول فاتورة') }}
                                 </a>

resources/views/livewire/pricing/pricing-rule-list.blade.php

@@ -3,7 +3,7 @@
     <div class="flex flex-col sm:flex-row sm:items-center justify-between gap-3 mb-4 sm:mb-6">
         <h1 class="text-xl sm:text-2xl font-bold text-gray-800">{{ __('قواعد التسعير') }}</h1>
         @can('pricing.create')
-        <a href="{{ route('pricing.rules.create') }}" wire:navigate
+        <a href="{{ route('pricing.rules.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             <span class="hidden sm:inline">{{ __('إضافة قاعدة') }}</span>
@@ -120,7 +120,7 @@ class="text-blue-600 hover:text-blue-800 text-sm">{{ __('تعديل') }}</a>
                                 </svg>
                                 <p class="text-gray-500 text-sm">{{ __('لا توجد قواعد تسعير') }}</p>
                                 @can('pricing.create')
-                                <a href="{{ route('pricing.rules.create') }}" wire:navigate
+                                <a href="{{ route('pricing.rules.wizard') }}" wire:navigate
                                    class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium">
                                     {{ __('إضافة أول قاعدة') }}
                                 </a>
@@ -208,7 +208,7 @@ class="block text-center py-2 text-blue-600 hover:text-blue-800 text-sm font-med
                 </svg>
                 <p class="text-gray-500 text-sm">{{ __('لا توجد قواعد تسعير') }}</p>
                 @can('pricing.create')
-                <a href="{{ route('pricing.rules.create') }}" wire:navigate
+                <a href="{{ route('pricing.rules.wizard') }}" wire:navigate
                    class="mt-2 text-blue-600 hover:text-blue-800 text-sm font-medium">
                     {{ __('إضافة أول قاعدة') }}
                 </a>

resources/views/livewire/programs/program-list.blade.php

@@ -2,7 +2,7 @@
     <div class="flex flex-col sm:flex-row sm:items-center justify-between gap-3 mb-4 sm:mb-6">
         <h1 class="text-xl sm:text-2xl font-bold text-gray-800">{{ __('البرامج التدريبية') }}</h1>
         @permission('programs.create')
-        <a href="{{ route('programs.create') }}" wire:navigate
+        <a href="{{ route('programs.wizard') }}" wire:navigate
            class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm font-medium">
             <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/></svg>
             <span class="hidden sm:inline">{{ __('إضافة برنامج') }}</span>
@@ -24,7 +24,7 @@ class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-l
 
     <!-- Filters -->
     <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-3 sm:p-4 mb-4">
-        <div class="grid grid-cols-2 md:grid-cols-3 gap-3">
+        <div class="grid grid-cols-2 md:grid-cols-4 gap-3">
             <div class="col-span-2 md:col-span-1">
                 <input type="text" wire:model.live.debounce.300ms="search"
                        placeholder="{{ __('بحث بالاسم...') }}"
@@ -36,6 +36,12 @@ class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg focus:ring-2 f
                     <option value="{{ $activity->id }}">{{ $activity->name_ar }}</option>
                 @endforeach
             </select>
+            <select wire:model.live="trainerFilter" class="px-3 py-2 text-sm border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                <option value="">{{ __('كل المدربين') }}</option>
+                @foreach($trainers as $trainer)
+                    <option value="{{ $trainer->id }}">{{ $trainer->name_ar ?: $trainer->name }}</option>
+                @endforeach
+            </select>
             <select wire:model.live="status" class="px-3 py-2 text-sm border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
                 <option value="">{{ __('كل الحالات') }}</option>
                 @foreach($statusOptions as $key => $label)