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

Merge branch 'fix/school-term-validity-range-in-full-register-print-out' into 'master'

Show validity range and school term correctly in full register printout

See merge request !66
parents 2e023399 26901d9e
No related branches found
No related tags found
1 merge request!66Show validity range and school term correctly in full register printout
Pipeline #3059 passed
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
<div class="center-align"> <div class="center-align">
<h1>{% trans 'Class register' %}</h1> <h1>{% trans 'Class register' %}</h1>
<h5>{{ school_term }}</h5>
<p>({{ school_term.date_start }}–{{ school_term.date_end }})</p>
{% static "img/aleksis-banner.svg" as aleksis_banner %} {% static "img/aleksis-banner.svg" as aleksis_banner %}
<img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}"
alt="{{ request.site.preferences.general__title }} – Logo" class="max-size-600 center"> alt="{{ request.site.preferences.general__title }} – Logo" class="max-size-600 center">
...@@ -117,8 +119,8 @@ ...@@ -117,8 +119,8 @@
<tr> <tr>
<td>{{ lesson.subject.name }}</td> <td>{{ lesson.subject.name }}</td>
<td>{{ lesson.teachers.all|join:', ' }}</td> <td>{{ lesson.teachers.all|join:', ' }}</td>
<td>{{ lesson.date_start }}</td> <td>{{ lesson.validity.date_start }}</td>
<td>{{ lesson.date_end }}</td> <td>{{ lesson.validity.date_end }}</td>
<td>{{ lesson.lesson_periods.count }}</td> <td>{{ lesson.lesson_periods.count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
...@@ -150,8 +152,8 @@ ...@@ -150,8 +152,8 @@
<td>{{ child_group.name }}</td> <td>{{ child_group.name }}</td>
<td>{{ lesson.subject.name }}</td> <td>{{ lesson.subject.name }}</td>
<td>{{ lesson.teachers.all|join:', ' }}</td> <td>{{ lesson.teachers.all|join:', ' }}</td>
<td>{{ lesson.date_start }}</td> <td>{{ lesson.validity.date_start }}</td>
<td>{{ lesson.date_end }}</td> <td>{{ lesson.validity.date_end }}</td>
<td>{{ lesson.lesson_periods.count }}</td> <td>{{ lesson.lesson_periods.count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
......
...@@ -346,6 +346,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -346,6 +346,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
} }
) )
context["school_term"] = current_school_term
context["persons"] = persons context["persons"] = persons
context["personal_note_filters"] = personal_note_filters context["personal_note_filters"] = personal_note_filters
context["group"] = group context["group"] = group
......
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