Skip to content
Snippets Groups Projects

Resolve "[Full register] Filter personal notes by school term"

Merged Resolve "[Full register] Filter personal notes by school term"
88-ensure-that-full_register-only-counts-personal-notes-in-the-selected-school-term into master
Merged Jonathan Weth requested to merge 88-ensure-that-full_register-only-counts-personal-notes-in-the-selected-school-term into master
Compare
and
2 files
+ 56
− 32
Compare changes
  • Side-by-side
  • Inline
Files
2
aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+ 26
− 24
@@ -310,32 +310,34 @@
<tbody>
{% for note in person.personal_notes.all %}
{% if note.absent or note.late or note.remarks %}
{% period_to_date note.week note.lesson_period.period as note_date %}
<tr>
<td>{{ note_date }}</td>
<td>{{ note.lesson_period.period.period }}</td>
<td>{{ note.lesson_period.get_subject.short_name }} </td>
<td>{{ note.lesson_period.get_teachers.first.short_name }}</td>
<td>
{% if note.absent %}
{% trans 'Yes' %}
{% if note.excused %}
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% if note.lesson_period in lesson_periods or note.lesson_period in lesson_periods %}
{% if note.absent or note.late or note.remarks %}
{% period_to_date note.week note.lesson_period.period as note_date %}
<tr>
<td>{{ note_date }}</td>
<td>{{ note.lesson_period.period.period }}</td>
<td>{{ note.lesson_period.get_subject.short_name }} </td>
<td>{{ note.lesson_period.get_teachers.first.short_name }}</td>
<td>
{% if note.absent %}
{% trans 'Yes' %}
{% if note.excused %}
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
{% endif %}
{% endif %}
{% endif %}
</td>
<td>
{% if note.late %}
{{ note.late }}'
{% endif %}
</td>
<td>{{ note.remarks }}</td>
</tr>
</td>
<td>
{% if note.late %}
{{ note.late }}'
{% endif %}
</td>
<td>{{ note.remarks }}</td>
</tr>
{% endif %}
{% endif %}
{% endfor %}
</tbody>