Fix: Sort participants by created_at

This reverts commit eee0c64106.

.docker/base.Dockerfile

@@ -1,13 +1,14 @@
-FROM php:8.1.6-fpm as php
+FROM php:8.3.11-fpm as php
 WORKDIR /app
 RUN ls /app
 RUN apt-get update
-RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip poppler-utils libpng-dev libjpeg-dev default-mysql-client
+RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip poppler-utils libpng-dev libjpeg-dev default-mysql-client libzip-dev imagemagick libmagickwand-dev
 RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra texlive-extra-utils
-RUN docker-php-ext-install pdo_mysql curl gd exif intl mbstring pcntl
+RUN docker-php-ext-install pdo_mysql curl exif intl mbstring pcntl zip
 RUN pecl install redis && docker-php-ext-enable redis
+RUN pecl install imagick && docker-php-ext-enable imagick
 RUN docker-php-ext-configure gd --with-jpeg
-RUN docker-php-ext-enable gd
+RUN docker-php-ext-install gd
 RUN usermod -s /bin/bash www-data
 RUN echo 'memory_limit = 2G' >> /usr/local/etc/php/conf.d/99-custom-php-memlimit.ini
 

.docker/bin/build_base

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+docker buildx build -f .docker/base.Dockerfile .
+docker image tag sha256:... zoomyboy/adrema-base
+docker push zoomyboy/adrema-base
+

.docker/nginx.Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2.7 as composer
+FROM composer:2.7.9 as composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
@@ -8,8 +8,7 @@ RUN php artisan horizon:publish
 FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
-RUN cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
-RUN npm ci && npm run prod && npm run img && rm -R node_modules
+RUN npm install && npm run prod && npm run img && rm -R node_modules
 
 FROM nginx:1.21.6-alpine as nginx
 WORKDIR /app

.docker/php.Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.2.7 as composer
+FROM composer:2.7.9 as composer
 WORKDIR /app
 COPY . /app
 RUN composer install --ignore-platform-reqs --no-dev
@@ -6,8 +6,7 @@ RUN composer install --ignore-platform-reqs --no-dev
 FROM node:20.15.0-slim as node
 WORKDIR /app
 COPY . /app
-RUN cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
-RUN npm ci && npm run prod && npm run img && rm -R node_modules
+RUN npm install && npm run prod && npm run img && rm -R node_modules
 
 FROM zoomyboy/adrema-base:latest as php
 COPY --chown=www-data:www-data . /app

.drone.yml

@@ -12,7 +12,7 @@ steps:
           - git submodule update --init --recursive
 
     - name: composer_dev
-      image: composer:2.2.7
+      image: composer:2.7.9
       commands:
           - composer install --ignore-platform-reqs --dev
 
@@ -39,6 +39,7 @@ steps:
     - name: tests
       image: zoomyboy/adrema-base:latest
       commands:
+          - touch .env
           - php artisan migrate
           - php artisan test
           - rm -f .env
@@ -102,7 +103,7 @@ steps:
           event: tag
 
     - name: deploy
-      image: php:8.1.6
+      image: zoomyboy/adrema-base:latest
       environment:
           SSH_KEY:
               from_secret: deploy_private_key
@@ -135,7 +136,7 @@ steps:
           event: push
 
     - name: composer_no_dev
-      image: composer:2.2.7
+      image: composer:2.7.9
       commands:
           - composer install --ignore-platform-reqs --no-dev
 

.gitignore

@@ -40,3 +40,4 @@ Homestead.json
 /public/sprite.svg
 /.php-cs-fixer.cache
 /groups.sql
+/.phpunit.cache

CHANGELOG.md

@@ -1,5 +1,62 @@
 # Letzte Änderungen
 
+### 1.12.2
+
+-   Zuschussliste Gallier
+
+### 1.12.1
+
+-   In Teilnehmer-Liste von Veranstaltungen kann nun sortiert und gefiltert werden.
+-   Formulare: Feld Registrierung von / bis
+
+### 1.11.5
+
+-   Fix: Synchronisation von NaMi-Mitgliedern
+
+### 1.11.4
+
+-   Fix: Nicht an Präventions-Unterlagen für vergangene Veranstaltungen erinnern
+
+### 1.11.1
+
+-   Es kann nun auch das Feld "Datenweiterverwendung" über Adrema gepflegt werden.
+
+### 1.10.20
+
+-   Fixed: Bei Textfeldern wird nun die Einleitung dargestellt
+
+### 1.10.19
+
+-   Fixed: Erweiterte Führungszeugnisse und Präventionsschulungen nur für aktive Mitgliedschaften auf Dashboard anzeigen
+
+### 1.10.18
+
+-   Fixed: All Gruppen als Option anbieten bei Bedingungen
+
+### 1.10.17
+
+-   Es können nun auch Bedingungen für Felder vom Typ Gruppierung definiert werden
+
+### 1.10.16
+
+-   Rechnungen und Erinnerungen werden nun automatisch täglich um 10 Uhr verschickt
+-   Es kann eingestellt werden, nach wie vielen Wochen an Rechnungen erinnert werden soll (Standard: 12)
+-   Name und Profilbild des angemeldeten Benutzers wird nun oben rechts angezeigt
+
+### 1.10.15
+
+-   "Für Mitglieder zusätzlich abfragen" kann nun im Formular auch gesetzt werden, wenn ein NaMi Feld ausgewählt ist.
+
+### 1.10.14
+
+-   Fixed: Ist eine Präventionsschulung älter als 5 Jahre, so ist nur eine Auffrischungs-Schulung erforderlich
+
+### 1.10.13
+
+-   Bei Veranstaltungs-Übersicht alle Veranstaltungen anzeigen
+-   Download von Teilnehmern als Tabellen-Dokument
+-   Spalte "Prävention" bei TN-Liste eingefügt für benötigte Unterlagen
+
 ### 1.10.11
 
 -   Bei Prävention auch an Verhaltenskodex erinnern

app/Actions/InsertMemberAction.php

@@ -50,6 +50,7 @@ class InsertMemberAction
             'nationality_id' => Nationality::where('nami_id', $member->nationalityId)->firstOrFail()->id,
             'mitgliedsnr' => $member->memberId,
             'version' => $member->version,
+            'keepdata' => $member->keepdata,
         ]);
     }
 

app/Activity.php

@@ -4,12 +4,14 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use Cviebrock\EloquentSluggable\Sluggable;
+use Database\Factories\ActivityFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Activity extends Model
 {
+    /** @use HasFactory<ActivityFactory> */
     use HasFactory;
     use HasNamiField;
     use Sluggable;

app/Confession.php

@@ -2,11 +2,13 @@
 
 namespace App;
 
+use Database\Factories\ConfessionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Confession extends Model
 {
+    /** @use HasFactory<ConfessionFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id', 'is_null'];

app/Console/Kernel.php

@@ -33,6 +33,7 @@ class Kernel extends ConsoleKernel
         $schedule->command(DbMaintainAction::class)->daily();
         $schedule->command(InitializeMembers::class)->dailyAt('03:00');
         $schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
+        $schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
     }
 
     /**

app/Contribution/ContributionFactory.php

@@ -8,6 +8,7 @@ use App\Contribution\Documents\RdpNrwDocument;
 use App\Contribution\Documents\CityRemscheidDocument;
 use App\Contribution\Documents\CitySolingenDocument;
 use App\Contribution\Documents\CityFrankfurtMainDocument;
+use App\Contribution\Documents\WuppertalDocument;
 use Illuminate\Support\Collection;
 use Illuminate\Validation\Rule;
 
@@ -22,6 +23,7 @@ class ContributionFactory
         CityRemscheidDocument::class,
         CityFrankfurtMainDocument::class,
         BdkjHesse::class,
+        WuppertalDocument::class,
     ];
 
     /**
@@ -30,7 +32,7 @@ class ContributionFactory
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'title' => $document::getName(),
+            'title' => $document::buttonName(),
             'class' => $document,
         ]);
     }

app/Contribution/Data/MemberData.php

@@ -29,7 +29,7 @@ class MemberData extends Data
      */
     public static function fromModels(array $ids): Collection
     {
-        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::withoutMagicalCreationFrom([
+        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
             ...$member->toArray(),
             'birthday' => $member->birthday->toAtomString(),
             'isLeader' => $member->isLeader(),
@@ -44,7 +44,7 @@ class MemberData extends Data
      */
     public static function fromApi(array $data): Collection
     {
-        return collect($data)->map(fn ($member) => self::withoutMagicalCreationFrom([
+        return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
             ...$member,
             'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
             'gender' => Gender::fromString($member['gender']),
@@ -54,31 +54,41 @@ class MemberData extends Data
 
     public function fullname(): string
     {
-        return $this->firstname.' '.$this->lastname;
+        return $this->firstname . ' ' . $this->lastname;
     }
 
     public function separatedName(): string
     {
-        return $this->lastname.', '.$this->firstname;
+        return $this->lastname . ', ' . $this->firstname;
     }
 
     public function fullAddress(): string
     {
-        return $this->address.', '.$this->zip.' '.$this->location;
+        return $this->address . ', ' . $this->zip . ' ' . $this->location;
     }
 
     public function city(): string
     {
-        return $this->zip.' '.$this->location;
+        return $this->zip . ' ' . $this->location;
     }
 
-    public function age(): string
+    public function age(): int
     {
-        return (string) $this->birthday->diffInYears(now()) ?: '';
+        return intval($this->birthday->diffInYears(now()));
     }
 
     public function birthYear(): string
     {
         return (string) $this->birthday->year;
     }
+
+    public function birthdayHuman(): string
+    {
+        return $this->birthday->format('d.m.Y');
+    }
+
+    public function genderLetter(): string
+    {
+        return $this->gender->short;
+    }
 }

app/Contribution/Documents/BdkjHesse.php

@@ -3,15 +3,16 @@
 namespace App\Contribution\Documents;
 
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
 
 class BdkjHesse extends ContributionDocument
 {
+
+    use HasPdfBackground;
+
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
@@ -25,6 +26,7 @@ class BdkjHesse extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
     }
 
     public function dateFrom(): string
@@ -74,7 +76,7 @@ class BdkjHesse extends ContributionDocument
 
     public function durationDays(): int
     {
-        return Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom)) + 1;
+        return intVal(Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom))) + 1;
     }
 
     /**
@@ -114,36 +116,9 @@ class BdkjHesse extends ContributionDocument
         return $member->birthYear();
     }
 
-    public function basename(): string
-    {
-        return 'zuschuesse-bdkj-hessen' . Str::slug($this->eventName);
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.bdkj-hesse';
-    }
-
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
-    public function setFilename(string $filename): static
-    {
-        $this->filename = $filename;
-
-        return $this;
-    }
-
-    public function getEngine(): Engine
-    {
-        return Engine::PDFLATEX;
-    }
-
     public static function getName(): string
     {
-        return 'Für BDKJ Hessen erstellen';
+        return 'BDKJ Hessen';
     }
 
     /**
@@ -156,7 +131,6 @@ class BdkjHesse extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
         ];
     }
 }

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -3,16 +3,17 @@
 namespace App\Contribution\Documents;
 
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use App\Invoice\InvoiceSettings;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     public string $fromName;
 
     /**
@@ -28,6 +29,7 @@ class CityFrankfurtMainDocument extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
@@ -61,17 +63,6 @@ class CityFrankfurtMainDocument extends ContributionDocument
         );
     }
 
-    public function dateFromHuman(): string
-    {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y');
-    }
-
-    public function dateUntilHuman(): string
-    {
-        return Carbon::parse($this->dateUntil)->format('d.m.Y');
-    }
-
-
     public function countryName(): string
     {
         return $this->country->name;
@@ -82,56 +73,9 @@ class CityFrankfurtMainDocument extends ContributionDocument
         return count($this->members);
     }
 
-    public function memberShort(MemberData $member): string
-    {
-        return $member->isLeader ? 'L' : '';
-    }
-
-    public function memberName(MemberData $member): string
-    {
-        return $member->separatedName();
-    }
-
-    public function memberAddress(MemberData $member): string
-    {
-        return $member->fullAddress();
-    }
-
-    public function memberAge(MemberData $member): string
-    {
-        return $member->age();
-    }
-
-    public function basename(): string
-    {
-        return 'zuschuesse-frankfurt-' . Str::slug($this->eventName);
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.city-frankfurt-main';
-    }
-
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
-    public function setFilename(string $filename): static
-    {
-        $this->filename = $filename;
-
-        return $this;
-    }
-
-    public function getEngine(): Engine
-    {
-        return Engine::PDFLATEX;
-    }
-
     public static function getName(): string
     {
-        return 'Für Frankfurt erstellen';
+        return 'Frankfurt';
     }
 
     /**
@@ -144,7 +88,6 @@ class CityFrankfurtMainDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
         ];
     }
 }

app/Contribution/Documents/CityRemscheidDocument.php

@@ -3,15 +3,17 @@
 namespace App\Contribution\Documents;
 
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
 use App\Member\Member;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
 
 class CityRemscheidDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     /**
      * @param Collection<int, Collection<int, Member>> $leaders
      * @param Collection<int, Collection<int, Member>> $children
@@ -25,17 +27,9 @@ class CityRemscheidDocument extends ContributionDocument
         public Collection $children,
         public ?string $filename = '',
         public string $type = 'F',
+        public string $eventName = '',
     ) {
-    }
-
-    public function niceDateFrom(): string
-    {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y');
-    }
-
-    public function niceDateUntil(): string
-    {
-        return Carbon::parse($this->dateUntil)->format('d.m.Y');
+        $this->setEventName($eventName);
     }
 
     /**
@@ -52,6 +46,7 @@ class CityRemscheidDocument extends ContributionDocument
             country: Country::where('id', $request['country'])->firstOrFail(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
+            eventName: $request['eventName'],
         );
     }
 
@@ -70,39 +65,13 @@ class CityRemscheidDocument extends ContributionDocument
             country: Country::where('id', $request['country'])->firstOrFail(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
+            eventName: $request['eventName'],
         );
     }
 
-    public function basename(): string
-    {
-        return 'zuschuesse-remscheid';
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.city-remscheid';
-    }
-
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
-    public function setFilename(string $filename): static
-    {
-        $this->filename = $filename;
-
-        return $this;
-    }
-
-    public function getEngine(): Engine
-    {
-        return Engine::PDFLATEX;
-    }
-
     public static function getName(): string
     {
-        return 'Für Remscheid erstellen';
+        return 'Remscheid';
     }
 
     /**

app/Contribution/Documents/CitySolingenDocument.php

@@ -6,9 +6,7 @@ use App\Contribution\Data\MemberData;
 use App\Invoice\InvoiceSettings;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
 
 class CitySolingenDocument extends ContributionDocument
 {
@@ -25,6 +23,7 @@ class CitySolingenDocument extends ContributionDocument
         public string $eventName,
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
@@ -74,11 +73,6 @@ class CitySolingenDocument extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
     public function checkboxes(): string
     {
         $output = '';
@@ -94,16 +88,6 @@ class CitySolingenDocument extends ContributionDocument
         return $firstRow . "\n" . $secondRow;
     }
 
-    public function basename(): string
-    {
-        return 'zuschuesse-solingen-' . Str::slug($this->eventName);
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.city-solingen';
-    }
-
     public function getEngine(): Engine
     {
         return Engine::PDFLATEX;
@@ -111,7 +95,7 @@ class CitySolingenDocument extends ContributionDocument
 
     public static function getName(): string
     {
-        return 'Für Stadt Solingen erstellen';
+        return 'Stadt Solingen';
     }
 
     /**
@@ -123,7 +107,6 @@ class CitySolingenDocument extends ContributionDocument
             'dateFrom' => 'required|string|date_format:Y-m-d',
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
         ];
     }
 }

app/Contribution/Documents/ContributionDocument.php

@@ -3,9 +3,12 @@
 namespace App\Contribution\Documents;
 
 use Zoomyboy\Tex\Document;
+use Zoomyboy\Tex\Template;
 
 abstract class ContributionDocument extends Document
 {
+    private string $eventName;
+
     abstract public static function getName(): string;
 
     /**
@@ -29,8 +32,34 @@ abstract class ContributionDocument extends Document
     public static function globalRules(): array
     {
         return [
+            'eventName' => 'required|string',
             'members' => 'present|array|min:1',
             'members.*' => 'integer|exists:members,id',
         ];
     }
+
+    public static function buttonName(): string
+    {
+        return 'Für ' . static::getName() . ' erstellen';;
+    }
+
+    public function setEventName(string $eventName): void
+    {
+        $this->eventName = $eventName;
+    }
+
+    public function basename(): string
+    {
+        return str('Zuschüsse ')->append($this->getName())->append(' ')->append($this->eventName)->slug();
+    }
+
+    public function template(): Template
+    {
+        return Template::make('tex.templates.contribution');
+    }
+
+    public function view(): string
+    {
+        return 'tex.contribution.' . str(class_basename(static::class))->replace('Document', '')->kebab()->toString();
+    }
 }

app/Contribution/Documents/RdpNrwDocument.php

@@ -3,14 +3,16 @@
 namespace App\Contribution\Documents;
 
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
 
 class RdpNrwDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
@@ -22,14 +24,9 @@ class RdpNrwDocument extends ContributionDocument
         public Collection $members,
         public ?string $filename = '',
         public string $type = 'F',
+        public string $eventName = '',
     ) {
-    }
-
-    public function dateRange(): string
-    {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y')
-            . ' - '
-            . Carbon::parse($this->dateUntil)->format('d.m.Y');
+        $this->setEventName($eventName);
     }
 
     /**
@@ -43,6 +40,7 @@ class RdpNrwDocument extends ContributionDocument
             zipLocation: $request['zipLocation'],
             country: Country::where('id', $request['country'])->firstOrFail(),
             members: MemberData::fromModels($request['members'])->chunk(17),
+            eventName: $request['eventName'],
         );
     }
 
@@ -57,6 +55,7 @@ class RdpNrwDocument extends ContributionDocument
             zipLocation: $request['zipLocation'],
             country: Country::where('id', $request['country'])->firstOrFail(),
             members: MemberData::fromApi($request['member_data'])->chunk(17),
+            eventName: $request['eventName'],
         );
     }
 
@@ -65,65 +64,9 @@ class RdpNrwDocument extends ContributionDocument
         return $this->country->name;
     }
 
-    public function memberShort(MemberData $member): string
-    {
-        return $member->isLeader ? 'L' : '';
-    }
-
-    public function memberName(MemberData $member): string
-    {
-        return $member->separatedName();
-    }
-
-    public function memberAddress(MemberData $member): string
-    {
-        return $member->fullAddress();
-    }
-
-    public function memberGender(MemberData $member): string
-    {
-        if (!$member->gender) {
-            return '';
-        }
-
-        return strtolower(substr($member->gender->name, 0, 1));
-    }
-
-    public function memberAge(MemberData $member): string
-    {
-        return $member->age();
-    }
-
-    public function basename(): string
-    {
-        return 'zuschuesse-rdp-nrw';
-    }
-
-    public function view(): string
-    {
-        return 'tex.contribution.rdp-nrw';
-    }
-
-    public function template(): Template
-    {
-        return Template::make('tex.templates.contribution');
-    }
-
-    public function setFilename(string $filename): static
-    {
-        $this->filename = $filename;
-
-        return $this;
-    }
-
-    public function getEngine(): Engine
-    {
-        return Engine::PDFLATEX;
-    }
-
     public static function getName(): string
     {
-        return 'Für RdP NRW erstellen';
+        return 'RdP NRW';
     }
 
     /**
@@ -136,7 +79,6 @@ class RdpNrwDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
         ];
     }
 }

app/Contribution/Documents/WuppertalDocument.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Contribution\Documents;
+
+use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
+use App\Country;
+use Illuminate\Support\Collection;
+
+class WuppertalDocument extends ContributionDocument
+{
+
+    use HasPdfBackground;
+    use FormatsDates;
+
+    /**
+     * @param Collection<int, Collection<int, MemberData>> $members
+     */
+    public function __construct(
+        public string $dateFrom,
+        public string $dateUntil,
+        public string $zipLocation,
+        public ?Country $country,
+        public Collection $members,
+        public ?string $filename = '',
+        public string $type = 'F',
+        public string $eventName = '',
+    ) {
+        $this->setEventName($eventName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromModels($request['members'])->chunk(14),
+            eventName: $request['eventName'],
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromApiRequest(array $request): self
+    {
+        return new self(
+            dateFrom: $request['dateFrom'],
+            dateUntil: $request['dateUntil'],
+            zipLocation: $request['zipLocation'],
+            country: Country::where('id', $request['country'])->firstOrFail(),
+            members: MemberData::fromApi($request['member_data'])->chunk(14),
+            eventName: $request['eventName'],
+        );
+    }
+
+    public static function getName(): string
+    {
+        return 'Wuppertal';
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function rules(): array
+    {
+        return [
+            'dateFrom' => 'required|string|date_format:Y-m-d',
+            'dateUntil' => 'required|string|date_format:Y-m-d',
+            'zipLocation' => 'required|string',
+        ];
+    }
+}

app/Contribution/Traits/FormatsDates.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Contribution\Traits;
+
+use Carbon\Carbon;
+
+trait FormatsDates
+{
+
+    public function niceDateFrom(): string
+    {
+        return Carbon::parse($this->dateFrom)->format('d.m.Y');
+    }
+
+    public function niceDateUntil(): string
+    {
+        return Carbon::parse($this->dateUntil)->format('d.m.Y');
+    }
+
+    public function dateRange(): string
+    {
+        return implode(' - ', [$this->niceDateFrom(), $this->niceDateUntil()]);
+    }
+}

app/Contribution/Traits/HasPdfBackground.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Contribution\Traits;
+
+use Zoomyboy\Tex\Engine;
+
+trait HasPdfBackground
+{
+    public function getEngine(): Engine
+    {
+        return Engine::PDFLATEX;
+    }
+}

app/Country.php

@@ -3,11 +3,13 @@
 namespace App;
 
 use App\Nami\HasNamiField;
+use Database\Factories\CountryFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Country extends Model
 {
+    /** @use HasFactory<CountryFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/Course.php

@@ -3,11 +3,13 @@
 namespace App\Course\Models;
 
 use App\Nami\HasNamiField;
+use Database\Factories\Course\Models\CourseFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Course extends Model
 {
+    /** @use HasFactory<CourseFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/CourseMember.php

@@ -3,12 +3,14 @@
 namespace App\Course\Models;
 
 use App\Member\Member;
+use Database\Factories\Course\Models\CourseMemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CourseMember extends Model
 {
+    /** @use HasFactory<CourseMemberFactory> */
     use HasFactory;
 
     /** @var array<int, string> */

app/Dashboard/DashboardServiceProvider.php

@@ -2,7 +2,9 @@
 
 namespace App\Dashboard;
 
+use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
+use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
 
 class DashboardServiceProvider extends ServiceProvider
 {
@@ -23,5 +25,8 @@ class DashboardServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
+            $router->get('/', DashboardIndexAction::class)->name('home');
+        });
     }
 }

app/Dav/Principal.php

@@ -178,7 +178,7 @@ class Principal implements PrincipalBackendInterface
     private function userToPrincipal(User $user): array
     {
         return [
-            '{DAV:}displayname' => $user->name,
+            '{DAV:}displayname' => $user->firstname . ' ' . $user->lastname,
             'uri' => 'principals/' . $user->email,
             '{http://sabredav.org/ns}email-address' => $user->email,
         ];

app/Efz/EfzPendingBlock.php

@@ -19,7 +19,7 @@ class EfzPendingBlock extends Block
         })
             ->whereCurrentGroup()
             ->orderByRaw('lastname, firstname')
-            ->whereHas('memberships', fn ($builder) => $builder->isLeader());
+            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
     }
 
     /**

app/Fee.php

@@ -4,12 +4,14 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use App\Payment\Subscription;
+use Database\Factories\FeeFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Fee extends Model
 {
+    /** @use HasFactory<FeeFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Fileshare/Actions/FileshareIndexAction.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Fileshare\Actions;
-
-use App\Fileshare\Models\Fileshare;
-use App\Fileshare\Resources\FileshareResource;
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class FileshareIndexAction
-{
-    use AsAction;
-
-    public function handle(): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'Datei-Verbindungen');
-
-        return Inertia::render('fileshare/Index', [
-            'data' => FileshareResource::collection(Fileshare::paginate(15)),
-        ]);
-    }
-}

app/Fileshare/Actions/ListFilesAction.php

@@ -17,6 +17,6 @@ class ListFilesAction
      */
     public function handle(ActionRequest $request, Fileshare $fileshare): DataCollection
     {
-        return ResourceData::collection($fileshare->type->getSubDirectories($request->input('parent')))->wrap('data');
+        return ResourceData::collect($fileshare->type->getSubDirectories($request->input('parent')), DataCollection::class)->wrap('data');
     }
 }

app/Fileshare/FileshareSettings.php

@@ -2,29 +2,29 @@
 
 namespace App\Fileshare;
 
-use App\Fileshare\Actions\FileshareIndexAction;
-use App\Setting\Contracts\Indexable;
+use App\Fileshare\Models\Fileshare;
+use App\Fileshare\Resources\FileshareResource;
 use App\Setting\LocalSettings;
 
-class FileshareSettings extends LocalSettings implements Indexable
+class FileshareSettings extends LocalSettings
 {
     public static function group(): string
     {
         return 'fileshare';
     }
 
-    public static function slug(): string
-    {
-        return 'fileshare';
-    }
-
-    public static function indexAction(): string
-    {
-        return FileshareIndexAction::class;
-    }
-
     public static function title(): string
     {
         return 'Datei-Verbindungen';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
+    {
+        return [
+            'data' => FileshareResource::collection(Fileshare::paginate(15))
+        ];
+    }
 }

app/Fileshare/Models/Fileshare.php

@@ -3,11 +3,13 @@
 namespace App\Fileshare\Models;
 
 use App\Fileshare\ConnectionTypes\ConnectionType;
+use Database\Factories\Fileshare\Models\FileshareFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Fileshare extends Model
 {
+    /** @use HasFactory<FileshareFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Actions/CreateExcelDocumentAction.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use App\Form\Models\Participant;
+use Illuminate\Database\Eloquent\Collection;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Zoomyboy\TableDocument\SheetData;
+use Zoomyboy\TableDocument\TableDocumentData;
+
+class CreateExcelDocumentAction
+{
+    use AsAction;
+
+    public Form $form;
+
+    /**
+     * @param Collection<int, Participant> $participants
+     */
+    public function handle(Form $form, Collection $participants): string
+    {
+        $this->form = $form;
+
+        return file_get_contents($this->allSheet($participants)->compile($this->tempPath()));
+    }
+
+    /**
+     * @param Collection<int, Participant> $participants
+     */
+    private function allSheet(Collection $participants): TableDocumentData
+    {
+        $document = TableDocumentData::from(['title' => 'Anmeldungen für ' . $this->form->name, 'sheets' => []]);
+        $headers = $this->form->getFields()->map(fn ($field) => $field->name)->toArray();
+
+        $document->addSheet(SheetData::from([
+            'header' => $headers,
+            'data' => $participants
+                ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
+                ->toArray(),
+            'name' => 'Alle',
+        ]));
+
+        if ($this->form->export->groupBy) {
+            $groups = $participants->groupBy(fn ($participant) => $participant->getFields()->findByKey($this->form->export->groupBy)->presentRaw());
+
+            foreach ($groups as $name => $participants) {
+                $document->addSheet(SheetData::from([
+                    'header' => $headers,
+                    'data' => $participants
+                        ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
+                        ->toArray(),
+                    'name' => $name,
+                ]));
+            }
+
+            $document->addSheet(SheetData::from([
+                'header' => ['Wert', 'Anzahl'],
+                'data' => $groups->map(fn ($participants, $name) => [$name, (string) count($participants)])->toArray(),
+                'name' => 'Statistik',
+            ]));
+        }
+
+        return $document;
+    }
+
+    private function tempPath(): string
+    {
+        return sys_get_temp_dir() . '/' . str()->uuid()->toString();
+    }
+}

app/Form/Actions/ExportAction.php

@@ -15,22 +15,14 @@ class ExportAction
 
     public function handle(Form $form): string
     {
-        $csv = Writer::createFromString();
-
-        $csv->insertOne($form->getFields()->names());
-
-        foreach ($form->participants as $participant) {
-            $csv->insertOne($participant->getFields()->presentValues());
-        }
-
-        return $csv->toString();
+        return CreateExcelDocumentAction::run($form, $form->participants);
     }
 
     public function asController(Form $form, ActionRequest $request): StreamedResponse
     {
         $contents = $this->handle($form);
 
-        $filename = 'tn-' . $form->slug . '.csv';
+        $filename = 'tn-' . $form->slug . '.xlsx';
         Storage::disk('temp')->put($filename, $contents);
 
         return Storage::disk('temp')->download($filename);

app/Form/Actions/ExportSyncAction.php

@@ -3,12 +3,8 @@
 namespace App\Form\Actions;
 
 use App\Form\Models\Form;
-use App\Form\Models\Participant;
 use App\Group;
-use Illuminate\Support\Collection;
 use Lorisleiva\Actions\Concerns\AsAction;
-use Zoomyboy\TableDocument\SheetData;
-use Zoomyboy\TableDocument\TableDocumentData;
 
 class ExportSyncAction
 {
@@ -18,15 +14,13 @@ class ExportSyncAction
 
     public function handle(Form $form): void
     {
-        $this->form = $form;
-
         if (!$form->export->root) {
             return;
         }
 
         $storage = $form->export->root->getStorage();
 
-        $storage->put($form->export->root->resource . '/Anmeldungen ' . $form->name . '.xlsx', file_get_contents($this->allSheet($this->form->participants)->compile($this->tempPath())));
+        $storage->put($form->export->root->resource . '/Anmeldungen ' . $form->name . '.xlsx', CreateExcelDocumentAction::run($form, $form->participants));
 
         if ($form->export->toGroupField) {
             foreach ($form->participants->groupBy(fn ($participant) => $participant->data[$form->export->toGroupField]) as $groupId => $participants) {
@@ -35,7 +29,7 @@ class ExportSyncAction
                     continue;
                 }
 
-                $group->fileshare->getStorage()->put($group->fileshare->resource . '/Anmeldungen ' . $form->name . '.xlsx', file_get_contents($this->allSheet($participants)->compile($this->tempPath())));
+                $group->fileshare->getStorage()->put($group->fileshare->resource . '/Anmeldungen ' . $form->name . '.xlsx', CreateExcelDocumentAction::run($form, $participants));
             }
         }
     }
@@ -44,48 +38,4 @@ class ExportSyncAction
     {
         $this->handle(Form::find($formId));
     }
-
-    /**
-     * @param Collection<int, Participant> $participants
-     */
-    private function allSheet(Collection $participants): TableDocumentData
-    {
-        $document = TableDocumentData::from(['title' => 'Anmeldungen für ' . $this->form->name, 'sheets' => []]);
-        $headers = $this->form->getFields()->map(fn ($field) => $field->name)->toArray();
-
-        $document->addSheet(SheetData::from([
-            'header' => $headers,
-            'data' => $participants
-                ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
-                ->toArray(),
-            'name' => 'Alle',
-        ]));
-
-        if ($this->form->export->groupBy) {
-            $groups = $participants->groupBy(fn ($participant) => $participant->getFields()->findByKey($this->form->export->groupBy)->presentRaw());
-
-            foreach ($groups as $name => $participants) {
-                $document->addSheet(SheetData::from([
-                    'header' => $headers,
-                    'data' => $participants
-                        ->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
-                        ->toArray(),
-                    'name' => $name,
-                ]));
-            }
-
-            $document->addSheet(SheetData::from([
-                'header' => ['Wert', 'Anzahl'],
-                'data' => $groups->map(fn ($participants, $name) => [$name, (string) count($participants)])->toArray(),
-                'name' => 'Statistik',
-            ]));
-        }
-
-        return $document;
-    }
-
-    private function tempPath(): string
-    {
-        return sys_get_temp_dir() . '/' . str()->uuid()->toString();
-    }
 }

app/Form/Actions/FormApiListAction.php

@@ -27,7 +27,7 @@ class FormApiListAction
     {
         return FormApiResource::collection($this->handle(
             $request->input('filter', ''),
-            $request->input('perPage', 10)
+            $request->input('perPage', 9999)
         ));
     }
 }

app/Form/Actions/FormUpdateMetaAction.php

@@ -22,10 +22,10 @@ class FormUpdateMetaAction
 
         return [
             'sorting' => 'array',
-            'sorting.0' => 'required|string',
-            'sorting.1' => 'required|string|in:asc,desc',
+            'sorting.by' => 'required|string',
+            'sorting.direction' => 'required|boolean',
             'active_columns' => 'array',
-            'active_columns.*' => ['string', Rule::in([...$form->getFields()->pluck('key')->toArray(), 'created_at'])]
+            'active_columns.*' => ['string', Rule::in([...$form->getFields()->pluck('key')->toArray(), 'created_at', 'prevention'])]
         ];
     }
 

app/Form/Actions/ParticipantIndexAction.php

@@ -6,9 +6,8 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Form\Resources\ParticipantResource;
 use App\Form\Scopes\ParticipantFilterScope;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Pagination\LengthAwarePaginator;
+use Laravel\Scout\Builder;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class ParticipantIndexAction
@@ -16,29 +15,22 @@ class ParticipantIndexAction
     use AsAction;
 
     /**
-     * @return HasMany<Participant>
+     * @return Builder<Participant>
      */
-    protected function getQuery(Form $form, ParticipantFilterScope $filter): HasMany
+    protected function getQuery(Form $form, ParticipantFilterScope $filter): Builder
     {
-        return $form->participants()->withFilter($filter)->withCount('children')->with('form');
-    }
-
-    /**
-     * @return LengthAwarePaginator<Participant>
-     */
-    public function handle(Form $form, ParticipantFilterScope $filter): LengthAwarePaginator
-    {
-        return $this->getQuery($form, $filter)->paginate(15);
+        return $filter->setForm($form)->getQuery()
+            ->query(fn ($q) => $q->withCount('children')->with('form'));
     }
 
     public function asController(Form $form, ?int $parent = null): AnonymousResourceCollection
     {
-        $filter = ParticipantFilterScope::fromRequest(request()->input('filter'));
+        $filter = ParticipantFilterScope::fromRequest(request()->input('filter', ''))->parent($parent);
 
         $data = match ($parent) {
-            null => $this->handle($form, $filter),
-            -1 => $this->getQuery($form, $filter)->where('parent_id', null)->paginate(15),
-            default => $this->getQuery($form, $filter)->where('parent_id', $parent)->get(),
+            null => $this->getQuery($form, $filter)->paginate(15),                              // initial all elements - paginate
+            -1 => $this->getQuery($form, $filter)->paginate(15),      // initial root elements - parinate
+            default => $this->getQuery($form, $filter)->get(),     // specific parent element - show all
         };
 
         return ParticipantResource::collection($data)->additional(['meta' => ParticipantResource::meta($form)]);

app/Form/Actions/PreventionRememberAction.php

@@ -17,7 +17,12 @@ class PreventionRememberAction
 
     public function handle(): void
     {
-        $query = Participant::whereHas('form', fn ($form) => $form->where('needs_prevention', true))
+        $query = Participant::whereHas(
+            'form',
+            fn ($form) => $form
+                ->where('needs_prevention', true)
+                ->where('from', '>=', now())
+        )
             ->where(
                 fn ($q) => $q
                     ->where('last_remembered_at', '<=', now()->subWeeks(2))

app/Form/Actions/RegisterAction.php

@@ -7,6 +7,7 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Member\Member;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -19,6 +20,10 @@ class RegisterAction
      */
     public function handle(Form $form, array $input): Participant
     {
+        if (!$form->canRegister()) {
+            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
+        }
+
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
             ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());

app/Form/Actions/SettingIndexAction.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\FormSettings;
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingIndexAction
-{
-    use AsAction;
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function handle(FormSettings $settings): array
-    {
-        return [
-            'data' => [
-                'register_url' => $settings->registerUrl,
-                'clear_cache_url' => $settings->clearCacheUrl,
-            ],
-        ];
-    }
-
-    public function asController(FormSettings $settings): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'Module');
-
-        return Inertia::render('setting/Form', [
-            'data' => $this->handle($settings),
-        ]);
-    }
-}

app/Form/Actions/SettingStoreAction.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Form\Actions;
-
-use App\Form\FormSettings;
-use Illuminate\Http\RedirectResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingStoreAction
-{
-    use AsAction;
-
-    /**
-     * @param array<string, mixed> $input
-     */
-    public function handle(array $input): void
-    {
-        $settings = app(FormSettings::class);
-
-        $settings->fill([
-            'registerUrl' => $input['register_url'],
-            'clearCacheUrl' => $input['clear_cache_url'],
-        ]);
-
-        $settings->save();
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'register_url' => 'present|string',
-            'clear_cache_url' => 'present|string',
-        ];
-    }
-
-    public function asController(ActionRequest $request): RedirectResponse
-    {
-        $this->handle($request->validated());
-
-        return redirect()->back();
-    }
-}

app/Form/Actions/UpdateParticipantSearchIndexAction.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class UpdateParticipantSearchIndexAction
+{
+    use AsAction;
+
+    public function handle(Form $form): void
+    {
+        if (config('scout.driver') !== 'meilisearch') {
+            return;
+        }
+
+        $form->searchableUsing()->updateIndexSettings(
+            $form->participantsSearchableAs(),
+            [
+                'filterableAttributes' => [...$form->getFields()->filterables()->getKeys(), 'parent-id'],
+                'searchableAttributes' => $form->getFields()->searchables()->getKeys(),
+                'sortableAttributes' => [...$form->getFields()->sortables()->getKeys(), 'id', 'created_at'],
+                'displayedAttributes' => [...$form->getFields()->filterables()->getKeys(), ...$form->getFields()->searchables()->getKeys(), 'id'],
+                'pagination' => [
+                    'maxTotalHits' => 1000000,
+                ]
+            ]
+        );
+    }
+}

app/Form/Casts/CollectionCast.php

@@ -6,6 +6,7 @@ use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Casts\Cast;
 use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class CollectionCast implements Cast
@@ -20,10 +21,9 @@ class CollectionCast implements Cast
 
     /**
      * @param array<int, array<string, mixed>> $value
-     * @param array<string, mixed> $context
      * @return Collection<int, Data>
      */
-    public function cast(DataProperty $property, mixed $value, array $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
     {
         return collect($value)->map(fn ($item) => $this->target::from($item));
     }

app/Form/Casts/FieldCollectionCast.php

@@ -5,16 +5,16 @@ namespace App\Form\Casts;
 use App\Form\Data\FieldCollection;
 use App\Form\Fields\Field;
 use Spatie\LaravelData\Casts\Cast;
+use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class FieldCollectionCast implements Cast
 {
     /**
      * @param array<int, array<string, string>> $value
-     * @param array<string, mixed> $context
      * @return FieldCollection
      */
-    public function cast(DataProperty $property, mixed $value, array $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
     {
         return new FieldCollection(collect($value)->map(fn ($value) => Field::classFromType($value['type'])::from($value))->all());
     }

app/Form/Contracts/Filterable.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Form\Contracts;
+
+interface Filterable
+{
+    /** @param mixed $value */
+    public function filter($value): string;
+}

app/Form/Data/FieldCollection.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Data;
 
+use App\Form\Contracts\Filterable;
 use App\Form\Enums\SpecialType;
 use App\Form\Fields\Field;
 use App\Form\Fields\NamiField;
@@ -117,4 +118,27 @@ class FieldCollection extends Collection
     {
         return $this->first(fn ($field) => $field->specialType === $specialType);
     }
+
+    public function searchables(): self
+    {
+        return $this;
+    }
+
+    public function sortables(): self
+    {
+        return $this;
+    }
+
+    public function filterables(): self
+    {
+        return $this->filter(fn ($field) => $field instanceof Filterable);
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getKeys(): array
+    {
+        return $this->map(fn ($field) => $field->key)->toArray();
+    }
 }

app/Form/Enums/NamiType.php

@@ -48,7 +48,7 @@ enum NamiType: string
             static::LOCATION => $member->location,
             static::NICKNAME => $member->nickname,
             static::GENDER => $member->gender?->name,
-            static::AGE => $member->birthday->diffInYears(now()),
+            static::AGE => intVal($member->birthday->diffInYears(now())),
             static::AGEEVENT => $member->birthday->diffInYears($form->from),
             static::MOBILEPHONE => $member->mobile_phone,
         };

app/Form/Fields/CheckboxField.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Fields;
 
+use App\Form\Contracts\Filterable;
 use App\Form\Matchers\BooleanMatcher;
 use App\Form\Matchers\Matcher;
 use App\Form\Models\Form;
@@ -9,9 +10,8 @@ use App\Form\Models\Participant;
 use App\Form\Presenters\BooleanPresenter;
 use App\Form\Presenters\Presenter;
 use Faker\Generator;
-use Illuminate\Validation\Rule;
 
-class CheckboxField extends Field
+class CheckboxField extends Field implements Filterable
 {
     public bool $required;
     public string $description;
@@ -86,4 +86,11 @@ class CheckboxField extends Field
     {
         return app(BooleanMatcher::class);
     }
+
+    public function filter($value): string
+    {
+        $asString = $value ? 'true' : 'false';
+
+        return "{$this->key} = $asString";
+    }
 }

app/Form/Fields/DropdownField.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Fields;
 
+use App\Form\Contracts\Filterable;
 use App\Form\Matchers\Matcher;
 use App\Form\Matchers\SingleValueMatcher;
 use App\Form\Models\Form;
@@ -9,7 +10,7 @@ use App\Form\Models\Participant;
 use Faker\Generator;
 use Illuminate\Validation\Rule;
 
-class DropdownField extends Field
+class DropdownField extends Field implements Filterable
 {
     public bool $required;
     /** @var array<int, string> */
@@ -87,4 +88,14 @@ class DropdownField extends Field
     {
         return app(SingleValueMatcher::class);
     }
+
+    /** @inheritdoc */
+    public function filter($value): string
+    {
+        if (is_null($value)) {
+            return "{$this->key} IS NULL";
+        }
+
+        return $this->key . ' = \'' . $value . '\'';
+    }
 }

app/Form/Fields/Field.php

@@ -180,4 +180,10 @@ abstract class Field extends Data
     {
         return app(SingleValueMatcher::class);
     }
+
+    /** @param mixed $value */
+    public function filter($value): string
+    {
+        return '';
+    }
 }

app/Form/Fields/RadioField.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Fields;
 
+use App\Form\Contracts\Filterable;
 use App\Form\Matchers\Matcher;
 use App\Form\Matchers\SingleValueMatcher;
 use App\Form\Models\Form;
@@ -9,7 +10,7 @@ use App\Form\Models\Participant;
 use Faker\Generator;
 use Illuminate\Validation\Rule;
 
-class RadioField extends Field
+class RadioField extends Field implements Filterable
 {
     public bool $required;
     /** @var array<int, string> */
@@ -87,4 +88,13 @@ class RadioField extends Field
     {
         return app(SingleValueMatcher::class);
     }
+
+    public function filter($value): string
+    {
+        if (is_null($value)) {
+            return "{$this->key} IS NULL";
+        }
+
+        return $this->key . ' = \'' . $value . '\'';
+    }
 }

app/Form/FormSettings.php

@@ -2,13 +2,12 @@
 
 namespace App\Form;
 
-use App\Form\Actions\SettingIndexAction;
 use App\Form\Actions\SettingStoreAction;
-use App\Setting\Contracts\Indexable;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
+use Lorisleiva\Actions\ActionRequest;
 
-class FormSettings extends LocalSettings implements Indexable, Storeable
+class FormSettings extends LocalSettings implements Storeable
 {
     public string $registerUrl;
     public string $clearCacheUrl;
@@ -18,23 +17,38 @@ class FormSettings extends LocalSettings implements Indexable, Storeable
         return 'form';
     }
 
-    public static function slug(): string
-    {
-        return 'form';
-    }
-
     public static function title(): string
     {
         return 'Formulare';
     }
 
-    public static function indexAction(): string
+    /**
+     * @inheritdoc
+     */
+    public function rules(): array
     {
-        return SettingIndexAction::class;
+        return [
+            'registerUrl' => 'present|string',
+            'clearCacheUrl' => 'present|string',
+        ];
     }
 
-    public static function storeAction(): string
+    public function beforeSave(ActionRequest $request): void
     {
-        return SettingStoreAction::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
+    {
+        return [
+            'data' => [
+                'data' => [
+                    'registerUrl' => $this->registerUrl,
+                    'clearCacheUrl' => $this->clearCacheUrl,
+                ]
+            ]
+        ];
     }
 }

app/Form/Models/Form.php

@@ -2,17 +2,20 @@
 
 namespace App\Form\Models;
 
+use App\Form\Actions\UpdateParticipantSearchIndexAction;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
 use App\Lib\Editor\Condition;
 use App\Lib\Editor\EditorData;
+use App\Lib\Sorting;
 use Cviebrock\EloquentSluggable\Sluggable;
+use Database\Factories\Form\Models\FormFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Laravel\Scout\Searchable;
-use Spatie\Image\Manipulations;
+use Spatie\Image\Enums\Fit;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
@@ -21,6 +24,7 @@ use Zoomyboy\MedialibraryHelper\DefersUploads;
 /** @todo replace editor content with EditorData cast */
 class Form extends Model implements HasMedia
 {
+    /** @use HasFactory<FormFactory> */
     use HasFactory;
     use Sluggable;
     use InteractsWithMedia;
@@ -41,11 +45,12 @@ class Form extends Model implements HasMedia
         'needs_prevention' => 'boolean',
         'prevention_text' => EditorData::class,
         'prevention_conditions' => Condition::class,
+        'from' => 'datetime',
+        'to' => 'datetime',
+        'registration_from' => 'datetime',
+        'registration_until' => 'datetime',
     ];
 
-    /** @var array<int, string> */
-    public $dates = ['from', 'to', 'registration_from', 'registration_until'];
-
     /**
      * @return SluggableConfig
      */
@@ -73,7 +78,7 @@ class Form extends Model implements HasMedia
             ->forceFileName(fn (Form $model, string $name) => $model->slug)
             ->convert(fn () => 'jpg')
             ->registerMediaConversions(function (Media $media) {
-                $this->addMediaConversion('square')->fit(Manipulations::FIT_CROP, 400, 400);
+                $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
             });
         $this->addMediaCollection('mailattachments')
             ->withDefaultProperties(fn () => [
@@ -155,7 +160,7 @@ class Form extends Model implements HasMedia
             if (is_null(data_get($model->meta, 'active_columns'))) {
                 $model->setAttribute('meta', [
                     'active_columns' => $model->getFields()->count() ? $model->getFields()->take(4)->pluck('key')->toArray() : null,
-                    'sorting' => $model->getFields()->count() ? [$model->getFields()->first()->key, 'asc'] : null,
+                    'sorting' => Sorting::by('id'),
                 ]);
                 return;
             }
@@ -163,10 +168,37 @@ class Form extends Model implements HasMedia
             if (is_array(data_get($model->meta, 'active_columns'))) {
                 $model->setAttribute('meta', [
                     ...$model->meta,
-                    'active_columns' => array_values(array_intersect([...$model->getFields()->pluck('key')->toArray(), 'created_at'], $model->meta['active_columns'])),
+                    'active_columns' => array_values(array_intersect([...$model->getFields()->pluck('key')->toArray(), 'created_at', 'prevention'], $model->meta['active_columns'])),
                 ]);
                 return;
             }
         });
+
+        static::saved(function ($model) {
+            UpdateParticipantSearchIndexAction::dispatch($model);
+        });
+    }
+
+    public function participantsSearchableAs(): string
+    {
+        return config('scout.prefix') . 'forms_' . $this->id . '_participants';
+    }
+
+    public function defaultSorting(): Sorting
+    {
+        return Sorting::from($this->meta['sorting']);
+    }
+
+    public function canRegister(): bool
+    {
+        if ($this->registration_from && $this->registration_from->gt(now())) {
+            return false;
+        }
+
+        if ($this->registration_until && $this->registration_until->lt(now())) {
+            return false;
+        }
+
+        return true;
     }
 }

app/Form/Models/Formtemplate.php

@@ -4,6 +4,7 @@ namespace App\Form\Models;
 
 use App\Form\Data\FormConfigData;
 use App\Lib\Editor\EditorData;
+use Database\Factories\Form\Models\FormtemplateFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -12,6 +13,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Formtemplate extends Model
 {
+    /** @use HasFactory<FormtemplateFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Models/Participant.php

@@ -8,17 +8,22 @@ use App\Form\Mails\ConfirmRegistrationMail;
 use App\Form\Scopes\ParticipantFilterScope;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
+use Database\Factories\Form\Models\ParticipantFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Facades\Mail;
+use Laravel\Scout\Searchable;
 use stdClass;
 
 class Participant extends Model implements Preventable
 {
+
+    /** @use HasFactory<ParticipantFactory> */
     use HasFactory;
+    use Searchable;
 
     public $guarded = [];
 
@@ -43,15 +48,6 @@ class Participant extends Model implements Preventable
         return $this->hasMany(self::class, 'parent_id');
     }
 
-    /**
-     * @param  Builder<self> $query
-     * @return Builder<self>
-     */
-    public function scopeWithFilter(Builder $query, ParticipantFilterScope $filter): Builder
-    {
-        return $filter->apply($query);
-    }
-
     /**
      * @return BelongsTo<Member, self>
      */
@@ -107,4 +103,15 @@ class Participant extends Model implements Preventable
     {
         return 'Nachweise erforderlich für deine Anmeldung zu ' . $this->form->name;
     }
+
+    public function searchableAs(): string
+    {
+        return $this->form->participantsSearchableAs();
+    }
+
+    /** @return array<string, mixed> */
+    public function toSearchableArray(): array
+    {
+        return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
+    }
 }

app/Form/Resources/FormApiResource.php

@@ -35,6 +35,7 @@ class FormApiResource extends JsonResource
             'image' => $this->getMedia('headerImage')->first()->getFullUrl('square'),
             'is_active' => $this->is_active,
             'is_private' => $this->is_private,
+            'can_register' => $this->getModel()->canRegister(),
         ];
     }
 

app/Form/Resources/ParticipantResource.php

@@ -5,6 +5,7 @@ namespace App\Form\Resources;
 use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Form\Scopes\ParticipantFilterScope;
+use App\Prevention\Enums\Prevention;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 
@@ -28,6 +29,7 @@ class ParticipantResource extends JsonResource
             'created_at_display' => $this->created_at->format('d.m.Y'),
             'children_count' => $this->children_count,
             'member_id' => $this->member_id,
+            'prevention_items' => $this->member ? Prevention::items($this->member->preventions()) : [],
             'links' => [
                 'assign' => route('participant.assign', ['participant' => $this->getModel()]),
                 'destroy' => route('participant.destroy', ['participant' => $this->getModel()]),
@@ -73,7 +75,11 @@ class ParticipantResource extends JsonResource
                 'name' => 'Registriert am',
                 'id' => 'created_at',
                 'display_attribute' => 'created_at_display'
-            ])
+            ])->push([
+                'name' => 'Prävention',
+                'id' => 'prevention',
+                'display_attribute' => 'prevention_display'
+            ]),
         ];
     }
 }

app/Form/Scopes/ParticipantFilterScope.php

@@ -4,32 +4,76 @@ namespace App\Form\Scopes;
 
 use App\Form\Models\Form;
 use App\Form\Models\Participant;
-use App\Lib\Filter;
-use Illuminate\Database\Eloquent\Builder;
+use App\Lib\ScoutFilter;
+use App\Lib\Sorting;
 use Illuminate\Support\Arr;
+use Laravel\Scout\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 
 /**
- * @extends Filter<Participant>
+ * @extends ScoutFilter<Participant>
  */
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-class ParticipantFilterScope extends Filter
+class ParticipantFilterScope extends ScoutFilter
 {
+
+    public static string $nan = 'deeb3ef4-d185-44b1-a4bc-0a4e7addebc3d8900c6f-a344-4afb-b54e-065ed483a7ba';
+    private Form $form;
+
     /**
      * @param array<string, mixed> $data
+     * @param array<string, mixed> $options
      */
     public function __construct(
         public array $data = [],
+        public string $search = '',
+        public array $options = [],
+        public ?int $parent = null,
+        public ?Sorting $sort = null
     ) {
     }
 
-    public static string $nan = 'deeb3ef4-d185-44b1-a4bc-0a4e7addebc3d8900c6f-a344-4afb-b54e-065ed483a7ba';
+    public function getQuery(): Builder
+    {
+        $this->search = $this->search ?: '';
+
+        return Participant::search($this->search, function ($engine, string $query, array $options) {
+            $filter = collect([]);
+
+            foreach ($this->form->getFields()->filterables() as $field) {
+                if ($this->data[$field->key] === static::$nan) {
+                    continue;
+                }
+                $filter->push($field->filter($this->data[$field->key]));
+            }
+
+            if ($this->parent === -1) {
+                $filter->push('parent-id IS NULL');
+            }
+
+            if ($this->parent !== null && $this->parent !== -1) {
+                $filter->push('parent-id = ' . $this->parent);
+            }
+
+            $options['filter'] = $filter->map(fn ($expression) => "($expression)")->implode(' AND ');
+
+            $options['sort'] = $this->sort->toMeilisearch();
+
+            return $engine->search($query, [...$this->options, ...$options]);
+        })->within($this->form->participantsSearchableAs());
+    }
 
     public function setForm(Form $form): self
     {
+        $this->form = $form;
+
+        if (is_null($this->sort)) {
+            $this->sort = $this->form->defaultSorting();
+        }
+
         foreach ($form->getFields() as $field) {
             if (!Arr::has($this->data, $field->key)) {
                 data_set($this->data, $field->key, static::$nan);
@@ -39,18 +83,10 @@ class ParticipantFilterScope extends Filter
         return $this;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function apply(Builder $query): Builder
+    public function parent(?int $parent): self
     {
-        foreach ($this->data as $key => $value) {
-            if ($value === static::$nan) {
-                continue;
-            }
-            $query = $query->where('data->' . $key, $value);
-        }
+        $this->parent = $parent;
 
-        return $query;
+        return $this;
     }
 }

app/Form/Transformers/CollectionTransformer.php

@@ -5,6 +5,7 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
+use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class CollectionTransformer implements Transformer
@@ -18,7 +19,7 @@ class CollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value): mixed
+    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
     {
         return $value->toArray();
     }

app/Form/Transformers/FieldCollectionTransformer.php

@@ -5,6 +5,7 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
+use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class FieldCollectionTransformer implements Transformer
@@ -14,7 +15,7 @@ class FieldCollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value): mixed
+    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
     {
         return $value->map(fn ($field) => [
             ...$field->toArray(),

app/Gender.php

@@ -3,12 +3,15 @@
 namespace App;
 
 use App\Nami\HasNamiField;
+use Database\Factories\GenderFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Gender extends Model
 {
     use HasNamiField;
+
+    /** @use HasFactory<GenderFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id'];
@@ -22,6 +25,15 @@ class Gender extends Model
         };
     }
 
+    public function getShortAttribute(): string
+    {
+        return match ($this->name) {
+            'Männlich' => 'm',
+            'Weiblich' => 'w',
+            default => ''
+        };
+    }
+
     public static function fromString(string $title): self
     {
         return self::firstWhere('name', $title);

app/Group.php

@@ -5,6 +5,7 @@ namespace App;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Group\Enums\Level;
 use App\Nami\HasNamiField;
+use Database\Factories\GroupFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -12,6 +13,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Group extends Model
 {
+    /** @use HasFactory<GroupFactory> */
     use HasFactory;
     use HasNamiField;
 
@@ -24,11 +26,11 @@ class Group extends Model
     ];
 
     /**
-     * @return BelongsTo<static, self>
+     * @return BelongsTo<self, self>
      */
     public function parent(): BelongsTo
     {
-        return $this->belongsTo(static::class, 'parent_id');
+        return $this->belongsTo(self::class, 'parent_id');
     }
 
     /**
@@ -36,7 +38,7 @@ class Group extends Model
      */
     public function children(): HasMany
     {
-        return $this->hasMany(static::class, 'parent_id');
+        return $this->hasMany(self::class, 'parent_id');
     }
 
     public static function booted(): void

app/Group/Actions/GroupApiIndexAction.php

@@ -6,6 +6,7 @@ use App\Group;
 use App\Group\Resources\GroupResource;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GroupApiIndexAction
@@ -20,8 +21,12 @@ class GroupApiIndexAction
         return Group::get();
     }
 
-    public function asController(?Group $group = null): AnonymousResourceCollection
+    public function asController(ActionRequest $request, ?Group $group = null): AnonymousResourceCollection
     {
-        return GroupResource::collection($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get());
+        return GroupResource::collection(
+            $request->has('all')
+                ? Group::with('children')->get()
+                : ($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get())
+        );
     }
 }

app/Http/Resources/UserResource.php

@@ -21,7 +21,9 @@ class UserResource extends JsonResource
     public function toArray($request): array
     {
         return [
-            'name' => $this->name,
+            'firstname' => $this->firstname,
+            'lastname' => $this->lastname,
+            'avatar_url' => $this->getGravatarUrl(),
             'email' => $this->email,
             'avatar' => [
                 'src' => Storage::url('avatar.png'),

app/Invoice/Actions/InvoiceIndexAction.php

@@ -6,9 +6,9 @@ use Lorisleiva\Actions\Concerns\AsAction;
 use App\Invoice\Models\Invoice;
 use App\Invoice\Resources\InvoiceResource;
 use App\Invoice\Scopes\InvoiceFilterScope;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Inertia\Inertia;
 use Inertia\Response;
+use Laravel\Scout\Builder;
 use Lorisleiva\Actions\ActionRequest;
 
 class InvoiceIndexAction
@@ -17,11 +17,11 @@ class InvoiceIndexAction
 
 
     /**
-     * @return LengthAwarePaginator<Invoice>
+     * @return Builder<Invoice>
      */
-    public function handle(InvoiceFilterScope $filter): LengthAwarePaginator
+    public function handle(InvoiceFilterScope $filter): Builder
     {
-        return Invoice::withFilter($filter)->with('positions')->paginate(15);
+        return $filter->getQuery()->query(fn ($q) => $q->with('positions'));
     }
 
     public function asController(ActionRequest $request): Response
@@ -32,7 +32,7 @@ class InvoiceIndexAction
         $filter = InvoiceFilterScope::fromRequest($request->input('filter', ''));
 
         return Inertia::render('invoice/Index', [
-            'data' => InvoiceResource::collection($this->handle($filter)),
+            'data' => InvoiceResource::collection($this->handle($filter)->paginate(15)),
         ]);
     }
 }

app/Invoice/Actions/InvoiceSendAction.php

@@ -4,7 +4,6 @@ namespace App\Invoice\Actions;
 
 use App\Invoice\BillDocument;
 use App\Invoice\BillKind;
-use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Mails\BillMail;
 use App\Invoice\Mails\RememberMail;
 use App\Invoice\Models\Invoice;

app/Invoice/InvoiceDocument.php

@@ -36,7 +36,7 @@ abstract class InvoiceDocument extends Document
 
     public static function fromInvoice(Invoice $invoice): self
     {
-        return static::withoutMagicalCreationFrom([
+        return static::factory()->withoutMagicalCreation()->from([
             'toName' => $invoice->to['name'],
             'toAddress' => $invoice->to['address'],
             'toZip' => $invoice->to['zip'],

app/Invoice/InvoiceSettings.php

@@ -2,50 +2,73 @@
 
 namespace App\Invoice;
 
-use App\Setting\Contracts\Indexable;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
+use Lorisleiva\Actions\ActionRequest;
 
-class InvoiceSettings extends LocalSettings implements Indexable, Storeable
+class InvoiceSettings extends LocalSettings implements Storeable
 {
-    public string $from_long;
-
-    public string $from;
-
-    public string $mobile;
-
-    public string $email;
-
-    public string $website;
-
-    public string $address;
-
-    public string $place;
-
-    public string $zip;
-
-    public string $iban;
-
-    public string $bic;
+    public ?string $from_long;
+    public ?string $from;
+    public ?string $mobile;
+    public ?string $email;
+    public ?string $website;
+    public ?string $address;
+    public ?string $place;
+    public ?string $zip;
+    public ?string $iban;
+    public ?string $bic;
+    public ?int $rememberWeeks;
 
     public static function group(): string
     {
         return 'bill';
     }
 
-    public static function slug(): string
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
     {
-        return 'bill';
+        return [
+            'data' => [
+                'from_long' => $this->from_long,
+                'from' => $this->from,
+                'mobile' => $this->mobile,
+                'email' => $this->email,
+                'website' => $this->website,
+                'address' => $this->address,
+                'place' => $this->place,
+                'zip' => $this->zip,
+                'iban' => $this->iban,
+                'bic' => $this->bic,
+                'rememberWeeks' => $this->rememberWeeks,
+            ]
+        ];
     }
 
-    public static function indexAction(): string
+    /**
+     * @inheritdoc
+     */
+    public function rules(): array
     {
-        return SettingIndexAction::class;
+        return [
+            'from_long' => '',
+            'from' => '',
+            'mobile' => '',
+            'email' => '',
+            'website' => '',
+            'address' => '',
+            'place' => '',
+            'zip' => '',
+            'iban' => '',
+            'bic' => '',
+            'rememberWeeks' => '',
+        ];
     }
 
-    public static function storeAction(): string
+    public function beforeSave(ActionRequest $request): void
     {
-        return SettingSaveAction::class;
     }
 
     public static function title(): string

app/Invoice/Models/Invoice.php

@@ -6,20 +6,25 @@ use App\Invoice\BillDocument;
 use App\Invoice\BillKind;
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\InvoiceDocument;
+use App\Invoice\InvoiceSettings;
 use App\Invoice\RememberDocument;
 use App\Invoice\Scopes\InvoiceFilterScope;
 use App\Member\Member;
 use App\Payment\Subscription;
+use Database\Factories\Invoice\Models\InvoiceFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Laravel\Scout\Searchable;
 use stdClass;
 
 class Invoice extends Model
 {
+    /** @use HasFactory<InvoiceFactory> */
     use HasFactory;
+    use Searchable;
 
     public $guarded = [];
 
@@ -27,12 +32,8 @@ class Invoice extends Model
         'to' => 'json',
         'status' => InvoiceStatus::class,
         'via' => BillKind::class,
-    ];
-
-    /** @var array<int, string> */
-    public $dates = [
-        'sent_at',
-        'last_remembered_at',
+        'sent_at' => 'datetime',
+        'last_remembered_at' => 'datetime',
     ];
 
     /**
@@ -111,22 +112,14 @@ class Invoice extends Model
      *
      * @return Builder<self>
      */
-    public function scopeWhereNeedsRemember(Builder $query): Builder
+    public function scopeWhereNeedsRemember(Builder $query, ?int $weeks = null): Builder
     {
+        $weeks = $weeks ?: app(InvoiceSettings::class)->rememberWeeks;
         return $query
             ->where('status', InvoiceStatus::SENT)
             ->whereNotNull('sent_at')
             ->whereNotNull('last_remembered_at')
-            ->where('last_remembered_at', '<=', now()->subMonths(3));
-    }
-
-    /**
-     * @param  Builder<self> $query
-     * @return Builder<self>
-     */
-    public function scopeWithFilter(Builder $query, InvoiceFilterScope $filter): Builder
-    {
-        return $filter->apply($query);
+            ->where('last_remembered_at', '<=', now()->subWeeks($weeks));
     }
 
     public function getMailRecipient(): stdClass
@@ -154,4 +147,20 @@ class Invoice extends Model
             ]);
         }
     }
+
+    /**
+     * Get the indexable data array for the model.
+     *
+     * @return array<string, mixed>
+     */
+    public function toSearchableArray(): array
+    {
+        return [
+            'to' => implode(', ', $this->to),
+            'usage' => $this->usage,
+            'greeting' => $this->greeting,
+            'mail_email' => $this->mail_email,
+            'status' => $this->status->value,
+        ];
+    }
 }

app/Invoice/Models/InvoicePosition.php

@@ -3,12 +3,14 @@
 namespace App\Invoice\Models;
 
 use App\Member\Member;
+use Database\Factories\Invoice\Models\InvoicePositionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class InvoicePosition extends Model
 {
+    /** @use HasFactory<InvoicePositionFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Invoice/Scopes/InvoiceFilterScope.php

@@ -5,42 +5,43 @@ namespace App\Invoice\Scopes;
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Models\Invoice;
 use App\Lib\Filter;
-use Illuminate\Database\Eloquent\Builder;
+use App\Lib\ScoutFilter;
+use Laravel\Scout\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 
 /**
- * @extends Filter<Invoice>
+ * @extends ScoutFilter<Invoice>
  */
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-class InvoiceFilterScope extends Filter
+class InvoiceFilterScope extends ScoutFilter
 {
     /**
      * @param array<int, string> $statuses
      */
     public function __construct(
         public ?array $statuses = null,
+        public ?string $search = null
     ) {
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply(Builder $query): Builder
-    {
-        $query = $query->whereIn('status',  $this->statuses);
-
-        return $query;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function toDefault(): self
-    {
         $this->statuses = $this->statuses === null ? InvoiceStatus::defaultVisibleValues()->toArray() : $this->statuses;
-        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getQuery(): Builder
+    {
+        $this->search = $this->search ?: '';
+
+        return Invoice::search($this->search, function ($engine, string $query, array $options) {
+            if (empty($this->statuses)) {
+                $filter = 'status = "asa6aeruuni4BahC7Wei6ahm1"';
+            } else {
+                $filter = collect($this->statuses)->map(fn (string $status) => "status = \"$status\"")->join(' OR ');
+            }
+            return $engine->search($query, [...$options, 'filter' => $filter]);
+        });
     }
 }

app/Invoice/SettingIndexAction.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Invoice;
-
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingIndexAction
-{
-    use AsAction;
-
-    /**
-     * @return array<string, string>
-     */
-    public function handle(InvoiceSettings $settings): array
-    {
-        return [
-            'from_long' => $settings->from_long,
-            'from' => $settings->from,
-            'mobile' => $settings->mobile,
-            'email' => $settings->email,
-            'website' => $settings->website,
-            'address' => $settings->address,
-            'place' => $settings->place,
-            'zip' => $settings->zip,
-            'iban' => $settings->iban,
-            'bic' => $settings->bic,
-        ];
-    }
-
-    public function asController(InvoiceSettings $settings): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'Rechnungs-Einstellungen');
-
-        return Inertia::render('setting/Bill', [
-            'data' => $this->handle($settings),
-        ]);
-    }
-}

app/Invoice/SettingSaveAction.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Invoice;
-
-use Illuminate\Http\RedirectResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingSaveAction
-{
-    use AsAction;
-
-    /**
-     * @param array<string, string> $input
-     */
-    public function handle(array $input): void
-    {
-        $settings = app(InvoiceSettings::class);
-
-        $settings->fill([
-            'from_long' => $input['from_long'] ?? '',
-            'from' => $input['from'] ?? '',
-            'mobile' => $input['mobile'] ?? '',
-            'email' => $input['email'] ?? '',
-            'website' => $input['website'] ?? '',
-            'address' => $input['address'] ?? '',
-            'place' => $input['place'] ?? '',
-            'zip' => $input['zip'] ?? '',
-            'iban' => $input['iban'] ?? '',
-            'bic' => $input['bic'] ?? '',
-        ]);
-
-        $settings->save();
-    }
-
-    public function asController(ActionRequest $request): RedirectResponse
-    {
-        $this->handle($request->all());
-
-        return redirect()->back();
-    }
-}

app/Lib/Editor/Condition.php

@@ -20,12 +20,12 @@ class Condition extends Data
 
     public static function fromMedia(Media $media): self
     {
-        return $media->getCustomProperty('conditions') ? static::withoutMagicalCreationFrom($media->getCustomProperty('conditions')) : static::defaults();
+        return $media->getCustomProperty('conditions') ? static::factory()->withoutMagicalCreation()->from($media->getCustomProperty('conditions')) : static::defaults();
     }
 
     public static function defaults(): self
     {
-        return static::withoutMagicalCreationFrom(['mode' => 'any', 'ifs' => []]);
+        return static::factory()->withoutMagicalCreation()->from(['mode' => 'any', 'ifs' => []]);
     }
 
     public function hasStatements(): bool

app/Lib/Editor/ConditionResolver.php

@@ -20,7 +20,7 @@ abstract class ConditionResolver
      */
     public function filterBlock(array $block): bool
     {
-        return $this->filterCondition(Condition::withoutMagicalCreationFrom([
+        return $this->filterCondition(Condition::factory()->withoutMagicalCreation()->from([
             'mode' => data_get($block, 'tunes.condition.mode', 'any'),
             'ifs' =>  data_get($block, 'tunes.condition.ifs', []),
         ]));

app/Lib/Filter.php

@@ -36,7 +36,7 @@ abstract class Filter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::withoutMagicalCreationFrom($post ?: [])->toDefault();
+        return static::factory()->withoutMagicalCreation()->from($post ?: [])->toDefault();
     }
 
     /**

app/Lib/ScoutFilter.php

@@ -14,9 +14,11 @@ abstract class ScoutFilter extends Data
 {
 
     /**
-     * @return Builder
+     * @return Builder<T>
      */
     abstract public function getQuery(): Builder;
+
+    /** @var Builder<T> */
     protected Builder $query;
 
     /**
@@ -36,6 +38,6 @@ abstract class ScoutFilter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::withoutMagicalCreationFrom($post ?: []);
+        return static::factory()->withoutMagicalCreation()->from($post ?: []);
     }
 }

app/Lib/Sorting.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Lib;
+
+use Spatie\LaravelData\Data;
+
+class Sorting extends Data
+{
+    public static function by(string $by): self
+    {
+        return static::factory()->withoutMagicalCreation()->from(['by' => $by]);
+    }
+
+    public function __construct(public string $by, public bool $direction = false)
+    {
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function toMeilisearch(): array
+    {
+        return [$this->by . ':' . ($this->direction ? 'desc' : 'asc')];
+    }
+}

app/Maildispatcher/Models/Localmaildispatcher.php

@@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class Localmaildispatcher extends Model
 {
-    use HasFactory;
     use HasUuids;
 
     public $guarded = [];

app/Maildispatcher/Models/Maildispatcher.php

@@ -3,6 +3,7 @@
 namespace App\Maildispatcher\Models;
 
 use App\Mailgateway\Models\Mailgateway;
+use Database\Factories\Maildispatcher\Models\MaildispatcherFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -10,6 +11,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Maildispatcher extends Model
 {
+    /** @use HasFactory<MaildispatcherFactory> */
     use HasFactory;
     use HasUuids;
 

app/Mailgateway/Actions/IndexAction.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Mailgateway\Actions;
-
-use App\Mailgateway\Models\Mailgateway;
-use App\Mailgateway\Resources\MailgatewayResource;
-use Illuminate\Database\Eloquent\Builder;
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class IndexAction
-{
-    use AsAction;
-
-    /**
-     * @return Builder<Mailgateway>
-     */
-    public function handle(): Builder
-    {
-        return (new Mailgateway())->newQuery();
-    }
-
-    public function asController(): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'E-Mail-Verbindungen');
-
-        return Inertia::render('mailgateway/Index', [
-            'data' => MailgatewayResource::collection($this->handle()->paginate(10)),
-        ]);
-    }
-}

app/Mailgateway/MailgatewaySettings.php

@@ -2,29 +2,29 @@
 
 namespace App\Mailgateway;
 
-use App\Mailgateway\Actions\IndexAction;
-use App\Setting\Contracts\Indexable;
+use App\Mailgateway\Models\Mailgateway;
+use App\Mailgateway\Resources\MailgatewayResource;
 use App\Setting\LocalSettings;
 
-class MailgatewaySettings extends LocalSettings implements Indexable
+class MailgatewaySettings extends LocalSettings
 {
     public static function group(): string
     {
         return 'mailgateway';
     }
 
-    public static function slug(): string
-    {
-        return 'mailgateway';
-    }
-
-    public static function indexAction(): string
-    {
-        return IndexAction::class;
-    }
-
     public static function title(): string
     {
         return 'E-Mail-Verbindungen';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
+    {
+        return [
+            'data' => MailgatewayResource::collection(Mailgateway::paginate(10)),
+        ];
+    }
 }

app/Mailgateway/Models/Mailgateway.php

@@ -3,12 +3,14 @@
 namespace App\Mailgateway\Models;
 
 use App\Mailgateway\Casts\TypeCast;
+use Database\Factories\Mailgateway\Models\MailgatewayFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Mailgateway extends Model
 {
+    /** @use HasFactory<MailgatewayFactory> */
     use HasFactory;
     use HasUuids;
 

app/Mailman/Data/MailingList.php

@@ -26,7 +26,7 @@ class MailingList extends Data
     ) {
     }
 
-    public static function factory(): MailinglistFactory
+    public static function toFactory(): MailinglistFactory
     {
         return MailinglistFactory::new();
     }

app/Member/Actions/NamiPutMemberAction.php

@@ -46,7 +46,7 @@ class NamiPutMemberAction
             'groupId' => $member->group->nami_id,
             'id' => $member->nami_id,
             'version' => $member->version,
-            'keepdata' => false,
+            'keepdata' => $member->keepdata,
         ]);
         $response = $api->putMember($namiMember, $activity ? $activity->nami_id : null, $subactivity ? $subactivity->nami_id : null);
         Member::withoutEvents(function () use ($response, $member) {

app/Member/Data/NestedGroup.php

@@ -5,7 +5,6 @@ namespace App\Member\Data;
 use App\Group;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\DataCollection;
 
 class NestedGroup extends Data
 {
@@ -23,7 +22,7 @@ class NestedGroup extends Data
         $groups = collect([]);
 
         foreach (Group::where('parent_id', $parentId)->orderBy('name')->get()->toBase() as $group) {
-            $groups->push(['name' => str_repeat('- ', $level).$group->name, 'id' => $group->id]);
+            $groups->push(['name' => str_repeat('- ', $level) . $group->name, 'id' => $group->id]);
             $groups = $groups->merge(static::forSelect($group->id, $level + 1));
         }
 
@@ -31,10 +30,10 @@ class NestedGroup extends Data
     }
 
     /**
-     * @return DataCollection<int, static>
+     * @return Collection<int, static>
      */
-    public static function cacheForSelect(): DataCollection
+    public static function cacheForSelect(): Collection
     {
-        return static::collection(static::forSelect());
+        return static::collect(static::forSelect());
     }
 }

app/Member/Member.php

@@ -33,6 +33,7 @@ use Zoomyboy\Osm\Geolocatable;
 use Zoomyboy\Osm\HasGeolocation;
 use Zoomyboy\Phone\HasPhoneNumbers;
 use App\Prevention\Enums\Prevention;
+use Database\Factories\Member\MemberFactory;
 
 /**
  * @property string $subscription_name
@@ -42,6 +43,7 @@ class Member extends Model implements Geolocatable
 {
     use Notifiable;
     use HasNamiField;
+    /** @use HasFactory<MemberFactory> */
     use HasFactory;
     use Sluggable;
     use Searchable;
@@ -56,12 +58,7 @@ class Member extends Model implements Geolocatable
     /**
      * @var array<int, string>
      */
-    public static array $namiFields = ['firstname', 'lastname', 'joined_at', 'birthday', 'send_newspaper', 'address', 'zip', 'location', 'nickname', 'other_country', 'further_address', 'main_phone', 'mobile_phone', 'work_phone', 'fax', 'email', 'email_parents', 'gender_id', 'confession_id', 'region_id', 'country_id', 'fee_id', 'nationality_id', 'slug', 'subscription_id'];
-
-    /**
-     * @var array<int, string>
-     */
-    public $dates = ['try_created_at', 'recertified_at', 'joined_at', 'birthday', 'efz', 'ps_at', 'more_ps_at', 'without_education_at', 'without_efz_at'];
+    public static array $namiFields = ['firstname', 'lastname', 'joined_at', 'birthday', 'send_newspaper', 'address', 'zip', 'location', 'nickname', 'other_country', 'further_address', 'main_phone', 'mobile_phone', 'work_phone', 'fax', 'email', 'email_parents', 'gender_id', 'confession_id', 'region_id', 'country_id', 'fee_id', 'nationality_id', 'slug', 'subscription_id', 'keepdata'];
 
     /**
      * @var array<string, string>
@@ -80,8 +77,19 @@ class Member extends Model implements Geolocatable
         'multiply_pv' => 'boolean',
         'multiply_more_pv' => 'boolean',
         'is_leader' => 'boolean',
+        'keepdata' => 'boolean',
         'bill_kind' => BillKind::class,
         'mitgliedsnr' => 'integer',
+
+        'try_created_at' => 'datetime',
+        'recertified_at' => 'datetime',
+        'joined_at' => 'datetime',
+        'birthday' => 'datetime',
+        'efz' => 'datetime',
+        'ps_at' => 'datetime',
+        'more_ps_at' => 'datetime',
+        'without_education_at' => 'datetime',
+        'without_efz_at' => 'datetime',
     ];
 
     /**
@@ -177,7 +185,7 @@ class Member extends Model implements Geolocatable
 
     public function getAge(): ?int
     {
-        return $this->birthday?->diffInYears(now());
+        return $this->birthday ? intval($this->birthday->diffInYears(now())) : null;
     }
 
     protected function getAusstand(): int
@@ -360,8 +368,10 @@ class Member extends Model implements Geolocatable
         }
 
         if ($this->more_ps_at === null) {
-            if ($this->ps_at === null || $this->ps_at->diffInYears($date) >= 5) {
+            if ($this->ps_at === null) {
                 $preventions[] = Prevention::PS;
+            } else if ($this->ps_at->diffInYears($date) >= 5) {
+                $preventions[] = Prevention::MOREPS;
             }
         } else {
             if ($this->more_ps_at === null || $this->more_ps_at->diffInYears($date) >= 5) {
@@ -399,14 +409,14 @@ class Member extends Model implements Geolocatable
         return $query->where('group_id', $group->id);
     }
 
-    public static function fromVcard(string $url, string $data): static
+    public static function fromVcard(string $url, string $data): self
     {
         $settings = app(NamiSettings::class);
         $card = Reader::read($data);
         [$lastname, $firstname] = $card->N->getParts();
         [$deprecated1, $deprecated2, $address, $location, $region, $zip, $country] = $card->ADR->getParts();
 
-        return new static([
+        return new self([
             'joined_at' => now(),
             'send_newspaper' => false,
             'firstname' => $firstname,

app/Member/MemberController.php

@@ -2,7 +2,6 @@
 
 namespace App\Member;
 
-use App\Country;
 use App\Http\Controllers\Controller;
 use App\Setting\NamiSettings;
 use Illuminate\Http\RedirectResponse;
@@ -33,8 +32,7 @@ class MemberController extends Controller
         session()->put('menu', 'member');
         session()->put('title', 'Mitglied erstellen');
 
-        return \Inertia::render('member/VForm', [
-            'data' => MemberResource::defaultModel(),
+        return Inertia::render('member/VForm', [
             'mode' => 'create',
             'meta' => MemberResource::meta(),
         ]);
@@ -52,7 +50,7 @@ class MemberController extends Controller
         session()->put('menu', 'member');
         session()->put('title', "Mitglied {$member->firstname} {$member->lastname} bearbeiten");
 
-        return \Inertia::render('member/VForm', [
+        return Inertia::render('member/VForm', [
             'data' => new MemberResource($member),
             'mode' => 'edit',
             'conflict' => '1' === $request->query('conflict', '0'),

app/Member/MemberRequest.php

@@ -83,6 +83,7 @@ class MemberRequest extends FormRequest
             'other_country' => '',
             'salutation' => '',
             'comment' => '',
+            'keepdata' => 'boolean',
         ];
     }
 

app/Member/MemberResource.php

@@ -106,6 +106,7 @@ class MemberResource extends JsonResource
             'lat' => $this->lat,
             'lon' => $this->lon,
             'group_name' => $this->group->name,
+            'keepdata' => $this->keepdata,
             'links' => [
                 'membership_index' => route('member.membership.index', ['member' => $this->getModel()]),
                 'invoiceposition_index' => route('member.invoice-position.index', ['member' => $this->getModel()]),
@@ -162,54 +163,48 @@ class MemberResource extends JsonResource
                 'activity_ids' => [],
                 'subactivity_ids' => []
             ],
-        ];
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function defaultModel(): array
-    {
-        return [
-            'gender_id' => null,
-            'salutation' => '',
-            'nationality_id' => null,
-            'firstname' => '',
-            'lastname' => '',
-            'address' => '',
-            'further_address' => '',
-            'zip' => '',
-            'location' => '',
-            'birthday' => '',
-            'region_id' => null,
-            'country_id' => Country::default(),
-            'other_country' => '',
-            'main_phone' => '',
-            'mobile_phone' => '',
-            'work_phone' => '',
-            'children_phone' => '',
-            'email' => '',
-            'email_parents' => '',
-            'fax' => '',
-            'letter_address' => '',
-            'bill_kind' => null,
-            'subscription_id' => null,
-            'has_nami' => false,
-            'send_newspaper' => false,
-            'joined_at' => now()->format('Y-m-d'),
-            'comment' => '',
-            'first_activity_id' => null,
-            'first_subactivity_id' => null,
-            'efz' => null,
-            'ps_at' => null,
-            'more_ps_at' => null,
-            'without_education_at' => null,
-            'recertified_at' => null,
-            'without_efz_at' => null,
-            'has_vk' => false,
-            'has_svk' => false,
-            'multiply_pv' => false,
-            'multiply_more_pv' => false,
+            'default' => [
+                'gender_id' => null,
+                'salutation' => '',
+                'nationality_id' => null,
+                'firstname' => '',
+                'lastname' => '',
+                'address' => '',
+                'further_address' => '',
+                'zip' => '',
+                'location' => '',
+                'birthday' => '',
+                'region_id' => null,
+                'country_id' => Country::default(),
+                'other_country' => '',
+                'main_phone' => '',
+                'mobile_phone' => '',
+                'work_phone' => '',
+                'children_phone' => '',
+                'email' => '',
+                'email_parents' => '',
+                'fax' => '',
+                'letter_address' => '',
+                'bill_kind' => null,
+                'subscription_id' => null,
+                'has_nami' => false,
+                'send_newspaper' => false,
+                'joined_at' => now()->format('Y-m-d'),
+                'comment' => '',
+                'first_activity_id' => null,
+                'first_subactivity_id' => null,
+                'efz' => null,
+                'ps_at' => null,
+                'more_ps_at' => null,
+                'without_education_at' => null,
+                'recertified_at' => null,
+                'without_efz_at' => null,
+                'has_vk' => false,
+                'has_svk' => false,
+                'multiply_pv' => false,
+                'multiply_more_pv' => false,
+                'keepdata' => false,
+            ]
         ];
     }
 }

app/Member/Membership.php

@@ -6,6 +6,7 @@ use App\Activity;
 use App\Group;
 use App\Nami\HasNamiField;
 use App\Subactivity;
+use Database\Factories\Member\MembershipFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -16,6 +17,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  */
 class Membership extends Model
 {
+    /** @use HasFactory<MembershipFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Member/PsPendingBlock.php

@@ -23,7 +23,7 @@ class PsPendingBlock extends Block
         })
             ->whereCurrentGroup()
             ->orderByRaw('lastname, firstname')
-            ->whereHas('memberships', fn ($builder) => $builder->isLeader());
+            ->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
     }
 
     /**

app/Module/ModuleIndexAction.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Module;
-
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class ModuleIndexAction
-{
-    use AsAction;
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function handle(ModuleSettings $settings): array
-    {
-        return [
-            'data' => [
-                'modules' => $settings->modules,
-            ],
-            'meta' => ['modules' => Module::forSelect()],
-        ];
-    }
-
-    public function asController(ModuleSettings $settings): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'Module');
-
-        return Inertia::render('setting/Module', [
-            'data' => $this->handle($settings),
-        ]);
-    }
-}

app/Module/ModuleSettings.php

@@ -2,11 +2,12 @@
 
 namespace App\Module;
 
-use App\Setting\Contracts\Indexable;
 use App\Setting\Contracts\Storeable;
 use App\Setting\LocalSettings;
+use Illuminate\Validation\Rule;
+use Lorisleiva\Actions\ActionRequest;
 
-class ModuleSettings extends LocalSettings implements Indexable, Storeable
+class ModuleSettings extends LocalSettings implements Storeable
 {
     /** @var array<int, string> */
     public array $modules;
@@ -16,28 +17,43 @@ class ModuleSettings extends LocalSettings implements Indexable, Storeable
         return 'module';
     }
 
-    public static function slug(): string
-    {
-        return 'module';
-    }
-
     public static function title(): string
     {
         return 'Module';
     }
 
-    public static function indexAction(): string
-    {
-        return ModuleIndexAction::class;
-    }
-
-    public static function storeAction(): string
-    {
-        return ModuleStoreAction::class;
-    }
-
     public function hasModule(string $module): bool
     {
         return in_array($module, $this->modules);
     }
+
+    public function beforeSave(ActionRequest $request): void
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules(): array
+    {
+        return [
+            'modules' => 'present|array',
+            'modules.*' => ['string', Rule::in(Module::values())],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
+    {
+        return [
+            'data' => [
+                'data' => [
+                    'modules' => $this->modules,
+                ],
+                'meta' => ['modules' => Module::forSelect()],
+            ]
+        ];
+    }
 }

app/Module/ModuleStoreAction.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Module;
-
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Validation\Rule;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class ModuleStoreAction
-{
-    use AsAction;
-
-    /**
-     * @param array<string, mixed> $input
-     */
-    public function handle(array $input): void
-    {
-        $settings = app(ModuleSettings::class);
-
-        $settings->fill([
-            'modules' => $input['modules'],
-        ]);
-
-        $settings->save();
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'modules' => 'present|array',
-            'modules.*' => ['string', Rule::in(Module::values())],
-        ];
-    }
-
-    public function asController(ActionRequest $request): RedirectResponse
-    {
-        $this->handle($request->validated());
-
-        return redirect()->back();
-    }
-}

app/Nami/Actions/SettingIndexAction.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Nami\Actions;
-
-use App\Setting\NamiSettings;
-use Inertia\Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingIndexAction
-{
-    use AsAction;
-
-    /**
-     * @return array<string, string>
-     */
-    public function handle(NamiSettings $settings): array
-    {
-        return [
-            'mglnr' => $settings->mglnr,
-            'password' => '',
-            'default_group_id' => $settings->default_group_id,
-        ];
-    }
-
-    public function asController(NamiSettings $settings): Response
-    {
-        session()->put('menu', 'setting');
-        session()->put('title', 'NaMi-Settings');
-
-        return Inertia::render('setting/Nami', [
-            'data' => $this->handle($settings),
-        ]);
-    }
-}

app/Nami/Actions/SettingSaveAction.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Nami\Actions;
-
-use App\Initialize\Actions\NamiLoginCheckAction;
-use App\Setting\NamiSettings;
-use Illuminate\Http\RedirectResponse;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class SettingSaveAction
-{
-    use AsAction;
-
-    /**
-     * @param array<string, string> $input
-     */
-    public function handle(array $input): void
-    {
-        $settings = app(NamiSettings::class);
-
-        $settings->fill([
-            'mglnr' => $input['mglnr'] ?? '',
-            'password' => $input['password'] ?? '',
-            'default_group_id' => $input['default_group_id'] ?? '',
-        ]);
-
-        $settings->save();
-    }
-
-    public function asController(ActionRequest $request): RedirectResponse
-    {
-        NamiLoginCheckAction::run([
-            'mglnr' => $request->mglnr,
-            'password' => $request->password,
-        ]);
-
-        $this->handle($request->all());
-
-        return redirect()->back();
-    }
-}

app/Nationality.php

@@ -3,11 +3,13 @@
 namespace App;
 
 use App\Nami\HasNamiField;
+use Database\Factories\NationalityFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Nationality extends Model
 {
+    /** @use HasFactory<NationalityFactory> */
     use HasFactory;
     use HasNamiField;