From afa7462317249a4a9c6a805ac25c9e1588f05c2a Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 17 Mar 2020 15:36:43 +0100
Subject: [PATCH] Show announcements in weekly timetable views (SMART PLAN)
Closes "SMART PLAN" on #63
---
aleksis/apps/chronos/templates/chronos/timetable.html | 2 +-
aleksis/apps/chronos/views.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/aleksis/apps/chronos/templates/chronos/timetable.html b/aleksis/apps/chronos/templates/chronos/timetable.html
index 4fa91ac6..4605d70b 100644
--- a/aleksis/apps/chronos/templates/chronos/timetable.html
+++ b/aleksis/apps/chronos/templates/chronos/timetable.html
@@ -113,7 +113,7 @@
{% endif %}
</div>
- {# {% include "chronos/hintsinplan.html" %}#}
+ {% include "core/announcements.html" with announcements=announcements show_interval=1 %}
{# show full timetable on tablets, laptops and pcs #}
<div class="timetable-plan hide-on-small-and-down">
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index fe7d1f2c..ddbd1aac 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -168,6 +168,11 @@ def timetable(
"dest": reverse("timetable", args=[type_, pk])
}
+ if is_smart:
+ start = wanted_week[TimePeriod.weekday_min]
+ stop = wanted_week[TimePeriod.weekday_max]
+ context["announcements"] = Announcement.for_timetables().relevant_for(el).in_days(start, stop)
+
week_prev = wanted_week - 1
week_next = wanted_week + 1
--
GitLab