Add frontend for later link

CHANGELOG.md

@@ -1,5 +1,35 @@
 # 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

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/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 Illuminate\Http\JsonResponse;
-use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 use Zoomyboy\Tex\BaseCompiler;
 use Zoomyboy\Tex\Tex;
@@ -15,23 +15,19 @@ class GenerateAction
 {
     use AsAction;
 
-    /**
+    public function handle(HasContributionData $request): BaseCompiler
-     * @param class-string<ContributionDocument> $document
-     * @param array<string, mixed>               $payload
-     */
-    public function handle(string $document, array $payload): 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);
+        app(ContributionFactory::class)->validateType($request);
-        $type = data_get($payload, 'type');
+        $request->validateContribution();
-        ValidateAction::validateType($type);
-        Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
 
-        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 App\Contribution\Contracts\HasContributionData;
-use Lorisleiva\Actions\ActionRequest;
+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
+     * @todo merge this with GenerateAction
-     * @param array<string, mixed>               $payload
      */
-    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 $this->handle($request);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [];
     }
 }

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,6 +2,7 @@
 
 namespace App\Contribution;
 
+use App\Contribution\Contracts\HasContributionData;
 use App\Contribution\Documents\BdkjHesse;
 use App\Contribution\Documents\ContributionDocument;
 use App\Contribution\Documents\RdpNrwDocument;
@@ -10,6 +11,7 @@ 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
@@ -27,13 +29,13 @@ class ContributionFactory
     ];
 
     /**
-     * @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
+     * @return Collection<int, array{name: string, id: class-string<ContributionDocument>}>
      */
     public function compilerSelect(): Collection
     {
         return collect($this->documents)->map(fn ($document) => [
-            'title' => $document::buttonName(),
+            'name' => $document::getName(),
-            'class' => $document,
+            'id' => $document,
         ]);
     }
 
@@ -59,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

@@ -47,7 +47,7 @@ class MemberData extends Data
         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'],
         ]));
     }

app/Contribution/Documents/BdkjHesse.php

@@ -2,9 +2,11 @@
 
 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;
 
@@ -17,8 +19,8 @@ class BdkjHesse extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -39,33 +41,15 @@ class BdkjHesse extends ContributionDocument
         return Carbon::parse($this->dateUntil)->format('d.m.Y');
     }
 
-    /**
+    public static function fromPayload(HasContributionData $request): self
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            country: $request->country(),
-            members: MemberData::fromModels($request['members'])->chunk(20),
+            members: $request->members()->chunk(20),
-            eventName: $request['eventName'],
+            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'],
         );
     }
 
@@ -133,4 +117,15 @@ class BdkjHesse extends ContributionDocument
             'zipLocation' => '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,12 +2,15 @@
 
 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 Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class CityFrankfurtMainDocument extends ContributionDocument
 {
@@ -20,8 +23,8 @@ class CityFrankfurtMainDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -33,33 +36,15 @@ class CityFrankfurtMainDocument extends ContributionDocument
         $this->fromName = app(InvoiceSettings::class)->from_long;
     }
 
-    /**
+    public static function fromPayload(HasContributionData $request): self
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            country: $request->country(),
-            members: MemberData::fromModels($request['members'])->chunk(15),
+            members: $request->members()->chunk(15),
-            eventName: $request['eventName'],
+            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'],
         );
     }
 
@@ -90,4 +75,15 @@ class CityFrankfurtMainDocument extends ContributionDocument
             'zipLocation' => '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,12 +2,14 @@
 
 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 Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 class CityRemscheidDocument extends ContributionDocument
 {
@@ -19,8 +21,8 @@ class CityRemscheidDocument extends ContributionDocument
      * @param Collection<int, Collection<int, Member>> $children
      */
     public function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $leaders,
@@ -32,40 +34,18 @@ class CityRemscheidDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
+    public static function fromPayload(HasContributionData $request): self
-     * {@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'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            country: $request->country(),
             leaders: $leaders->values()->toBase()->chunk(6),
             children: $children->values()->toBase()->chunk(20),
-            eventName: $request['eventName'],
+            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),
-            eventName: $request['eventName'],
         );
     }
 
@@ -86,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,7 +2,9 @@
 
 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;
@@ -16,8 +18,8 @@ class CitySolingenDocument extends ContributionDocument
      * @param Collection<int, MemberData> $members
      */
     final private function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public Collection $members,
         public string $eventName,
@@ -30,28 +32,14 @@ class CitySolingenDocument extends ContributionDocument
     /**
      * {@inheritdoc}
      */
-    public static function fromRequest(array $request): static
+    public static function fromPayload(HasContributionData $request): static
     {
         return new static(
-            dateFrom: $request['dateFrom'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            members: MemberData::fromModels($request['members']),
+            members: $request->members(),
-            eventName: $request['eventName'],
+            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'],
         );
     }
 
@@ -75,8 +63,6 @@ class CitySolingenDocument extends ContributionDocument
 
     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(' & ') . ' \\\\';
@@ -109,4 +95,15 @@ class CitySolingenDocument extends ContributionDocument
             'zipLocation' => '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,6 +2,8 @@
 
 namespace App\Contribution\Documents;
 
+use App\Contribution\Contracts\HasContributionData;
+use App\Form\Enums\SpecialType;
 use Zoomyboy\Tex\Document;
 use Zoomyboy\Tex\Template;
 
@@ -11,15 +13,12 @@ abstract class ContributionDocument extends Document
 
     abstract public static function getName(): string;
 
-    /**
+    abstract public static function fromPayload(HasContributionData $request): self;
-     * @param ContributionRequestArray $request
-     */
-    abstract public static function fromRequest(array $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>
@@ -38,11 +37,6 @@ abstract class ContributionDocument extends Document
         ];
     }
 
-    public static function buttonName(): string
-    {
-        return 'Für ' . static::getName() . ' erstellen';;
-    }
-
     public function setEventName(string $eventName): void
     {
         $this->eventName = $eventName;

app/Contribution/Documents/RdpNrwDocument.php

@@ -2,11 +2,14 @@
 
 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 RdpNrwDocument extends ContributionDocument
 {
@@ -17,8 +20,8 @@ class RdpNrwDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -29,33 +32,15 @@ class RdpNrwDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
+    public static function fromPayload(HasContributionData $request): self
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            country: $request->country(),
-            members: MemberData::fromModels($request['members'])->chunk(17),
+            members: $request->members()->chunk(17),
-            eventName: $request['eventName'],
+            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(17),
-            eventName: $request['eventName'],
         );
     }
 
@@ -81,4 +66,15 @@ class RdpNrwDocument extends ContributionDocument
             'zipLocation' => '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

@@ -2,11 +2,14 @@
 
 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
 {
@@ -18,8 +21,8 @@ class WuppertalDocument extends ContributionDocument
      * @param Collection<int, Collection<int, MemberData>> $members
      */
     public function __construct(
-        public string $dateFrom,
+        public Carbon $dateFrom,
-        public string $dateUntil,
+        public Carbon $dateUntil,
         public string $zipLocation,
         public ?Country $country,
         public Collection $members,
@@ -30,33 +33,15 @@ class WuppertalDocument extends ContributionDocument
         $this->setEventName($eventName);
     }
 
-    /**
+    public static function fromPayload(HasContributionData $request): self
-     * {@inheritdoc}
-     */
-    public static function fromRequest(array $request): self
     {
         return new self(
-            dateFrom: $request['dateFrom'],
+            dateFrom: $request->dateFrom(),
-            dateUntil: $request['dateUntil'],
+            dateUntil: $request->dateUntil(),
-            zipLocation: $request['zipLocation'],
+            zipLocation: $request->zipLocation(),
-            country: Country::where('id', $request['country'])->firstOrFail(),
+            country: $request->country(),
-            members: MemberData::fromModels($request['members'])->chunk(14),
+            members: $request->members()->chunk(14),
-            eventName: $request['eventName'],
+            eventName: $request->eventName(),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromApiRequest(array $request): self
-    {
-        return new self(
-            dateFrom: $request['dateFrom'],
-            dateUntil: $request['dateUntil'],
-            zipLocation: $request['zipLocation'],
-            country: Country::where('id', $request['country'])->firstOrFail(),
-            members: MemberData::fromApi($request['member_data'])->chunk(14),
-            eventName: $request['eventName'],
         );
     }
 
@@ -76,4 +61,16 @@ class WuppertalDocument extends ContributionDocument
             '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/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
     {

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Form\Actions;
+
+use App\Form\FormSettings;
+use App\Form\Models\Form;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\URL;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class FormGenerateLaterlinkAction
+{
+    use AsAction;
+
+    public function asController(Form $form)
+    {
+        $registerUrl = str(app(FormSettings::class)->registerUrl)->replace('{slug}', $form->slug)->toString();
+        $laterId = str()->uuid()->toString();
+        $laterUrl = URL::signedRoute('form.register', ['form' => $form, 'later' => '1', 'id' => $laterId]);
+        $urlParts = parse_url($laterUrl);
+
+        Cache::remember('later_'.$laterId, 2592000, fn () => $form->id);    // Link ist 40 Tage gültig
+
+        return response()->json([
+            'url' => $registerUrl.'?'.data_get($urlParts, 'query')
+        ]);
+    }
+}

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

@@ -36,6 +36,10 @@ class FormStoreAction
             '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',
         ];
     }
 

app/Form/Actions/FormUpdateAction.php

@@ -3,7 +3,6 @@
 namespace App\Form\Actions;
 
 use App\Form\Models\Form;
-use App\Lib\Editor\Condition;
 use App\Lib\Events\Succeeded;
 use Illuminate\Http\JsonResponse;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -36,6 +35,10 @@ class FormUpdateAction
             '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',
         ];
     }
 

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/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\Cache;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -20,13 +23,9 @@ class RegisterAction
      */
     public function handle(Form $form, array $input): Participant
     {
-        if (!$form->canRegister()) {
-            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
-        }
-
         $memberQuery = FieldCollection::fromRequest($form, $input)
             ->withNamiType()
-            ->reduce(fn ($query, $field) => $field->namiType->performQuery($query, $field->value), (new Member())->newQuery());
+            ->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([
@@ -34,7 +33,7 @@ class RegisterAction
             '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);
@@ -77,8 +76,34 @@ class RegisterAction
 
     public function asController(ActionRequest $request, Form $form): JsonResponse
     {
+        if (!$form->canRegister() && !$this->isRegisteringLater($request, $form)) {
+            throw ValidationException::withMessages(['event' => 'Anmeldung zzt nicht möglich.']);
+        }
+
         $participant = $this->handle($form, $request->validated());
 
+        if ($this->isRegisteringLater($request, $form)) {
+            Cache::forget('later_'.request('id'));
+        }
+
         return response()->json($participant);
     }
+
+    public function isRegisteringLater(ActionRequest $request, Form $form): 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',
+        ]);
+
+        if (!URL::hasValidSignature($request) || $validator->fails()) {
+            return false;
+        }
+
+        return Cache::get('later_'.data_get($validator->validated(), 'id')) === $form->id;
+    }
 }

app/Form/Data/FieldCollection.php

@@ -114,7 +114,12 @@ class FieldCollection extends Collection
         return $this->map(fn ($field) => $field->presentRaw())->toArray();
     }
 
-    private function findBySpecialType(SpecialType $specialType): ?Field
+    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);
     }

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/Mails/ConfirmRegistrationMail.php

@@ -69,10 +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(Condition::fromMedia($media)))
+            ->filter(fn ($media) => $this->participant->matchesCondition(Condition::fromMedia($media)))
             ->map(fn ($media) => Attachment::fromStorageDisk($media->disk, $media->getPathRelativeToRoot()))
             ->all();
     }

app/Form/Models/Form.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Models;
 
+use App\Contribution\Enums\Country;
 use App\Form\Actions\UpdateParticipantSearchIndexAction;
 use App\Form\Data\ExportData;
 use App\Form\Data\FieldCollection;
@@ -18,7 +19,6 @@ use Laravel\Scout\Searchable;
 use Spatie\Image\Enums\Fit;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Zoomyboy\MedialibraryHelper\DefersUploads;
 
 /** @todo replace editor content with EditorData cast */
@@ -49,6 +49,8 @@ class Form extends Model implements HasMedia
         'to' => 'datetime',
         'registration_from' => 'datetime',
         'registration_until' => 'datetime',
+        'country' => Country::class,
+        'leader_conditions' => Condition::class,
     ];
 
     /**
@@ -69,25 +71,24 @@ class Form extends Model implements HasMedia
         return $this->hasMany(Participant::class);
     }
 
-
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('headerImage')
             ->singleFile()
-            ->maxWidth(fn () => 500)
+            ->maxWidth(fn() => 500)
-            ->forceFileName(fn (Form $model, string $name) => $model->slug)
+            ->forceFileName(fn(Form $model) => $model->slug)
-            ->convert(fn () => 'jpg')
+            ->convert(fn() => 'jpg')
-            ->registerMediaConversions(function (Media $media) {
+            ->registerMediaConversions(function () {
                 $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
             });
         $this->addMediaCollection('mailattachments')
-            ->withDefaultProperties(fn () => [
+            ->withDefaultProperties(fn() => [
                 'conditions' => [
                     'mode' => 'all',
                     'ifs' => []
                 ],
             ])
-            ->withPropertyValidation(fn () => [
+            ->withPropertyValidation(fn() => [
                 'conditions.mode' => 'required|string|in:all,any',
                 'conditions.ifs' => 'array',
                 'conditions.ifs.*.field' => 'required',
@@ -101,7 +102,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationRules(): array
     {
-        return $this->getFields()->reduce(fn ($carry, $field) => [
+        return $this->getFields()->reduce(fn($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationRules($this),
         ], []);
@@ -112,7 +113,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationMessages(): array
     {
-        return $this->getFields()->reduce(fn ($carry, $field) => [
+        return $this->getFields()->reduce(fn($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationMessages($this),
         ], []);
@@ -123,7 +124,7 @@ class Form extends Model implements HasMedia
      */
     public function getRegistrationAttributes(): array
     {
-        return $this->getFields()->reduce(fn ($carry, $field) => [
+        return $this->getFields()->reduce(fn($carry, $field) => [
             ...$carry,
             ...$field->getRegistrationAttributes($this),
         ], []);
@@ -189,8 +190,7 @@ class Form extends Model implements HasMedia
         return Sorting::from($this->meta['sorting']);
     }
 
-    public function canRegister(): bool
+    public function isInDates(): bool {
-    {
         if ($this->registration_from && $this->registration_from->gt(now())) {
             return false;
         }
@@ -201,4 +201,9 @@ class Form extends Model implements HasMedia
 
         return true;
     }
+
+    public function canRegister(): bool
+    {
+        return $this->is_active && $this->isInDates();
+    }
 }

app/Form/Models/Participant.php

@@ -4,12 +4,12 @@ namespace App\Form\Models;
 
 use App\Form\Data\FieldCollection;
 use App\Form\Data\FormConfigData;
+use App\Form\Editor\FormConditionResolver;
 use App\Form\Mails\ConfirmRegistrationMail;
-use App\Form\Scopes\ParticipantFilterScope;
+use App\Lib\Editor\Condition;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
 use Database\Factories\Form\Models\ParticipantFactory;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -110,4 +110,8 @@ class Participant extends Model implements Preventable
     {
         return [...$this->data, 'parent-id' => $this->parent_id, 'created_at' => $this->created_at->timestamp];
     }
+
+    public function matchesCondition(Condition $condition): bool {
+        return app(FormConditionResolver::class)->forParticipant($this)->filterCondition($condition);
+    }
 }

app/Form/Requests/FormCompileRequest.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Form\Requests;
+
+use App\Contribution\Contracts\HasContributionData;
+use App\Contribution\Data\MemberData;
+use App\Contribution\Documents\ContributionDocument;
+use App\Country;
+use App\Form\Editor\FormConditionResolver;
+use App\Form\Enums\SpecialType;
+use App\Form\Models\Form;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Validator;
+use Spatie\LaravelData\Data;
+
+class FormCompileRequest extends Data implements HasContributionData {
+
+    public function __construct(public Form $form) {}
+
+    /**
+     * @return class-string<ContributionDocument>
+     */
+    public function type(): string
+    {
+        $payload = json_decode(rawurldecode(base64_decode(request()->input('payload'))), true);
+
+        return $payload['type'];
+    }
+
+    public function dateFrom(): Carbon
+    {
+        return $this->form->from;
+    }
+
+    public function dateUntil(): Carbon
+    {
+        return $this->form->to;
+    }
+
+    public function zipLocation(): string
+    {
+        return $this->form->zip.' '.$this->form->location;
+    }
+
+    public function eventName(): string
+    {
+        return $this->form->name;
+    }
+
+    public function members(): Collection
+    {
+        $members = [];
+        $fields = [
+            [SpecialType::FIRSTNAME, 'firstname'],
+            [SpecialType::LASTNAME, 'lastname'],
+            [SpecialType::BIRTHDAY, 'birthday'],
+            [SpecialType::GENDER, 'gender'],
+            [SpecialType::ADDRESS, 'address'],
+            [SpecialType::ZIP, 'zip'],
+            [SpecialType::LOCATION, 'location'],
+        ];
+
+        foreach ($this->form->participants as $participant) {
+            $member = [];
+            foreach ($fields as [$type, $name]) {
+                $f = $this->form->getFields()->findBySpecialType($type);
+                if (!$f) {
+                    continue;
+                }
+                $member[$name] = $participant->getFields()->find($f)->value;
+            }
+
+            $members[] = [
+                'is_leader' => $participant->matchesCondition($participant->form->leader_conditions),
+                'gender' => 'weiblich',
+                ...$member,
+            ];
+        }
+
+        return MemberData::fromApi($members);
+    }
+
+    public function country(): ?Country
+    {
+        return Country::first();
+    }
+
+    public function validateContribution(): void
+    {
+        Validator::make($this->form->toArray(), [
+            'zip' => 'required',
+            'location' => 'required'
+        ])
+            ->after(function($validator) {
+                foreach ($this->type()::requiredFormSpecialTypes() as $type) {
+                    if (!$this->form->getFields()->hasSpecialType($type)) {
+                        $validator->errors()->add($type->name, 'Kein Feld für ' . $type->value . ' vorhanden.');
+                    }
+                }
+                if ($this->form->participants->count() === 0) {
+                    $validator->errors()->add('participants',  'Veranstaltung besitzt noch keine Teilnehmer*innen.');
+                }
+            })
+            ->validate();
+    }
+}

app/Form/Resources/FormResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Resources;
 
+use App\Contribution\Enums\Country;
 use App\Form\Data\ExportData;
 use App\Form\Enums\NamiType;
 use App\Form\Enums\SpecialType;
@@ -14,6 +15,7 @@ use App\Group;
 use App\Lib\Editor\EditorData;
 use App\Lib\HasMeta;
 use Illuminate\Http\Resources\Json\JsonResource;
+use App\Contribution\ContributionFactory;
 
 /**
  * @mixin Form
@@ -44,6 +46,7 @@ class FormResource extends JsonResource
             'mail_bottom' => $this->mail_bottom,
             'registration_from' => $this->registration_from?->format('Y-m-d H:i:s'),
             'registration_until' => $this->registration_until?->format('Y-m-d H:i:s'),
+            'is_in_dates' => $this->isInDates(),
             'config' => $this->config,
             'participants_count' => $this->participants_count,
             'is_active' => $this->is_active,
@@ -53,14 +56,21 @@ class FormResource extends JsonResource
             'needs_prevention' => $this->needs_prevention,
             'prevention_text' => $this->prevention_text,
             'prevention_conditions' => $this->prevention_conditions,
+            'leader_conditions' => $this->leader_conditions,
+            'zip' => $this->zip,
+            'location' => $this->location,
+            'country' => $this->country,
             'links' => [
                 'participant_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => null]),
                 'participant_root_index' => route('form.participant.index', ['form' => $this->getModel(), 'parent' => -1]),
-                'update' => route('form.update', ['form' => $this->getModel()]),
+                'update' => route('form.update', $this->getModel()),
-                'destroy' => route('form.destroy', ['form' => $this->getModel()]),
+                'destroy' => route('form.destroy', $this->getModel()),
-                'is_dirty' => route('form.is-dirty', ['form' => $this->getModel()]),
+                'is_dirty' => route('form.is-dirty', $this->getModel()),
                 'frontend' => str(app(FormSettings::class)->registerUrl)->replace('{slug}', $this->slug),
-                'export' => route('form.export', ['form' => $this->getModel()]),
+                'export' => route('form.export', $this->getModel()),
+                'copy' => route('form.copy', $this->getModel()),
+                'contribution' => route('form.contribution', $this->getModel()),
+                'laterlink' => route('form.laterlink', $this->getModel()),
             ]
         ];
     }
@@ -82,6 +92,8 @@ class FormResource extends JsonResource
             'templates' => FormtemplateResource::collection(Formtemplate::get()),
             'namiTypes' => NamiType::forSelect(),
             'specialTypes' => SpecialType::forSelect(),
+            'countries' => Country::forSelect(),
+            'contribution_types' => app(ContributionFactory::class)->compilerSelect(),
             'default' => [
                 'description' => [],
                 'is_active' => true,
@@ -101,6 +113,9 @@ class FormResource extends JsonResource
                 'id' => null,
                 'export' => ExportData::from([]),
                 'prevention_conditions' => ['mode' => 'all', 'ifs' => []],
+                'zip' => '',
+                'location' => '',
+                'country' => null,
             ],
             'section_default' => [
                 'name' => '',

app/Initialize/Actions/InitializeAction.php

@@ -71,7 +71,7 @@ class InitializeAction
 
     public function asController(ActionRequest $request, NamiSettings $settings): RedirectResponse
     {
-        $settings->mglnr = (int) $request->input('mglnr');
+        $settings->mglnr = $request->input('mglnr');
         $settings->password = $request->input('password');
         $settings->default_group_id = (int) $request->input('group_id');
         $settings->search_params = $request->input('params');

app/Initialize/Actions/NamiGetSearchLayerAction.php

@@ -21,7 +21,7 @@ class NamiGetSearchLayerAction
      */
     public function handle(array $input): Collection
     {
-        return Nami::login((int) $input['mglnr'], $input['password'])->searchLayerOptions(
+        return Nami::login($input['mglnr'], $input['password'])->searchLayerOptions(
             SearchLayer::from($input['layer'] ?: 0),
             $input['parent'] ?: null
         );

app/Initialize/Actions/NamiLoginCheckAction.php

@@ -16,7 +16,7 @@ class NamiLoginCheckAction
      */
     public function handle(array $input): void
     {
-        Nami::freshLogin((int) $input['mglnr'], $input['password']);
+        Nami::freshLogin($input['mglnr'], $input['password']);
     }
 
     /**

app/Initialize/Actions/NamiSearchAction.php

@@ -16,7 +16,7 @@ class NamiSearchAction
     /**
      * @param array<string, mixed> $params
      *
-     * @return LengthAwarePaginator<MemberEntry>
+     * @return LengthAwarePaginator<int, MemberEntry>
      */
     public function handle(Api $api, int $page, array $params, int $perPage = 10): LengthAwarePaginator
     {
@@ -36,7 +36,7 @@ class NamiSearchAction
     }
 
     /**
-     * @return LengthAwarePaginator<MemberEntry>
+     * @return LengthAwarePaginator<int, MemberEntry>
      */
     public function asController(ActionRequest $request): LengthAwarePaginator
     {

app/Invoice/Scopes/InvoiceFilterScope.php

@@ -4,7 +4,6 @@ namespace App\Invoice\Scopes;
 
 use App\Invoice\Enums\InvoiceStatus;
 use App\Invoice\Models\Invoice;
-use App\Lib\Filter;
 use App\Lib\ScoutFilter;
 use Laravel\Scout\Builder;
 use Spatie\LaravelData\Attributes\MapInputName;

app/Lib/Data/DateData.php

@@ -5,15 +5,10 @@ namespace App\Lib\Data;
 use Spatie\LaravelData\Normalizers\Normalizer;
 use App\Lib\Normalizers\DateNormalizer;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Attributes\WithTransformer;
-use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 use App\Lib\Transformers\DateTransformer;
 use Carbon\Carbon;
 
-#[MapInputName(SnakeCaseMapper::class)]
-#[MapOutputName(SnakeCaseMapper::class)]
 class DateData extends Data
 {
     public function __construct(

app/Lib/Data/RecordData.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Lib\Data;
+
+use Spatie\LaravelData\Data;
+
+class RecordData extends Data {
+
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {}
+
+}

app/Lib/Filter.php

@@ -14,10 +14,12 @@ abstract class Filter extends Data
 {
 
     /**
-     * @param Builder<T> $query
      * @return Builder<T>
      */
-    abstract public function apply(Builder $query): Builder;
+    abstract public function getQuery(): Builder;
+
+    /** @var Builder<T> */
+    protected Builder $query;
 
     /**
      * @param array<string, mixed>|string|null $request
@@ -36,14 +38,6 @@ abstract class Filter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::factory()->withoutMagicalCreation()->from($post ?: [])->toDefault();
+        return static::factory()->withoutMagicalCreation()->from($post ?: []);
-    }
-
-    /**
-     * @return static
-     */
-    public function toDefault(): self
-    {
-        return $this;
     }
 }

app/Lib/HasDataMeta.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Lib;
+
+use Spatie\LaravelData\PaginatedDataCollection;
+
+/**
+ * @mixin Spatie\LaravelData\Data
+ */
+trait HasDataMeta
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public static function collectPages(mixed $items): array {
+        $source = parent::collect($items, PaginatedDataCollection::class)->toArray();
+        return [
+            ...parent::collect($items, PaginatedDataCollection::class)->toArray(),
+            'meta' => [...$source['meta'], ...static::meta()]
+        ];
+    }
+}

app/Lib/HasMeta.php

@@ -2,7 +2,9 @@
 
 namespace App\Lib;
 
-/** @mixin \Illuminate\Http\Resources\Json\JsonResource */
+/**
+ * @mixin \Illuminate\Http\Resources\Json\JsonResource
+ */
 trait HasMeta
 {
     /**

app/Member/Actions/MemberShowAction.php

@@ -17,19 +17,16 @@ class MemberShowAction
      */
     public function handle(Member $member): array
     {
-        $member = Member::withPendingPayment()->with([
-            'memberships.activity',
-            'memberships.subactivity',
-            'invoicePositions.invoice',
-            'nationality',
-            'region',
-            'subscription',
-            'courses.course',
-            'bankAccount',
-        ])->find($member->id);
-
         return [
-            'data' => new MemberResource($member),
+            'data' => new MemberResource(
+                $member
+                    ->load('memberships')
+                    ->load('invoicePositions.invoice')
+                    ->load('nationality')
+                    ->load('region')
+                    ->load('subscription')
+                    ->load('courses.course')
+            ),
             'meta' => MemberResource::meta(),
         ];
     }

app/Member/Data/ActivityData.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
-use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-
-#[MapInputName(SnakeCaseMapper::class)]
-#[MapOutputName(SnakeCaseMapper::class)]
-class ActivityData extends Data {
-
-    public function __construct(
-        public int $id,
-        public string $name,
-    ) {}
-
-}

app/Member/Data/GroupData.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use App\Group;
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
-use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-
-#[MapInputName(SnakeCaseMapper::class)]
-#[MapOutputName(SnakeCaseMapper::class)]
-class GroupData extends Data {
-
-    public function __construct(
-        public int $id,
-        public string $name,
-    ) {}
-
-    public static function fromId(int $id): static {
-        $group = Group::findOrFail($id);
-
-        return static::from([
-            'name' => $group->name,
-            'id' => $group->id,
-        ]);
-    }
-
-}

app/Member/Data/MemberData.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Member\Data;
+
+use Spatie\LaravelData\Data;
+use App\Member\Member;
+
+class MemberData extends Data
+{
+
+    public function __construct(
+        public string $fullname,
+    ) {}
+
+    public static function fromModel(Member $member): static
+    {
+        return static::factory()->withoutMagicalCreation()->from([
+            'fullname' => $member->fullname
+        ]);
+    }
+
+}

app/Member/Data/MembershipData.php

@@ -2,33 +2,49 @@
 
 namespace App\Member\Data;
 
+use App\Activity;
+use App\Group;
 use Spatie\LaravelData\Data;
-use App\Member\Membership;
-use App\Member\Member;
 use App\Lib\Data\DateData;
+use App\Lib\Data\RecordData;
+use App\Lib\HasDataMeta;
+use App\Member\Membership;
+use App\Membership\FilterScope;
+use App\Subactivity;
 
 class MembershipData extends Data
 {
 
+    use HasDataMeta;
+
+    /**
+     * @param array<string, string> $links
+     */
     public function __construct(
-        public ?ActivityData $activity = null,
+        public int $id,
-        public ?SubactivityData $subactivity = null,
+        public RecordData $activity,
-        public ?GroupData $group = null,
+        public ?RecordData $subactivity,
-        public ?DateData $promisedAt = null,
+        public RecordData $group,
-        public ?DateData $from = null,
+        public ?DateData $promisedAt,
-        public bool $isActive = false,
+        public DateData $from,
-        public array $links = [],
+        public ?DateData $to,
+        public MemberData $member,
+        public bool $isActive,
+        public array $links,
     ) {}
 
     public static function fromModel(Membership $membership): static
     {
         return static::factory()->withoutMagicalCreation()->from([
+            'id' => $membership->id,
             'activity' => $membership->activity,
-            'subactivity' => $membership?->subactivity,
+            'subactivity' => $membership->subactivity,
             'isActive' => $membership->isActive(),
             'from' => $membership->from,
+            'to' => $membership->to,
             'group' => $membership->group,
             'promisedAt' => $membership->promised_at,
+            'member' => $membership->member,
             'links' => [
                 'update' => route('membership.update', $membership),
                 'destroy' => route('membership.destroy', $membership),
@@ -39,8 +55,13 @@ class MembershipData extends Data
     /**
      * @return array<string, mixed>
      */
-    public static function memberMeta(Member $member): MembershipMeta
+    public static function meta(): array {
-    {
+        return [
-        return MembershipMeta::fromMember($member);
+            'activities' => RecordData::collect(Activity::get()),
+            'subactivities' => RecordData::collect(Subactivity::get()),
+            'groups' => RecordData::collect(Group::get()),
+            'filter' => FilterScope::fromRequest(request()->input('filter', '')),
+        ];
     }
+
 }

app/Member/Data/MembershipMeta.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use App\Activity;
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
-use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use App\Member\Member;
-use Illuminate\Support\Collection;
-
-#[MapInputName(SnakeCaseMapper::class)]
-#[MapOutputName(SnakeCaseMapper::class)]
-class MembershipMeta extends Data
-{
-
-    public function __construct(
-        public array $links,
-        public Collection $groups,
-        public Collection $activities,
-        public Collection $subactivities,
-        public MembershipData $default,
-    ) {}
-
-    public static function fromMember(Member $member): static
-    {
-        $activities = Activity::with('subactivities')->get();
-
-        return static::factory()->withoutMagicalCreation()->from([
-            'links' => [
-                'store' => route('member.membership.store', ['member' => $member]),
-            ],
-            'groups' => NestedGroup::cacheForSelect(),
-            'activities' => $activities->map(fn($activity) => ['id' => $activity->id, 'name' => $activity->name]),
-            'subactivities' => $activities->mapWithKeys(fn($activity) => [$activity->id => $activity->subactivities->map(fn($subactivity) => ['id' => $subactivity->id, 'name' => $subactivity->name, 'is_age_group' => $subactivity->is_age_group])]),
-            'default' => MembershipData::from(['group' => $member->group_id]),
-        ]);
-    }
-
-}

app/Member/Data/SubactivityData.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Member\Data;
-
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
-use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-
-#[MapInputName(SnakeCaseMapper::class)]
-#[MapOutputName(SnakeCaseMapper::class)]
-class SubactivityData extends Data {
-
-    public function __construct(
-        public int $id,
-        public string $name,
-    ) {}
-
-}

app/Member/MemberResource.php

@@ -14,7 +14,7 @@ use App\Member\Data\NestedGroup;
 use App\Member\Resources\BankAccountResource;
 use App\Member\Resources\NationalityResource;
 use App\Member\Resources\RegionResource;
-use App\Member\Data\MembershipData;
+use App\Membership\MembershipResource;
 use App\Nationality;
 use App\Payment\Subscription;
 use App\Payment\SubscriptionResource;
@@ -75,7 +75,7 @@ class MemberResource extends JsonResource
             'pending_payment' => $this->pending_payment ? number_format($this->pending_payment / 100, 2, ',', '.') . ' €' : null,
             'age_group_icon' => $this->ageGroupMemberships->first()?->subactivity->slug,
             'courses' => CourseMemberResource::collection($this->whenLoaded('courses')),
-            'memberships' => $this->relationLoaded('memberships') ? MembershipData::collect($this->memberships) : null,
+            'memberships' => MembershipResource::collection($this->whenLoaded('memberships')),
             'invoicePositions' => InvoicePositionResource::collection($this->whenLoaded('invoicePositions')),
             'nationality' => new NationalityResource($this->whenLoaded('nationality')),
             'region' => new RegionResource($this->whenLoaded('region')),
@@ -138,7 +138,7 @@ class MemberResource extends JsonResource
         return [
             'filterActivities' => Activity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
             'filterSubactivities' => Subactivity::where('is_filterable', true)->get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
-            'formActivities' => $activities->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'formActivities' => $activities->pluck('name', 'id'),
             'formSubactivities' => $activities->map(function (Activity $activity) {
                 return ['subactivities' => $activity->subactivities->pluck('name', 'id'), 'id' => $activity->id];
             })->pluck('subactivities', 'id'),
@@ -148,11 +148,11 @@ class MemberResource extends JsonResource
             })->pluck('subactivities', 'id'),
             'groups' => NestedGroup::cacheForSelect(),
             'filter' => FilterScope::fromRequest(request()->input('filter', '')),
-            'courses' => Course::get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'courses' => Course::pluck('name', 'id'),
-            'regions' => Region::get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'regions' => Region::forSelect(),
-            'subscriptions' => Subscription::get()->map(fn($a) => ['id' => $a->id, 'name' => $a->name]),
+            'subscriptions' => Subscription::pluck('name', 'id'),
-            'countries' => Country::get()->map(fn($c) => ['id' => $c->id, 'name' => $c->name]),
+            'countries' => Country::pluck('name', 'id'),
-            'genders' => Gender::get()->map(fn($c) => ['id' => $c->id, 'name' => $c->name]),
+            'genders' => Gender::pluck('name', 'id'),
             'billKinds' => BillKind::forSelect(),
             'nationalities' => Nationality::pluck('name', 'id'),
             'members' => Member::ordered()->get()->map(fn($member) => ['id' => $member->id, 'name' => $member->fullname]),

app/Member/Membership.php

@@ -79,6 +79,19 @@ class Membership extends Model
             ->where(fn ($query) => $query->whereNull('to')->orWhere('to', '>=', now()));
     }
 
+    /**
+     * @param Builder<Membership> $query
+     *
+     * @return Builder<Membership>
+     */
+    public function scopeInactive(Builder $query): Builder
+    {
+        return $query->where(fn ($q) => $q
+            ->orWhere('from', '>=', now())
+            ->orWhere('to', '<=', now())
+        );
+    }
+
     /**
      * @param Builder<Membership> $query
      *

app/Membership/Actions/IndexAction.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Membership\Actions;
-
-use App\Member\Member;
-use App\Member\Membership;
-use Illuminate\Database\Eloquent\Collection;
-use Lorisleiva\Actions\Concerns\AsAction;
-use App\Member\Data\MembershipData;
-use Illuminate\Http\JsonResponse;
-
-class IndexAction
-{
-    use AsAction;
-
-    /**
-     * @return Collection<int, Membership>
-     */
-    public function handle(Member $member): Collection
-    {
-        return $member->memberships;
-    }
-
-    public function asController(Member $member): JsonResponse
-    {
-        return response()->json([
-            'data' => MembershipData::collect($this->handle($member)),
-            'meta' => MembershipData::memberMeta($member),
-        ]);
-    }
-}

app/Membership/Actions/MassStoreAction.php

@@ -10,6 +10,7 @@ use App\Maildispatcher\Actions\ResyncAction;
 use App\Member\Member;
 use App\Member\Membership;
 use App\Subactivity;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -20,13 +21,18 @@ class MassStoreAction
     use TracksJob;
 
     /**
-     * @return array<string, string>
+     * @return array<string, mixed>
      */
     public function rules(): array
     {
         return [
             'group_id' => 'required|numeric|exists:groups,id',
-            'activity_id' => 'required|numeric|exists:activities,id',
+            'activity_id' => ['required', 'numeric', 'exists:activities,id', function($key, $value, $fail) {
+                $activity = Activity::findOrFail($value);
+                if ($activity->subactivities->pluck('id')->doesntContain(request()->subactivity_id)) {
+                    return $fail(':attribute ist nicht vorhanden.');
+                }
+            }],
             'subactivity_id' => 'required|numeric|exists:subactivities,id',
             'members' => 'array',
             'members.*' => 'numeric|exists:members,id',
@@ -48,9 +54,7 @@ class MassStoreAction
             Membership::where($attributes)->active()->whereNotIn('member_id', $members)->get()
                 ->each(fn ($membership) => MembershipDestroyAction::run($membership->id));
 
-            collect($members)
+            Member::whereIn('id', $members)->whereDoesntHave('memberships', fn ($q) => $q->where($attributes))->get()
-                ->except(Membership::where($attributes)->active()->pluck('member_id'))
-                ->map(fn ($memberId) => Member::findOrFail($memberId))
                 ->each(fn ($member) => MembershipStoreAction::run(
                     $member,
                     $activity,
@@ -59,12 +63,11 @@ class MassStoreAction
                     null,
                 ));
 
-
             ResyncAction::dispatch();
         });
     }
 
-    public function asController(ActionRequest $request): void
+    public function asController(ActionRequest $request): JsonResponse
     {
         /**
          * @var array{members: array<int, int>, group_id: int, activity_id: int, subactivity_id: int}
@@ -77,6 +80,19 @@ class MassStoreAction
             Subactivity::findOrFail($input['subactivity_id']),
             $input['members'],
         );
+
+        return response()->json([], 200);
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function getValidationAttributes(): array {
+        return [
+            'activity_id' => 'Tätigkeit',
+            'subactivity_id' => 'Untertätigkeit',
+            'group_id' => 'Gruppe',
+        ];
     }
 
     /**

app/Membership/Actions/MemberIndexAction.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Membership\Actions;
+
+use App\Member\Member;
+use App\Member\Membership;
+use App\Membership\MembershipResource;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class MemberIndexAction
+{
+    use AsAction;
+
+    /**
+     * @return Collection<int, Membership>
+     */
+    public function handle(Member $member): Collection
+    {
+        return $member->memberships;
+    }
+
+    public function asController(Member $member): AnonymousResourceCollection
+    {
+        return MembershipResource::collection($this->handle($member))
+            ->additional([
+                'meta' => MembershipResource::memberMeta($member)
+            ]);
+    }
+}

app/Membership/Actions/MembershipIndexAction.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Membership\Actions;
+
+use App\Member\Data\MembershipData;
+use App\Membership\FilterScope;
+use Inertia\Inertia;
+use Inertia\Response;
+use Lorisleiva\Actions\ActionRequest;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class MembershipIndexAction
+{
+    use AsAction;
+
+    public function asController(ActionRequest $request): Response
+    {
+        return Inertia::render(
+            'membership/Index',
+            ['data' => MembershipData::collectPages(FilterScope::fromRequest($request->input('filter', ''))->getQuery()->paginate(20))]
+        );
+    }
+}

app/Membership/FilterScope.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Membership;
+
+use App\Lib\Filter;
+use App\Member\Membership;
+use Illuminate\Database\Eloquent\Builder;
+
+/**
+ * @extends Filter<Membership>
+ */
+class FilterScope extends Filter
+{
+    /**
+     * @param array<int, int> $activities
+     * @param array<int, int> $subactivities
+     * @param array<int, int> $groups
+     */
+    public function __construct(
+        public array $activities = [],
+        public array $subactivities = [],
+        public array $groups = [],
+        public ?bool $active = true,
+    ) {}
+
+    public function getQuery(): Builder
+    {
+        $query = Membership::orderByRaw('member_id, activity_id, subactivity_id');
+
+        if ($this->active === true) {
+            $query = $query->active();
+        }
+
+        if ($this->active === false) {
+            $query = $query->inactive();
+        }
+
+        if (count($this->groups)) {
+            $query = $query->whereIn('group_id', $this->groups);
+        }
+
+        if (count($this->activities)) {
+            $query = $query->whereIn('activity_id', $this->activities);
+        }
+
+        if (count($this->subactivities)) {
+            $query = $query->whereIn('subactivity_id', $this->subactivities);
+        }
+
+        return $query;
+    }
+}

app/Membership/MembershipResource.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Membership;
+
+use App\Activity;
+use App\Lib\HasMeta;
+use App\Member\Data\NestedGroup;
+use App\Member\Member;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Member\Membership
+ */
+class MembershipResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'group_id' => $this->group_id,
+            'activity_id' => $this->activity_id,
+            'activity_name' => $this->activity->name,
+            'subactivity_id' => $this->subactivity_id,
+            'subactivity_name' => $this->subactivity?->name,
+            'human_date' => $this->from->format('d.m.Y'),
+            'promised_at' => $this->promised_at?->format('Y-m-d'),
+            'is_active' => $this->isActive(),
+            'links' => [
+                'update' => route('membership.update', ['membership' => $this->getModel()]),
+                'destroy' => route('membership.destroy', ['membership' => $this->getModel()]),
+            ]
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public static function memberMeta(Member $member): array
+    {
+        $activities = Activity::with('subactivities')->get();
+
+        return [
+            'links' => [
+                'store' => route('member.membership.store', ['member' => $member]),
+            ],
+            'groups' => NestedGroup::cacheForSelect(),
+            'activities' => $activities->map(fn ($activity) => ['id' => $activity->id, 'name' => $activity->name]),
+            'subactivities' => $activities->mapWithKeys(fn ($activity) => [$activity->id => $activity->subactivities->map(fn ($subactivity) => ['id' => $subactivity->id, 'name' => $subactivity->name, 'is_age_group' => $subactivity->is_age_group])]),
+            'default' => [
+                'group_id' => $member->group_id,
+                'activity_id' => null,
+                'subactivity_id' => null,
+                'promised_at' => null,
+            ],
+        ];
+    }
+}

app/Remote/Actions/SearchAction.php

@@ -14,7 +14,7 @@ class SearchAction
     use AsAction;
 
     /**
-     * @return LengthAwarePaginator<array<string, mixed>>
+     * @return LengthAwarePaginator<int, array<string, mixed>>
      */
     public function handle(ActionRequest $request): LengthAwarePaginator
     {

app/Setting/NamiSettings.php

@@ -4,7 +4,6 @@ namespace App\Setting;
 
 use App\Group;
 use App\Initialize\Actions\NamiLoginCheckAction;
-use App\Nami\Actions\SettingSaveAction;
 use App\Setting\Contracts\Storeable;
 use Lorisleiva\Actions\ActionRequest;
 use Zoomyboy\LaravelNami\Api;
@@ -12,7 +11,7 @@ use Zoomyboy\LaravelNami\Nami;
 
 class NamiSettings extends LocalSettings implements Storeable
 {
-    public int $mglnr;
+    public string $mglnr;
 
     public string $password;
 

composer.json

@@ -50,7 +50,7 @@
         "cviebrock/eloquent-sluggable": "^11.0",
         "doctrine/dbal": "^3.1",
         "guzzlehttp/guzzle": "^7.0.1",
-        "inertiajs/inertia-laravel": "^1.0",
+        "inertiajs/inertia-laravel": "^2.0",
         "laravel/framework": "^11.0",
         "laravel/horizon": "^5.0",
         "laravel/pail": "^1.1",
@@ -70,7 +70,6 @@
         "spatie/laravel-data": "^4.0",
         "spatie/laravel-ignition": "^2.0",
         "spatie/laravel-settings": "^3.0",
-        "spatie/laravel-typescript-transformer": "^2.5",
         "worksome/request-factories": "^3.0",
         "zoomyboy/laravel-nami": "dev-master",
         "zoomyboy/medialibrary-helper": "dev-master as 1.0",

config/typescript-transformer.php

@@ -1,88 +0,0 @@
-<?php
-
-return [
-    /*
-     * The paths where typescript-transformer will look for PHP classes
-     * to transform, this will be the `app` path by default.
-     */
-
-    'auto_discover_types' => [
-        app_path(),
-    ],
-
-    /*
-     * Collectors will search for classes in the `auto_discover_types` paths and choose the correct
-     * transformer to transform them. By default, we include a DefaultCollector which will search
-     * for @typescript annotated and #[TypeScript] attributed classes to transform.
-     */
-
-    'collectors' => [
-        Spatie\TypeScriptTransformer\Collectors\DefaultCollector::class,
-        Spatie\TypeScriptTransformer\Collectors\EnumCollector::class,
-        Spatie\LaravelData\Support\TypeScriptTransformer\DataTypeScriptCollector::class,
-    ],
-
-    /*
-     * Transformers take PHP classes(e.g., enums) as an input and will output
-     * a TypeScript representation of the PHP class.
-     */
-
-    'transformers' => [
-        Spatie\LaravelTypeScriptTransformer\Transformers\SpatieStateTransformer::class,
-        Spatie\TypeScriptTransformer\Transformers\EnumTransformer::class,
-        Spatie\TypeScriptTransformer\Transformers\SpatieEnumTransformer::class,
-        Spatie\LaravelData\Support\TypeScriptTransformer\DataTypeScriptTransformer::class,
-        Spatie\LaravelTypeScriptTransformer\Transformers\DtoTransformer::class,
-    ],
-
-    /*
-     * In your classes, you sometimes have types that should always be replaced
-     * by the same TypeScript representations. For example, you can replace a
-     * Datetime always with a string. You define these replacements here.
-     */
-
-    'default_type_replacements' => [
-        DateTime::class => 'string',
-        DateTimeImmutable::class => 'string',
-        Carbon\CarbonInterface::class => 'string',
-        Carbon\CarbonImmutable::class => 'string',
-        Carbon\Carbon::class => 'string',
-    ],
-
-    /*
-     * The package will write the generated TypeScript to this file.
-     */
-
-    'output_file' => resource_path('types/generated.d.ts'),
-
-    /*
-     * When the package is writing types to the output file, a writer is used to
-     * determine the format. By default, this is the `TypeDefinitionWriter`.
-     * But you can also use the `ModuleWriter` or implement your own.
-     */
-
-    'writer' => Spatie\TypeScriptTransformer\Writers\TypeDefinitionWriter::class,
-
-    /*
-     * The generated TypeScript file can be formatted. We ship a Prettier formatter
-     * out of the box: `PrettierFormatter` but you can also implement your own one.
-     * The generated TypeScript will not be formatted when no formatter was set.
-     */
-
-    'formatter' => null,
-
-    /*
-     * Enums can be transformed into types or native TypeScript enums, by default
-     * the package will transform them to types.
-     */
-
-    'transform_to_native_enums' => false,
-
-    /*
-     * By default, this package will convert PHP nullable properties to TypeScript
-     * types using a `null` type union. Setting `transform_null_to_optional` will
-     * make them optional instead.
-     */
-
-    'transform_null_to_optional' => false,
-];

database/factories/Form/Models/FormFactory.php

@@ -47,8 +47,8 @@ class FormFactory extends Factory
             'description' => EditorRequestFactory::new()->toData(),
             'excerpt' => $this->faker->words(10, true),
             'config' => ['sections' => []],
-            'from' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
+            'from' => $this->faker->dateTimeBetween('+1 week', '+3 weeks')->format('Y-m-d'),
-            'to' => $this->faker->dateTimeBetween('+1 week', '+4 weeks')->format('Y-m-d H:i:s'),
+            'to' => $this->faker->dateTimeBetween('+4 week', '+6 weeks')->format('Y-m-d'),
             'registration_from' => $this->faker->dateTimeBetween(Carbon::parse('-2 weeks'), now())->format('Y-m-d H:i:s'),
             'registration_until' => $this->faker->dateTimeBetween(now(), Carbon::parse('+2 weeks'))->format('Y-m-d H:i:s'),
             'mail_top' => EditorRequestFactory::new()->toData(),
@@ -57,6 +57,8 @@ class FormFactory extends Factory
             'is_private' => false,
             'export' => ExportData::from([]),
             'prevention_conditions' => Condition::defaults(),
+            'zip' => $this->faker->numberBetween(1100, 99999),
+            'location' => $this->faker->city(),
         ];
     }
 
@@ -65,7 +67,7 @@ class FormFactory extends Factory
      */
     public function sections(array $sections): self
     {
-        return $this->state(['config' => ['sections' => array_map(fn ($section) => $section->create(), $sections)]]);
+        return $this->state(['config' => ['sections' => array_map(fn($section) => $section->create(), $sections)]]);
     }
 
     /**

database/factories/Member/MemberFactory.php

@@ -98,6 +98,12 @@ class MemberFactory extends Factory
         return $this->state(['nami_id' => null]);
     }
 
+    public function name(string $name): self
+    {
+        [$firstname, $lastname] = explode(' ', $name);
+        return $this->state(compact('firstname', 'lastname'));
+    }
+
     public function withBankAccount(BankAccountFactory $factory): self
     {
         return $this->afterCreating(function ($member) use ($factory) {

database/factories/Member/MembershipFactory.php

@@ -4,6 +4,7 @@ namespace Database\Factories\Member;
 
 use App\Activity;
 use App\Group;
+use App\Member\Member;
 use App\Member\Membership;
 use App\Subactivity;
 use Carbon\Carbon;
@@ -30,6 +31,10 @@ class MembershipFactory extends Factory
         ];
     }
 
+    public function defaults(): self {
+        return $this->for(Member::factory()->defaults())->for(Group::factory())->for(Activity::factory())->for(Subactivity::factory());
+    }
+
     public function inNami(int $namiId): self
     {
         return $this->state(['nami_id' => $namiId]);

database/migrations/2025_07_04_210136_create_forms_zip_column.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->string('zip')->nullable()->after('name');
+            $table->string('location')->nullable()->after('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->dropColumn('zip');
+            $table->dropColumn('location');
+        });
+    }
+};

database/migrations/2025_07_06_022536_create_forms_country_column.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->string('country')->nullable()->after('location');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->dropColumn('country');
+        });
+    }
+};

database/migrations/2025_07_09_221048_create_forms_leader_conditions_column.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->json('leader_conditions')->after('name')->default(json_encode(['mode' => 'all', 'ifs' => []]));
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('forms', function (Blueprint $table) {
+            $table->dropColumn('leader_conditions');
+        });
+    }
+};

docker-compose.yml

@@ -103,8 +103,6 @@ services:
             - ./data/redis:/data
 
     meilisearch:
-        ports:
-            - "7700:7700"
         image: getmeili/meilisearch:v1.6
         volumes:
             - ./data/meilisearch:/meili_data

package-lock.json

@@ -9,7 +9,7 @@
                 "@editorjs/header": "^2.8.1",
                 "@editorjs/nested-list": "^1.4.2",
                 "@editorjs/paragraph": "^2.11.3",
-                "@inertiajs/vue3": "^1.0.14",
+                "@inertiajs/vue3": "^2.0",
                 "@tailwindcss/forms": "^0.5.7",
                 "@tailwindcss/typography": "^0.5.10",
                 "@vitejs/plugin-vue": "^4.6.2",
@@ -27,8 +27,10 @@
                 "pusher-js": "^8.3.0",
                 "svg-sprite": "^2.0.2",
                 "typescript-eslint": "^8.34.0",
+                "uuid": "^11.1.0",
                 "vite": "^4.5.2",
                 "vue": "^3.3.4",
+                "vue-clipboard3": "^2.0.0",
                 "vue-toastification": "^2.0.0-rc.5",
                 "vuedraggable": "^4.1.0",
                 "wnumb": "^1.2.0"
@@ -527,9 +529,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.20.0",
+            "version": "0.20.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+            "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
             "dependencies": {
                 "@eslint/object-schema": "^2.1.6",
                 "debug": "^4.3.1",
@@ -540,9 +542,9 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.2.2",
+            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-            "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+            "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
@@ -600,17 +602,28 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.1",
+            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.2.tgz",
-            "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+            "integrity": "sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==",
             "dependencies": {
-                "@eslint/core": "^0.14.0",
+                "@eslint/core": "^0.15.0",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
+        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
+            "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
         "node_modules/@floating-ui/core": {
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.1.tgz",
@@ -689,24 +702,22 @@
             }
         },
         "node_modules/@inertiajs/core": {
-            "version": "1.3.0",
+            "version": "2.0.12",
-            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-1.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/@inertiajs/core/-/core-2.0.12.tgz",
-            "integrity": "sha512-TJ8R1eUYY473m9DaKlCPRdHTdznFWTDuy5VvEzXg3t/hohbDQedLj46yn/uAqziJPEUZJrSftZzPI2NMzL9tQA==",
+            "integrity": "sha512-TxMRUcSB/w2Or9KSsldgcx49u+1xveLg7HuwRkqrs196ZrDwYRjtc984uc838vDP+dsFIz//+Tn0n7ysG/MgMQ==",
             "dependencies": {
-                "axios": "^1.6.0",
+                "axios": "^1.8.2",
-                "deepmerge": "^4.0.0",
+                "es-toolkit": "^1.34.1",
-                "nprogress": "^0.2.0",
                 "qs": "^6.9.0"
             }
         },
         "node_modules/@inertiajs/vue3": {
-            "version": "1.3.0",
+            "version": "2.0.12",
-            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-1.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/@inertiajs/vue3/-/vue3-2.0.12.tgz",
-            "integrity": "sha512-GizqdCM3u4JWunit3uUbW4fEmTLKQTi1W7VvPRdrNy8XDt4Qy2cCmfFjq+aH5tHBSS3fI/ngYuhN7XvwqNaKvw==",
+            "integrity": "sha512-ruvThr3BKunFjh+EamcGilAI8RGSF/upL//E9bnchYEWFCwQtZ2NzQ0tBOFLQ+qYnaRiDjsyTa63h1R36PUmbg==",
             "dependencies": {
-                "@inertiajs/core": "1.3.0",
+                "@inertiajs/core": "2.0.12",
-                "lodash.clonedeep": "^4.5.0",
+                "es-toolkit": "^1.33.0"
-                "lodash.isequal": "^4.5.0"
             },
             "peerDependencies": {
                 "vue": "^3.0.0"
@@ -1765,9 +1776,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001722",
+            "version": "1.0.30001723",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001722.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",
-            "integrity": "sha512-DCQHBBZtiK6JVkAGw7drvAMK0Q0POD/xZvEmDp6baiMMP6QXXk9HpD6mNYBZWhOPG6LvIDb82ITqtWjhDckHCA==",
+            "integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==",
             "dev": true,
             "funding": [
                 {
@@ -1862,6 +1873,16 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/clipboard": {
+            "version": "2.0.11",
+            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+            "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+            "dependencies": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
         "node_modules/cliui": {
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -2122,14 +2143,6 @@
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
             "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
         },
-        "node_modules/deepmerge": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -2138,6 +2151,11 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
         "node_modules/didyoumean": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -2232,9 +2250,9 @@
             "integrity": "sha512-m6w/cRxnFucC3dyfrB+DTNXw70SnJNv05AX6P3bZ8qkbzB1OAJTuaFrEKZBdN0YvEvTe1zvg3S344EkPAveemQ=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.166",
+            "version": "1.5.167",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.166.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.167.tgz",
-            "integrity": "sha512-QPWqHL0BglzPYyJJ1zSSmwFFL6MFXhbACOCcsCdUMCkzPdS9/OIBVxg516X/Ado2qwAq8k0nJJ7phQPCqiaFAw==",
+            "integrity": "sha512-LxcRvnYO5ez2bMOFpbuuVuAI5QNeY1ncVytE/KXaL6ZNfzX1yPlAO0nSOyIHx2fVAuUprMqPs/TdVhUFZy7SIQ==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -2296,6 +2314,15 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/es-toolkit": {
+            "version": "1.39.3",
+            "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.39.3.tgz",
+            "integrity": "sha512-Qb/TCFCldgOy8lZ5uC7nLGdqJwSabkQiYQShmw4jyiPk1pZzaYWTwaYKYP7EgLccWYgZocMrtItrwh683voaww==",
+            "workspaces": [
+                "docs",
+                "benchmarks"
+            ]
+        },
         "node_modules/esbuild": {
             "version": "0.18.20",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
@@ -2837,6 +2864,14 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "dependencies": {
+                "delegate": "^3.1.2"
+            }
+        },
         "node_modules/gopd": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -3191,22 +3226,11 @@
             "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
             "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="
         },
-        "node_modules/lodash.clonedeep": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-            "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
-        },
         "node_modules/lodash.escape": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
             "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="
         },
-        "node_modules/lodash.isequal": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-            "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-            "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead."
-        },
         "node_modules/lodash.isplainobject": {
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -3444,11 +3468,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/nprogress": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-            "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
-        },
         "node_modules/nth-check": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -3705,9 +3724,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.5.4",
+            "version": "8.5.5",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.4.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.5.tgz",
-            "integrity": "sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==",
+            "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4080,6 +4099,11 @@
                 "node": ">=10"
             }
         },
+        "node_modules/select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
         "node_modules/semver": {
             "version": "7.7.2",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -4550,6 +4574,11 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
         "node_modules/tinyglobby": {
             "version": "0.2.14",
             "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
@@ -4836,6 +4865,18 @@
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
+        "node_modules/uuid": {
+            "version": "11.1.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+            "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "bin": {
+                "uuid": "dist/esm/bin/uuid"
+            }
+        },
         "node_modules/vinyl": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -4945,6 +4986,14 @@
                 "vue": "^3.0.0 || ^2.0.0"
             }
         },
+        "node_modules/vue-clipboard3": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/vue-clipboard3/-/vue-clipboard3-2.0.0.tgz",
+            "integrity": "sha512-Q9S7dzWGax7LN5iiSPcu/K1GGm2gcBBlYwmMsUc5/16N6w90cbKow3FnPmPs95sungns4yvd9/+JhbAznECS2A==",
+            "dependencies": {
+                "clipboard": "^2.0.6"
+            }
+        },
         "node_modules/vue-demi": {
             "version": "0.14.10",
             "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",

package.json

@@ -26,7 +26,7 @@
         "@editorjs/header": "^2.8.1",
         "@editorjs/nested-list": "^1.4.2",
         "@editorjs/paragraph": "^2.11.3",
-        "@inertiajs/vue3": "^1.0.14",
+        "@inertiajs/vue3": "^2.0",
         "@tailwindcss/forms": "^0.5.7",
         "@tailwindcss/typography": "^0.5.10",
         "@vitejs/plugin-vue": "^4.6.2",
@@ -44,8 +44,10 @@
         "pusher-js": "^8.3.0",
         "svg-sprite": "^2.0.2",
         "typescript-eslint": "^8.34.0",
+        "uuid": "^11.1.0",
         "vite": "^4.5.2",
         "vue": "^3.3.4",
+        "vue-clipboard3": "^2.0.0",
         "vue-toastification": "^2.0.0-rc.5",
         "vuedraggable": "^4.1.0",
         "wnumb": "^1.2.0"

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit c20cf930f2037ddda4400dd7d35bf9ef707356eb
+Subproject commit 47f01b3c3c98821603f3612511d713cf51a6a14c

phpstan.neon

@@ -68,6 +68,11 @@ parameters:
             count: 1
             path: app/Member/MemberRequest.php
 
+        -
+            message: "#^Method App\\\\Membership\\\\MembershipResource\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
+            count: 1
+            path: app/Membership/MembershipResource.php
+
         -
             message: "#^Method App\\\\Payment\\\\SubscriptionResource\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#"
             count: 1
@@ -413,11 +418,6 @@ parameters:
             count: 1
             path: app/Mailgateway/Resources/MailgatewayResource.php
 
-        -
-            message: "#^Generic type Illuminate\\\\Pagination\\\\LengthAwarePaginator\\<int, App\\\\Member\\\\Member\\> in PHPDoc tag @return specifies 2 template types, but class Illuminate\\\\Pagination\\\\LengthAwarePaginator supports only 1\\: TValue$#"
-            count: 1
-            path: app/Member/Actions/SearchAction.php
-
         -
             message: "#^Class Plugins\\\\Test\\\\ServiceProvider not found\\.$#"
             count: 1

resources/css/buttons.css

@@ -31,6 +31,12 @@
             @apply bg-yellow-500 text-yellow-100;
         }
     }
+    &.btn-default {
+        @apply bg-gray-700 text-gray-300;
+        &:not(.disabled):hover {
+            @apply bg-gray-500 text-gray-100;
+        }
+    }
     &.btn-info {
         @apply bg-blue-700 text-blue-300;
         &:not(.disabled):hover {

resources/css/editor.css

@@ -5,14 +5,14 @@
 .ce-settings__button,
 .ce-toolbar__settings-btn,
 .cdx-button,
-.ce-popover,
+.ce-popover__container,
 .ce-toolbar__plus:hover {
     @apply bg-primary-700;
     color: inherit;
 }
 
-.ce-inline-tool-input {
+.cdx-search-field {
-    @apply bg-primary-700 text-primary-200 placeholder-primary-500;
+    @apply bg-primary-600;
 }
 
 .ce-block--selected {

resources/css/tooltip.css

@@ -1,3 +1,7 @@
+.v-popper__popper {
+    @apply max-w-lg;
+}
+
 .v-popper--theme-tooltip .v-popper__inner {
     @apply bg-primary-400 text-primary-800 px-3 py-1 text-sm;
 }

resources/img/svg/copy.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M6 6V2c0-1.1.9-2 2-2h10a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-4v4a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V8c0-1.1.9-2 2-2h4zm2 0h4a2 2 0 0 1 2 2v4h4V2H8v4zM2 8v10h10V8H2z"/></svg>

resources/img/svg/externallink.svg

@@ -0,0 +1,4 @@
+<svg x="0px" y="0px" viewBox="0 0 511.626 511.627" xml:space="preserve">
+    <path d="M392.857,292.354h-18.274c-2.669,0-4.859,0.855-6.563,2.573c-1.718,1.708-2.573,3.897-2.573,6.563v91.361    c0,12.563-4.47,23.315-13.415,32.262c-8.945,8.945-19.701,13.414-32.264,13.414H82.224c-12.562,0-23.317-4.469-32.264-13.414    c-8.945-8.946-13.417-19.698-13.417-32.262V155.31c0-12.562,4.471-23.313,13.417-32.259c8.947-8.947,19.702-13.418,32.264-13.418    h200.994c2.669,0,4.859-0.859,6.57-2.57c1.711-1.713,2.566-3.9,2.566-6.567V82.221c0-2.662-0.855-4.853-2.566-6.563    c-1.711-1.713-3.901-2.568-6.57-2.568H82.224c-22.648,0-42.016,8.042-58.102,24.125C8.042,113.297,0,132.665,0,155.313v237.542    c0,22.647,8.042,42.018,24.123,58.095c16.086,16.084,35.454,24.13,58.102,24.13h237.543c22.647,0,42.017-8.046,58.101-24.13    c16.085-16.077,24.127-35.447,24.127-58.095v-91.358c0-2.669-0.856-4.859-2.574-6.57    C397.709,293.209,395.519,292.354,392.857,292.354z"/>
+    <path d="M506.199,41.971c-3.617-3.617-7.905-5.424-12.85-5.424H347.171c-4.948,0-9.233,1.807-12.847,5.424    c-3.617,3.615-5.428,7.898-5.428,12.847s1.811,9.233,5.428,12.85l50.247,50.248L198.424,304.067    c-1.906,1.903-2.856,4.093-2.856,6.563c0,2.479,0.953,4.668,2.856,6.571l32.548,32.544c1.903,1.903,4.093,2.852,6.567,2.852    s4.665-0.948,6.567-2.852l186.148-186.148l50.251,50.248c3.614,3.617,7.898,5.426,12.847,5.426s9.233-1.809,12.851-5.426    c3.617-3.616,5.424-7.898,5.424-12.847V54.818C511.626,49.866,509.813,45.586,506.199,41.971z"/>
+</svg>

resources/img/svg/warning-triangle-light.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M1.225 21.225A1.678 1.678 0 0 0 2.707 22H22.28a1.68 1.68 0 0 0 1.484-.775 1.608 1.608 0 0 0 .003-1.656L13.995 1.827a1.745 1.745 0 0 0-2.969 0l-9.8 17.742a1.603 1.603 0 0 0 0 1.656zm.859-1.143l9.82-17.773A.71.71 0 0 1 12.508 2a.73.73 0 0 1 .629.342l9.751 17.708a.626.626 0 0 1 .017.662.725.725 0 0 1-.626.288H2.708a.723.723 0 0 1-.623-.286.605.605 0 0 1-.001-.632zM13 15h-1V8h1zm-1.5 2.5a1 1 0 1 1 1 1 1.002 1.002 0 0 1-1-1z"/><path fill="none" d="M0 0h24v24H0z"/></svg>

resources/js/components/components.d.ts

@@ -25,6 +25,7 @@ declare module 'vue' {
     PageFullLayout: typeof import('@/components/page/FullLayout.vue')['default']
     PageHeader: typeof import('@/components/page/Header.vue')['default']
     PageLayout: typeof import('@/components/page/Layout.vue')['default']
+    PagePopups: typeof import('@/components/page/Popups.vue')['default']
     PageSearchModal: typeof import('@/components/page/SearchModal.vue')['default']
     PageTitle: typeof import('@/components/page/Title.vue')['default']
     PageToolbarButton: typeof import('@/components/page/ToolbarButton.vue')['default']

resources/js/components/form/Editor.vue

@@ -1,22 +1,21 @@
 <template>
     <div>
         <div class="flex flex-col group" :for="id" :class="sizeClass(size)">
-            <f-label v-if="label" :required="required" :value="label"></f-label>
+            <f-label v-if="label" :required="required" :value="label" />
             <div class="relative w-full h-full">
-                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]"></div>
+                <div :id="id" :class="[fieldAppearance, paddingX, paddingY]" />
-                <f-hint v-if="hint" :value="hint"></f-hint>
+                <f-hint v-if="hint" :value="hint" />
             </div>
         </div>
 
-        <ui-popup
+        <ui-popup v-if="condition !== null"
-            v-if="condition !== null"
+                  heading="Bedingungen"
-            heading="Bedingungen"
+                  @close="
-            @close="
+                      condition.resolve(condition.data);
-                condition.resolve(condition.data);
+                      condition = null;
-                condition = null;
+                  "
-            "
         >
-            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject"></slot>
+            <slot name="conditions" :data="condition.data" :resolve="condition.resolve" :reject="condition.reject" />
         </ui-popup>
     </div>
 </template>
@@ -106,10 +105,10 @@ class ConditionTune {
     wrap(blockContent) {
         this.wrapper = document.createElement('div');
 
-        var tooltip = document.createElement('div');
+        const tooltip = document.createElement('div');
         tooltip.setAttribute('data-tooltip', '');
 
-        var content = document.createElement('div');
+        const content = document.createElement('div');
         content.setAttribute('data-content', '');
 
         content.appendChild(blockContent);
@@ -144,7 +143,7 @@ class ConditionTune {
             'Bedingung ' +
             this.data.ifs
                 .map((i) => {
-                    var parts = [i.field];
+                    const parts = [i.field];
 
                     if (i.comparator === 'isEqual' || i.comparator === 'isIn') {
                         parts.push('=');
@@ -191,7 +190,7 @@ class ConditionTune {
 }
 
 onMounted(async () => {
-    var tools = {
+    const tools = {
         paragraph: {
             class: Paragraph,
             shortcut: 'CTRL+P',
@@ -225,7 +224,7 @@ onMounted(async () => {
         },
     };
 
-    var tunes = [];
+    const tunes = [];
 
     if (props.conditions) {
         tools.condition = {

resources/js/components/form/Multipleselect.vue

@@ -1,24 +1,22 @@
 <template>
     <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="false" :value="label"></f-label>
+        <f-label v-if="label" :required="false" :value="label" />
         <div class="relative flex-none flex">
-            <div
+            <div :class="[fieldHeight, fieldAppearance, selectAppearance]"
-                :class="[fieldHeight, fieldAppearance, selectAppearance]"
+                 class="form-select flex items-center w-full"
-                class="form-select flex items-center w-full"
+                 @click="visible = !visible"
-                @click="visible = !visible"
+                 v-text="`${modelValue.length} Einträge ausgewählt`"
-                v-text="`${modelValue.length} Einträge ausgewählt`"
+            />
-            ></div>
+            <div v-show="visible" class="absolute w-[max-content] z-30 max-h-[25rem] overflow-auto shadow-lg bg-gray-600 border border-gray-500 rounded-lg p-2 top-7 space-y-1 mt-2">
-            <div v-show="visible" class="absolute w-[max-content] z-30 max-h-[25rem] overflow-auto shadow-lg bg-gray-600 border border-gray-500 rounded-lg p-2 top-7 space-y-1">
                 <div v-for="(option, index) in parsedOptions" :key="index" class="flex items-center space-x-2">
-                    <f-switch
+                    <f-switch :id="`${id}-${index}`"
-                        :id="`${id}-${index}`"
+                              :name="`${id}-${index}`"
-                        :name="`${id}-${index}`"
+                              size="sm"
-                        size="sm"
+                              :model-value="modelValue.includes(option.id)"
-                        :model-value="modelValue.includes(option.id)"
+                              :value="option.id"
-                        :value="option.id"
+                              @update:model-value="trigger(option, $event)"
-                        @update:modelValue="trigger(option, $event)"
+                    />
-                    ></f-switch>
+                    <div class="text-sm text-gray-200" v-text="option.name" />
-                    <div class="text-sm text-gray-200" v-text="option.name"></div>
                 </div>
             </div>
         </div>
@@ -62,11 +60,11 @@ const parsedOptions = computed(() =>
     Array.isArray(props.options)
         ? props.options
         : map(props.options, (value, key) => {
-              return {name: value, id: key};
+            return {name: value, id: key};
-          })
+        })
 );
 function trigger(option, v) {
-    var value = JSON.parse(JSON.stringify(props.modelValue));
+    const value = JSON.parse(JSON.stringify(props.modelValue));
 
     emit('update:modelValue', value.includes(option.id) ? value.filter((cv) => cv !== option.id) : [...value, option.id]);
 }

resources/js/components/form/Select.vue

@@ -1,17 +1,17 @@
 <template>
     <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="required" :value="label" />
+        <f-label v-if="label" :required="required" :value="label"></f-label>
         <div class="relative flex-none flex">
             <select v-model="inner" :disabled="disabled" :name="name" :class="[fieldHeight, fieldAppearance, selectAppearance]">
                 <option v-if="placeholder" :value="def">{{ placeholder }}</option>
                 <option v-for="option in parsedOptions" :key="option.id" :value="option.id">{{ option.name }}</option>
             </select>
-            <f-hint v-if="hint" :value="hint" />
+            <f-hint v-if="hint" :value="hint"></f-hint>
         </div>
     </label>
 </template>
 
-<script lang="ts" setup>
+<script setup>
 import {computed, ref} from 'vue';
 import useFieldSize from '../../composables/useFieldSize.js';
 import map from 'lodash/map';
@@ -59,6 +59,11 @@ const props = defineProps({
         default: '--kein--',
         type: String,
     },
+    def: {
+        required: false,
+        type: Number,
+        default: -1,
+    },
     name: {
         required: true,
     },
@@ -74,8 +79,8 @@ const parsedOptions = computed(() => {
     return Array.isArray(props.options)
         ? props.options
         : map(props.options, (value, key) => {
-            return {name: value, id: key};
+              return {name: value, id: key};
-        });
+          });
 });
 
 const def = ref('iu1Feixah5AeKai3ewooJahjeaegee0eiD4maeth1oul4Hei7u');

resources/js/components/page/Popups.vue

@@ -0,0 +1,21 @@
+<template>
+    <ui-popup v-for="(popup, index) in swal.popups" :key="index" :icon="popup.icon" :heading="popup.title" @close="popup.reject(popup.id)">
+        <div class="text-center mt-4" v-text="popup.body" />
+        <div class="mt-4">
+            <template v-for="field in popup.fields">
+                <f-text v-if="field.type === 'text'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" />
+                <f-select v-if="field.type === 'select'" :id="field.name" :key="field.name" v-model="popup.payload[field.name]" :name="field.name" :label="field.label" :options="field.options" />
+            </template>
+        </div>
+        <div class="flex justify-center space-x-4 mt-6">
+            <ui-button type="button" class="btn-primary" @click.prevent="popup.resolve(popup.id)">{{ popup.confirmButton }}</ui-button>
+            <ui-button type="button" class="btn-default" @click.prevent="popup.reject(popup.id)">{{ popup.cancelButton }}</ui-button>
+        </div>
+    </ui-popup>
+</template>
+
+<script lang="ts" setup>
+import useSwal from '@/stores/swalStore.ts';
+const swal = useSwal();
+</script>
+

resources/js/components/ui/ActionButton.vue

@@ -5,10 +5,10 @@
 </template>
 
 <script lang="ts" setup>
-const {tooltip, icon, blank = false, href = '#'} = defineProps<{
+withDefaults(defineProps<{
-    tooltip: string,
+    tooltip: string;
-    href?: string,
+    href?: string;
     blank?: boolean,
     icon: string,
-}>();
+}>(), {href: '#', blank: false});
 </script>

resources/js/components/ui/Button.vue

@@ -1,24 +1,22 @@
 <template>
     <button v-bind="$attrs" class="btn btn-primary relative group">
         <div :class="{hidden: !isLoading, flex: isLoading}" class="absolute items-center top-0 h-full left-0 ml-2">
-            <ui-spinner class="border-primary-400 w-6 h-6 group-hover:border-primary-200"></ui-spinner>
+            <ui-spinner class="border-primary-400 w-6 h-6 group-hover:border-primary-200" />
         </div>
-        <slot></slot>
+        <slot />
     </button>
 </template>
 
 <script>
-import {menuStore} from '../../stores/menuStore.js';
-
 export default {
-    data: function () {
-        return {};
-    },
     props: {
         isLoading: {
             type: Boolean,
             default: false,
         },
     },
+    data: function () {
+        return {};
+    },
 };
 </script>

resources/js/components/ui/Popup.vue

@@ -1,23 +1,25 @@
 <template>
     <div class="fixed z-40 top-0 left-0 w-full h-full flex items-center justify-center p-6 bg-black/60 backdrop-blur-sm">
-        <div
+        <div class="relative rounded-lg p-8 bg-zinc-800 shadow-2xl shadow-black border border-zinc-700 border-solid w-full max-h-full flex flex-col overflow-auto"
-            class="relative rounded-lg p-8 bg-zinc-800 shadow-2xl shadow-black border border-zinc-700 border-solid w-full max-h-full flex flex-col overflow-auto"
+             :class="full ? 'h-full' : innerWidth"
-            :class="full ? 'h-full' : innerWidth"
         >
             <div class="absolute top-0 right-0 mt-6 mr-6 flex space-x-6">
-                <slot name="actions"></slot>
+                <slot name="actions" />
                 <a href="#" @click.prevent="$emit('close')">
-                    <ui-sprite src="close" class="text-zinc-400 w-6 h-6"></ui-sprite>
+                    <ui-sprite src="close" class="text-zinc-400 w-6 h-6" />
                 </a>
             </div>
-            <h3 v-if="heading" class="font-semibold text-primary-200 text-xl" v-html="heading"></h3>
+            <div class="flex justify-center">
+                <ui-sprite v-if="icon" class="text-yellow-700 size-28" :src="icon" />
+            </div>
+            <h3 v-if="heading" class="font-semibold text-primary-200 text-xl" :class="{'text-center mt-5': icon !== null}" v-html="heading" />
             <div class="text-primary-100 group is-popup grow flex flex-col">
                 <suspense>
                     <div>
-                        <slot></slot>
+                        <slot />
                     </div>
                     <template #fallback>
-                        <ui-loading></ui-loading>
+                        <ui-loading />
                     </template>
                 </suspense>
             </div>
@@ -25,21 +27,14 @@
     </div>
 </template>
 
-<script>
+<script lang="ts" setup>
-export default {
+defineEmits<{
-    props: {
+    close: [],
-        heading: {
+}>();
-            type: String,
+withDefaults(defineProps<{
-            default: () => '',
+    heading?: string,
-        },
+    innerWidth?: string,
-        innerWidth: {
+    full?: boolean,
-            default: () => 'max-w-xl',
+    icon?: string|null,
-            type: String,
+}>(), {innerWidth: 'max-w-xl', full: false, heading: '', icon: null});
-        },
-        full: {
-            type: Boolean,
-            default: () => false,
-        },
-    },
-};
 </script>

resources/js/components/ui/RemoteResource.vue

@@ -1,15 +1,15 @@
 <template>
     <ui-popup v-if="selecting !== false" heading="Resource auswählen" @close="selecting = false">
-        <ui-remote-selector :value="selecting" @input="set"></ui-remote-selector>
+        <ui-remote-selector :value="selecting" @input="set" />
     </ui-popup>
     <label class="flex flex-col group" :for="id" :class="sizeClass(size)">
-        <f-label v-if="label" :required="false" :value="label"></f-label>
+        <f-label v-if="label" :required="false" :value="label" />
         <div class="relative flex-none flex">
             <div class="w-full flex flex-col justify-center" :class="[fieldHeight, fieldAppearance, paddingX]" @click.prevent="selecting = modelValue === null ? null : {...modelValue}">
-                <div v-if="modelValue !== null" v-text="modelValue.resource"></div>
+                <div v-if="modelValue !== null" v-text="modelValue.resource" />
                 <div v-else>Datei auswählen</div>
             </div>
-            <f-hint v-if="hint" :value="hint"></f-hint>
+            <f-hint v-if="hint" :value="hint" />
         </div>
     </label>
 </template>

resources/js/components/ui/Sprite.vue

@@ -2,5 +2,6 @@
     <svg v-bind="$attrs" class="fill-current"><use :xlink:href="`/sprite.svg#${$attrs.src}`" /></svg>
 </template>
 
-<script lang="ts" setup>
+<script>
+export default {};
 </script>

resources/js/components/ui/Tabs.vue

@@ -9,7 +9,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script  lang="ts" setup>
 defineProps<{
     modelValue: number,
     entries: {title: string}[]

resources/js/composables/useApiIndex.js

@@ -1,73 +1,84 @@
 import {ref, inject, onBeforeUnmount} from 'vue';
 import {router} from '@inertiajs/vue3';
-import type {Ref} from 'vue';
 import useQueueEvents from './useQueueEvents.js';
-import { Axios } from 'axios';
 
-export function useApiIndex<D, M extends Custom.PageMetadata>(firstUrl, siteName = null) {
+export function useApiIndex(firstUrl, siteName = null) {
-    const axios = inject<Axios>('axios');
+    const axios = inject('axios');
 
     if (siteName !== null) {
         var {startListener, stopListener} = useQueueEvents(siteName, () => reload());
     }
 
-    const single: Ref<D|null> = ref(null);
+    const single = ref(null);
 
     const url = ref(firstUrl);
-    const inner: {data: Ref<D[]|null>, meta: Ref<M|null>} = {
+    const inner = {
-        data: ref(null),
+        data: ref([]),
-        meta: ref(null),
+        meta: ref({}),
     };
 
     async function reload(resetPage = true, p = {}) {
-        const params = {
+        var params = {
-            page: resetPage ? 1 : inner.meta.value?.current_page,
+            page: resetPage ? 1 : inner.meta.value.current_page,
             ...p,
         };
 
-        const response = (await axios.get(url.value, {params})).data;
+        var response = (await axios.get(url.value, {params})).data;
         inner.data.value = response.data;
         inner.meta.value = response.meta;
     }
 
-    async function reloadPage(page: number, p = {}) {
+    async function reloadPage(page, p = {}) {
-        if (inner.meta.value?.current_page) {
+        inner.meta.value.current_page = page;
-            inner.meta.value.current_page = page;
-        }
         await reload(false, p);
     }
 
     function create() {
-        single.value = JSON.parse(JSON.stringify(inner.meta.value?.default));
+        single.value = JSON.parse(JSON.stringify(inner.meta.value.default));
     }
 
-    function edit(model: D) {
+    function edit(model) {
         single.value = JSON.parse(JSON.stringify(model));
     }
 
     async function submit() {
-        if (single.value === null) {
-            return;
-        }
         single.value.id ? await axios.patch(single.value.links.update, single.value) : await axios.post(inner.meta.value.links.store, single.value);
         await reload();
         single.value = null;
     }
 
-    async function remove(model: D) {
+    async function remove(model) {
         await axios.delete(model.links.destroy);
         await reload();
     }
 
+    function can(permission) {
+        return inner.meta.value.can[permission];
+    }
+
     function toFilterString(data) {
         return btoa(encodeURIComponent(JSON.stringify(data)));
     }
 
+    function requestCallback(successMessage, failureMessage) {
+        return {
+            onSuccess: () => {
+                this.$success(successMessage);
+                reload(false);
+            },
+            onFailure: () => {
+                this.$error(failureMessage);
+                reload(false);
+            },
+            preserveState: true,
+        };
+    }
+
     function cancel() {
         single.value = null;
     }
 
-    function updateUrl(newUrl: string) {
+    function updateUrl(newUrl) {
         url.value = newUrl;
     }
 
@@ -84,6 +95,8 @@ export function useApiIndex<D, M extends Custom.PageMetadata>(firstUrl, siteName
         edit,
         reload,
         reloadPage,
+        can,
+        requestCallback,
         router,
         submit,
         remove,

resources/js/composables/useDownloads.ts

@@ -0,0 +1,14 @@
+import { Axios } from 'axios';
+import { inject } from 'vue';
+
+export default function() {
+    const axios = inject<Axios>('axios');
+
+    async function download(url: string, payload: Record<string, string>) {
+        const payloadString = btoa(encodeURIComponent(JSON.stringify(payload)));
+        await axios.get(`${url}?payload=${payloadString}&validate=1`);
+        window.open(`${url}?payload=${payloadString}`);
+    }
+
+    return { download };
+}

resources/js/composables/useIndex.js

@@ -1,10 +1,10 @@
-import {ref, inject, computed, onBeforeUnmount} from 'vue';
+import { ref, inject, computed, onBeforeUnmount } from 'vue';
-import {router} from '@inertiajs/vue3';
+import { router } from '@inertiajs/vue3';
 import useQueueEvents from './useQueueEvents.js';
 
 export function useIndex(props, siteName) {
     const axios = inject('axios');
-    const {startListener, stopListener} = useQueueEvents(siteName, () => reload(false));
+    const { startListener, stopListener } = useQueueEvents(siteName, () => reload(false));
     const rawProps = JSON.parse(JSON.stringify(props));
     const inner = {
         data: ref(rawProps.data),
@@ -40,7 +40,7 @@ export function useIndex(props, siteName) {
     }
 
     function reloadPage(page) {
-        reload(false, {page: page});
+        reload(false, { page: page });
     }
 
     function can(permission) {
@@ -83,10 +83,10 @@ export function useIndex(props, siteName) {
 const indexProps = {
     data: {
         default: () => {
-            return {data: [], meta: {}};
+            return { data: [], meta: {} };
         },
         type: Object,
     },
 };
 
-export {indexProps};
+export { indexProps };

resources/js/layouts/AppLayout.vue

@@ -1,13 +1,12 @@
 <template>
-    <v-notification class="fixed z-40 right-0 bottom-0 mb-3 mr-3"></v-notification>
+    <v-notification class="fixed z-40 right-0 bottom-0 mb-3 mr-3" />
 
     <!-- ******************************** Sidebar ******************************** -->
-    <div
+    <div class="fixed z-40 bg-gray-800 p-6 w-56 top-0 h-screen border-r border-gray-600 border-solid flex flex-col justify-between transition-all"
-        class="fixed z-40 bg-gray-800 p-6 w-56 top-0 h-screen border-r border-gray-600 border-solid flex flex-col justify-between transition-all"
+         :class="{
-        :class="{
+             '-left-[14rem]': !menuStore.isShifted,
-            '-left-[14rem]': !menuStore.isShifted,
+             'left-0': menuStore.isShifted,
-            'left-0': menuStore.isShifted,
+         }"
-        }"
     >
         <div class="grid gap-2">
             <v-link href="/" menu="dashboard" icon="loss">Dashboard</v-link>
@@ -29,13 +28,15 @@
             <v-link icon="logout" href="/logout" @click.prevent="$inertia.post('/logout')">Abmelden</v-link>
         </div>
         <a v-if="menuStore.hideable" href="#" class="absolute right-0 top-0 mr-2 mt-2" @click.prevent="menuStore.hide()">
-            <ui-sprite src="close" class="w-5 h-5 text-gray-300"></ui-sprite>
+            <ui-sprite src="close" class="w-5 h-5 text-gray-300" />
         </a>
     </div>
 
-    <slot></slot>
+    <page-popups />
 
-    <page-search-modal v-if="searchVisible" @close="searchVisible = false"></page-search-modal>
+    <slot />
+
+    <page-search-modal v-if="searchVisible" @close="searchVisible = false" />
 </template>
 
 <script>

resources/js/lib/floatingVue.js

@@ -17,4 +17,4 @@ var options = {
     },
 };
 
-export {Plugin, options};
+export { Plugin, options };

resources/js/stores/menuStore.js

@@ -1,5 +1,5 @@
-import {defineStore} from 'pinia';
+import { defineStore } from 'pinia';
-import {router} from '@inertiajs/vue3';
+import { router } from '@inertiajs/vue3';
 
 export const menuStore = defineStore('menu', {
     state: () => ({

resources/js/stores/swalStore.ts

@@ -0,0 +1,93 @@
+import { defineStore } from 'pinia';
+import { v4 as uuidv4 } from 'uuid';
+
+type Payload = Record<string, string|null>;
+
+interface Popup {
+    id: string;
+    title: string;
+    body: string;
+    icon: string|null;
+    confirmButton: string;
+    cancelButton: string;
+    resolve: (id: string) => void;
+    reject: (id: string) => void;
+    fields: SwalField[];
+    payload: Payload;
+}
+
+interface SwalField {
+    name: string;
+    label: string;
+    required: boolean;
+    type: 'select' | 'text';
+    options: [],
+}
+
+export default defineStore('swal', {
+    state: () => ({
+        popups: [] as Popup[],
+    }),
+    actions: {
+        confirm(title: string, body: string): Promise<void> {
+            return new Promise((resolve, reject) =>  {
+                new Promise<string>((resolve, reject) => {
+                    this.popups.push({
+                        title,
+                        body,
+                        confirmButton: 'Okay',
+                        cancelButton: 'Abbrechen',
+                        resolve,
+                        reject,
+                        id: uuidv4(),
+                        icon: 'warning-triangle-light',
+                        fields: [],
+                        payload: {},
+                    });
+                }).then((id) => {
+                    this.remove(id);
+                    resolve();
+                }).catch((id) => {
+                    this.remove(id);
+                    reject();
+                });
+            });
+        },
+
+        ask(title: string, body: string, fields: SwalField[] = []): Promise<Payload> {
+            return new Promise<Payload>((resolve, reject) =>  {
+                new Promise<string>((resolve, reject) => {
+                    const payload: Payload = {};
+                    fields.forEach(f => payload[f.name] = null);
+                    this.popups.push({
+                        title,
+                        body,
+                        confirmButton: 'Okay',
+                        cancelButton: 'Abbrechen',
+                        resolve,
+                        reject,
+                        id: uuidv4(),
+                        icon: 'warning-triangle-light',
+                        fields: fields,
+                        payload: payload,
+                    });
+                }).then((id) => {
+                    const p = this.find(id)?.payload;
+                    this.remove(id);
+                    resolve(p || {});
+                }).catch((id) => {
+                    this.remove(id);
+                    reject();
+                });
+            });
+        },
+
+        remove(id: string) {
+            this.popups = this.popups.filter(p => p.id !== id);
+        },
+
+        find(id: string): Popup|undefined {
+            return this.popups.find(p => p.id === id);
+        }
+    },
+});

resources/js/views/activity/Masslist.vue

@@ -1,27 +1,26 @@
 <template>
     <page-layout>
         <template #right>
-            <f-save-button form="actionform"></f-save-button>
+            <f-save-button form="actionform" />
         </template>
         <form id="actionform" class="grow p-3" @submit.prevent="submit">
             <div class="flex space-x-3">
-                <f-select
+                <f-select :model-value="meta.activity_id"
-                    :model-value="meta.activity_id"
+                          :options="props.activities"
-                    :options="props.activities"
+                          label="Tätigkeit"
-                    label="Tätigkeit"
+                          size="sm"
-                    size="sm"
+                          name="activity_id"
-                    name="activity_id"
+                          @update:model-value="meta = {...meta, activity_id: $event, subactivity_id: null}"
-                    @update:model-value="meta = {...meta, activity_id: $event, subactivity_id: null}"
+                />
-                ></f-select>
+                <f-select v-model="meta.subactivity_id" :options="props.subactivities[meta.activity_id]" name="subactivity_id" label="Untertätigkeit" size="sm" />
-                <f-select v-model="meta.subactivity_id" :options="props.subactivities[meta.activity_id]" name="subactivity_id" label="Untertätigkeit" size="sm"></f-select>
+                <f-select v-model="meta.group_id" :options="props.groups" label="Gruppierung" size="sm" name="group_id" />
-                <f-select v-model="meta.group_id" :options="props.groups" label="Gruppierung" size="sm" name="group_id"></f-select>
+                <f-text id="search_text" v-model="searchText" label="Suchen …" size="sm" />
-                <f-text id="search_text" v-model="searchText" label="Suchen …" size="sm"></f-text>
             </div>
             <div class="grid gap-2 grid-cols-6 mt-4">
-                <f-switch v-for="member in members.hits" :id="`member-${member.id}`" :key="member.id" v-model="selected" :value="member.id" :label="member.fullname" size="sm"></f-switch>
+                <f-switch v-for="member in members.hits" :id="`member-${member.id}`" :key="member.id" v-model="selected" :value="member.id" :label="member.fullname" size="sm" />
             </div>
             <div class="px-6">
-                <ui-search-pagination class="mt-4" :value="members" @reload="reloadReal($event)"></ui-search-pagination>
+                <ui-search-pagination class="mt-4" :value="members" @reload="reloadReal($event)" />
             </div>
         </form>
     </page-layout>