From 9d4dcad941ee5a2e64b3a35b5f93d5bab89efd3c Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sat, 20 Jan 2024 17:14:01 +0100
Subject: [PATCH] Only include existing documentations in coursebook when dates
match
---
aleksis/apps/alsijil/models.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 7f91b90a2..8898ceb23 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -532,8 +532,8 @@ class Documentation(CalendarEvent):
# if so, add the documentation to a list, if not, create a new one
return [
(
- event_reference_obj.documentation.first() # TODO: probably show all documentations
- if (event_reference_obj := event["REFERENCE_OBJ"]).documentation.exists() else
+ existing_documentations.first()
+ if (existing_documentations := (event_reference_obj := event["REFERENCE_OBJ"]).documentation.filter(datetime_start=event["DTSTART"].dt, datetime_end=event["DTEND"].dt)).exists() else
cls(
pk=f"DUMMY:{event_reference_obj.id}",
lesson_event=event_reference_obj,
--
GitLab