From 5187a2dba6b5168112d98c24d987acc8663776dd Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 21 May 2025 10:56:09 +0200
Subject: [PATCH] change: handlebar abstracts for date

---
 .../admin/club/protocolController.ts          |  7 +----
 src/demodata/protocol.data.ts                 |  9 ++----
 src/handlebars.config.ts                      | 29 +++++++++++++++++++
 src/helpers/newsletterHelper.ts               | 26 -----------------
 src/templates/newsletter.body.template.html   |  2 +-
 src/templates/protocol.body.template.html     |  2 +-
 6 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/controller/admin/club/protocolController.ts b/src/controller/admin/club/protocolController.ts
index 02a1bab..4edfd88 100644
--- a/src/controller/admin/club/protocolController.ts
+++ b/src/controller/admin/club/protocolController.ts
@@ -249,12 +249,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
       title: protocol.title,
       summary: protocol.summary,
       iteration: iteration + 1,
-      date: new Date(protocol.date).toLocaleDateString("de-DE", {
-        weekday: "long",
-        day: "2-digit",
-        month: "2-digit",
-        year: "numeric",
-      }),
+      date: protocol.date,
       start: protocol.starttime,
       end: protocol.endtime,
       agenda: agenda.sort((a, b) => a.sort - b.sort),
diff --git a/src/demodata/protocol.data.ts b/src/demodata/protocol.data.ts
index 8d18b2a..437d280 100644
--- a/src/demodata/protocol.data.ts
+++ b/src/demodata/protocol.data.ts
@@ -7,7 +7,7 @@ export const protocolDemoData: {
   title: string;
   summary: string;
   iteration: number;
-  date: string;
+  date: Date;
   start: string;
   end: string;
   agenda: Array<Partial<protocolAgenda>>;
@@ -19,12 +19,7 @@ export const protocolDemoData: {
   title: "Beispiel Protokoll Daten",
   summary: "Zusammenfassung der Demodaten.",
   iteration: 1,
-  date: new Date().toLocaleDateString("de-DE", {
-    weekday: "long",
-    day: "2-digit",
-    month: "2-digit",
-    year: "numeric",
-  }),
+  date: new Date(),
   start: "19:00:00",
   end: "21:00:00",
   agenda: [
diff --git a/src/handlebars.config.ts b/src/handlebars.config.ts
index 2cbded1..19b32ad 100644
--- a/src/handlebars.config.ts
+++ b/src/handlebars.config.ts
@@ -8,6 +8,14 @@ Handlebars.registerHelper("date", function (aString) {
   });
 });
 
+Handlebars.registerHelper("weekdayDayMonth", function (aString) {
+  return new Date(aString).toLocaleDateString("de-DE", {
+    weekday: "long",
+    day: "2-digit",
+    month: "long",
+  });
+});
+
 Handlebars.registerHelper("longdate", function (aString) {
   return new Date(aString).toLocaleDateString("de-DE", {
     weekday: "long",
@@ -27,6 +35,27 @@ Handlebars.registerHelper("datetime", function (aString) {
   });
 });
 
+Handlebars.registerHelper("longdatetime", function (aString) {
+  return new Date(aString).toLocaleDateString("de-DE", {
+    day: "2-digit",
+    month: "long",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+});
+
+Handlebars.registerHelper("longdatetimeWithWeekday", function (aString) {
+  return new Date(aString).toLocaleDateString("de-DE", {
+    weekday: "long",
+    day: "2-digit",
+    month: "long",
+    year: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+});
+
 Handlebars.registerHelper("json", function (context) {
   return JSON.stringify(context);
 });
diff --git a/src/helpers/newsletterHelper.ts b/src/helpers/newsletterHelper.ts
index c09da94..26f9342 100644
--- a/src/helpers/newsletterHelper.ts
+++ b/src/helpers/newsletterHelper.ts
@@ -66,33 +66,7 @@ export abstract class NewsletterHelper {
           title: d.diffTitle || d.calendar.title,
           content: d.diffDescription || d.calendar.content,
           starttime: d.calendar.starttime,
-          formattedStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-          }),
-          formattedFullStarttime: new Date(d.calendar.starttime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-            year: "numeric",
-            hour: "2-digit",
-            minute: "2-digit",
-          }),
           endtime: d.calendar.endtime,
-          formattedEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-          }),
-          formattedFullEndtime: new Date(d.calendar.endtime).toLocaleDateString("de-DE", {
-            weekday: "long",
-            day: "2-digit",
-            month: "long",
-            year: "numeric",
-            hour: "2-digit",
-            minute: "2-digit",
-          }),
           location: d.calendar.location,
         }))
         .sort((a, b) => a.starttime.getTime() - b.starttime.getTime()),
diff --git a/src/templates/newsletter.body.template.html b/src/templates/newsletter.body.template.html
index 01433c0..bae1064 100644
--- a/src/templates/newsletter.body.template.html
+++ b/src/templates/newsletter.body.template.html
@@ -10,7 +10,7 @@
     <br />
     {{#each dates}}
     <div>
-      <h2><b>{{this.formattedStarttime}}: {{this.title}}</b></h2>
+      <h2><b>{{weekdayDayMonth this.starttime}}: {{this.title}}</b></h2>
       <span>{{{this.content}}}</span>
     </div>
     <br />
diff --git a/src/templates/protocol.body.template.html b/src/templates/protocol.body.template.html
index 5a263ff..6b6bbdb 100644
--- a/src/templates/protocol.body.template.html
+++ b/src/templates/protocol.body.template.html
@@ -6,7 +6,7 @@
   </head>
   <body>
     <h1>{{title}}</h1>
-    <p>Am {{date}} von {{start}} Uhr bis {{end}} Uhr</p>
+    <p>Am {{longdate date}} von {{start}} Uhr bis {{end}} Uhr</p>
     <p>Ausdruck Nr {{iteration}}</p>
     <br />
     <p><b>Zusammenfassung:</b></p>