From 6d8b86280c8362718897cb12446cc603f1015f41 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 30 Sep 2025 14:46:34 +0200 Subject: [PATCH] changed e-mail formatting to direct url at actual notified shipcall --- src/server/BreCal/msg/msg_types.json | 7 ------- src/server/BreCal/services/schedule_routines.py | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/server/BreCal/msg/msg_types.json b/src/server/BreCal/msg/msg_types.json index 9664605..4398615 100644 --- a/src/server/BreCal/msg/msg_types.json +++ b/src/server/BreCal/msg/msg_types.json @@ -3,49 +3,42 @@ "type" : 1, "color" : "#0867ec", "name" : "assignment", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Nominierung" }, { "type" : 2, "color" : "#ea5c00", "name" : "next24h", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Morgenrunde relevant" }, { "type" : 3, "color" : "#f34336", "name" : "time_conflict", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Zeitlicher Konflikt" }, { "type" : 4, "color" : "#28b532", "name" : "time_conflict_resolved", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Zeitlicher Konflikt gelöst" }, { "type" : 5, "color" : "#a8a8a8", "name" : "unassigned", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Nominierung abgewählt" }, { "type" : 6, "color" : "#a8a800", "name" : "missing_data", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Fehlende Daten" }, { "type" : 7, "color" : "#808070", "name" : "cancelled", - "link" : "https://www.bremen-calling.de/", "msg_text" : "Storno" } ] \ No newline at end of file diff --git a/src/server/BreCal/services/schedule_routines.py b/src/server/BreCal/services/schedule_routines.py index a86bbe3..8851444 100644 --- a/src/server/BreCal/services/schedule_routines.py +++ b/src/server/BreCal/services/schedule_routines.py @@ -135,7 +135,8 @@ def SendEmails(email_dict): with open(os.path.join(current_path,'../msg/notification_element.html'), mode="r", encoding="utf-8") as file: element = file.read() element = element.replace("[[color]]", message_type["color"]) - element = element.replace("[[link]]", message_type["link"]) + linktext = defs.email_credentials["url_template"] + str(notification.shipcall_id) + element = element.replace("[[link]]", linktext) # We want to show the following information for each notification: # Ship-name, Arr/Dep/Shift, ETA/ETD, berth