Merge branch...

Merge branch '135-week-view-get-holidays-by-actual-weekday-and-not-by-for-loop-counter' into 'master'

Resolve "[Week view] Get holidays by actual weekday and not by for loop counter"

Closes #135

See merge request !147

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">

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)