diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html index 4e6f6ee60f35763a438d0bbc82153f7e236abf16..40e7ce2ff15b4502c1edf92981b6ca3a43d1de18 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html @@ -16,80 +16,82 @@ </thead> <tbody> {% for day, documentations in group.documentations_by_day.items %} - <tr class=" - {% if doc.amends %} - {% if doc.amends.cancelled %} - lesson-cancelled + {% for doc in documentations %} + <tr class=" + {% if doc.amends %} + {% if doc.amends.cancelled %} + lesson-cancelled + {% endif %} + {% if doc.amends.amends %} + lesson-substituted + {% endif %} {% endif %} - {% if doc.amends.amends %} - lesson-substituted + {% if forloop.first %} + lessons-day-first {% endif %} + "> + {% if forloop.first %} + <!-- TODO: There is no lessons-day-head class --> + <th rowspan="{{ documentations|length }}" class="lessons-day-head">{{ day|date:"D" }}</th> + {% endif %} + <td class="lesson-pe"> + {% if doc.amends %} + {% if doc.amends.slot_number_start == doc.amends.slot_number_ends %} + {{ doc.amends.slot_number_start }}. + {% else %} + {{ doc.amends.slot_number_start }}.–{{ doc.amends.slot_number_end }}. {% endif %} - {% if forloop.first %} - lessons-day-first - {% endif %} - "> - {% if forloop.first %} - <!-- TODO: There is no lessons-day-head class --> - <th rowspan="{{ documentations|length }}" class="lessons-day-head">{{ day|date:"D" }}</th> - {% endif %} - <td class="lesson-pe"> - {% if doc.amends %} - {% if doc.amends.slot_number_start == doc.amends.slot_number_ends %} - {{ doc.amends.slot_number_start }}. {% else %} - {{ doc.amends.slot_number_start }}.–{{ doc.amends.slot_number_end }}. - {% endif %} - {% else %} - {{ doc.datetime_start|time:"H:i" }}-{{ doc.datetime_end|time:"H:i" }} - {% endif %} - </td> - <td class="lesson-subj"> - {% include "chronos/partials/subject.html" with subject=doc.subject %} - </td> - <td class="lesson-topic"> - {{ doc.topic }} - </td> - <td class="lesson-homework">{{ doc.homework }}</td> - <td class="lesson-notes"> - {{ documentation.group_note }} - {% for participation in doc.notable_participations %} - {% if participation.absence_reason %} - <span class="lesson-note-absent"> - {{ participation.person.short_name }} - <span style="color: {{ participation.absence_reason.colour }};"> - ({{ participation.absence_reason.short_name }}) - </span> - </span> + {{ doc.datetime_start|time:"H:i" }}-{{ doc.datetime_end|time:"H:i" }} {% endif %} - {% if participation.tardiness %} - <span class="lesson-note-late"> - {{ participation.person.short_name }} - ({{ participation.tardiness }}′) - </span> - {% endif %} - {% for personal_note in doc.personal_notes.all %} - {% if personal_note.extra_mark %} - <span> - {{ personal_note.person.short_name }} - ({{ personal_note.extra_mark.short_name }}) + </td> + <td class="lesson-subj"> + {% include "chronos/partials/subject.html" with subject=doc.subject %} + </td> + <td class="lesson-topic"> + {{ doc.topic }} + </td> + <td class="lesson-homework">{{ doc.homework }}</td> + <td class="lesson-notes"> + {{ documentation.group_note }} + {% for participation in doc.notable_participations %} + {% if participation.absence_reason %} + <span class="lesson-note-absent"> + {{ participation.person.short_name }} + <span style="color: {{ participation.absence_reason.colour }};"> + ({{ participation.absence_reason.short_name }}) + </span> </span> {% endif %} - {% if personal_note.note %} - <span> - {{ personal_note.person.short_name }} - ({{ personal_note.note }}) + {% if participation.tardiness %} + <span class="lesson-note-late"> + {{ participation.person.short_name }} + ({{ participation.tardiness }}′) </span> {% endif %} + {% for personal_note in doc.personal_notes.all %} + {% if personal_note.extra_mark %} + <span> + {{ personal_note.person.short_name }} + ({{ personal_note.extra_mark.short_name }}) + </span> + {% endif %} + {% if personal_note.note %} + <span> + {{ personal_note.person.short_name }} + ({{ personal_note.note }}) + </span> + {% endif %} + {% endfor %} {% endfor %} - {% endfor %} - </td> - <td class="lesson-te"> - {% if documentation.topic %} - {{ doc.teachers.get_teachers_short_names|join:', ' }} - {% endif %} - </td> - </tr> + </td> + <td class="lesson-te"> + {% if documentation.topic %} + {{ doc.teachers.get_teachers_short_names|join:', ' }} + {% endif %} + </td> + </tr> + {% endfor %} {% endfor %} </tbody> </table>