Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 12 Pull requests Projects Releases 18 Packages Wiki Activity Actions

patches v1.3.6 #78

Merged
jkeffects merged 4 commits from develop into main 2025-04-10 10:47:10 +00:00
Conversation 0 Commits 4 Files changed 6 +20 -8
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7aa0db3684 - Show all commits

2
src/components/admin/club/newsletter/NewsletterMailProgressModal.vue
View file

@ -19,7 +19,7 @@
<div class="flex flex-row justify-end"> <div class="flex flex-row justify-end">
<div class="flex flex-row gap-4 py-2"> <div class="flex flex-row gap-4 py-2">
<button primary-outline @click="closeModal">abbrechen</button> <button primary-outline @click="closeModal">schließen</button>
</div> </div>
</div> </div>
</div> </div>

2
src/components/admin/club/newsletter/NewsletterPrintingProgressModal.vue
View file

@ -19,7 +19,7 @@
<div class="flex flex-row justify-end"> <div class="flex flex-row justify-end">
<div class="flex flex-row gap-4 py-2"> <div class="flex flex-row gap-4 py-2">
<button primary-outline @click="closeModal">abbrechen</button> <button primary-outline @click="closeModal">schließen</button>
</div> </div>
</div> </div>
</div> </div>

4
src/stores/admin/club/newsletter/newsletterPrintout.ts
View file

@ -124,7 +124,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
chunk.split("//").forEach((r) => { chunk.split("//").forEach((r) => {
if (r.trim() != "") { if (r.trim() != "") {
let data = JSON.parse(r); let data = JSON.parse(r);
this.pdfSourceMessages.push(data); this.pdfSourceMessages.unshift(data);
let type: NotificationType = "info"; let type: NotificationType = "info";
let timeout = undefined; let timeout = undefined;
if (data.factor == "failed") { if (data.factor == "failed") {
@ -146,7 +146,7 @@ export const useNewsletterPrintoutStore = defineStore("newsletterPrintout", {
chunk.split("//").forEach((r) => { chunk.split("//").forEach((r) => {
if (r.trim() != "") { if (r.trim() != "") {
let data = JSON.parse(r); let data = JSON.parse(r);
this.mailSourceMessages.push(data); this.mailSourceMessages.unshift(data);
let type: NotificationType = "info"; let type: NotificationType = "info";
let timeout = undefined; let timeout = undefined;
if (data.factor == "failed") { if (data.factor == "failed") {

20
src/views/admin/club/newsletter/NewsletterPrintout.vue
View file

@ -27,7 +27,7 @@
primary primary
class="!w-fit whitespace-nowrap flex flex-row gap-2" class="!w-fit whitespace-nowrap flex flex-row gap-2"
:disabled="printing != undefined" :disabled="printing != undefined"
@click="createNewsletterPrintout" @click="openPdfCommit"
> >
Newsletter drucken Newsletter drucken
<Spinner v-if="printing == 'loading'" class="my-auto" /> <Spinner v-if="printing == 'loading'" class="my-auto" />
@ -39,7 +39,7 @@
primary primary
class="!w-fit whitespace-nowrap flex flex-row gap-2" class="!w-fit whitespace-nowrap flex flex-row gap-2"
:disabled="sending != undefined" :disabled="sending != undefined"
@click="createNewsletterSend" @click="openMailCommit"
> >
Mails versenden Mails versenden
<Spinner v-if="sending == 'loading'" class="my-auto" /> <Spinner v-if="sending == 'loading'" class="my-auto" />
@ -108,10 +108,8 @@ export default defineComponent({
...mapActions(useModalStore, ["openModal"]), ...mapActions(useModalStore, ["openModal"]),
...mapActions(useNewsletterPrintoutStore, [ ...mapActions(useNewsletterPrintoutStore, [
"fetchNewsletterPrintout", "fetchNewsletterPrintout",
"createNewsletterPrintout",
"fetchNewsletterPrintoutById", "fetchNewsletterPrintoutById",
"createNewsletterMailPreview", "createNewsletterMailPreview",
"createNewsletterSend",
]), ]),
openPdfShow(filename?: string) { openPdfShow(filename?: string) {
this.openModal( this.openModal(
@ -132,6 +130,20 @@ export default defineComponent({
}) })
.catch(() => {}); .catch(() => {});
}, },
openPdfCommit() {
this.openModal(
markRaw(
defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterPrintingRecipientsModal.vue"))
)
);
},
openMailCommit() {
this.openModal(
markRaw(
defineAsyncComponent(() => import("@/components/admin/club/newsletter/NewsletterMailRecipientsModal.vue"))
)
);
},
openPdfLogs() { openPdfLogs() {
this.openModal( this.openModal(
markRaw( markRaw(