From 58c0f55c7cb407e55a1240c193d7a46e42669750 Mon Sep 17 00:00:00 2001
From: klaas <klaas@boergmann.it>
Date: Tue, 1 Oct 2024 21:56:09 +0200
Subject: [PATCH] Trainingstag aus .env

---
 .env_default | 4 +++-
 app.js       | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.env_default b/.env_default
index ba41e86..b56b477 100644
--- a/.env_default
+++ b/.env_default
@@ -6,4 +6,6 @@ MAILFROM=
 MAILPASS=
 PORT=2000
 TELEBOT=
-TELECHAT=
\ No newline at end of file
+TELECHAT=
+HOST=
+WEEKDAY=4
\ No newline at end of file
diff --git a/app.js b/app.js
index e39e1f5..3151cb2 100644
--- a/app.js
+++ b/app.js
@@ -157,11 +157,12 @@ const addNewSpiel = async (spielName) => {
   }
 };
 
-function getThursdayOfWeek(week, year) {
+function getdayOfWeek(week, year) {
+  const weekday = parseInt(process.env.WEEKDAY, 10);
   const firstDayOfYear = new Date(year, 0, 1);
   const dayOfWeek = firstDayOfYear.getDay();
   const daysUntilFirstThursday =
-    dayOfWeek <= 4 ? 4 - dayOfWeek : 11 - dayOfWeek;
+    dayOfWeek <= weekday ? weekday - dayOfWeek : 11 - dayOfWeek;
   const daysUntilThursdayOfWeek = (week - 1) * 7 + daysUntilFirstThursday;
   const thursdayOfWeek = new Date(year, 0, 1 + daysUntilThursdayOfWeek);
   return thursdayOfWeek;
@@ -677,7 +678,7 @@ app.get("/training", requireAuth, async (req, res) => {
     );
     const trainingsDates = trainingsResult.rows.map((tr) => ({
       kw: tr.kw,
-      datum: formatDate(getThursdayOfWeek(tr.kw, tr.jahr)),
+      datum: formatDate(getdayOfWeek(tr.kw, tr.jahr)),
     }));
 
     // Vorheriges Training ermitteln
@@ -737,7 +738,7 @@ ORDER BY r.riegennummer, t.geburtsdatum ASC;
     });
 
     if (training) {
-      training.datum = getThursdayOfWeek(training.kw, training.jahr);
+      training.datum = getdayOfWeek(training.kw, training.jahr);
     }
 
     const aufwaermleiterCandidates = await getCandidatesForAufwaermleiter();