Show announcements in timetable views

Blocked by AlekSIS!184 (merged)

Closes #63 (closed)

aleksis/apps/chronos/views.py

@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
 from django_tables2 import RequestConfig
 
 from aleksis.core.decorators import admin_required
-from aleksis.core.models import Person, Group
+from aleksis.core.models import Person, Group, Announcement
 from aleksis.core.util import messages
 from .forms import LessonSubstitutionForm
 from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room
@@ -77,6 +77,7 @@ def my_timetable(
         context["day"] = wanted_day
         context["periods"] = TimePeriod.get_times_dict()
         context["smart"] = True
+        context["announcements"] = Announcement.for_timetables().on_date(wanted_day).for_person(person)
 
         context["url_prev"], context["url_next"] = TimePeriod.get_prev_next_by_day(
             wanted_day, "my_timetable_by_date"
@@ -167,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).within_days(start, stop)
+
     week_prev = wanted_week - 1
     week_next = wanted_week + 1
 
@@ -306,6 +312,8 @@ def substitutions(
         subs = LessonSubstitution.objects.on_day(day).order_by("lesson_period__lesson__groups", "lesson_period__period")
         day_contexts[day]["substitutions"] = subs
 
+        day_contexts[day]["announcements"] = Announcement.for_timetables().on_date(day).filter(show_in_timetables=True)
+
         if config.CHRONOS_SUBSTITUTIONS_SHOW_HEADER_BOX:
             day_contexts[day]["affected_teachers"] = subs.affected_teachers()
             day_contexts[day]["affected_groups"] = subs.affected_groups()