Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 14 Pull requests Projects Releases 24 Packages Wiki Activity Actions

patches v1.3.11 #83

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

4
src/controller/admin/club/newsletterController.ts
View file

@ -94,7 +94,7 @@ export async function getNewsletterPrintoutsById(req: Request, res: Response): P
let newsletter = await NewsletterService.getById(newsletterId); let newsletter = await NewsletterService.getById(newsletterId);
let filesInFolder = FileSystemHelper.getFilesInDirectory( let filesInFolder = FileSystemHelper.getFilesInDirectory(
`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}` `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`
); );
res.json(filesInFolder); res.json(filesInFolder);
@ -114,7 +114,7 @@ export async function getNewsletterPrintoutByIdAndPrint(req: Request, res: Respo
let filepath = FileSystemHelper.formatPath( let filepath = FileSystemHelper.formatPath(
"newsletter", "newsletter",
`${newsletter.id}_${newsletter.title.replace(" ", "")}`, `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
filename filename
); );

2
src/controller/admin/club/protocolController.ts
View file

@ -235,7 +235,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
year: "numeric", year: "numeric",
})}`; })}`;
let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replace( let filename = `${new Date().toISOString().split("T")[0]}_${iteration + 1}_Protokoll_${protocol.title.replaceAll(
/[^a-zA-Z0-9]/g, /[^a-zA-Z0-9]/g,
"" ""
)}`; )}`;

18
src/helpers/newsletterHelper.ts
View file

@ -191,13 +191,17 @@ export abstract class NewsletterHelper {
public static getICSFilePath(newsletter: newsletter) { public static getICSFilePath(newsletter: newsletter) {
return FileSystemHelper.formatPath( return FileSystemHelper.formatPath(
"newsletter", "newsletter",
`${newsletter.id}_${newsletter.title.replace(" ", "")}`, `${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
`events.ics` `events.ics`
); );
} }
public static saveIcsToFile(newsletter: newsletter, ics: string) { public static saveIcsToFile(newsletter: newsletter, ics: string) {
FileSystemHelper.writeFile(`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, "events.ics", ics); FileSystemHelper.writeFile(
`newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
"events.ics",
ics
);
} }
public static async sendMails(newsletterId: number) { public static async sendMails(newsletterId: number) {
@ -264,7 +268,7 @@ export abstract class NewsletterHelper {
let config = await NewsletterConfigService.getAll(); let config = await NewsletterConfigService.getAll();
FileSystemHelper.clearDirectoryByFiletype( FileSystemHelper.clearDirectoryByFiletype(
`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
".pdf" ".pdf"
); );
@ -284,8 +288,8 @@ export abstract class NewsletterHelper {
await PdfExport.renderFile({ await PdfExport.renderFile({
template: "newsletter", template: "newsletter",
title: `Newsletter von ${CLUB_NAME}`, title: `Newsletter von ${CLUB_NAME}`,
filename: `${rec.lastname}_${rec.firstname}_${rec.id}`.replace(" ", "-"), filename: `${rec.lastname}_${rec.firstname}_${rec.id}`.replaceAll(" ", "-"),
folder: `newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, folder: `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
data: data, data: data,
}) })
.then(() => { .then(() => {
@ -313,9 +317,9 @@ export abstract class NewsletterHelper {
} }
await PdfExport.sqashToSingleFile( await PdfExport.sqashToSingleFile(
`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}`, `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`,
"allPdfsTogether", "allPdfsTogether",
`newsletter/${newsletter.id}_${newsletter.title.replace(" ", "")}` `newsletter/${newsletter.id}_${newsletter.title.replaceAll(" ", "")}`
) )
.then(() => { .then(() => {
this.formatJobEmit( this.formatJobEmit(

6
src/helpers/templateHelper.ts
View file

@ -27,9 +27,9 @@ export abstract class TemplateHelper {
} }
static normalizeTemplate(template: string): string { static normalizeTemplate(template: string): string {
template = template.replace(/<listend>.*?<\/listend>/g, "{{/each}}"); template = template.replaceAll(/<listend>.*?<\/listend>/g, "{{/each}}");
template = template.replace(/<liststart\b[^>]*>(WDH Start: )?/g, "{{#each "); template = template.replaceAll(/<liststart\b[^>]*>(WDH Start: )?/g, "{{#each ");
template = template.replace(/<\/liststart>/g, "}}"); template = template.replaceAll(/<\/liststart>/g, "}}");
return template; return template;
} }