From 1af576c10cda56faa21abdf2d54323479653062a Mon Sep 17 00:00:00 2001 From: Michael Bauer <michael-bauer@posteo.de> Date: Mon, 4 Nov 2024 11:09:24 +0100 Subject: [PATCH] Show absence_reasons in their colour in rest of coursebook-printout --- .../templates/alsijil/partials/person_overview.html | 8 +++++--- .../alsijil/partials/register_abbreviations.html | 4 ++-- .../alsijil/partials/register_members_table.html | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html b/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html index 8b26683d6..ef78e1713 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html @@ -46,13 +46,13 @@ <td>{{ person.absence_count }}</td> </tr> {% for for absence_reason in absence_reasons %} - <tr> + <tr style="color: {{ absence_reason.colour }};"> <th>{{ absence_reason.name }}</th> <td>{{ person|get_dict:absence_reason.count_label }}</td> </tr> {% endfor %} {% for for absence_reason in absence_reasons_not_counted %} - <tr> + <tr style="color: {{ absence_reason.colour }};"> <th colspan="3">{{ absence_reason.name }}</th> <td>{{ person|get_dict:absence_reason.count_label }}</td> </tr> @@ -99,7 +99,9 @@ {{ participation.documentation.subject.short_name }} </td> <td>{{ participation.note.documentation.get_teachers_short_names|join:', ' }}</td> - <td>{{ participation.absence_reason.short_name }}</td> + <td style="color: {{ absence_reason.colour }};"> + {{ participation.absence_reason.short_name }} + </td> <td>{{ participation.tardiness }}</td> </tr> {% endfor %} diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_abbreviations.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_abbreviations.html index 8ba5dc3e3..91d6f5e22 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/register_abbreviations.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_abbreviations.html @@ -17,7 +17,7 @@ <ul class="collection"> {% for absence_reason in absence_reasons %} - <li class="collection-item"> + <li class="collection-item" style="color: {{ absence_reason.colour }};"> <strong>({{ absence_reason.short_name }})</strong> {{ absence_reason.name }} </li> {% endfor %} @@ -27,7 +27,7 @@ <ul class="collection"> {% for absence_reason in absence_reasons_not_counted %} - <li class="collection-item"> + <li class="collection-item" style="color: {{ absence_reason.colour }};"> <strong>({{ absence_reason.short_name }})</strong> {{ absence_reason.name }} </li> {% endfor %} diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html index 7ca5952ce..549be02d4 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html @@ -10,10 +10,14 @@ <th>{% trans 'Date of birth' %}</th> <th>{% trans '(a)' %}</th> {% for absence_reason in absence_reasons %} - <th>({{ absence_reason.short_name }})</th> + <th style="color: {{ absence_reason.colour }};"> + ({{ absence_reason.short_name }}) + </th> {% endfor %} {% for absence_reason in absence_reasons_not_counted %} - <th>({{ absence_reason.short_name }})</th> + <th style="color: {{ absence_reason.colour }};"> + ({{ absence_reason.short_name }}) + </th> {% endfor %} <th>{% trans '(b)' %}</th> {% for extra_mark in extra_marks %} -- GitLab