From 948bc4d1c50929fe1424d55d927c301ce128b634 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 11 Mar 2020 16:20:56 +0100
Subject: [PATCH] Add functionality to show announcements in substitution views
---
aleksis/apps/chronos/templates/chronos/substitutions.html | 2 +-
.../apps/chronos/templates/chronos/substitutions_print.html | 2 +-
aleksis/apps/chronos/views.py | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index 0dc5e242..febc6aeb 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -28,7 +28,7 @@
<div class="col s12 m6 l8">
{% include "chronos/partials/headerbox.html" %}
- {# {% include "chronos/hintsinsub.html" %}#}
+ {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
</div>
<div class="col s12 m6 l4 no-padding">
{% include "chronos/partials/datepicker.html" %}
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions_print.html b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
index bc041f24..400124f2 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions_print.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions_print.html
@@ -16,7 +16,7 @@
{% for day, c in days.items %}
<h4>{% trans "Substitutions" %} {{ c.day|date:"l" }} {{ c.day }}</h4>
- {# {% include "timetable/hintsinsubprint.html" %}#}
+ {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
{% include "chronos/partials/headerbox.html" with affected_teachers=c.affected_teachers affected_groups=c.affected_groups print=1 %}
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index daad66d7..909268db 100644
--- a/aleksis/apps/chronos/views.py
+++ b/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
@@ -306,6 +306,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().at_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()
--
GitLab