fix: string replacement on all occurances

This commit is contained in:
Julian Krauser 2025-04-10 08:07:11 +02:00
parent 8c333b1b89
commit a660642bbb
4 changed files with 17 additions and 13 deletions

View file

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

View file

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