Skip to content
Snippets Groups Projects
Commit c4e64c53 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

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 !138
parents 2f79cae3 032db270
No related branches found
No related tags found
1 merge request!138Resolve "[Week view] Get holidays by actual weekday and not by for loop counter"
Pipeline #5629 passed
......@@ -75,7 +75,7 @@
<div class="col s12" id="week-overview">
{% regroup lesson_periods by period.get_weekday_display as periods_by_day %}
{% for weekday, periods in periods_by_day %}
{% with weekdays|get_dict:forloop.counter0 as advanced_weekday %}
{% with weekdays|get_dict:periods.0.period.weekday as advanced_weekday %}
{% weekday_to_date week periods.0.period.weekday as current_date %}
{% if advanced_weekday.holiday and not request.site.preferences.alsijil__allow_entries_in_holidays %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment