Skip to content
Snippets Groups Projects
Verified Commit 948bc4d1 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Add functionality to show announcements in substitution views

parent e96156dd
No related branches found
No related tags found
1 merge request!41Show announcements in timetable views
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="col s12 m6 l8"> <div class="col s12 m6 l8">
{% include "chronos/partials/headerbox.html" %} {% include "chronos/partials/headerbox.html" %}
{# {% include "chronos/hintsinsub.html" %}#} {% include "core/announcements.html" with announcements=announcements show_recipients=1 %}
</div> </div>
<div class="col s12 m6 l4 no-padding"> <div class="col s12 m6 l4 no-padding">
{% include "chronos/partials/datepicker.html" %} {% include "chronos/partials/datepicker.html" %}
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{% for day, c in days.items %} {% for day, c in days.items %}
<h4>{% trans "Substitutions" %} {{ c.day|date:"l" }} {{ c.day }}</h4> <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 %} {% include "chronos/partials/headerbox.html" with affected_teachers=c.affected_teachers affected_groups=c.affected_groups print=1 %}
......
...@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _ ...@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from aleksis.core.decorators import admin_required 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 aleksis.core.util import messages
from .forms import LessonSubstitutionForm from .forms import LessonSubstitutionForm
from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room from .models import LessonPeriod, LessonSubstitution, TimePeriod, Room
...@@ -306,6 +306,8 @@ def substitutions( ...@@ -306,6 +306,8 @@ def substitutions(
subs = LessonSubstitution.objects.on_day(day).order_by("lesson_period__lesson__groups", "lesson_period__period") subs = LessonSubstitution.objects.on_day(day).order_by("lesson_period__lesson__groups", "lesson_period__period")
day_contexts[day]["substitutions"] = subs 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: if config.CHRONOS_SUBSTITUTIONS_SHOW_HEADER_BOX:
day_contexts[day]["affected_teachers"] = subs.affected_teachers() day_contexts[day]["affected_teachers"] = subs.affected_teachers()
day_contexts[day]["affected_groups"] = subs.affected_groups() day_contexts[day]["affected_groups"] = subs.affected_groups()
......
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