src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue

@@ -3,13 +3,13 @@
     <div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
       <p>Newsletter bei Type "{{ comType.type }}" versenden/exportieren als</p>
       <div v-if="can('create', 'configuration', 'newsletter_config')" class="flex flex-row justify-end w-16">
-        <button v-if="status == null" type="submit" class="p-0! h-fit! w-fit!" title="speichern">
+        <button v-if="status == null" type="submit" class="p-0! h-fit! w-fit!" title="Änderung speichern">
           <ArchiveBoxArrowDownIcon class="w-5 h-5 p-1 box-content pointer-events-none" />
         </button>
         <Spinner v-else-if="status == 'loading'" class="my-auto" />
         <SuccessCheckmark v-else-if="status?.status == 'success'" />
         <FailureXMark v-else-if="status?.status == 'failed'" />
-        <button type="button" class="p-0! h-fit! w-fit!" title="zurücksetzen" @click="resetForm">
+        <button type="button" class="p-0! h-fit! w-fit!" title="Änderung zurücksetzen" @click="resetForm">
           <ArchiveBoxXMarkIcon class="w-5 h-5 p-1 box-content pointer-events-none" />
         </button>
       </div>
@@ -36,7 +36,7 @@ import Spinner from "@/components/Spinner.vue";
 import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
 import FailureXMark from "@/components/FailureXMark.vue";
 import { useModalStore } from "@/stores/modal";
-import { NewsletterConfigType } from "@/enums/newsletterConfigType";
+import { NewsletterConfigEnum } from "@/enums/newsletterConfigEnum";
 import type { AxiosResponse } from "axios";
 import type { CommunicationTypeViewModel } from "@/viewmodels/admin/configuration/communicationType.models";
 import { useAbilityStore } from "@/stores/ability";
@@ -62,7 +62,7 @@ export default defineComponent({
     },
   },
   mounted() {
-    this.configs = Object.values(NewsletterConfigType);
+    this.configs = Object.values(NewsletterConfigEnum);
   },
   beforeUnmount() {
     try {

src/enums/newsletterConfigEnum.ts

@@ -0,0 +1,5 @@
+export enum NewsletterConfigEnum {
+  pdf = "pdf",
+  mail = "mail",
+  none = "none",
+}

src/enums/newsletterConfigType.ts

@@ -1,4 +0,0 @@
-export enum NewsletterConfigType {
-  pdf = "pdf",
-  mail = "mail",
-}

src/stores/admin/configuration/newsletterConfig.ts

@@ -6,7 +6,7 @@ import type {
 import { http } from "@/serverCom";
 import type { AxiosResponse } from "axios";
 
-export const useNewsletterConfigStore = defineStore("newsletterConfi", {
+export const useNewsletterConfigStore = defineStore("newsletterConfig", {
   state: () => {
     return {
       config: [] as Array<NewsletterConfigViewModel>,

src/viewmodels/admin/configuration/newsletterConfig.models.ts

@@ -1,13 +1,13 @@
-import type { NewsletterConfigType } from "@/enums/newsletterConfigType";
+import type { NewsletterConfigEnum } from "@/enums/newsletterConfigEnum";
 import type { CommunicationTypeViewModel } from "./communicationType.models";
 
 export interface NewsletterConfigViewModel {
   comTypeId: number;
-  config: NewsletterConfigType;
+  config: NewsletterConfigEnum;
   comType: CommunicationTypeViewModel;
 }
 
 export interface SetNewsletterConfigViewModel {
   comTypeId: number;
-  config: NewsletterConfigType;
+  config: NewsletterConfigEnum;
 }

src/views/admin/club/newsletter/NewsletterRecipients.vue

@@ -4,6 +4,7 @@
     <p v-else-if="loading == 'failed'" @click="fetchNewsletterRecipients" class="cursor-pointer">
       &#8634; laden fehlgeschlagen
     </p>
+
     <div v-if="!showMemberSelect" class="flex flex-row gap-2 items-center">
       <select v-model="recipientsByQueryId">
         <option value="def">Optional</option>
@@ -24,6 +25,7 @@
         <ArchiveBoxIcon class="w-7 h-7 cursor-pointer" />
       </div>
     </div>
+
     <p v-if="!showMemberSelect">Empfänger durch gespeicherte Abfrage</p>
     <p v-else>Ausgewählte Empfänger</p>
 
@@ -33,7 +35,7 @@
         :key="member.id"
         class="flex flex-row gap-2 h-fit w-full border border-primary rounded-md bg-primary p-2 text-white items-center"
       >
-        <ExclamationTriangleIcon v-if="member.sendNewsletter?.type.type == null" class="w-7 h-7" />
+        <ExclamationTriangleIcon v-if="member.sendNewsletter == null" class="w-7 h-7" />
 
         <div class="grow">
           <p>{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}</p>
@@ -130,14 +132,14 @@ export default defineComponent({
     },
     showRecipientsByMode() {
       return (this.showMemberSelect ? this.selected : this.queried).sort((a, b) => {
-        const aHasConfig = a.sendNewsletter?.type.type != null;
-        const bHasConfig = b.sendNewsletter?.type.type != null;
+        const aHasConfig = a.sendNewsletter != null;
+        const bHasConfig = b.sendNewsletter != null;
         if (aHasConfig === bHasConfig) return 0;
         return aHasConfig ? -1 : 1;
       });
     },
     countOfNoConfig() {
-      return this.showRecipientsByMode.filter((member) => member.sendNewsletter?.type.type == null).length;
+      return this.showRecipientsByMode.filter((member) => member.sendNewsletter == null).length;
     },
     recipientsByQueryId: {
       get() {