Add later registration backend

This reverts commit e3c7dad51e.

.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,16 +1,16 @@
-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
 RUN php artisan telescope:publish
 RUN php artisan horizon:publish
 
-FROM node:18.13.0-slim as node
+FROM node:20.15.0-slim AS node
 WORKDIR /app
 COPY . /app
 RUN npm install && npm run prod && npm run img && rm -R node_modules
 
-FROM nginx:1.21.6-alpine as nginx
+FROM nginx:1.21.6-alpine AS nginx
 WORKDIR /app
 COPY --from=node /app /app
 COPY --from=composer /app/public/vendor /app/public/vendor

.docker/php.Dockerfile

@@ -1,14 +1,14 @@
-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
 
-FROM node:17.9.0-slim as node
+FROM node:20.15.0-slim AS node
 WORKDIR /app
 COPY . /app
 RUN npm install && npm run prod && npm run img && rm -R node_modules
 
-FROM zoomyboy/adrema-base:latest as php
+FROM zoomyboy/adrema-base:latest AS php
 COPY --chown=www-data:www-data . /app
 COPY --chown=www-data:www-data --from=node /app/public /app/public
 COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor
@@ -20,7 +20,7 @@ RUN php artisan horizon:publish
 USER root
 COPY ./.docker/php /bin
 
-VOLUME ["/app/packages/laravel-nami/.cookies", "/app/storage/app"]
+VOLUME ["/app/packages/laravel-nami/.cookies", "/app/storage/app", "/app/resources/views/tex/invoice"]
 
 EXPOSE 9000
 

.docker/php/entrypoint

@@ -15,6 +15,11 @@ mkdir -p /app/storage/app/public || true
 chown -R www-data:www-data /app/packages/laravel-nami/.cookies
 chown -R www-data:www-data /app/storage/app
 
+if [ $APP_KEY = "YOUR_APP_KEY" ]; then
+    echo "----------------------- Keinen APP KEY gefunden. Key wird generiert:    $(su www-data -c 'php artisan key:generate --show')   ----------------------- Füge diesen Key als APP_KEY ein ---------------------"
+    exit 1
+fi
+
 if [ $1 == "horizon" ]; then
     wait_for_db
     su www-data -c 'php artisan horizon'
@@ -22,10 +27,6 @@ fi
 
 if [ $1 == "app" ]; then
     # --------------------------- ensure appkey is set ----------------------------
-    if [ $APP_KEY = "YOUR_APP_KEY" ]; then
-        echo "----------------------- Keinen APP KEY gefunden. Key wird generiert:    $(su www-data -c 'php artisan key:generate --show')   ----------------------- Füge diesen Key als APP_KEY ein ---------------------"
-        exit 1
-    fi
     wait_for_db
     php -r '$connection = new PDO("mysql:host='$DB_HOST';dbname='$DB_DATABASE'", "'$DB_USERNAME'", "'$DB_PASSWORD'"); $connection->query("DESCRIBE migrations");' > /dev/null || php artisan migrate --seed --force
     su www-data -c 'php artisan migrate --force'

.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
 
@@ -21,14 +21,25 @@ steps:
       commands:
           - while ! mysqladmin ping -h db -u db -pdb --silent; do sleep 1; done
 
-    - name: node
-      image: node:18.13.0-slim
+    - name: ocdb_healthcheck
+      image: mysql:oracle
       commands:
-          - npm ci && cd packages/adrema-form && npm ci && npm run build && cd ../../ && npm run img && npm run prod && rm -R node_modules
+          - while ! mysqladmin ping -h ownclouddb -u owncloud -powncloud --silent; do sleep 1; done
+
+    - name: oc_healthcheck
+      image: zoomyboy/adrema-base:latest
+      commands:
+          - while ! curl  --silent 'http://owncloudserver:8080/ocs/v1.php/cloud/capabilities?format=json' -u admin:admin | grep '"status":"ok"'; do sleep 1; done
+
+    - name: node
+      image: node:20.15.0-slim
+      commands:
+          - npm ci && cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../ && npm run img && npm run prod && rm -R node_modules
 
     - name: tests
       image: zoomyboy/adrema-base:latest
       commands:
+          - touch .env
           - php artisan migrate
           - php artisan test
           - rm -f .env
@@ -58,6 +69,8 @@ steps:
           XELATEX_BIN: /usr/bin/xelatex
           SCOUT_DRIVER: database
           MEILI_MASTER_KEY: abc
+          TEST_OWNCLOUD_DOMAIN: http://owncloudserver:8080
+          TEST_NEXTCLOUD_DOMAIN: http://nextcloudserver:80
 
     - name: docker_app_push
       image: plugins/docker
@@ -90,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
@@ -123,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
 
@@ -160,6 +173,47 @@ services:
       image: getmeili/meilisearch:v1.6
       commands:
           - meilisearch --master-key="abc"
+    - name: ownclouddb
+      image: mariadb:10.11
+      environment:
+          MYSQL_ROOT_PASSWORD: owncloud
+          MYSQL_USER: owncloud
+          MYSQL_PASSWORD: owncloud
+          MYSQL_DATABASE: owncloud
+          MARIADB_AUTO_UPGRADE: 1
+    - name: owncloudserver
+      image: owncloud/server:10.10.0
+      environment:
+          OWNCLOUD_DOMAIN: http://owncloudserver:8080
+          OWNCLOUD_TRUSTED_DOMAINS: owncloudserver
+          OWNCLOUD_DB_TYPE: mysql
+          OWNCLOUD_DB_NAME: owncloud
+          OWNCLOUD_DB_USERNAME: owncloud
+          OWNCLOUD_DB_PASSWORD: owncloud
+          OWNCLOUD_DB_HOST: ownclouddb
+          OWNCLOUD_ADMIN_USERNAME: admin
+          OWNCLOUD_ADMIN_PASSWORD: admin
+          OWNCLOUD_MYSQL_UTF8MB4: true
+          OWNCLOUD_REDIS_ENABLED: false
+          OWNCLOUD_REDIS_HOST: false
+    - name: nextclouddb
+      image: mariadb:10.11
+      environment:
+          MYSQL_ROOT_PASSWORD: nextcloud
+          MYSQL_USER: nextcloud
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: nextcloud
+          MARIADB_AUTO_UPGRADE: 1
+    - name: nextcloudserver
+      image: nextcloud
+      environment:
+          MYSQL_PASSWORD: nextcloud
+          MYSQL_DATABASE: nextcloud
+          MYSQL_USER: nextcloud
+          MYSQL_HOST: nextclouddb
+          NEXTCLOUD_ADMIN_USER: admin
+          NEXTCLOUD_ADMIN_PASSWORD: admin
+          NEXTCLOUD_TRUSTED_DOMAINS: nextcloudserver
 
 trigger:
     event:

.eslintrc.json

@@ -1,28 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:vue/vue3-recommended",
-        "prettier"
-    ],
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "vue"
-    ],
-    "overrides": [
-        {
-            "files": [
-                "*.vue"
-            ],
-            "rules": {
-                "vue/multi-word-component-names": "off"
-            }
-        }
-    ]
-}

.gitignore

@@ -8,6 +8,7 @@ yarn-error.log
 /public/build
 /public/vendor
 storage/*.key
+/storage/media-library/*
 /vendor/
 Homestead.yaml
 Homestead.json
@@ -15,6 +16,7 @@ Homestead.json
 .phpunit.result.cache
 /storage/temp/
 /storage/debugbar/
+/tests/Fileshare/oc_tmp/*
 
 # User data files
 /data/
@@ -38,3 +40,4 @@ Homestead.json
 /public/sprite.svg
 /.php-cs-fixer.cache
 /groups.sql
+/.phpunit.cache

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "packages/silvaletter"]
-	path = packages/silvaletter
-	url = https://git.zoomyboy.de/silva/silvaletter.git
 [submodule "packages/laravel-nami"]
 	path = packages/laravel-nami
 	url = https://git.zoomyboy.de/silva/laravel-nami-api
@@ -14,3 +11,9 @@
 	path = packages/medialibrary-helper
 	url = https://git.zoomyboy.de/zoomyboy/medialibrary-helper.git
 	branch = version2
+[submodule "packages/flysystem-webdav"]
+	path = packages/flysystem-webdav
+	url = https://github.com/zoomyboy/flysystem-webdav.git
+[submodule "packages/table-document"]
+	path = packages/table-document
+	url = https://git.zoomyboy.de/zoomyboy/table-document.git

CHANGELOG.md

@@ -0,0 +1,148 @@
+# Letzte Änderungen
+
+### 1.12.19
+
+-   Zuschusslisten können nun aus Veranstaltungs-Daten erstellt werden
+-   Veranstaltungs-Übersicht zeigt nun Tags an
+
+### 1.12.18
+
+-   Fix: Initialisierung klappt nun auch, wenn Mitgliedsnummer mit einer 0 beginnt
+
+### 1.12.17
+
+-   Fix: Mitgliedschaften werden beim Sammel-Speichern nicht mehr doppelt angelegt
+
+### 1.12.16
+
+-   Mitgliedschaften können nun bei Mitgliedschaften-Übersicht gelöscht werden
+
+### 1.12.15
+
+-   Bestätigung wird eingeblendet beim Kopieren eines Events
+
+### 1.12.14
+
+-   Bilder werden nun mitkopiert beim Kopieren eines Events
+
+### 1.12.13
+
+-   Kopieren von bestehenden Veranstaltungen
+-   Präventions-Erinnerung automatisch versenden
+
+### 1.12.11
+
+-   Fix: Bank Account mit abrufen wenn Mitglied editiert wird
+
+### 1.12.7
+
+-   Fix: Synchronisation von allen Mitgliedern bei Mail-Verteilern - nicht nur den ersten 20
+
+### 1.12.6
+
+-   Fix: Beiträge von Familienmitgliedern splitten
+
+### 1.12.5
+
+-   Fix: Synchronisieren von bestehenden Beiträgen aus NaMi
+
+### 1.12.4
+
+-   Filter Mitglieder nach Verhaltenskodex
+
+### 1.12.3
+
+-   Volltextsuche für Rechnungen
+
+### 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
+
+### 1.10.10
+
+-   Eine Formular-Vorlage kann nun auch Mail-Inhalte enthalten, die für die Formulare übernommen werden
+
+### 1.10.9
+
+-   Nextcloud als neuen Type bei Datei-Verbindungen angelegt
+
+### 1.10.8
+
+-   Anmeldeformulare: Bearbeiten von Teilnehmer\*innen ist nun möglich
+
+### 1.10.7
+
+-   Anmeldeformulare: Versenden von Präventions-Unterlagen können nun an eine Feld-Bedingung geknüpft werden innerhalb der Veranstaltung
+
+### 1.10.6
+
+-   Kleinere Fehler behoben
+
+### 1.10.5
+
+-   Kleinere Fehler behoben
+
+### 1.10.4
+
+-   Anmeldeformular: Erinnerung an Präventions-Unterlagen bei Teilnehmer\*innnen
+
+### 1.10.3
+
+-   Anmeldeformulare: Ist NaMi-Feld "E-Mail" ausgewählt bei Formular-Feldern, muss die E-Mail-Adresse nun nicht mehr auf das Mitglied matchen. Dies ist nur noch bei Formular-Feldern mit NaMi-Feldern "Vorname", "Nachname" und "Geburtsdatum" der Fall.

Envoy.blade.php

@@ -1,4 +1,4 @@
-@servers(['docker' => ['stammsilva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
+@servers(['docker' => ['stamm-silva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
 
 @task('deploy', ['on' => 'docker'])
 cd $ADREMA_PATH

README.md

@@ -32,16 +32,16 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
 
 ## Installation des Produktivsystems
 
-1. Herunterladen der Beispiel Docker-Compose
+1. Verschieben der Docker-Compose
 
     ```cmd
-    curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/docker-compose.prod.yml -o docker-compose.yml
+    mv docker-compose.prod.yml docker-compose.yml
     ```
 
-2. Herunterladen der Beispiel Environmentvariablen-Datei
+2. Anwenden der Beispiel Environmentvariablen-Datei
 
     ```cmd
-    curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/.app.env.example -o .app.env
+    mv .app.env.example .app.env
     ```
 
 3. In der `.app.env` notwendige Einstellungen vornehmen:
@@ -50,7 +50,8 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
     - Mail-Server Einstellungen `MAIL_PORT`, `MAIL_HOST`, `MAIL_USERNAME`, `MAIL_PASSWORD` und `MAIL_ENCRYPTION` anpassen
     - `MAIL_FROM_NAME`: Der Name, der als Absender von E-Mails gesetzt wird (z.B. `Stamm Bipi Service`)
     - `MAIL_FROM_ADDRESS`: Die dazu gehörige E-Mail-Adresse, die natürlich für antworten erreichbar sein sollte (z.B. `vorstand@stamm-bipi.de`)
-    - `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben sicheren Passwort für die Datenbank versehen
+    - `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben neu erstellten, sicheren Passwort für die Datenbank versehen
+    - `MEILI_MASTER_KEY` Mit einem neu erstellten, sicheren Passwort versehen
     - `USER_EMAIL` und `USER_PASSWORD`: Einstellen des standard Adrema Logins
 
 4. Container zur Gennerierung des App-Key starten
@@ -85,6 +86,12 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
 
 7. Nach kurzer Zeit ist AdReMa über <http://localhost:8000> erreichbar und es kann sich mit dem zuvor festgelegten Login eingeloggt werden
 
+### Individuelle anpassungen
+
+#### Rechnungswesen
+
+Bei dem Setup wird im Daten-Verzeichniss ein Ordner `./data/setup` angelegt. Hier kann das Logo des Stammes in den Briefkopf eingefügt werden. Zusätzlich kann der Text der Rechnung und der Zahlungserinnerung angepasst werden, dafür ist ein grundlegendes Verständnis für `.tex` Datein erforderlich.
+
 ## Nutzen des Entwicklungssystmes
 
 1. Klonen des Reposetories
@@ -93,28 +100,22 @@ Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles
     git clone https://git.zoomyboy.de/silva/adrema.git
     ```
 
-2. Kopieren der Beispiel Docker-Compose für das Entwickeln und nach Wünschen anpassen
-
-    ```cmd
-    cp docker-compose.dev.yml docker-compose.yml
-    ```
-
-3. Kopieren der Beispiel Environmentvariablen-Datei
+2. Kopieren der Beispiel Environmentvariablen-Datei
 
     ```cmd
     cp .app.env.example .app.env
     ```
 
-4. Submodule aktuallisieren
+3. Submodule aktuallisieren
 
     ```cmd
     git submodule update --init
     ```
 
-5. Container erstellen
+4. Container erstellen
 
     ```cmd
     docker compose build
     ```
 
-6. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
+5. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren

app/Actions/DbMaintainAction.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Actions;
+
+use DB;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Http;
+use Laravel\Telescope\Console\PruneCommand;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class DbMaintainAction
+{
+    use AsAction;
+
+    public string $commandSignature = 'db:maintain';
+
+    public function handle(): void
+    {
+        Artisan::call(PruneCommand::class, ['--hours' => 168]);     // 168h = 7 Tage
+        DB::select('optimize table telescope_entries');
+        Http::post('https://zoomyboy.de/maintain', ['url' => url()->current()]);
+    }
+}

app/Actions/InsertMemberAction.php

@@ -22,7 +22,7 @@ class InsertMemberAction
     {
         $region = Region::firstWhere('nami_id', $member->regionId ?: -1);
 
-        return Member::updateOrCreate(['nami_id' => $member->id], [
+        $payload = [
             'firstname' => $member->firstname,
             'lastname' => $member->lastname,
             'joined_at' => $member->joinedAt,
@@ -50,7 +50,27 @@ class InsertMemberAction
             'nationality_id' => Nationality::where('nami_id', $member->nationalityId)->firstOrFail()->id,
             'mitgliedsnr' => $member->memberId,
             'version' => $member->version,
-        ]);
+            'keepdata' => $member->keepdata,
+        ];
+
+        // Dont update subscription if fee id of existing member's subscription is already the same
+        if ($existing = Member::nami($member->id)) {
+            if ($existing->subscription && $existing->subscription->fee->nami_id === $member->feeId) {
+                $payload['subscription_id'] = $existing->subscription->id;
+            }
+        }
+
+        return tap(Member::updateOrCreate(['nami_id' => $member->id], $payload), function ($insertedMember) use ($member) {
+            $insertedMember->bankAccount->update([
+                'iban' => $member->bankAccount->iban,
+                'bic' => $member->bankAccount->bic,
+                'blz' => $member->bankAccount->blz,
+                'account_number' => $member->bankAccount->accountNumber,
+                'person' => $member->bankAccount->person,
+                'bank_name' => $member->bankAccount->bankName,
+                'nami_id' => $member->bankAccount->id,
+            ]);
+        });
     }
 
     public function getSubscription(NamiMember $member): ?Subscription

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;
@@ -32,7 +34,7 @@ class Activity extends Model
     }
 
     /**
-     * @return BelongsToMany<Subactivity>
+     * @return BelongsToMany<Subactivity, $this>
      */
     public function subactivities(): BelongsToMany
     {

app/Activity/Resources/ActivityResource.php

@@ -54,6 +54,7 @@ class ActivityResource extends JsonResource
                 'index' => route('activity.index'),
                 'create' => route('activity.create'),
                 'membership_masslist' => route('membership.masslist.index'),
+                'membership_index' => route('membership.index'),
             ],
         ];
     }

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

@@ -2,11 +2,13 @@
 
 namespace App\Console;
 
+use App\Actions\DbMaintainAction;
+use App\Form\Actions\PreventionRememberAction;
 use App\Initialize\InitializeMembers;
 use App\Invoice\Actions\InvoiceSendAction;
+use App\Prevention\Actions\YearlyRememberAction;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Laravel\Telescope\Console\PruneCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -18,6 +20,9 @@ class Kernel extends ConsoleKernel
     protected $commands = [
         InvoiceSendAction::class,
         InitializeMembers::class,
+        DbMaintainAction::class,
+        PreventionRememberAction::class,
+        YearlyRememberAction::class,
     ];
 
     /**
@@ -27,8 +32,11 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command(PruneCommand::class, ['--hours' => 168])->daily();     // 168h = 7 Tage
+        $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');
+        $schedule->command(YearlyRememberAction::class)->dailyAt('09:00');
     }
 
     /**

app/Contribution/Actions/GenerateAction.php

@@ -2,11 +2,11 @@
 
 namespace App\Contribution\Actions;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\ContributionFactory;
-use App\Contribution\Documents\ContributionDocument;
+use App\Contribution\Requests\GenerateRequest;
 use App\Rules\JsonBase64Rule;
-use Illuminate\Support\Facades\Validator;
-use Lorisleiva\Actions\ActionRequest;
+use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,23 +15,19 @@ class GenerateAction
 {
     use AsAction;
 
-    /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
-     */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateRequest $request): BaseCompiler|JsonResponse
     {
-        $payload = $this->payload($request);
-        $type = data_get($payload, 'type');
-        ValidateAction::validateType($type);
-        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
+        app(ContributionFactory::class)->validateType($request);
+        $request->validateContribution();
 
-        return $this->handle($type, $payload);
+        return $request->input('validate')
+            ? response()->json([])
+            : $this->handle($request);
     }
 
     /**
@@ -43,12 +39,4 @@ class GenerateAction
             'payload' => [new JsonBase64Rule()],
         ];
     }
-
-    /**
-     * @return array<string, string>
-     */
-    private function payload(ActionRequest $request): array
-    {
-        return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
-    }
 }

app/Contribution/Actions/GenerateApiAction.php

@@ -2,8 +2,9 @@
 
 namespace App\Contribution\Actions;
 
-use App\Contribution\Documents\ContributionDocument;
-use Lorisleiva\Actions\ActionRequest;
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\ContributionFactory;
+use App\Contribution\Requests\GenerateApiRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -13,26 +14,17 @@ class GenerateApiAction
     use AsAction;
 
     /**
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
+     * @todo merge this with GenerateAction
      */
-    public function handle(string $document, array $payload): BaseCompiler
+    public function handle(HasContributionData $request): BaseCompiler
     {
-        return Tex::compile($document::fromApiRequest($payload));
+        return Tex::compile($request->type()::fromPayload($request));
     }
 
-    public function asController(ActionRequest $request): BaseCompiler
+    public function asController(GenerateApiRequest $request): BaseCompiler
     {
-        ValidateAction::validateType($request->input('type'));
+        app(ContributionFactory::class)->validateType($request);
 
-        return $this->handle($request->input('type'), $request->input());
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [];
+        return $this->handle($request);
     }
 }

app/Contribution/Actions/ValidateAction.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Contribution\Actions;
-
-use App\Contribution\ContributionFactory;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Validator;
-use Lorisleiva\Actions\ActionRequest;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class ValidateAction
-{
-    use AsAction;
-
-    public function asController(): JsonResponse
-    {
-        return response()->json(['valid' => true]);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return app(ContributionFactory::class)->rules(request()->type);
-    }
-
-    public function prepareForValidation(ActionRequest $request): void
-    {
-        static::validateType($request->input('type'));
-    }
-
-    public static function validateType(?string $type = null): void
-    {
-        Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
-    }
-}

app/Contribution/Contracts/HasContributionData.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Contribution\Contracts;
+
+use App\Contribution\Data\MemberData;
+use Carbon\Carbon;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use Illuminate\Support\Collection;
+
+interface HasContributionData {
+
+    public function dateFrom(): Carbon;
+    public function dateUntil(): Carbon;
+    public function zipLocation(): string;
+    public function eventName(): string;
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string;
+
+    /**
+     * @return Collection<int, MemberData>
+     */
+    public function members(): Collection;
+
+    public function country(): ?Country;
+
+    public function validateContribution(): void;
+}

app/Contribution/ContributionFactory.php

@@ -2,13 +2,16 @@
 
 namespace App\Contribution;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 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\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
 class ContributionFactory
@@ -22,16 +25,17 @@ class ContributionFactory
         CityRemscheidDocument::class,
         CityFrankfurtMainDocument::class,
         BdkjHesse::class,
+        WuppertalDocument::class,
     ];
 
     /**
-     * @return Collection<int, array{title: mixed, class: mixed}>
+     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
      */
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'title' => $document::getName(),
-            'class' => $document,
+            'name' => $document::getName(),
+            'id' => $document,
         ]);
     }
 
@@ -57,4 +61,9 @@ class ContributionFactory
             ...$type::rules(),
         ];
     }
+
+    public function validateType(HasContributionData $request): void {
+        Validator::make(['type' => $request->type()], $this->typeRule())->validate();
+    }
 }
+

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,41 +44,51 @@ 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']),
+            'gender' => $member['gender'] ? Gender::fromString($member['gender']) : null,
             'isLeader' => $member['is_leader'],
         ]));
     }
 
     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

@@ -2,22 +2,25 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
+use App\Form\Enums\SpecialType;
 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
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -25,6 +28,7 @@ class BdkjHesse extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
     }
 
     public function dateFrom(): string
@@ -37,33 +41,15 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $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(20),
-            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(20),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(20),
+            eventName: $request->eventName(),
         );
     }
 
@@ -74,7 +60,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 +100,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 +115,17 @@ class BdkjHesse extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
+        ];
+    }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+            SpecialType::GENDER,
         ];
     }
 }

app/Contribution/Documents/CityFrankfurtMainDocument.php

@@ -2,25 +2,29 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
+use App\Form\Enums\SpecialType;
 use App\Invoice\InvoiceSettings;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
+use Carbon\Carbon;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     public string $fromName;
 
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -28,50 +32,22 @@ class CityFrankfurtMainDocument extends ContributionDocument
         public ?string $filename = '',
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $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(15),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(15),
+            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(15),
-            eventName: $request['eventName'],
-        );
-    }
-
-    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 +58,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 +73,17 @@ class CityFrankfurtMainDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
+        ];
+    }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+            SpecialType::ADDRESS,
         ];
     }
 }

app/Contribution/Documents/CityRemscheidDocument.php

@@ -2,107 +2,56 @@
 
 namespace App\Contribution\Documents;
 
-use App\Contribution\Data\MemberData;
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
+use App\Form\Enums\SpecialType;
 use App\Member\Member;
-use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
+use Carbon\Carbon;
 
 class CityRemscheidDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     /**
      * @param Collection<int, Collection<int, Member>> $leaders
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
         public Collection $children,
         public ?string $filename = '',
         public string $type = 'F',
+        public string $eventName = '',
     ) {
+        $this->setEventName($eventName);
     }
 
-    public function niceDateFrom(): string
+    public static function fromPayload(HasContributionData $request): self
     {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y');
-    }
-
-    public function niceDateUntil(): string
-    {
-        return Carbon::parse($this->dateUntil)->format('d.m.Y');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
-    {
-        [$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
+        [$leaders, $children] = $request->members()->partition(fn ($member) => $member->isLeader);
 
         return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
+            eventName: $request->eventName(),
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        $members = MemberData::fromApi($request['member_data']);
-        [$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
-
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            leaders: $leaders->values()->toBase()->chunk(6),
-            children: $children->values()->toBase()->chunk(20),
-        );
-    }
-
-    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';
     }
 
     /**
@@ -117,4 +66,15 @@ class CityRemscheidDocument extends ContributionDocument
             'country' => 'required|integer|exists:countries,id',
         ];
     }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::ADDRESS,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+        ];
+    }
 }

app/Contribution/Documents/CitySolingenDocument.php

@@ -2,13 +2,13 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
+use App\Form\Enums\SpecialType;
 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
 {
@@ -18,41 +18,28 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
         public string $type = 'F',
     ) {
+        $this->setEventName($eventName);
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function fromRequest(array $request): static
+    public static function fromPayload(HasContributionData $request): static
     {
         return new static(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            members: MemberData::fromModels($request['members']),
-            eventName: $request['eventName'],
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): static
-    {
-        return new static(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            members: MemberData::fromApi($request['member_data']),
-            eventName: $request['eventName'],
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            members: $request->members(),
+            eventName: $request->eventName(),
         );
     }
 
@@ -74,15 +61,8 @@ 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 = '';
-
         $firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
             return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
         })->implode(' & ') . ' \\\\';
@@ -94,16 +74,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 +81,7 @@ class CitySolingenDocument extends ContributionDocument
 
     public static function getName(): string
     {
-        return 'Für Stadt Solingen erstellen';
+        return 'Stadt Solingen';
     }
 
     /**
@@ -123,7 +93,17 @@ 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',
+        ];
+    }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+            SpecialType::ADDRESS,
         ];
     }
 }

app/Contribution/Documents/ContributionDocument.php

@@ -2,21 +2,23 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
+use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
+use Zoomyboy\Tex\Template;
 
 abstract class ContributionDocument extends Document
 {
+    private string $eventName;
+
     abstract public static function getName(): string;
 
-    /**
-     * @param ContributionRequestArray $request
-     */
-    abstract public static function fromRequest(array $request): self;
+    abstract public static function fromPayload(HasContributionData $request): self;
 
     /**
-     * @param ContributionApiRequestArray $request
+     * @return array<int, SpecialType>
      */
-    abstract public static function fromApiRequest(array $request): self;
+    abstract public static function requiredFormSpecialTypes(): array;
 
     /**
      * @return array<string, mixed>
@@ -29,8 +31,29 @@ 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 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

@@ -2,61 +2,45 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
 use App\Country;
-use Carbon\Carbon;
+use App\Form\Enums\SpecialType;
 use Illuminate\Support\Collection;
-use Zoomyboy\Tex\Engine;
-use Zoomyboy\Tex\Template;
+use Carbon\Carbon;
 
 class RdpNrwDocument extends ContributionDocument
 {
+    use HasPdfBackground;
+    use FormatsDates;
+
     /**
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
         public ?string $filename = '',
         public string $type = 'F',
+        public string $eventName = '',
     ) {
+        $this->setEventName($eventName);
     }
 
-    public function dateRange(): string
-    {
-        return Carbon::parse($this->dateFrom)->format('d.m.Y')
-            . ' - '
-            . Carbon::parse($this->dateUntil)->format('d.m.Y');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
+    public static function fromPayload(HasContributionData $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(17),
-        );
-    }
-
-    /**
-     * {@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(17),
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->chunk(17),
+            eventName: $request->eventName(),
         );
     }
 
@@ -65,65 +49,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 +64,17 @@ class RdpNrwDocument extends ContributionDocument
             'dateUntil' => 'required|string|date_format:Y-m-d',
             'country' => 'required|integer|exists:countries,id',
             'zipLocation' => 'required|string',
-            'eventName' => 'required|string',
+        ];
+    }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+            SpecialType::GENDER,
         ];
     }
 }

app/Contribution/Documents/WuppertalDocument.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Contribution\Documents;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
+use App\Contribution\Traits\FormatsDates;
+use App\Contribution\Traits\HasPdfBackground;
+use App\Country;
+use App\Form\Enums\SpecialType;
+use Illuminate\Support\Collection;
+use Carbon\Carbon;
+
+class WuppertalDocument extends ContributionDocument
+{
+
+    use HasPdfBackground;
+    use FormatsDates;
+
+    /**
+     * @param Collection<int, Collection<int, MemberData>> $members
+     */
+    public function __construct(
+        public Carbon $dateFrom,
+        public Carbon $dateUntil,
+        public string $zipLocation,
+        public ?Country $country,
+        public Collection $members,
+        public ?string $filename = '',
+        public string $type = 'F',
+        public string $eventName = '',
+    ) {
+        $this->setEventName($eventName);
+    }
+
+    public static function fromPayload(HasContributionData $request): self
+    {
+        return new self(
+            dateFrom: $request->dateFrom(),
+            dateUntil: $request->dateUntil(),
+            zipLocation: $request->zipLocation(),
+            country: $request->country(),
+            members: $request->members()->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',
+        ];
+    }
+
+    public static function requiredFormSpecialTypes(): array {
+        return [
+            SpecialType::FIRSTNAME,
+            SpecialType::LASTNAME,
+            SpecialType::ADDRESS,
+            SpecialType::BIRTHDAY,
+            SpecialType::ZIP,
+            SpecialType::LOCATION,
+            SpecialType::GENDER,
+        ];
+    }
+}

app/Contribution/Enums/Country.php

@@ -0,0 +1,256 @@
+<?php
+
+namespace App\Contribution\Enums;
+
+enum Country: string {
+    case AD = 'Andorra';
+    case AE = 'Vereinigte Arabische Emirate';
+    case AF = 'Afghanistan';
+    case AG = 'Antigua und Barbuda';
+    case AI = 'Anguilla';
+    case AL = 'Albanien';
+    case AM = 'Armenien';
+    case AN = 'Niederländische Antillen';
+    case AO = 'Angola';
+    case AQ = 'Antarktis';
+    case AR = 'Argentinien';
+    case AS = 'Amerikanisch-Samoa';
+    case AT = 'Österreich (Austria)';
+    case AU = 'Australien';
+    case AW = 'Aruba';
+    case AZ = 'Azerbaijan';
+    case BA = 'Bosnien-Herzegovina';
+    case BB = 'Barbados';
+    case BD = 'Bangladesh';
+    case BE = 'Belgien';
+    case BF = 'Burkina Faso';
+    case BG = 'Bulgarien';
+    case BH = 'Bahrain';
+    case BI = 'Burundi';
+    case BJ = 'Benin';
+    case BM = 'Bermudas';
+    case BN = 'Brunei Darussalam';
+    case BO = 'Bolivien';
+    case BR = 'Brasilien';
+    case BS = 'Bahamas';
+    case BT = 'Bhutan';
+    case BV = 'Bouvet Island';
+    case BW = 'Botswana';
+    case BY = 'Weißrußland (Belarus)';
+    case BZ = 'Belize';
+    case CA = 'Canada';
+    case CC = 'Cocos (Keeling) Islands';
+    case CD = 'Demokratische Republik Kongo';
+    case CF = 'Zentralafrikanische Republik';
+    case CG = 'Kongo';
+    case CH = 'Schweiz';
+    case CI = 'Elfenbeinküste (Cote D’Ivoire)';
+    case CK = 'Cook Islands';
+    case CL = 'Chile';
+    case CM = 'Kamerun';
+    case CN = 'China';
+    case CO = 'Kolumbien';
+    case CR = 'Costa Rica';
+    case CS = 'Tschechoslowakei (ehemalige)';
+    case CU = 'Kuba';
+    case CV = 'Kap Verde';
+    case CX = 'Christmas Island';
+    case CY = 'Zypern';
+    case CZ = 'Tschechische Republik';
+    case DE = 'Deutschland';
+    case DJ = 'Djibouti';
+    case DK = 'Dänemark';
+    case DM = 'Dominica';
+    case DO = 'Dominikanische Republik';
+    case DZ = 'Algerien';
+    case EC = 'Ecuador';
+    case EE = 'Estland';
+    case EG = 'Ägypten';
+    case EH = 'Westsahara';
+    case ER = 'Eritrea';
+    case ES = 'Spanien';
+    case ET = 'Äthiopien';
+    case FI = 'Finnland';
+    case FJ = 'Fiji';
+    case FK = 'Falkland-Inseln (Malvinas)';
+    case FM = 'Micronesien';
+    case FO = 'Faröer-Inseln';
+    case FR = 'Frankreich';
+    case FX = 'France, Metropolitan';
+    case GA = 'Gabon';
+    case GD = 'Grenada';
+    case GE = 'Georgien';
+    case GF = 'Französisch Guiana';
+    case GH = 'Ghana';
+    case GI = 'Gibraltar';
+    case GL = 'Grönland';
+    case GM = 'Gambia';
+    case GN = 'Guinea';
+    case GP = 'Guadeloupe';
+    case GQ = 'Äquatorialguinea';
+    case GR = 'Griechenland';
+    case GS = 'Südgeorgien und Südliche Sandwich-Inseln';
+    case GT = 'Guatemala';
+    case GU = 'Guam';
+    case GW = 'Guinea-Bissau';
+    case GY = 'Guyana';
+    case HK = 'Kong Hong';
+    case HM = 'Heard und Mc Donald Islands';
+    case HN = 'Honduras';
+    case HT = 'Haiti';
+    case HU = 'Ungarn';
+    case ID = 'Indonesien';
+    case IE = 'Irland';
+    case IL = 'Israel';
+    case IN = 'Indien';
+    case IO = 'British Indian Ocean Territory';
+    case IQ = 'Irak';
+    case IR = 'Iran (Islamische Republik)';
+    case IS = 'Island';
+    case IT = 'Italien';
+    case JM = 'Jamaica';
+    case JO = 'Jordanien';
+    case JP = 'Japan';
+    case KE = 'Kenya';
+    case KG = 'Kirgisien';
+    case KH = 'Königreich Kambodscha';
+    case KI = 'Kiribati';
+    case KM = 'Komoren';
+    case KN = 'Saint Kitts und Nevis';
+    case KP = 'Korea, Volksrepublik';
+    case KR = 'Korea';
+    case KW = 'Kuwait';
+    case KY = 'Kayman Islands';
+    case KZ = 'Kasachstan';
+    case LA = 'Laos';
+    case LB = 'Libanon';
+    case LC = 'Saint Lucia';
+    case LI = 'Liechtenstein';
+    case LK = 'Sri Lanka';
+    case LR = 'Liberia';
+    case LS = 'Lesotho';
+    case LT = 'Littauen';
+    case LU = 'Luxemburg';
+    case LV = 'Lettland';
+    case LY = 'Libyen';
+    case MA = 'Marokko';
+    case MC = 'Monaco';
+    case MD = 'Moldavien';
+    case MG = 'Madagaskar';
+    case MH = 'Marshall-Inseln';
+    case MK = 'Mazedonien, ehem. Jugoslawische Republik';
+    case ML = 'Mali';
+    case MM = 'Myanmar';
+    case MN = 'Mongolei';
+    case MO = 'Macao';
+    case MP = 'Nördliche Marianneninseln';
+    case MQ = 'Martinique';
+    case MR = 'Mauretanien';
+    case MS = 'Montserrat';
+    case MT = 'Malta';
+    case MU = 'Mauritius';
+    case MV = 'Malediven';
+    case MW = 'Malawi';
+    case MX = 'Mexico';
+    case MY = 'Malaysien';
+    case MZ = 'Mozambique';
+    case NA = 'Namibia';
+    case NC = 'Neu Kaledonien';
+    case NE = 'Niger';
+    case NF = 'Norfolk Island';
+    case NG = 'Nigeria';
+    case NI = 'Nicaragua';
+    case NL = 'Niederlande';
+    case NO = 'Norwegen';
+    case NP = 'Nepal';
+    case NR = 'Nauru';
+    case NU = 'Niue';
+    case NZ = 'Neuseeland';
+    case OM = 'Oman';
+    case PA = 'Panama';
+    case PE = 'Peru';
+    case PF = 'Französisch Polynesien';
+    case PG = 'Papua Neuguinea';
+    case PH = 'Philippinen';
+    case PK = 'Pakistan';
+    case PL = 'Polen';
+    case PM = 'St. Pierre und Miquelon';
+    case PN = 'Pitcairn';
+    case PR = 'Puerto Rico';
+    case PT = 'Portugal';
+    case PW = 'Palau';
+    case PY = 'Paraguay';
+    case QA = 'Katar';
+    case RE = 'Reunion';
+    case RO = 'Rumänien';
+    case RU = 'Russische Föderation';
+    case RW = 'Ruanda';
+    case SA = 'Saudi Arabien';
+    case SB = 'Salomonen';
+    case SC = 'Seychellen';
+    case SD = 'Sudan';
+    case SE = 'Schweden';
+    case SG = 'Singapur';
+    case SH = 'St. Helena';
+    case SI = 'Slovenien';
+    case SJ = 'Svalbard und Jan Mayen Islands';
+    case SK = 'Slowakei';
+    case SL = 'Sierra Leone';
+    case SM = 'San Marino';
+    case SN = 'Senegal';
+    case SO = 'Somalia';
+    case SR = 'Surinam';
+    case ST = 'Sao Tome und Principe';
+    case SV = 'El Salvador';
+    case SY = 'Syrien, Arabische Republik';
+    case SZ = 'Swaziland';
+    case TC = 'Turk und Caicos-Inseln';
+    case TD = 'Tschad';
+    case TF = 'Französisches Südl.Territorium';
+    case TG = 'Togo';
+    case TH = 'Thailand';
+    case TJ = 'Tadschikistan';
+    case TK = 'Tokelau';
+    case TM = 'Turkmenistan';
+    case TN = 'Tunesien';
+    case TO = 'Tonga';
+    case TP = 'Ost-Timor';
+    case TR = 'Türkei';
+    case TT = 'Trinidad und Tobago';
+    case TV = 'Tuvalu';
+    case TW = 'Taiwan';
+    case TZ = 'Tansania, United Republic of';
+    case UA = 'Ukraine';
+    case UG = 'Uganda';
+    case GB = 'Großbritannien';
+    case US = 'Vereinigte Staaten';
+    case UM = 'Vereinigte Staaten, Minor Outlying Islands';
+    case UY = 'Uruguay';
+    case UZ = 'Usbekistan';
+    case VA = 'Vatikanstaat';
+    case VC = 'Saint Vincent und Grenadines';
+    case VE = 'Venezuela';
+    case VG = 'Virgin Islands (Britisch)';
+    case VI = 'Virgin Islands (U.S.)';
+    case VN = 'Vietnam';
+    case VU = 'Vanuatu';
+    case WF = 'Wallis und Futuna Islands';
+    case WS = 'Samoa';
+    case YE = 'Jemen';
+    case YT = 'Mayotte';
+    case YU = 'Jugoslawien';
+    case ZA = 'Südafrika';
+    case ZM = 'Sambia';
+    case ZW = 'Zimbabw';
+
+    /**
+     * @return array<int, array{name: string, id: string}>
+     */
+    public static function forSelect(): array
+    {
+        return collect(static::cases())
+            ->map(fn ($case) => ['id' => $case->value, 'name' => $case->value])
+            ->toArray();
+    }
+}
+

app/Contribution/Requests/GenerateApiRequest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Contribution\Requests;
+
+use App\Contribution\Data\MemberData;
+use Illuminate\Support\Collection;
+
+class GenerateApiRequest extends GenerateRequest {
+    /**
+     * @return array<string, string>
+     */
+    public function payload(): array
+    {
+        return $this->input();
+    }
+
+    public function validateContribution(): void {
+    }
+
+    public function members(): Collection {
+        return MemberData::fromApi($this->value('members'));
+    }
+
+}

app/Contribution/Requests/GenerateRequest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Contribution\Requests;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\ContributionFactory;
+use App\Contribution\Data\MemberData;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use Lorisleiva\Actions\ActionRequest;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Validator;
+
+class GenerateRequest extends ActionRequest implements HasContributionData {
+    /**
+     * @return array<string, string>
+     */
+    protected function payload(): array
+    {
+        return json_decode(rawurldecode(base64_decode($this->input('payload', ''))), true);
+    }
+
+    public function validateContribution(): void {
+        Validator::make($this->payload(), app(ContributionFactory::class)->rules($this->type()))->validate();
+    }
+
+    /**
+     * @return string|array<array-key, mixed>
+     */
+    public function value(string $key): string|array
+    {
+        return data_get($this->payload(), $key);
+    }
+
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string
+    {
+        return $this->value('type');
+    }
+
+    public function dateFrom(): Carbon {
+        return Carbon::parse($this->value('dateFrom'));
+    }
+
+    public function dateUntil(): Carbon {
+        return Carbon::parse($this->value('dateUntil'));
+    }
+
+    public function zipLocation(): string {
+        return $this->value('zipLocation');
+    }
+
+    public function eventName(): string {
+        return $this->value('eventName');
+    }
+
+    public function members(): Collection {
+        return MemberData::fromModels($this->value('members'));
+    }
+
+    public function country(): ?Country {
+        return Country::where('id', $this->value('country'))->first();
+    }
+
+}

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,19 +3,21 @@
 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> */
     public $guarded = [];
 
     /**
-     * @return BelongsTo<Course, self>
+     * @return BelongsTo<Course, $this>
      */
     public function course(): BelongsTo
     {
@@ -23,7 +25,7 @@ class CourseMember extends Model
     }
 
     /**
-     * @return BelongsTo<Member, self>
+     * @return BelongsTo<Member, $this>
      */
     public function member(): BelongsTo
     {

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/AddressBookBackend.php

@@ -8,9 +8,6 @@ use Sabre\CardDAV\Backend\AbstractBackend;
 use Sabre\DAV\PropPatch;
 use Sabre\VObject\Component\VCard;
 
-/**
- * @template M as array{lastmodified: int, etag: string, uri: string, id: int, size: int}
- */
 class AddressBookBackend extends AbstractBackend
 {
     /**
@@ -115,7 +112,7 @@ class AddressBookBackend extends AbstractBackend
      *
      * @param mixed $addressbookId
      *
-     * @return array<int, M>
+     * @return array<int, AddressBookCard>
      */
     public function getCards($addressbookId): array
     {
@@ -133,7 +130,7 @@ class AddressBookBackend extends AbstractBackend
      * @param mixed  $addressBookId
      * @param string $cardUri
      *
-     * @return M
+     * @return AddressBookCard|bool
      */
     public function getCard($addressBookId, $cardUri)
     {
@@ -158,8 +155,9 @@ class AddressBookBackend extends AbstractBackend
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $addressBookId
+     * @param array<int, string> $uris
      *
-     * @return array
+     * @return array<int, mixed>
      */
     public function getMultipleCards($addressBookId, array $uris)
     {
@@ -248,7 +246,7 @@ class AddressBookBackend extends AbstractBackend
     }
 
     /**
-     * @return M
+     * @return AddressBookCard
      */
     private function cardMeta(Member $member): array
     {

app/Dav/Principal.php

@@ -129,6 +129,7 @@ class Principal implements PrincipalBackendInterface
      */
     public function findByUri($uri, $principalPrefix)
     {
+        return null;
     }
 
     /**
@@ -136,10 +137,11 @@ class Principal implements PrincipalBackendInterface
      *
      * @param string $principal
      *
-     * @return array
+     * @return array<int, string>|null
      */
     public function getGroupMemberSet($principal)
     {
+        return [];
     }
 
     /**
@@ -147,7 +149,7 @@ class Principal implements PrincipalBackendInterface
      *
      * @param string $principal
      *
-     * @return array
+     * @return array<int, string>|null
      */
     public function getGroupMembership($principal)
     {
@@ -155,7 +157,7 @@ class Principal implements PrincipalBackendInterface
             return null;
         }
 
-        return ['addressbooks/'.$matches[1]];
+        return ['addressbooks/' . $matches[1]];
     }
 
     /**
@@ -164,6 +166,8 @@ class Principal implements PrincipalBackendInterface
      * The principals should be passed as a list of uri's.
      *
      * @param string $principal
+     * @param array<int, string> $members
+     * @return void
      */
     public function setGroupMemberSet($principal, array $members)
     {
@@ -175,8 +179,8 @@ class Principal implements PrincipalBackendInterface
     private function userToPrincipal(User $user): array
     {
         return [
-            '{DAV:}displayname' => $user->name,
-            'uri' => 'principals/'.$user->email,
+            '{DAV:}displayname' => $user->firstname . ' ' . $user->lastname,
+            'uri' => 'principals/' . $user->email,
             '{http://sabredav.org/ns}email-address' => $user->email,
         ];
     }

app/Dav/ServiceProvider.php

@@ -9,6 +9,7 @@ use Sabre\CardDAV\AddressBookRoot;
 use Sabre\CardDAV\Plugin as CardDAVPlugin;
 use Sabre\DAV\Auth\Plugin as AuthPlugin;
 use Sabre\DAV\Browser\Plugin as BrowserPlugin;
+use Sabre\DAV\ServerPlugin;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 use Sabre\DAVACL\Plugin as AclPlugin;
 use Sabre\DAVACL\PrincipalCollection;
@@ -50,6 +51,9 @@ class ServiceProvider extends BaseServiceProvider
         ];
     }
 
+    /**
+     * @return array<int, ServerPlugin>
+     */
     private function plugins(): array
     {
         $authBackend = new AuthBackend();

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/Exceptions/Handler.php

@@ -12,15 +12,14 @@ class Handler extends ExceptionHandler
     /**
      * A list of the exception types that are not reported.
      *
-     * @var string[]
+     * @var array<int, class-string<Throwable>>
      */
-    protected $dontReport = [
-    ];
+    protected $dontReport = [];
 
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var string[]
+     * @var array<int, string>
      */
     protected $dontFlash = [
         'password',

app/Fee.php

@@ -4,23 +4,24 @@ 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;
 
-    /** @var array<int, string> */
     public $fillable = ['name', 'nami_id'];
 
     /** @var bool */
     public $timestamps = false;
 
     /**
-     * @return HasMany<Subscription>
+     * @return HasMany<Subscription, $this>
      */
     public function subscriptions(): HasMany
     {

app/Fileshare/Actions/FileshareApiIndexAction.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Fileshare\Actions;
+
+use App\Fileshare\Models\Fileshare;
+use App\Fileshare\Resources\FileshareResource;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FileshareApiIndexAction
+{
+    use AsAction;
+
+    public function handle(): AnonymousResourceCollection
+    {
+        session()->put('menu', 'setting');
+        session()->put('title', 'Datei-Verbindungen');
+
+        return FileshareResource::collection(Fileshare::paginate(15));
+    }
+}

app/Fileshare/Actions/FileshareStoreAction.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Fileshare\Actions;
+
+use App\Fileshare\Models\Fileshare;
+use App\Lib\Events\Succeeded;
+use Illuminate\Validation\ValidationException;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FileshareStoreAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'type' => 'required|string|max:255|exclude',
+            'config' => 'array|exclude',
+        ];
+    }
+
+    public function asController(ActionRequest $request): void
+    {
+        $type = $request->input('type')::from($request->input('config'));
+
+        if (!$type->check()) {
+            throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']);
+        }
+
+        Fileshare::create([
+            ...$request->validated(),
+            'type' => $type,
+        ]);
+
+        Succeeded::message('Verbindung erstellt.')->dispatch();
+    }
+}

app/Fileshare/Actions/FileshareUpdateAction.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Fileshare\Actions;
+
+use App\Fileshare\Models\Fileshare;
+use App\Lib\Events\Succeeded;
+use Illuminate\Validation\ValidationException;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FileshareUpdateAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'type' => 'required|string|max:255|exclude',
+            'config' => 'array|exclude',
+        ];
+    }
+
+    public function handle(ActionRequest $request, Fileshare $fileshare): void
+    {
+        $type = $request->input('type')::from($request->input('config'));
+
+        if (!$type->check()) {
+            throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']);
+        }
+
+        $fileshare->update([
+            ...$request->validated(),
+            'type' => $type,
+        ]);
+
+        Succeeded::message('Verbindung bearbeitet.')->dispatch();
+    }
+}

app/Fileshare/Actions/ListFilesAction.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Fileshare\Actions;
+
+use App\Fileshare\Data\ResourceData;
+use App\Fileshare\Models\Fileshare;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Spatie\LaravelData\DataCollection;
+
+class ListFilesAction
+{
+    use AsAction;
+
+    /**
+     * @return DataCollection<int, ResourceData>
+     */
+    public function handle(ActionRequest $request, Fileshare $fileshare): DataCollection
+    {
+        return ResourceData::collect($fileshare->type->getSubDirectories($request->input('parent')), DataCollection::class)->wrap('data');
+    }
+}

app/Fileshare/ConnectionTypes/ConnectionType.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Fileshare\ConnectionTypes;
+
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Collection;
+use Spatie\LaravelData\Data;
+
+abstract class ConnectionType extends Data
+{
+    abstract public function check(): bool;
+
+    /**
+     * @return array<string, mixed>
+     */
+    abstract public static function defaults(): array;
+
+    abstract public static function title(): string;
+
+    abstract public function getFilesystem(): FilesystemAdapter;
+
+    /**
+     * @return array<int, array{label: string, key: string, type: string}>
+     */
+    abstract public static function fields(): array;
+
+    /**
+     * @return array<int, mixed>
+     */
+    public static function forSelect(): array
+    {
+        return self::types()
+            ->map(fn ($file) => ['id' => $file, 'name' => $file::title(), 'defaults' => $file::defaults(), 'fields' => $file::fields()])
+            ->toArray();
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function getSubDirectories(?string $parent): array
+    {
+        $filesystem = $this->getFilesystem();
+
+        return $filesystem->directories($parent ?: '/');
+    }
+
+    /**
+     * @return Collection<int, class-string<ConnectionType>>
+     */
+    private static function types(): Collection
+    {
+        return collect(glob(base_path('app/Fileshare/ConnectionTypes/*')))
+            ->map(fn ($file) => 'App\\Fileshare\\ConnectionTypes\\' . pathinfo($file, PATHINFO_FILENAME))
+            ->filter(fn ($file) => $file !== static::class)
+            ->values();
+    }
+}

app/Fileshare/ConnectionTypes/NextcloudConnection.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Fileshare\ConnectionTypes;
+
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Support\Facades\Http;
+use League\Flysystem\Filesystem;
+use League\Flysystem\WebDAV\WebDAVAdapter;
+use Sabre\DAV\Client;
+
+class NextcloudConnection extends OwncloudConnection
+{
+
+    public function check(): bool
+    {
+        try {
+            $response = Http::withoutVerifying()
+                ->withBasicAuth($this->user, $this->password)
+                ->withHeaders(['OCS-APIRequest' => 'true'])
+                ->acceptJson()
+                ->get($this->baseUrl . '/ocs/v2.php/cloud/capabilities');
+            return $response->ok();
+        } catch (ConnectionException $e) {
+            return false;
+        }
+    }
+
+    public static function title(): string
+    {
+        return 'Nextcloud';
+    }
+
+    public function getFilesystem(): FilesystemAdapter
+    {
+        $adapter = new WebDAVAdapter(new Client([
+            'baseUri' =>  $this->baseUrl . '/remote.php/dav/files/' . $this->user,
+            'userName' => $this->user,
+            'password' => $this->password,
+        ]), '/remote.php/dav/files/' . $this->user);
+
+        return new FilesystemAdapter(new Filesystem($adapter), $adapter);
+    }
+}

app/Fileshare/ConnectionTypes/OwncloudConnection.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Fileshare\ConnectionTypes;
+
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Support\Facades\Http;
+use League\Flysystem\Filesystem;
+use League\Flysystem\WebDAV\WebDAVAdapter;
+use Sabre\DAV\Client;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class OwncloudConnection extends ConnectionType
+{
+
+    public function __construct(
+        public string $user,
+        public string $password,
+        public string $baseUrl,
+    ) {
+    }
+
+    public function check(): bool
+    {
+        try {
+            $response = Http::withoutVerifying()->withBasicAuth($this->user, $this->password)->acceptJson()->get($this->baseUrl . '/ocs/v1.php/cloud/capabilities?format=json');
+            return $response->ok();
+        } catch (ConnectionException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function defaults(): array
+    {
+        return [
+            'user' => '',
+            'password' => '',
+            'base_url' => '',
+        ];
+    }
+
+    public static function title(): string
+    {
+        return 'Owncloud';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function fields(): array
+    {
+        return [
+            ['label' => 'URL', 'key' => 'base_url', 'type' => 'text'],
+            ['label' => 'Benutzer', 'key' => 'user', 'type' => 'text'],
+            ['label' => 'Passwort', 'key' => 'password', 'type' => 'password'],
+        ];
+    }
+
+    public function getFilesystem(): FilesystemAdapter
+    {
+        $adapter = new WebDAVAdapter(new Client([
+            'baseUri' =>  $this->baseUrl . '/remote.php/dav/files/' . $this->user,
+            'userName' => $this->user,
+            'password' => $this->password,
+        ]), '/remote.php/dav/files/' . $this->user);
+
+        return new FilesystemAdapter(new Filesystem($adapter), $adapter);
+    }
+}

app/Fileshare/Data/FileshareResourceData.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Fileshare\Data;
+
+use App\Fileshare\Models\Fileshare;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class FileshareResourceData extends Data
+{
+
+    public function __construct(public int $connectionId, public string $resource)
+    {
+    }
+
+    public function getConnection(): Fileshare
+    {
+        return Fileshare::find($this->connectionId);
+    }
+
+    public function getStorage(): FilesystemAdapter
+    {
+        return $this->getConnection()->type->getFilesystem();
+    }
+}

app/Fileshare/Data/ResourceData.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Fileshare\Data;
+
+use Spatie\LaravelData\Data;
+
+class ResourceData extends Data
+{
+
+    public function __construct(public string $name, public string $path, public string $parent)
+    {
+    }
+
+    public static function fromString(string $path): self
+    {
+        $dir = '/' . trim($path, '\\/');
+
+        return self::from([
+            'path' => $dir,
+            'name' => pathinfo($dir, PATHINFO_BASENAME),
+            'parent' => pathinfo($dir, PATHINFO_DIRNAME),
+        ]);
+    }
+}

app/Fileshare/FileshareSettings.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Fileshare;
+
+use App\Fileshare\Models\Fileshare;
+use App\Fileshare\Resources\FileshareResource;
+use App\Setting\LocalSettings;
+
+class FileshareSettings extends LocalSettings
+{
+    public static function group(): string
+    {
+        return 'fileshare';
+    }
+
+    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

@@ -0,0 +1,20 @@
+<?php
+
+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 = [];
+
+    public $casts = [
+        'type' => ConnectionType::class,
+    ];
+}

app/Fileshare/Resources/FileshareResource.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Fileshare\Resources;
+
+use App\Fileshare\ConnectionTypes\ConnectionType;
+use App\Fileshare\Models\Fileshare;
+use App\Lib\HasMeta;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin Fileshare
+ */
+class FileshareResource extends JsonResource
+{
+
+    use HasMeta;
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array<string, mixed>
+     */
+    public function toArray($request)
+    {
+        return [
+            'name' => $this->name,
+            'is_active' => $this->type->check(),
+            'type' => get_class($this->type),
+            'config' => $this->type->toArray(),
+            'id' => $this->id,
+            'type_human' => $this->type::title(),
+            'links' => [
+                'update' => route('fileshare.update', ['fileshare' => $this->getModel()]),
+            ]
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function meta(): array
+    {
+        return [
+            'default' => [
+                'name' => '',
+                'type' => null,
+                'config' => null,
+            ],
+            'types' => ConnectionType::forSelect(),
+            'links' => [
+                'store' => route('fileshare.store'),
+            ]
+        ];
+    }
+}

app/Form/Actions/ClearFrontendCacheAction.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\FormSettings;
+use Illuminate\Support\Facades\Http;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ClearFrontendCacheAction
+{
+    use AsAction;
+
+    public function handle(): void
+    {
+        Http::get(app(FormSettings::class)->clearCacheUrl);
+    }
+}

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use Illuminate\Support\Facades\Storage;
+use League\Csv\Writer;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class ExportAction
+{
+    use AsAction;
+
+    public function handle(Form $form): string
+    {
+        return CreateExcelDocumentAction::run($form, $form->participants);
+    }
+
+    public function asController(Form $form, ActionRequest $request): StreamedResponse
+    {
+        $contents = $this->handle($form);
+
+        $filename = 'tn-' . $form->slug . '.xlsx';
+        Storage::disk('temp')->put($filename, $contents);
+
+        return Storage::disk('temp')->download($filename);
+    }
+}

app/Form/Actions/ExportSyncAction.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use App\Group;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ExportSyncAction
+{
+    use AsAction;
+
+    public Form $form;
+
+    public function handle(Form $form): void
+    {
+        if (!$form->export->root) {
+            return;
+        }
+
+        $storage = $form->export->root->getStorage();
+
+        $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) {
+                $group = Group::find($groupId);
+                if (!$group?->fileshare) {
+                    continue;
+                }
+
+                $group->fileshare->getStorage()->put($group->fileshare->resource . '/Anmeldungen ' . $form->name . '.xlsx', CreateExcelDocumentAction::run($form, $participants));
+            }
+        }
+    }
+
+    public function asJob(int $formId): void
+    {
+        $this->handle(Form::find($formId));
+    }
+}

app/Form/Actions/FormApiListAction.php

@@ -16,7 +16,7 @@ class FormApiListAction
 
     /**
      * @param string $filter
-     * @return LengthAwarePaginator<Form>
+     * @return LengthAwarePaginator<int, Form>
      */
     public function handle(string $filter, int $perPage): LengthAwarePaginator
     {
@@ -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/FormCopyAction.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use App\Lib\Events\Succeeded;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FormCopyAction
+{
+    use AsAction;
+
+    public function handle(Form $form): Form
+    {
+        $newForm = $form->replicate();
+        $newForm->save();
+        $newForm->update(['name' => $form->name.' - Kopie', 'is_active' => false]);
+
+        foreach ($form->getRegisteredMediaCollections() as $collection) {
+            foreach ($form->getMedia($collection->name) as $media) {
+                $media->copy($newForm, $collection->name);
+            }
+        }
+
+        ClearFrontendCacheAction::run();
+
+        return $form;
+    }
+
+    public function asController(Form $form): JsonResponse
+    {
+        $this->handle($form);
+
+        Succeeded::message('Veranstaltung kopiert.')->dispatch();
+        return response()->json([]);
+    }
+}

app/Form/Actions/FormDestroyAction.php

@@ -14,6 +14,8 @@ class FormDestroyAction
     {
         $form->delete();
 
+        ClearFrontendCacheAction::run();
+
         Succeeded::message('Veranstaltung gelöscht.')->dispatch();
     }
 }

app/Form/Actions/FormIndexAction.php

@@ -16,7 +16,7 @@ class FormIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<Form>
+     * @return LengthAwarePaginator<int, Form>
      */
     public function handle(string $filter): LengthAwarePaginator
     {

app/Form/Actions/FormStoreAction.php

@@ -28,10 +28,18 @@ class FormStoreAction
             'to' => 'required|date',
             'registration_from' => 'present|nullable|date',
             'registration_until' => 'present|nullable|date',
-            'mail_top' => 'array',
-            'mail_bottom' => 'array',
             'header_image' => 'required|exclude',
             'mailattachments' => 'present|array|exclude',
+            'is_active' => 'boolean',
+            'is_private' => 'boolean',
+            'export' => 'nullable|array',
+            'needs_prevention' => 'present|boolean',
+            'prevention_text' => 'array',
+            'prevention_conditions' => 'array',
+            'leader_conditions' => 'array',
+            'zip' => 'present|nullable|string',
+            'location' => 'present|nullable|string',
+            'country' => 'nullable|string|max:255',
         ];
     }
 
@@ -43,6 +51,7 @@ class FormStoreAction
         return tap(Form::create($attributes), function ($form) {
             $form->setDeferredUploads(request()->input('header_image'));
             $form->setDeferredUploads(request()->input('mailattachments'));
+            ClearFrontendCacheAction::run();
         });
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -29,8 +29,16 @@ class FormUpdateAction
             'to' => 'required|date',
             'registration_from' => 'present|nullable|date',
             'registration_until' => 'present|nullable|date',
-            'mail_top' => 'array',
-            'mail_bottom' => 'array',
+            'is_active' => 'boolean',
+            'is_private' => 'boolean',
+            'export' => 'nullable|array',
+            'needs_prevention' => 'present|boolean',
+            'prevention_text' => 'array',
+            'prevention_conditions' => 'array',
+            'location' => 'present|nullable|string',
+            'zip' => 'present|nullable|string',
+            'country' => 'nullable|string|max:255',
+            'leader_conditions' => 'array',
         ];
     }
 
@@ -40,6 +48,9 @@ class FormUpdateAction
     public function handle(Form $form, array $attributes): Form
     {
         $form->update($attributes);
+
+        ClearFrontendCacheAction::run();
+
         return $form;
     }
 

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/FormtemplateIndexAction.php

@@ -14,7 +14,7 @@ class FormtemplateIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<Formtemplate>
+     * @return LengthAwarePaginator<int, Formtemplate>
      */
     public function handle(): LengthAwarePaginator
     {

app/Form/Actions/GenerateContributionAction.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\ContributionFactory;
+use App\Form\Models\Form;
+use App\Form\Requests\FormCompileRequest;
+use App\Rules\JsonBase64Rule;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Zoomyboy\Tex\BaseCompiler;
+use Zoomyboy\Tex\Tex;
+
+class GenerateContributionAction
+{
+    use AsAction;
+
+    public function handle(HasContributionData $request): BaseCompiler
+    {
+        return Tex::compile($request->type()::fromPayload($request));
+    }
+
+    public function asController(ActionRequest $request, Form $form): BaseCompiler|JsonResponse
+    {
+        $r = FormCompileRequest::from(['form' => $form]);
+        app(ContributionFactory::class)->validateType($r);
+        $r->validateContribution();
+
+        return $request->input('validate')
+            ? response()->json([])
+            : $this->handle($r);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'payload' => [new JsonBase64Rule()],
+        ];
+    }
+}

app/Form/Actions/HasValidation.php

@@ -18,6 +18,7 @@ trait HasValidation
             'name' => 'required|string|max:255',
             'config' => 'array',
             'config.sections.*.name' => 'required',
+            'config.sections.*.intro' => 'nullable|string',
             'config.sections.*.fields' => 'array',
             'config.sections.*.fields.*.name' => 'required|string',
             'config.sections.*.fields.*.type' => ['required', 'string', Rule::in(array_column(Field::asMeta(), 'id'))],
@@ -27,6 +28,8 @@ trait HasValidation
             'config.sections.*.fields.*.columns.mobile' => 'required|numeric|gt:0|lte:2',
             'config.sections.*.fields.*.columns.tablet' => 'required|numeric|gt:0|lte:4',
             'config.sections.*.fields.*.columns.desktop' => 'required|numeric|gt:0|lte:6',
+            'mail_top' => 'array',
+            'mail_bottom' => 'array',
         ];
     }
 

app/Form/Actions/ParticipantAssignAction.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Participant;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ParticipantAssignAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'member_id' => 'required|exists:members,id',
+        ];
+    }
+
+    public function handle(Participant $participant, ActionRequest $request): void
+    {
+        $participant->update(['member_id' => $request->input('member_id')]);
+    }
+}

app/Form/Actions/ParticipantFieldsAction.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Participant;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ParticipantFieldsAction
+{
+    use AsAction;
+
+    public function handle(Participant $participant): JsonResponse
+    {
+        return response()->json([
+            'data' => [
+                'id' => $participant->id,
+                'config' => $participant->getConfig(),
+            ]
+        ]);
+    }
+}

app/Form/Actions/ParticipantIndexAction.php

@@ -7,7 +7,7 @@ use App\Form\Models\Participant;
 use App\Form\Resources\ParticipantResource;
 use App\Form\Scopes\ParticipantFilterScope;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Pagination\LengthAwarePaginator;
+use Laravel\Scout\Builder;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class ParticipantIndexAction
@@ -15,17 +15,24 @@ class ParticipantIndexAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<Participant>
+     * @return Builder<Participant>
      */
-    public function handle(Form $form, ParticipantFilterScope $filter): LengthAwarePaginator
+    protected function getQuery(Form $form, ParticipantFilterScope $filter): Builder
     {
-        return $form->participants()->withFilter($filter)->with('form')->paginate(15);
+        return $filter->setForm($form)->getQuery()
+            ->query(fn ($q) => $q->withCount('children')->with('form'));
     }
 
-    public function asController(Form $form): AnonymousResourceCollection
+    public function asController(Form $form, ?int $parent = null): AnonymousResourceCollection
     {
-        $filter = ParticipantFilterScope::fromRequest(request()->input('filter'));
-        return ParticipantResource::collection($this->handle($form, $filter))
-            ->additional(['meta' => ParticipantResource::meta($form)]);
+        $filter = ParticipantFilterScope::fromRequest(request()->input('filter', ''))->parent($parent);
+
+        $data = match ($parent) {
+            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/ParticipantStoreAction.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Form;
+use App\Form\Models\Participant;
+use App\Lib\Events\Succeeded;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ParticipantStoreAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        /** @var Form */
+        $form = request()->route('form');
+
+        return $form->getRegistrationRules();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getValidationAttributes(): array
+    {
+        /** @var Form */
+        $form = request()->route('form');
+
+        return $form->getRegistrationAttributes();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getValidationMessages(): array
+    {
+        /** @var Form */
+        $form = request()->route('form');
+
+        return $form->getRegistrationMessages();
+    }
+
+    public function handle(Form $form, ActionRequest $request): JsonResponse
+    {
+        $form->participants()->create(['data' => $request->validated()]);
+        ExportSyncAction::dispatch($form->id);
+        Succeeded::message('Teilnehmer*in erstellt.')->dispatch();
+        return response()->json([]);
+    }
+}

app/Form/Actions/ParticipantUpdateAction.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Models\Participant;
+use App\Lib\Events\Succeeded;
+use Illuminate\Http\JsonResponse;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ParticipantUpdateAction
+{
+    use AsAction;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        /** @var Participant */
+        $participant = request()->route('participant');
+
+        return $participant->form->getRegistrationRules();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getValidationAttributes(): array
+    {
+        /** @var Participant */
+        $participant = request()->route('participant');
+
+        return $participant->form->getRegistrationAttributes();
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getValidationMessages(): array
+    {
+        /** @var Participant */
+        $participant = request()->route('participant');
+
+        return $participant->form->getRegistrationMessages();
+    }
+
+    public function handle(Participant $participant, ActionRequest $request): JsonResponse
+    {
+        $participant->update(['data' => [...$participant->data, ...$request->validated()]]);
+        ExportSyncAction::dispatch($participant->form->id);
+        Succeeded::message('Teilnehmer*in bearbeitet.')->dispatch();
+        return response()->json([]);
+    }
+}

app/Form/Actions/PreventionRememberAction.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\Editor\FormConditionResolver;
+use App\Form\Models\Participant;
+use App\Prevention\Mails\PreventionRememberMail;
+use App\Prevention\PreventionSettings;
+use Illuminate\Support\Facades\Mail;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class PreventionRememberAction
+{
+    use AsAction;
+
+    public string $commandSignature = 'prevention:remember-forms';
+
+    public function handle(): void
+    {
+        $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))
+                    ->orWhereNull('last_remembered_at')
+            );
+        foreach ($query->get() as $participant) {
+            if (!app(FormConditionResolver::class)->forParticipant($participant)->filterCondition($participant->form->prevention_conditions)) {
+                continue;
+            }
+
+            if ($participant->getFields()->getMailRecipient() === null || $participant->preventions()->count() === 0) {
+                continue;
+            }
+
+            $body = app(PreventionSettings::class)->refresh()->formmail
+                ->placeholder('formname', $participant->form->name)
+                ->append($participant->form->prevention_text);
+
+            Mail::send(new PreventionRememberMail($participant, $body, $participant->preventions()));
+
+            $participant->update(['last_remembered_at' => now()]);
+        }
+    }
+}

app/Form/Actions/RegisterAction.php

@@ -7,6 +7,9 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Member\Member;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
@@ -21,17 +24,18 @@ class RegisterAction
     {
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
-            ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
-        $mglnr = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first()->mitgliedsnr : null;
+            ->reduce(fn($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
+        $member = $form->getFields()->withNamiType()->count() && $memberQuery->count() === 1 ? $memberQuery->first() : null;
 
         $participant = $form->participants()->create([
             'data' => $input,
-            'mitgliedsnr' => $mglnr,
+            'member_id' => $member?->id,
         ]);
 
-        $form->getFields()->each(fn ($field) => $field->afterRegistration($form, $participant, $input));
+        $form->getFields()->each(fn($field) => $field->afterRegistration($form, $participant, $input));
 
         $participant->sendConfirmationMail();
+        ExportSyncAction::dispatch($form->id);
 
         return $participant;
     }
@@ -71,8 +75,26 @@ class RegisterAction
 
     public function asController(ActionRequest $request, Form $form): JsonResponse
     {
+        if (!$form->canRegister() && !$this->isRegisteringLater($request)) {
+            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
+        }
+
         $participant = $this->handle($form, $request->validated());
 
         return response()->json($participant);
     }
+
+    public function isRegisteringLater(ActionRequest $request): bool {
+        if (!is_array($request->query())) {
+            return false;
+        }
+
+        $validator = Validator::make($request->query(), [
+            'later' => 'required|numeric|in:1',
+            'id' => 'required|string|uuid:4',
+            'signature' => 'required|string',
+        ]);
+
+        return URL::hasValidSignature($request) && $validator->passes();
+    }
 }

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, mixed>> $value
-     * @param array<string, mixed> $context
+     * @param array<int, array<string, string>> $value
      * @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/ExportData.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Form\Data;
+
+use App\Fileshare\Data\FileshareResourceData;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\MapOutputName;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Mappers\SnakeCaseMapper;
+use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
+
+#[MapInputName(SnakeCaseMapper::class)]
+#[MapOutputName(SnakeCaseMapper::class)]
+class ExportData extends Data
+{
+    public function __construct(public ?FileshareResourceData $root = null, public ?string $groupBy = null, public ?string $toGroupField = null)
+    {
+    }
+
+    /**
+     * @param array<int, mixed> $arguments
+     * @return DataEloquentCast<self>
+     */
+    public static function castUsing(array $arguments): DataEloquentCast
+    {
+        return new DataEloquentCast(static::class, $arguments);
+    }
+}

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;
@@ -35,6 +36,11 @@ class FieldCollection extends Collection
         return $this->filter(fn ($field) => !is_a($field, NamiField::class));
     }
 
+    public function hasNamiField(): bool
+    {
+        return $this->first(fn ($field) => is_a($field, NamiField::class)) !== null;
+    }
+
     /**
      * @return stdClass
      */
@@ -92,8 +98,52 @@ class FieldCollection extends Collection
         return $attributes->toArray();
     }
 
-    private function findBySpecialType(SpecialType $specialType): ?Field
+    /**
+     * @return array<int, string>
+     */
+    public function names(): array
+    {
+        return $this->map(fn ($field) => $field->name)->toArray();
+    }
+
+    /**
+     * @return array<int, string>
+     */
+    public function presentValues(): array
+    {
+        return $this->map(fn ($field) => $field->presentRaw())->toArray();
+    }
+
+    public function hasSpecialType(SpecialType $specialType): bool
+    {
+        return $this->findBySpecialType($specialType) !== null;
+    }
+
+    public function findBySpecialType(SpecialType $specialType): ?Field
     {
         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/Data/FormConfigData.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Collection;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\WithCast;
 use Spatie\LaravelData\Attributes\WithTransformer;
+use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
 
 class FormConfigData extends Data
 {
@@ -29,4 +30,13 @@ class FormConfigData extends Data
             new FieldCollection([])
         );
     }
+
+    /**
+     * @param array<int, mixed> $arguments
+     * @return DataEloquentCast<self>
+     */
+    public static function castUsing(array $arguments): DataEloquentCast
+    {
+        return new DataEloquentCast(static::class, $arguments);
+    }
 }

app/Form/Data/SectionData.php

@@ -15,7 +15,8 @@ class SectionData extends Data
         public string $name,
         #[WithCast(FieldCollectionCast::class)]
         #[WithTransformer(FieldCollectionTransformer::class)]
-        public FieldCollection $fields
+        public FieldCollection $fields,
+        public ?string $intro
     ) {
     }
 }

app/Form/Editor/FormConditionResolver.php

@@ -3,6 +3,7 @@
 namespace App\Form\Editor;
 
 use App\Form\Models\Participant;
+use App\Lib\Editor\Condition;
 use App\Lib\Editor\ConditionResolver;
 
 class FormConditionResolver extends ConditionResolver
@@ -20,24 +21,24 @@ class FormConditionResolver extends ConditionResolver
     /**
      * @inheritdoc
      */
-    public function filterCondition(string $mode, array $ifs): bool
+    public function filterCondition(Condition $condition): bool
     {
-        if (count($ifs) === 0) {
+        if (!$condition->hasStatements()) {
             return true;
         }
 
-        foreach ($ifs as $if) {
-            $field = $this->participant->getFields()->findByKey($if['field']);
-            $matches = $field->matches($if['comparator'], $if['value']);
-            if ($matches && $mode === 'any') {
+        foreach ($condition->ifs as $if) {
+            $field = $this->participant->getFields()->findByKey($if->field);
+            $matches = $field->matches($if->comparator, $if->value);
+            if ($matches && $condition->isAny()) {
                 return true;
             }
-            if (!$matches && $mode === 'all') {
+            if (!$matches && $condition->isAll()) {
                 return false;
             }
         }
 
-        if ($mode === 'any') {
+        if ($condition->isAny()) {
             return false;
         }
 

app/Form/Enums/NamiType.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Enums;
 
+use App\Form\Models\Form;
 use App\Group\Enums\Level;
 use App\Member\Member;
 use Illuminate\Database\Eloquent\Builder;
@@ -10,6 +11,7 @@ enum NamiType: string
 {
     case FIRSTNAME = 'Vorname';
     case LASTNAME = 'Nachname';
+    case NICKNAME = 'Spitzname';
     case BIRTHDAY = 'Geburtstag';
     case REGION = 'Bezirk';
     case STAMM = 'Stamm';
@@ -17,6 +19,10 @@ enum NamiType: string
     case ADDRESS = 'Adresse';
     case ZIP = 'PLZ';
     case LOCATION = 'Ort';
+    case GENDER = 'Geschlecht';
+    case MOBILEPHONE = 'Handynummer';
+    case AGE = 'Alter (zum Zeitpunkt der Anmeldung)';
+    case AGEEVENT = 'Alter (zum Zeitpunkt der Veranstaltung)';
 
     /**
      * @return array<int, array{name: string, id: string}>
@@ -28,7 +34,7 @@ enum NamiType: string
             ->toArray();
     }
 
-    public function getMemberAttribute(Member $member): ?string
+    public function getMemberAttribute(Member $member, Form $form): ?string
     {
         return match ($this) {
             static::FIRSTNAME => $member->firstname,
@@ -40,6 +46,11 @@ enum NamiType: string
             static::ADDRESS => $member->address,
             static::ZIP => $member->zip,
             static::LOCATION => $member->location,
+            static::NICKNAME => $member->nickname,
+            static::GENDER => $member->gender?->name,
+            static::AGE => intVal($member->birthday->diffInYears(now())),
+            static::AGEEVENT => $member->birthday->diffInYears($form->from),
+            static::MOBILEPHONE => $member->mobile_phone,
         };
     }
 
@@ -53,7 +64,6 @@ enum NamiType: string
             static::FIRSTNAME => $query->where('firstname', $value),
             static::LASTNAME => $query->where('lastname', $value),
             static::BIRTHDAY => $query->where('birthday', $value),
-            static::EMAIL => $query->where('email', $value),
             default => $query,
         };
     }

app/Form/Enums/SpecialType.php

@@ -7,6 +7,11 @@ enum SpecialType: string
     case FIRSTNAME = 'Vorname';
     case LASTNAME = 'Nachname';
     case EMAIL = 'E-Mail-Adresse';
+    case BIRTHDAY = 'Geburtsdatum';
+    case ZIP = 'PLZ';
+    case LOCATION = 'Ort';
+    case ADDRESS = 'Adresse';
+    case GENDER = 'Geschlecht';
 
     /**
      * @return array<int, array{name: string, id: string}>

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/CheckboxesField.php

@@ -13,6 +13,8 @@ class CheckboxesField extends Field
 {
     /** @var array<int, string> */
     public array $options;
+    public ?int $min;
+    public ?int $max;
 
     public static function name(): string
     {
@@ -23,6 +25,8 @@ class CheckboxesField extends Field
     {
         return [
             ['key' => 'options', 'default' => [], 'rules' => ['options' => 'array', 'options.*' => 'required|string'], 'label' => 'Optionen'],
+            ['key' => 'min', 'default' => null, 'rules' => ['min' => 'present'], 'label' => 'minimale Anzahl'],
+            ['key' => 'max', 'default' => null, 'rules' => ['max' => 'present'], 'label' => 'maximale Anzahl'],
         ];
     }
 
@@ -35,6 +39,8 @@ class CheckboxesField extends Field
     {
         return [
             'options' => $faker->words(4),
+            'min' => null,
+            'max' => null,
         ];
     }
 
@@ -43,8 +49,18 @@ class CheckboxesField extends Field
      */
     public function getRegistrationRules(Form $form): array
     {
+        $globalRules = ['array'];
+
+        if ($this->min > 0) {
+            $globalRules[] = 'min:' . $this->min;
+        }
+
+        if ($this->max > 0) {
+            $globalRules[] = 'max:' . $this->max;
+        }
+
         return [
-            $this->key => 'array',
+            $this->key => $globalRules,
             $this->key . '.*' => ['string', Rule::in($this->options)],
         ];
     }

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

@@ -11,6 +11,7 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use App\Form\Presenters\DefaultPresenter;
 use App\Form\Presenters\Presenter;
+use App\Lib\Editor\Comparator;
 use Faker\Generator;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\MapInputName;
@@ -29,6 +30,7 @@ abstract class Field extends Data
     public bool $forMembers;
     public ?SpecialType $specialType = null;
     public ?string $hint;
+    public ?string $intro;
 
     /** @var mixed */
     public $value;
@@ -78,6 +80,9 @@ abstract class Field extends Data
             ->toArray();
     }
 
+    /**
+     * @return class-string<Field>
+     */
     public static function classFromType(string $type): ?string
     {
         /** @var class-string<Field> */
@@ -100,10 +105,7 @@ abstract class Field extends Data
         ];
     }
 
-    /**
-     * @return mixed
-     */
-    public function presentRaw()
+    public function presentRaw(): string
     {
         return $this->getPresenter()->present($this->value);
     }
@@ -153,6 +155,7 @@ abstract class Field extends Data
                 'for_members' => true,
                 'special_type' => null,
                 'hint' => '',
+                'intro' => '',
                 ...collect(static::meta())->mapWithKeys(fn ($meta) => [$meta['key'] => $meta['default']])->toArray(),
             ],
         ];
@@ -168,7 +171,7 @@ abstract class Field extends Data
         return $this->key . '_display';
     }
 
-    public function matches(string $comparator, mixed $value): bool
+    public function matches(Comparator $comparator, mixed $value): bool
     {
         return $this->getMatcher()->setValue($this->value)->matches($comparator, $value);
     }
@@ -177,4 +180,10 @@ abstract class Field extends Data
     {
         return app(SingleValueMatcher::class);
     }
+
+    /** @param mixed $value */
+    public function filter($value): string
+    {
+        return '';
+    }
 }

app/Form/Fields/GroupField.php

@@ -65,7 +65,7 @@ class GroupField extends Field
             $rules[] = Rule::in(Group::find($this->parentGroup)->children()->pluck('id')->push(-1));
         }
 
-        if ($this->parentField && request()->input($this->parentField)) {
+        if ($this->parentField && request()->input($this->parentField) && request()->input($this->parentField) !== -1) {
             $rules[] = Rule::in(Group::find(request()->input($this->parentField))->children()->pluck('id')->push(-1));
         }
 

app/Form/Fields/NamiField.php

@@ -42,19 +42,18 @@ class NamiField extends Field
     public function getRegistrationRules(Form $form): array
     {
         $rules = [$this->key => 'present|array'];
+        $inputMembers = request($this->key);
 
-        $c = $form->getFields()->forMembers()->noNamiType()->noNamiField()
-            ->map(fn ($field) => $field->getRegistrationRules($form))
-            ->toArray();
-
-        foreach ($c as $field) {
-            foreach ($field as $ruleKey => $rule) {
-                $rules[$this->key . '.*.' . $ruleKey] = $rule;
+        foreach ($form->getFields()->noNamiField()->forMembers() as $field) {
+            foreach ($field->getRegistrationRules($form) as $ruleKey => $rule) {
+                foreach ($inputMembers as $memberIndex => $inputMember) {
+                    $rules[$this->key . '.' . $memberIndex . '.' . $ruleKey] = !$inputMember['id'] || $field->namiType === null ? $rule : '';
+                }
             }
         }
 
         return [
-            $this->key . '.*.id' => ['required', 'numeric', 'exists:members,mitgliedsnr'],
+            $this->key . '.*.id' => ['nullable', 'numeric', 'exists:members,mitgliedsnr'],
             ...$rules,
         ];
     }
@@ -71,12 +70,9 @@ class NamiField extends Field
             return [];
         }
 
-        $c = $form->getFields()->noNamiField()->forMembers();
-
-        foreach ($c as $field) {
+        foreach ($form->getFields()->noNamiField()->forMembers() as $field) {
             foreach ($field->getRegistrationRules($form) as $ruleKey => $rule) {
                 foreach ($inputMembers as $memberIndex => $inputMember) {
-
                     $message = $field->name . ' für ein Mitglied';
                     $rules = array_merge(
                         $rules,
@@ -111,16 +107,16 @@ class NamiField extends Field
     public function afterRegistration(Form $form, Participant $participant, array $input): void
     {
         foreach ($input[$this->key] as $memberData) {
-            $member = Member::firstWhere(['mitgliedsnr' => $memberData['id']]);
+            $member = $memberData['id'] ? Member::firstWhere(['mitgliedsnr' => $memberData['id']]) : null;
             $data = [];
             foreach (FieldCollection::fromRequest($form, $memberData) as $field) {
-                $data[$field->key] = $field->namiType === null
+                $data[$field->key] = $field->namiType === null || $member === null
                     ? $field->value
-                    : $field->namiType->getMemberAttribute($member);
+                    : $field->namiType->getMemberAttribute($member, $form);
             }
 
             $data[$this->key] = [];
-            $form->participants()->create(['data' => $data, 'mitgliedsnr' => $memberData['id'], 'parent_id' => $participant->id]);
+            $form->participants()->create(['data' => $data, 'member_id' => $member?->id, 'parent_id' => $participant->id]);
         }
     }
 

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

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Form;
+
+use App\Form\Actions\SettingStoreAction;
+use App\Setting\Contracts\Storeable;
+use App\Setting\LocalSettings;
+use Lorisleiva\Actions\ActionRequest;
+
+class FormSettings extends LocalSettings implements Storeable
+{
+    public string $registerUrl;
+    public string $clearCacheUrl;
+
+    public static function group(): string
+    {
+        return 'form';
+    }
+
+    public static function title(): string
+    {
+        return 'Formulare';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules(): array
+    {
+        return [
+            'registerUrl' => 'present|string',
+            'clearCacheUrl' => 'present|string',
+        ];
+    }
+
+    public function beforeSave(ActionRequest $request): void
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function viewData(): array
+    {
+        return [
+            'data' => [
+                'data' => [
+                    'registerUrl' => $this->registerUrl,
+                    'clearCacheUrl' => $this->clearCacheUrl,
+                ]
+            ]
+        ];
+    }
+}

app/Form/Mails/ConfirmRegistrationMail.php

@@ -5,6 +5,7 @@ namespace App\Form\Mails;
 use App\Form\Data\FormConfigData;
 use App\Form\Editor\FormConditionResolver;
 use App\Form\Models\Participant;
+use App\Lib\Editor\Condition;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
@@ -18,9 +19,9 @@ class ConfirmRegistrationMail extends Mailable
 
     public string $fullname;
     public FormConfigData $config;
-    /** @var array<string, mixed> */
+    /** @var array<int, mixed> */
     public array $topText;
-    /** @var array<string, mixed> */
+    /** @var array<int, mixed> */
     public array $bottomText;
 
     /**
@@ -68,13 +69,8 @@ class ConfirmRegistrationMail extends Mailable
      */
     public function attachments()
     {
-        $conditionResolver = app(FormConditionResolver::class)->forParticipant($this->participant);
-
         return $this->participant->form->getMedia('mailattachments')
-            ->filter(fn ($media) => $conditionResolver->filterCondition(
-                data_get($media->getCustomProperty('conditions'), 'mode', 'all'),
-                data_get($media->getCustomProperty('conditions'), 'ifs', []),
-            ))
+            ->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
             ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
             ->all();
     }

app/Form/Matchers/Matcher.php

@@ -2,6 +2,8 @@
 
 namespace App\Form\Matchers;
 
+use App\Lib\Editor\Comparator;
+
 abstract class Matcher
 {
 
@@ -14,5 +16,5 @@ abstract class Matcher
         return $this;
     }
 
-    abstract public function matches(string $comparator, mixed $value): bool;
+    abstract public function matches(Comparator $comparator, mixed $value): bool;
 }