From bdc42fe629f464d659ebeec75c65936510785512 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 28 Feb 2021 19:33:12 +0100
Subject: [PATCH] [Week view] Get weekday not from for loop, but from real date
---
.../alsijil/templates/alsijil/class_register/week_view.html | 2 +-
aleksis/apps/alsijil/views.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index 92f92a2b2..1f2531a89 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -79,7 +79,7 @@
</div>
<div class="col s12" id="week-overview">
{% for weekday, objects in regrouped_objects.items %}
- {% with weekdays|get_dict:forloop.counter0 as advanced_weekday %}
+ {% with weekdays|get_dict:objects.0.weekday as advanced_weekday %}
{% if advanced_weekday.holiday and not request.site.preferences.alsijil__allow_entries_in_holidays %}
<div class="card">
<div class="card-content">
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index b2378f891..4d3d63d46 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -497,6 +497,7 @@ def week_view(
regrouped_objects = {}
for register_object in list(lesson_periods) + list(extra_lessons):
+ register_object.weekday = register_object.period.weekday
regrouped_objects.setdefault(register_object.period.weekday, [])
regrouped_objects[register_object.period.weekday].append(register_object)
@@ -508,6 +509,7 @@ def week_view(
# Make a copy in order to keep the annotation only on this weekday
event_copy = deepcopy(event)
event_copy.annotate_day(wanted_week[weekday])
+ event_copy.weekday = weekday
regrouped_objects.setdefault(weekday, [])
regrouped_objects[weekday].append(event_copy)
--
GitLab