From 502ba20b6d266ce70441e675758313c52fd2a2a1 Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Tue, 2 Dec 2025 00:28:58 +0100
Subject: [PATCH] Add cancelled member data

---
 app/Form/Actions/FormIndexAction.php          |  2 +-
 app/Form/Scopes/ParticipantFilterScope.php    |  9 +++++++--
 .../Form/Models/ParticipantFactory.php        |  4 ++++
 resources/js/views/form/Participants.vue      |  1 +
 tests/EndToEnd/Form/FormIndexActionTest.php   | 12 ++++++++++++
 .../Form/ParticipantIndexActionTest.php       | 19 +++++++++++++++++++
 6 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/app/Form/Actions/FormIndexAction.php b/app/Form/Actions/FormIndexAction.php
index 21b116f4..49dc107f 100644
--- a/app/Form/Actions/FormIndexAction.php
+++ b/app/Form/Actions/FormIndexAction.php
@@ -20,7 +20,7 @@ class FormIndexAction
      */
     public function handle(string $filter): LengthAwarePaginator
     {
-        return FormFilterScope::fromRequest($filter)->getQuery()->query(fn ($query) => $query->withCount('participants'))->paginate(15);
+        return FormFilterScope::fromRequest($filter)->getQuery()->query(fn ($query) => $query->withCount(['participants' => fn ($q) => $q->whereNull('cancelled_at')]))->paginate(15);
     }
 
     public function asController(ActionRequest $request): Response
diff --git a/app/Form/Scopes/ParticipantFilterScope.php b/app/Form/Scopes/ParticipantFilterScope.php
index d29c0a11..81835afb 100644
--- a/app/Form/Scopes/ParticipantFilterScope.php
+++ b/app/Form/Scopes/ParticipantFilterScope.php
@@ -32,7 +32,8 @@ class ParticipantFilterScope extends ScoutFilter
         public string $search = '',
         public array $options = [],
         public ?int $parent = null,
-        public ?Sorting $sort = null
+        public ?Sorting $sort = null,
+        public bool $showCancelled = false,
     ) {
     }
 
@@ -54,7 +55,11 @@ class ParticipantFilterScope extends ScoutFilter
                 $filter->push('parent-id IS NULL');
             }
 
-            $filter->push('cancelled_at IS NULL');
+            if ($this->showCancelled) {
+                $filter->push('cancelled_at IS NOT NULL');
+            } else {
+                $filter->push('cancelled_at IS NULL');
+            }
 
             if ($this->parent !== null && $this->parent !== -1) {
                 $filter->push('parent-id = ' . $this->parent);
diff --git a/database/factories/Form/Models/ParticipantFactory.php b/database/factories/Form/Models/ParticipantFactory.php
index 5521ecab..3e0ab856 100644
--- a/database/factories/Form/Models/ParticipantFactory.php
+++ b/database/factories/Form/Models/ParticipantFactory.php
@@ -39,6 +39,10 @@ class ParticipantFactory extends Factory
         return $this->state(['data' => $data]);
     }
 
+    public function cancelled(): self {
+        return $this->state(['cancelled_at' => now()->subWeek()]);
+    }
+
     public function nr(int $number): self
     {
         return $this->state(['member_id' => $number]);
diff --git a/resources/js/views/form/Participants.vue b/resources/js/views/form/Participants.vue
index 28a53ba0..b02220c0 100644
--- a/resources/js/views/form/Participants.vue
+++ b/resources/js/views/form/Participants.vue
@@ -29,6 +29,7 @@
             </template>
 
             <template #fields>
+                <f-switch id="show_cancelled" v-model="innerFilter.show_cancelled" label="Abgemeldete zeigen" size="sm" name="show_cancelled" />
                 <template v-for="(filter, index) in meta.filters">
                     <f-select v-if="filter.base_type === 'CheckboxField'"
                               :id="`filter-field-${index}`"
diff --git a/tests/EndToEnd/Form/FormIndexActionTest.php b/tests/EndToEnd/Form/FormIndexActionTest.php
index 70c3dd93..658692fb 100644
--- a/tests/EndToEnd/Form/FormIndexActionTest.php
+++ b/tests/EndToEnd/Form/FormIndexActionTest.php
@@ -98,6 +98,18 @@ it('testItDisplaysForms', function () {
         ->assertInertiaPath('data.meta.default.location', '');
 });
 
+it('displays participants count', function () {
+    $this->login()->loginNami()->withoutExceptionHandling();
+    Form::factory()
+        ->has(Participant::factory()->count(2))
+        ->has(Participant::factory()->cancelled()->count(3))
+        ->create();
+
+    sleep(1);
+    $this->get(route('form.index'))
+        ->assertInertiaPath('data.data.0.participants_count', 2);
+});
+
 it('testFormtemplatesHaveData', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
     Formtemplate::factory()->name('tname')->sections([FormtemplateSectionRequest::new()->name('sname')->fields([
diff --git a/tests/EndToEnd/Form/ParticipantIndexActionTest.php b/tests/EndToEnd/Form/ParticipantIndexActionTest.php
index cc1382b0..25e3916b 100644
--- a/tests/EndToEnd/Form/ParticipantIndexActionTest.php
+++ b/tests/EndToEnd/Form/ParticipantIndexActionTest.php
@@ -78,6 +78,9 @@ it('testItShowsEmptyFilters', function () {
     $this->callFilter('form.participant.index', ['data' => ['check' => null]], ['form' => $form])->assertHasJsonPath('meta.filter.data.check')->assertJsonPath('meta.filter.data.check', null);
     $this->callFilter('form.participant.index', ['data' => ['check' => 'A']], ['form' => $form])->assertJsonPath('meta.filter.data.check', 'A');
     $this->callFilter('form.participant.index', ['data' => []], ['form' => $form])->assertJsonPath('meta.filter.data.check', ParticipantFilterScope::$nan);
+    $this->callFilter('form.participant.index', ['data' => []], ['form' => $form])->assertJsonPath('meta.filter.show_cancelled', false);
+    $this->callFilter('form.participant.index', ['show_cancelled' => true], ['form' => $form])->assertJsonPath('meta.filter.show_cancelled', true);
+    $this->callFilter('form.participant.index', ['show_cancelled' => false], ['form' => $form])->assertJsonPath('meta.filter.show_cancelled', false);
 });
 
 it('sorts by active colums sorting by default', function (array $sorting, string $by, bool $direction) {
@@ -186,6 +189,22 @@ it('testItFiltersParticipantsByRadioValue', function () {
         ->assertJsonCount(4, 'data');
 });
 
+it('filters participants by cancelled at', function () {
+    $this->login()->loginNami()->withoutExceptionHandling();
+    $form = Form::factory()
+        ->has(Participant::factory()->count(1))
+        ->has(Participant::factory()->cancelled()->count(2))
+        ->create();
+
+    sleep(2);
+    $this->callFilter('form.participant.index', [], ['form' => $form])
+        ->assertJsonCount(1, 'data');
+    $this->callFilter('form.participant.index', ['show_cancelled' => false], ['form' => $form])
+        ->assertJsonCount(1, 'data');
+    $this->callFilter('form.participant.index', ['show_cancelled' => true], ['form' => $form])
+        ->assertJsonCount(2, 'data');
+});
+
 it('testItPresentsNamiField', function () {
     $this->login()->loginNami()->withoutExceptionHandling();
     $form = Form::factory()