diff --git a/src/components/admin/club/newsletter/CreateNewsletterModal.vue b/src/components/admin/club/newsletter/CreateNewsletterModal.vue index 40da0c4..8a09764 100644 --- a/src/components/admin/club/newsletter/CreateNewsletterModal.vue +++ b/src/components/admin/club/newsletter/CreateNewsletterModal.vue @@ -63,11 +63,12 @@ export default defineComponent({ }; this.status = "loading"; this.createNewsletter(createNewsletter) - .then(() => { + .then((res) => { this.status = { status: "success" }; this.timeout = setTimeout(() => { (this.$refs.form as HTMLFormElement).reset(); this.closeModal(); + this.$router.push({ name: "admin-club-newsletter-overview", params: { newsletterId: res.data } }); }, 1500); }) .catch(() => { diff --git a/src/components/admin/club/newsletter/NewsletterListItem.vue b/src/components/admin/club/newsletter/NewsletterListItem.vue index 04a334f..41ab550 100644 --- a/src/components/admin/club/newsletter/NewsletterListItem.vue +++ b/src/components/admin/club/newsletter/NewsletterListItem.vue @@ -4,7 +4,15 @@ :to="{ name: 'admin-club-newsletter-overview', params: { newsletterId: newsletter.id } }" class="bg-primary p-2 text-white flex flex-row justify-between items-center" > -

{{ newsletter.title }}

+

+ {{ newsletter.title }} ({{ + new Date(newsletter.createdAt).toLocaleDateString("de-DE", { + day: "2-digit", + month: "2-digit", + year: "numeric", + }) + }}) +

diff --git a/src/components/admin/club/protocol/CreateProtocolModal.vue b/src/components/admin/club/protocol/CreateProtocolModal.vue index efa2e50..21331dd 100644 --- a/src/components/admin/club/protocol/CreateProtocolModal.vue +++ b/src/components/admin/club/protocol/CreateProtocolModal.vue @@ -66,11 +66,12 @@ export default defineComponent({ }; this.status = "loading"; this.createProtocol(createProtocol) - .then(() => { + .then((res) => { this.status = { status: "success" }; this.timeout = setTimeout(() => { (this.$refs.form as HTMLFormElement).reset(); this.closeModal(); + this.$router.push({ name: "admin-club-protocol-overview", params: { protocolId: res.data } }); }, 1500); }) .catch(() => { diff --git a/src/stores/admin/club/newsletter/newsletter.ts b/src/stores/admin/club/newsletter/newsletter.ts index 9a7a536..a0dbd31 100644 --- a/src/stores/admin/club/newsletter/newsletter.ts +++ b/src/stores/admin/club/newsletter/newsletter.ts @@ -1,11 +1,10 @@ import { defineStore } from "pinia"; -import type { CreateNewsletterViewModel, SyncNewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models"; +import type { CreateNewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models"; import { http } from "@/serverCom"; import type { AxiosResponse } from "axios"; import type { NewsletterViewModel } from "@/viewmodels/admin/club/newsletter/newsletter.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; -import difference from "lodash.difference"; export const useNewsletterStore = defineStore("newsletter", { state: () => { @@ -72,7 +71,6 @@ export const useNewsletterStore = defineStore("newsletter", { const result = await http.post(`/admin/newsletter`, { title: newsletter.title, }); - this.fetchNewsletters(); return result; }, async synchronizeActiveNewsletter(): Promise { diff --git a/src/stores/admin/club/protocol/protocol.ts b/src/stores/admin/club/protocol/protocol.ts index fb1fad0..387272a 100644 --- a/src/stores/admin/club/protocol/protocol.ts +++ b/src/stores/admin/club/protocol/protocol.ts @@ -1,11 +1,10 @@ import { defineStore } from "pinia"; -import type { CreateProtocolViewModel, SyncProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models"; +import type { CreateProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models"; import { http } from "@/serverCom"; import type { AxiosResponse } from "axios"; import type { ProtocolViewModel } from "@/viewmodels/admin/club/protocol/protocol.models"; import cloneDeep from "lodash.clonedeep"; import isEqual from "lodash.isequal"; -import difference from "lodash.difference"; export const useProtocolStore = defineStore("protocol", { state: () => { @@ -73,7 +72,6 @@ export const useProtocolStore = defineStore("protocol", { title: protocol.title, date: protocol.date, }); - this.fetchProtocols(); return result; }, async synchronizeActiveProtocol(): Promise { diff --git a/src/viewmodels/admin/club/newsletter/newsletter.models.ts b/src/viewmodels/admin/club/newsletter/newsletter.models.ts index 84d2988..0516ca0 100644 --- a/src/viewmodels/admin/club/newsletter/newsletter.models.ts +++ b/src/viewmodels/admin/club/newsletter/newsletter.models.ts @@ -7,6 +7,7 @@ export interface NewsletterViewModel { newsletterSignatur: string; isSent: boolean; recipientsByQueryId?: string | null; + createdAt: Date; } export interface CreateNewsletterViewModel {