From 0258f376e4784a2de59e5a629626ec3106d6dc14 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 14 Feb 2021 17:46:45 +0100
Subject: [PATCH] Remove superfluous endif in full register template (merge
result)
---
.../alsijil/print/full_register.html | 51 +++++++++----------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
index 5772a4208..ca2d801d6 100644
--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
@@ -317,34 +317,33 @@
<tbody>
{% for note in person.filtered_notes %}
- {% if note.absent or note.late or note.remarks or note.extra_marks.all %}
- <tr>
- {% if note.date %}
- <td>{{ note.date }}</td>
- <td>{{ note.register_object.period.period }}</td>
+ {% if note.absent or note.late or note.remarks or note.extra_marks.all %}
+ <tr>
+ {% if note.date %}
+ <td>{{ note.date }}</td>
+ <td>{{ note.register_object.period.period }}</td>
+ {% else %}
+ <td colspan="2">
+ {{ note.register_object.date_start }} {{ note.register_object.period_from.period }}.–{{ note.register_object.date_end }}
+ {{ note.register_object.period_to.period }}.
+ </td>
+ {% endif %}
+ <td>
+ {% if note.register_object.label_ != "event" %}
+ {{ note.register_object.get_subject.short_name }}
{% else %}
- <td colspan="2">
- {{ note.register_object.date_start }} {{ note.register_object.period_from.period }}.–{{ note.register_object.date_end }}
- {{ note.register_object.period_to.period }}.
- </td>
+ {% trans "Event" %}
{% endif %}
- <td>
- {% if note.register_object.label_ != "event" %}
- {{ note.register_object.get_subject.short_name }}
- {% else %}
- {% trans "Event" %}
- {% endif %}
- </td>
- <td>{{ note.register_object.teacher_short_names }}</td>
- <td>
- {% if note.absent %}
- {% trans 'Yes' %}
- {% if note.excused %}
- {% if note.excuse_type %}
- ({{ note.excuse_type.short_name }})
- {% else %}
- ({% trans 'e' %})
- {% endif %}
+ </td>
+ <td>{{ note.register_object.teacher_short_names }}</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 %}
--
GitLab