--wip-- [skip ci]

app/Form/Actions/PreventionRememberAction.php

@@ -13,7 +13,7 @@ class PreventionRememberAction
 {
     use AsAction;
 
-    public string $commandSignature = 'prevention:remember-forms';
+    public string $commandSignature = 'prevention:remember';
 
     public function handle(): void
     {
@@ -33,7 +33,7 @@ class PreventionRememberAction
                 continue;
             }
 
-            if ($participant->getFields()->getMailRecipient() === null || $participant->preventions()->count() === 0) {
+            if ($participant->getFields()->getMailRecipient() === null || count($participant->preventions()) === 0) {
                 continue;
             }
 

app/Form/Models/Participant.php

@@ -14,7 +14,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Scout\Searchable;
 use stdClass;
@@ -82,15 +81,20 @@ class Participant extends Model implements Preventable
         Mail::to($this->getMailRecipient())->queue(new ConfirmRegistrationMail($this));
     }
 
+    public function preventableLayout(): string
+    {
+        return 'mail.prevention.prevention-remember-participant';
+    }
+
     /**
      * @inheritdoc
      */
-    public function preventions(): Collection
+    public function preventions(): array
     {
-        return $this->member?->preventions($this->form->from) ?: collect([]);
+        return $this->member?->preventions($this->form->from) ?: [];
     }
 
-    public function getMailRecipient(): ?stdClass
+    public function getMailRecipient(): stdClass
     {
         return $this->getFields()->getMailRecipient();
     }

app/Member/Member.php

@@ -2,6 +2,7 @@
 
 namespace App\Member;
 
+use stdClass;
 use App\Confession;
 use App\Country;
 use App\Course\Models\CourseMember;
@@ -13,8 +14,7 @@ use App\Nami\HasNamiField;
 use App\Nationality;
 use App\Payment\Subscription;
 use App\Pdf\Sender;
-use App\Prevention\Contracts\Preventable;
+use App\Prevention\Contracts\YearlyPreventable;
-use App\Prevention\Data\PreventionData;
 use App\Region;
 use App\Setting\NamiSettings;
 use Carbon\Carbon;
@@ -37,14 +37,12 @@ use Zoomyboy\Phone\HasPhoneNumbers;
 use App\Prevention\Enums\Prevention;
 use Database\Factories\Member\MemberFactory;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Support\Collection;
-use stdClass;
 
 /**
  * @property string $subscription_name
  * @property int    $pending_payment
  */
-class Member extends Model implements Geolocatable, Preventable
+class Member extends Model implements Geolocatable, YearlyPreventable
 {
     use Notifiable;
     use HasNamiField;
@@ -198,20 +196,6 @@ class Member extends Model implements Geolocatable, Preventable
         return (int) $this->invoicePositions()->whereHas('invoice', fn($query) => $query->whereNeedsPayment())->sum('price');
     }
 
-    public function getMailRecipient(): ?stdClass
-    {
-        if (!$this->fullname) {
-            return null;
-        }
-
-        return (object) ['name' => $this->fullname, 'email' => $this->email];
-    }
-
-    public function preventableSubject(): string
-    {
-        return 'Nachweise erforderlich';
-    }
-
     // ---------------------------------- Relations ----------------------------------
     /**
      * @return BelongsTo<Country, $this>
@@ -382,47 +366,32 @@ class Member extends Model implements Geolocatable, Preventable
     }
 
     /**
-     * @inheritdoc
+     * @return array<int, Prevention>
      */
-    public function preventions(?Carbon $date = null): Collection
+    public function preventions(?Carbon $date = null): array
     {
         $date = $date ?: now();
 
-        /** @var Collection<int, PreventionData> */
+        /** @var array<int, Prevention> */
-        $preventions = collect([]);
+        $preventions = [];
 
         if ($this->efz === null || $this->efz->diffInYears($date) >= 5) {
-            $preventions->push(PreventionData::from([
+            $preventions[] = Prevention::EFZ;
-                'type' => Prevention::EFZ,
-                'expires' => $this->efz === null ? now() : $this->efz->addYears(5)
-            ]));
         }
 
         if (!$this->has_vk) {
-            $preventions->push(PreventionData::from([
+            $preventions[] = Prevention::VK;
-                'type' => Prevention::VK,
-                'expires' => now(),
-            ]));
         }
 
         if ($this->more_ps_at === null) {
             if ($this->ps_at === null) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::PS;
-                    'type' => Prevention::PS,
-                    'expires' => now(),
-                ]));
             } else if ($this->ps_at->diffInYears($date) >= 5) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::MOREPS;
-                    'type' => Prevention::MOREPS,
-                    'expires' => $this->ps_at->addYears(5),
-                ]));
             }
         } else {
             if ($this->more_ps_at === null || $this->more_ps_at->diffInYears($date) >= 5) {
-                $preventions->push(PreventionData::from([
+                $preventions[] = Prevention::MOREPS;
-                    'type' => Prevention::MOREPS,
-                    'expires' => $this->more_ps_at->addYears(5),
-                ]));
             }
         }
 
@@ -603,4 +572,21 @@ class Member extends Model implements Geolocatable, Preventable
                 ->map(fn($membership) => [...$membership->only('activity_id', 'subactivity_id'), 'both' => $membership->activity_id . '|' . $membership->subactivity_id, 'with_group' => $membership->group_id . '|' . $membership->activity_id . '|' . $membership->subactivity_id]),
         ];
     }
+
+    // -------------------------------- Prevention ---------------------------------
+    // *****************************************************************************
+    public function preventableSubject(): string
+    {
+        return 'Nachweise erforderlich';
+    }
+
+    public function preventableLayout(): string
+    {
+        return 'mail.prevention.prevention-remember-participant';
+    }
+
+    public function getMailRecipient(): stdClass
+    {
+        return (object) ['name' => $this->fullname, 'email' => $this->email];
+    }
 }

app/Prevention/Actions/YearlyRememberAction.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Prevention\Actions;
-
-use App\Member\Member;
-use App\Prevention\Data\PreventionData;
-use App\Prevention\Mails\YearlyMail;
-use App\Prevention\PreventionSettings;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Mail;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class YearlyRememberAction
-{
-    use AsAction;
-
-    public string $commandSignature = 'prevention:remember-yearly';
-
-    public function handle(): void
-    {
-        $settings = app(PreventionSettings::class);
-        $expireDate = now()->addWeeks($settings->weeks);
-
-        foreach (Member::get() as $member) {
-            $noticePreventions = $member->preventions($expireDate)
-                ->filter(fn($prevention) => $prevention->expiresAt($expireDate));
-
-            if ($noticePreventions->count() === 0) {
-                continue;
-            }
-
-            Mail::send($this->createMail($member, $noticePreventions));
-        }
-
-        foreach (Member::get() as $member) {
-            $preventions = $member->preventions()
-                ->filter(fn($prevention) => $prevention->expiresAt(now()));
-
-            if ($preventions->count() === 0) {
-                continue;
-            }
-
-            Mail::send($this->createMail($member, $preventions));
-        }
-    }
-
-    /**
-     * @param Collection<int, PreventionData> $preventions
-     */
-    protected function createMail(Member $member, Collection $preventions): YearlyMail
-    {
-        $body = app(PreventionSettings::class)->refresh()->formmail;
-        return new YearlyMail($member, $body, $preventions);
-    }
-}

app/Prevention/Contracts/Preventable.php

@@ -2,19 +2,19 @@
 
 namespace App\Prevention\Contracts;
 
-use App\Prevention\Data\PreventionData;
+use App\Prevention\Enums\Prevention;
-use Illuminate\Support\Collection;
 use stdClass;
 
 interface Preventable
 {
 
+    public function preventableLayout(): string;
     public function preventableSubject(): string;
 
     /**
-     * @return Collection<int, PreventionData>
+     * @return array<int, Prevention>
      */
-    public function preventions(): Collection;
+    public function preventions(): array;
 
-    public function getMailRecipient(): ?stdClass;
+    public function getMailRecipient(): stdClass;
 }

app/Prevention/Contracts/YearlyPreventable.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Prevention\Contracts;
+
+use App\Prevention\Enums\Prevention;
+use stdClass;
+
+interface YearlyPreventable
+{
+
+    public function preventableLayout(): string;
+    public function preventableSubject(): string;
+
+    /**
+     * @return array<int, Prevention>
+     */
+    public function preventions(): array;
+
+    public function getMailRecipient(): stdClass;
+}

app/Prevention/Data/PreventionData.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Prevention\Data;
-
-use App\Prevention\Enums\Prevention;
-use Carbon\Carbon;
-use Spatie\LaravelData\Data;
-
-class PreventionData extends Data
-{
-    public function __construct(public Prevention $type, public Carbon $expires) {}
-
-    public function expiresAt(Carbon $date): bool
-    {
-        return $this->expires->isSameDay($date);
-    }
-}

app/Prevention/Enums/Prevention.php

@@ -2,6 +2,8 @@
 
 namespace App\Prevention\Enums;
 
+use App\Member\Member;
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
 enum Prevention

app/Prevention/Mails/PreventionRememberMail.php

@@ -25,7 +25,7 @@ class PreventionRememberMail extends Mailable
     {
         $this->settings = app(InvoiceSettings::class);
         $this->bodyText = $this->bodyText
-            ->replaceWithList('wanted', collect($preventable->preventions())->map(fn($prevention) => $prevention->type->text())->toArray());
+            ->replaceWithList('wanted', collect($preventable->preventions())->map(fn ($prevention) => $prevention->text())->toArray());
     }
 
     /**
@@ -48,7 +48,7 @@ class PreventionRememberMail extends Mailable
     public function content()
     {
         return new Content(
-            markdown: 'mail.prevention.prevention-remember-participant',
+            markdown: $this->preventable->preventableLayout(),
         );
     }
 

app/Prevention/Mails/YearlyMail.php

@@ -5,14 +5,13 @@ namespace App\Prevention\Mails;
 use App\Invoice\InvoiceSettings;
 use App\Lib\Editor\EditorData;
 use App\Prevention\Contracts\Preventable;
-use App\Prevention\Data\PreventionData;
+use App\Prevention\Contracts\YearlyPreventable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Collection;
 
 class YearlyMail extends Mailable
 {
@@ -22,14 +21,12 @@ class YearlyMail extends Mailable
 
     /**
      * Create a new message instance.
-     *
-     * @param Collection<int, PreventionData> $preventions
      */
-    public function __construct(public Preventable $preventable, public EditorData $bodyText, public Collection $preventions)
+    public function __construct(public YearlyPreventable $preventable, public EditorData $bodyText)
     {
         $this->settings = app(InvoiceSettings::class);
         $this->bodyText = $this->bodyText
-            ->replaceWithList('wanted', collect($preventions)->pluck('type')->map(fn($prevention) => $prevention->text())->toArray());
+            ->replaceWithList('wanted', collect($preventable->preventions())->map(fn($prevention) => $prevention->text())->toArray());
     }
 
     /**
@@ -52,7 +49,7 @@ class YearlyMail extends Mailable
     public function content()
     {
         return new Content(
-            markdown: 'mail.prevention.prevention-remember-participant',
+            markdown: $this->preventable->preventableLayout(),
         );
     }
 

app/Prevention/PreventionSettings.php

@@ -10,7 +10,6 @@ class PreventionSettings extends LocalSettings
 
     public EditorData $formmail;
     public EditorData $yearlymail;
-    public int $weeks;
 
     public static function group(): string
     {

database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php

@@ -7,6 +7,5 @@ return new class extends SettingsMigration
     public function up(): void
     {
         $this->migrator->add('prevention.yearlymail', ['time' => 1, 'blocks' => [], 'version' => '1.0']);
-        $this->migrator->add('prevention.weeks', 8);
     }
 };

docker-compose.yml

@@ -91,6 +91,8 @@ services:
             - ./data/db:/var/lib/mysql
 
     socketi:
+        ports:
+            - '6001:6001'
         image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
         environment:
             SOKETI_DEFAULT_APP_ID: adremaid
@@ -103,6 +105,8 @@ services:
             - ./data/redis:/data
 
     meilisearch:
+        ports:
+            - '7700:7700'
         image: getmeili/meilisearch:v1.6
         volumes:
             - ./data/meilisearch:/meili_data

resources/js/components/page/Filter.vue

@@ -1,47 +1,19 @@
 <template>
-    <ui-popup v-if="visible === true" heading="Filtern" @close="visible = false">
+    <page-filter-sidebar v-if="visible === true" @close="visible = false">
-        <div class="grid gap-3 md:grid-cols-2">
         <slot name="fields"></slot>
-        </div>
+    </page-filter-sidebar>
-    </ui-popup>
+    <div class="px-6 py-2 border-b border-gray-600 items-center space-x-3">
-    <div class="px-6 py-2 border-b border-gray-600" :class="visibleDesktopBlock">
-        <div class="flex items-end space-x-3">
-            <slot name="buttons"></slot>
-            <ui-icon-button v-if="filterable" icon="filter" @click="filterVisible = !filterVisible">Filtern</ui-icon-button>
-        </div>
-        <ui-box v-if="filterVisible" class="mt-3">
-            <div class="grid grid-cols-4 gap-3 items-end">
-                <slot name="fields"></slot>
-                <ui-icon-button class="col-start-1" icon="close" @click="filterVisible = false">Schließen</ui-icon-button>
-            </div>
-        </ui-box>
-    </div>
-    <div class="px-6 py-2 border-b border-gray-600 items-center space-x-3" :class="visibleMobile">
         <div class="flex flex-col sm:flex-row items-stretch sm:items-end space-y-1 sm:space-y-0 sm:space-x-3">
             <slot name="buttons"></slot>
-            <ui-icon-button v-if="filterable" icon="filter" @click="visible = true">Filtern</ui-icon-button>
+            <ui-icon-button v-if="!!$slots.fields" icon="filter" @click="visible = true">Filtern</ui-icon-button>
         </div>
     </div>
 </template>
 
 <script setup>
-import {defineProps, ref} from 'vue';
+import {ref} from 'vue';
-import useBreakpoints from '../../composables/useBreakpoints.js';
+
+defineEmits(['close']);
 
 const visible = ref(false);
-
-const filterVisible = ref(false);
-
-const props = defineProps({
-    breakpoint: {
-        type: String,
-        required: true,
-    },
-    filterable: {
-        type: Boolean,
-        default: () => true,
-    },
-});
-
-const {visibleDesktopBlock, visibleMobile} = useBreakpoints(props);
 </script>

resources/js/components/page/FilterSidebar.vue

@@ -0,0 +1,16 @@
+<template>
+    <ui-sidebar :max="0" @close="$emit('close')">
+        <page-header title="Filtern" @close="$emit('close')"></page-header>
+        <div class="grid gap-6 p-6">
+            <slot></slot>
+        </div>
+    </ui-sidebar>
+</template>
+
+<script setup>
+import {ref} from 'vue';
+
+const visible = ref(false);
+
+defineEmits(['close']);
+</script>

resources/js/components/ui/Sidebar.vue

@@ -1,6 +1,5 @@
 <template>
-    <div
+    <div class="fixed shadow-2xl bg-gray-600 right-0 top-0 h-full flex flex-col group is-bright" :class="widths[max]">
-        class="fixed w-full w-[80vw] max-w-[40rem] shadow-2xl bg-gray-600 right-0 top-0 h-full flex flex-col group is-bright">
         <suspense>
             <slot></slot>
 
@@ -18,4 +17,20 @@
 
 <script setup>
 defineEmits(['close']);
+
+const widths = {
+    40: 'w-full w-[80vw] max-w-[40rem]',
+    30: 'w-full w-[80vw] max-w-[30rem]',
+    20: 'w-full w-[80vw] max-w-[20rem]',
+    10: 'w-full w-[80vw] max-w-[10rem]',
+    0: '',
+};
+
+defineProps({
+    max: {
+        default: () => 40,
+        type: Number,
+        required: false,
+    },
+});
 </script>

resources/js/components/ui/Tabs.vue

@@ -1,9 +1,15 @@
 <template>
-    <div class="flex-none w-maxc flex flex-col justify-between border-b-2 group-[.is-popup]:border-zinc-500 mb-3">
+    <div class="flex-none w-maxc flex flex-col justify-between border-b-2 border-gray-500 group-[.is-popup]:border-zinc-500 mb-3">
         <div class="flex space-x-1 px-2">
-            <a v-for="(item, index) in entries" :key="index" href="#" class="rounded-t-lg py-1 px-3 text-zinc-300"
+            <a
-                :class="index === modelValue ? `group-[.is-popup]:bg-zinc-600` : ''" @click.prevent="openMenu(index)"
+                v-for="(item, index) in entries"
-                v-text="item.title"></a>
+                :key="index"
+                href="#"
+                class="rounded-t-lg py-1 px-3 text-zinc-300"
+                :class="index === modelValue ? `bg-gray-700 group-[.is-popup]:bg-zinc-600` : ''"
+                @click.prevent="openMenu(index)"
+                v-text="item.title"
+            ></a>
         </div>
     </div>
 </template>

resources/js/composables/useBreakpoints.js

@@ -1,46 +0,0 @@
-import {computed} from 'vue';
-
-export default function (props) {
-    const visibleMobile = computed(() => {
-        return {
-            sm: 'flex sm:hidden',
-            md: 'flex md:hidden',
-            lg: 'flex lg:hidden',
-            xl: 'flex xl:hidden',
-        }[props.breakpoint];
-    });
-
-    const visibleDesktop = computed(() => {
-        return {
-            sm: 'hidden sm:flex',
-            md: 'hidden md:flex',
-            lg: 'hidden lg:flex',
-            xl: 'hidden xl:flex',
-        }[props.breakpoint];
-    });
-
-    const visibleMobileBlock = computed(() => {
-        return {
-            sm: 'block sm:hidden',
-            md: 'block md:hidden',
-            lg: 'block lg:hidden',
-            xl: 'block xl:hidden',
-        }[props.breakpoint];
-    });
-
-    const visibleDesktopBlock = computed(() => {
-        return {
-            sm: 'hidden sm:block',
-            md: 'hidden md:block',
-            lg: 'hidden lg:block',
-            xl: 'hidden xl:block',
-        }[props.breakpoint];
-    });
-
-    return {
-        visibleMobile,
-        visibleDesktop,
-        visibleDesktopBlock,
-        visibleMobileBlock,
-    };
-}

resources/js/views/form/Index.vue

@@ -144,7 +144,7 @@
             <conditions-form id="filesettings" :single="single" :value="fileSettingPopup.properties.conditions" @save="saveFileConditions"> </conditions-form>
         </ui-popup>
 
-        <page-filter breakpoint="xl" :filterable="false">
+        <page-filter>
             <template #buttons>
                 <f-text id="search" :model-value="getFilter('search')" label="Suchen …" size="sm" @update:model-value="setFilter('search', $event)"></f-text>
                 <f-switch id="past" :model-value="getFilter('past')" label="vergangene zeigen" name="past" size="sm" @update:model-value="setFilter('past', $event)"></f-switch>

resources/js/views/form/Participants.vue

@@ -21,7 +21,7 @@
                 </div>
             </div>
         </ui-popup>
-        <page-filter breakpoint="lg">
+        <page-filter>
             <template #buttons>
                 <f-text id="search" v-model="innerFilter.search" name="search" label="Suchen" size="sm"></f-text>
                 <ui-icon-button icon="plus" @click="editing = {participant: null, preview: JSON.stringify(meta.form_config)}">Hinzufügen</ui-icon-button>

resources/js/views/invoice/Index.vue

@@ -72,7 +72,7 @@
                 </section>
             </form>
         </ui-popup>
-        <page-filter breakpoint="xl" :filterable="false">
+        <page-filter>
             <template #buttons>
                 <f-text id="search" :model-value="getFilter('search')" label="Suchen …" size="sm" @update:model-value="setFilter('search', $event)"></f-text>
                 <f-multipleselect

resources/js/views/member/Filter.vue

@@ -0,0 +1,3 @@
+<template></template>
+
+<script setup></script>

resources/js/views/member/VIndex.vue

@@ -37,53 +37,14 @@
                 <span class="hidden xl:inline">Anwenden</span>
             </button>
         </ui-popup>
-        <page-filter breakpoint="xl">
+
+        <page-filter>
             <template #fields>
-                <f-switch
+                <f-switch v-show="hasModule('bill')" id="ausstand" name="ausstand" v-model="filter.ausstand" label="Nur Ausstände" size="sm"></f-switch>
-                    v-show="hasModule('bill')"
+                <f-select id="has_vk" name="has_vk" v-model="filter.has_vk" label="Verhaltenskodex unterschrieben" size="sm" :options="meta.boolean_filter"></f-select>
-                    id="ausstand"
+                <f-select id="has_svk" name="has_svk" v-model="filter.has_svk" label="SVK unterschrieben" size="sm" :options="meta.boolean_filter"></f-select>
-                    name="ausstand"
+                <f-multipleselect id="group_ids" :options="meta.groups" v-model="filter.group_ids" label="Gruppierungen" size="sm"></f-multipleselect>
-                    :model-value="getFilter('ausstand')"
+                <f-select v-show="hasModule('bill')" id="billKinds" name="billKinds" :options="meta.billKinds" v-model="filter.bill_kind" label="Rechnung" size="sm"></f-select>
-                    label="Nur Ausstände"
-                    size="sm"
-                    @update:model-value="setFilter('ausstand', $event)"
-                ></f-switch>
-                <f-select
-                    id="has_vk"
-                    name="has_vk"
-                    :model-value="getFilter('has_vk')"
-                    label="Verhaltenskodex unterschrieben"
-                    size="sm"
-                    :options="meta.boolean_filter"
-                    @update:model-value="setFilter('has_vk', $event)"
-                ></f-select>
-                <f-select
-                    id="has_svk"
-                    name="has_svk"
-                    :model-value="getFilter('has_svk')"
-                    label="SVK unterschrieben"
-                    size="sm"
-                    :options="meta.boolean_filter"
-                    @update:model-value="setFilter('has_svk', $event)"
-                ></f-select>
-                <f-multipleselect
-                    id="group_ids"
-                    :options="meta.groups"
-                    :model-value="getFilter('group_ids')"
-                    label="Gruppierungen"
-                    size="sm"
-                    @update:model-value="setFilter('group_ids', $event)"
-                ></f-multipleselect>
-                <f-select
-                    v-show="hasModule('bill')"
-                    id="billKinds"
-                    name="billKinds"
-                    :options="meta.billKinds"
-                    :model-value="getFilter('bill_kind')"
-                    label="Rechnung"
-                    size="sm"
-                    @update:model-value="setFilter('bill_kind', $event)"
-                ></f-select>
                 <button class="btn btn-primary label mr-2" @click.prevent="membershipFilters = getFilter('memberships')">
                     <ui-sprite class="w-3 h-3 xl:mr-2" src="filter"></ui-sprite>
                     <span class="hidden xl:inline">Mitgliedschaften</span>
@@ -174,6 +135,11 @@ const single = ref(null);
 const deleting = ref(null);
 const membershipFilters = ref(null);
 
+var filter = ref({
+    ausstand: false,
+});
+
+
 const props = defineProps(indexProps);
 var { router, data, meta, getFilter, setFilter, filterString, reloadPage } = useIndex(props.data, 'member');
 

resources/js/views/setting/Prevention.vue

@@ -3,24 +3,31 @@
         <template #right>
             <f-save-button form="preventionform"></f-save-button>
         </template>
+
         <setting-layout v-if="loaded">
             <form id="preventionform" class="grow p-6" @submit.prevent="submit">
                 <div class="col-span-full text-gray-100 mb-3">
                     <p class="text-sm">Hier kannst du Einstellungen zu Prävention setzen.</p>
                 </div>
-                <div class="grid gap-4 mt-2">
+                <ui-tabs v-model="active" class="mt-2" :entries="tabs"></ui-tabs>
-                    <f-editor id="frommail" v-model="data.formmail" label="E-Mail für Veranstaltungs-TN"></f-editor>
+                <f-editor v-if="active === 0" id="formmail" v-model="data.formmail" label="E-Mail für Veranstaltungs-TN"></f-editor>
-                </div>
+                <f-editor v-if="active === 1" id="yearlymail" v-model="data.yearlymail" label="Jährliche Präventions-Erinnerung"></f-editor>
             </form>
         </setting-layout>
     </page-layout>
 </template>
 
 <script lang="js" setup>
-import { ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useApiIndex } from '../../composables/useApiIndex.js';
 import SettingLayout from '../setting/Layout.vue';
 
+const tabs = [
+    { title: 'für Veranstaltungen' },
+    { title: 'Jährlich' },
+];
+const active = ref(0);
+
 const { axios, data, reload } = useApiIndex('/api/prevention', 'prevention');
 const loaded = ref(false);
 

resources/views/mail/prevention/prevention-remember-participant.blade.php

@@ -1,5 +1,5 @@
 @component('mail::message')
-# Hallo {{ $preventable->getMailRecipient()->name }},
+# Hallo {{ $preventable->member->fullname }},
 
 <x-mail-view::editor :content="$bodyText->toArray()['blocks']"></x-mail-view::editor>
 

tests/Feature/Member/PreventionTest.php

@@ -13,13 +13,15 @@ use App\Lib\Editor\Condition;
 use App\Prevention\Mails\PreventionRememberMail;
 use App\Member\Member;
 use App\Member\Membership;
-use App\Prevention\Actions\YearlyRememberAction;
 use App\Prevention\Mails\YearlyMail;
 use App\Prevention\PreventionSettings;
+use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\Lib\CreatesFormFields;
 use Tests\RequestFactories\EditorRequestFactory;
+use Tests\TestCase;
 
 uses(DatabaseTransactions::class);
 uses(CreatesFormFields::class);
@@ -48,11 +50,6 @@ function createMember(array $attributes): Member
 }
 
 dataset('attributes', fn() => [
-    [
-        ['has_vk' => false, 'efz' => null, 'ps_at' => null],
-        [Prevention::EFZ, Prevention::VK, Prevention::PS]
-    ],
-
     [
         ['has_vk' => true, 'efz' => null, 'ps_at' => now()],
         [Prevention::EFZ]
@@ -183,7 +180,7 @@ it('testItDoesntRememberWhenParticipantDoesntHaveMember', function () {
     $this->assertNull($participant->fresh()->last_remembered_at);
 });
 
-it('doesnt remember non leaders', function () {
+it('testItRemembersNonLeaders', function () {
     Mail::fake();
     $form = createForm();
     $participant = createParticipant($form);
@@ -195,7 +192,7 @@ it('doesnt remember non leaders', function () {
 });
 
 
-it('remembers event participant', function ($attrs, $preventions) {
+it('testItRemembersMember', function ($attrs, $preventions) {
     Mail::fake();
     $form = createForm();
     $participant = createParticipant($form);
@@ -204,7 +201,7 @@ it('remembers event participant', function ($attrs, $preventions) {
     PreventionRememberAction::run();
 
     if (count($preventions)) {
-        Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->preventable->preventions()->pluck('type')->toArray() === $preventions);
+        Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->preventable->preventions() === $preventions);
         $this->assertNotNull($participant->fresh()->last_remembered_at);
     } else {
         Mail::assertNotSent(PreventionRememberMail::class);
@@ -212,49 +209,6 @@ it('remembers event participant', function ($attrs, $preventions) {
     }
 })->with('attributes');
 
-it('sets due date in mail when not now', function () {
-    Mail::fake();
-    $form = createForm();
-    $form->update(['from' => now()->addMonths(8)]);
-    $participant = createParticipant($form);
-    $participant->member->update(['efz' =>  now()->subYears(5)->addMonth(), 'ps_at' => now(), 'has_vk' => true]);
-
-    PreventionRememberAction::run();
-
-    Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->preventable->preventions()->first()->expires->isSameDay(now()->addMonth()));
-});
-
-it('notices a few weeks before', function ($date, bool $shouldSend) {
-    Mail::fake();
-    app(PreventionSettings::class)->fill(['weeks' => 2])->save();
-    createMember(['efz' => $date, 'ps_at' => now(), 'has_vk' => true]);
-
-    YearlyRememberAction::run();
-
-    $shouldSend
-        ? Mail::assertSent(YearlyMail::class, fn($mail) => $mail->preventions->first()->expires->isSameDay(now()->addWeeks(2)))
-        : Mail::assertNotSent(YearlyMail::class);
-})->with([
-    [fn() => now()->subYears(5)->addWeeks(2), true],
-    [fn() => now()->subYears(5)->addWeeks(2)->addDay(), false],
-    [fn() => now()->subYears(5)->addWeeks(2)->subDay(), false],
-]);
-
-it('remembers members yearly', function ($date, $shouldSend) {
-    Mail::fake();
-    createMember(['efz' => $date, 'ps_at' => now(), 'has_vk' => true]);
-
-    YearlyRememberAction::run();
-
-    $shouldSend
-        ? Mail::assertSent(YearlyMail::class, fn($mail) => $mail->preventions->first()->expires->isSameDay(now()))
-        : Mail::assertNotSent(YearlyMail::class);
-})->with([
-    [fn() => now()->subYears(5), true],
-    [fn() => now()->subYears(5)->addDay(), false],
-    [fn() => now()->subYears(5)->subDay(), false],
-]);
-
 it('testItDoesntRememberParticipantThatHasNoMail', function () {
     Mail::fake();
     $form = createForm();
@@ -266,6 +220,16 @@ it('testItDoesntRememberParticipantThatHasNoMail', function () {
     Mail::assertNotSent(PreventionRememberMail::class);
 });
 
+it('testItRendersMail', function () {
+    InvoiceSettings::fake(['from_long' => 'Stamm Beispiel']);
+    $form = createForm();
+    $participant = createParticipant($form);
+    (new PreventionRememberMail($participant, app(PreventionSettings::class)->formmail))
+        ->assertSeeInText($participant->member->firstname)
+        ->assertSeeInText($participant->member->lastname)
+        ->assertSeeInText('Stamm Beispiel');
+});
+
 it('testItRendersSetttingMail', function () {
     Mail::fake();
     app(PreventionSettings::class)->fill([
@@ -315,8 +279,7 @@ it('testItDoesntAppendTextTwice', function () {
     Mail::assertSent(PreventionRememberMail::class, fn($mail) => $mail->bodyText->hasAll(['oberhausen']) && !$mail->bodyText->hasAll(['siegburg']));
 });
 
-/* ----------------------------------------- Mail contents ----------------------------------------- */
+it('testItDisplaysBodyTextInMail', function () {
-it('displays body text in prevention remember mail', function () {
     $form = createForm();
     $participant = createParticipant($form);
 
@@ -324,21 +287,8 @@ it('displays body text in prevention remember mail', function () {
     $mail->assertSeeInText('ggtt');
 });
 
-it('renders prevention mail for events with group name', function () {
+it('displays text in yearly mail', function () {
-    InvoiceSettings::fake(['from_long' => 'Stamm Beispiel']);
-    $form = createForm();
-    $participant = createParticipant($form);
-    (new PreventionRememberMail($participant, app(PreventionSettings::class)->formmail, collect([])))
-        ->assertSeeInText('Max')
-        ->assertSeeInText('Muster')
-        ->assertSeeInText('Stamm Beispiel');
-});
-
-it('renders yearly mail', function () {
-    InvoiceSettings::fake(['from_long' => 'Stamm Beispiel']);
     $member = createMember([]);
-    $mail = new YearlyMail($member, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData(), collect([]));
+    $mail = new YearlyMail($member, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData());
-    $mail
+    $mail->assertSeeInText('ggtt');
-        ->assertSeeInText('ggtt')
-        ->assertSeeInText('Stamm Beispiel');
 });

tests/Feature/Prevention/SettingTest.php

@@ -9,7 +9,6 @@ use Tests\RequestFactories\EditorRequestFactory;
 uses(DatabaseTransactions::class);
 
 it('testItOpensSettingsPage', function () {
-    test()->withoutExceptionHandling();
     test()->login()->loginNami();
 
     test()->get('/setting/prevention')->assertComponent('setting/Prevention')->assertOk();