diff --git a/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue b/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
index da19c83..a4e7842 100644
--- a/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
+++ b/src/components/admin/configuration/newsletterConfig/NewsletterConfigListItem.vue
@@ -3,13 +3,13 @@
Newsletter bei Type "{{ comType.type }}" versenden/exportieren als
@@ -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 {
diff --git a/src/enums/newsletterConfigEnum.ts b/src/enums/newsletterConfigEnum.ts
new file mode 100644
index 0000000..1e7313f
--- /dev/null
+++ b/src/enums/newsletterConfigEnum.ts
@@ -0,0 +1,5 @@
+export enum NewsletterConfigEnum {
+ pdf = "pdf",
+ mail = "mail",
+ none = "none",
+}
diff --git a/src/enums/newsletterConfigType.ts b/src/enums/newsletterConfigType.ts
deleted file mode 100644
index 4703494..0000000
--- a/src/enums/newsletterConfigType.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum NewsletterConfigType {
- pdf = "pdf",
- mail = "mail",
-}
diff --git a/src/stores/admin/configuration/newsletterConfig.ts b/src/stores/admin/configuration/newsletterConfig.ts
index 3bb12be..eef3687 100644
--- a/src/stores/admin/configuration/newsletterConfig.ts
+++ b/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
,
diff --git a/src/viewmodels/admin/configuration/newsletterConfig.models.ts b/src/viewmodels/admin/configuration/newsletterConfig.models.ts
index 6d8be6f..a5a0684 100644
--- a/src/viewmodels/admin/configuration/newsletterConfig.models.ts
+++ b/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;
}
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index c71df25..dac8ed7 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -4,6 +4,7 @@
↺ laden fehlgeschlagen
+
+
{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}
@@ -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() {