Skip to content
Snippets Groups Projects

Resolve "Full register printout doesn't load in time"

Merged Resolve "Full register printout doesn't load in time"
129-full-register-printout-doesn-t-load-in-time into master
Merged Jonathan Weth requested to merge 129-full-register-printout-doesn-t-load-in-time into master
Compare
and
4 files
+ 86
− 70
Compare changes
  • Side-by-side
  • Inline
Files
4
aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+ 36
− 38
@@ -180,7 +180,7 @@
<div class="page-break">&nbsp;</div>
{% if group.lessons.all %}
{% if lessons %}
<h4>{% trans 'Teachers and lessons in group' %} {{ group.name }}</h4>
<table id="lessons">
@@ -210,7 +210,7 @@
{% endif %}
{% if group.child_groups.all %}
{% if child_groups %}
<h4>{% trans 'Teachers and lessons in child groups' %}</h4>
<table id="lessons">
@@ -427,7 +427,7 @@
<tbody>
{% for day in week %}
{% with register_objects_by_day|get_dict:day as register_objects %}
{% for register_object, documentations, notes, substitution in register_objects %}
{% for register_object, documentation, notes, substitution in register_objects %}
<tr class="
{% if substitution %}
{% if substitution.cancelled %}
@@ -461,47 +461,45 @@
</td>
<td class="lesson-topic">
{% if register_object.label_ == "event" %}
{{ register_object.title }}: {{ documentations.0.topic }}
{{ register_object.title }}: {{ documentation.topic }}
{% elif substitution.cancelled %}
{% trans 'Lesson cancelled' %}
{% else %}
{{ documentations.0.topic }}
{{ documentation.topic }}
{% endif %}
</td>
<td class="lesson-homework">{{ documentations.0.homework }}</td>
<td class="lesson-homework">{{ documentation.homework }}</td>
<td class="lesson-notes">
{{ documentations.0.group_note }}
{{ documentation.group_note }}
{% for note in notes %}
{% if group in note.groups_of_person.all %}
{% if note.absent %}
<span class="lesson-note-absent">
{{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
{% if note.excused %}
<span class="lesson-note-excused">
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
</span>
{% endif %}
</span>
{% endif %}
{% if note.late %}
<span class="lesson-note-late">
{{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
({{ note.late }}′)
{% if note.excused %}
<span class="lesson-note-excused">
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
</span>
{% endif %}
</span>
{% endif %}
{% if note.absent %}
<span class="lesson-note-absent">
{{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
{% if note.excused %}
<span class="lesson-note-excused">
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
</span>
{% endif %}
</span>
{% endif %}
{% if note.late %}
<span class="lesson-note-late">
{{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
({{ note.late }}′)
{% if note.excused %}
<span class="lesson-note-excused">
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
</span>
{% endif %}
</span>
{% endif %}
{% for extra_mark in note.extra_marks.all %}
<span>
@@ -512,7 +510,7 @@
{% endfor %}
</td>
<td class="lesson-te">
{% if documentations.0.topic %}
{% if documentation.topic %}
{{ register_object.get_teachers.first.short_name }}
{% endif %}
</td>