From 8f2ac50fe9b3bbe298ea2517b3e0eb5b6398a7ad Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Fri, 10 Jul 2020 12:32:12 +0200
Subject: [PATCH] Fix lesson status icon to show cancelled icon at first
---
.../alsijil/partials/lesson_status_icon.html | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
index 08746b5c9..57b71b661 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/lesson_status_icon.html
@@ -8,17 +8,13 @@
{% period_to_time_start week period.period as time_start %}
{% period_to_time_end week period.period as time_end %}
- {% if now_dt > time_end %}
+ {% if period.get_substitution.cancelled %}
+ <i class="material-icons red-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Lesson cancelled" %}" title="{% trans "Lesson cancelled" %}">cancel</i>
+ {% elif now_dt > time_end %}
<i class="material-icons red-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Missing data" %}" title="{% trans "Missing data" %}">history</i>
{% elif now_dt > time_start and now_dt < time_end %}
<i class="material-icons orange-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Pending" %}" title="{% trans "Pending" %}">more_horiz</i>
- {% else %}
- {% if period.get_substitution %}
- {% if period.get_substitution.cancelled %}
- <i class="material-icons red-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Lesson cancelled" %}" title="{% trans "Lesson cancelled" %}">cancel</i>
- {% else %}
- <i class="material-icons orange-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Substitution" %}" title="{% trans "Substitution" %}">update</i>
- {% endif %}
- {% endif %}
+ {% elif period.get_substitution %}
+ <i class="material-icons orange-text tooltipped {{ css_class }}" data-position="bottom" data-tooltip="{% trans "Substitution" %}" title="{% trans "Substitution" %}">update</i>
{% endif %}
{% endif %}
--
GitLab