From 3b08daf4113ca123ba3b6a1ba2ebe60943fa1dbf Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 11 Jan 2020 15:03:58 +0100
Subject: [PATCH] Change variables in lesson.html and refactor
---
aleksis/apps/chronos/models.py | 8 +++
.../chronos/templates/chronos/groups.html | 5 ++
.../chronos/templates/chronos/lesson.html | 62 ++++++++++---------
3 files changed, 47 insertions(+), 28 deletions(-)
create mode 100644 aleksis/apps/chronos/templates/chronos/groups.html
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index cc2451f7..8db0a7cf 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -333,6 +333,14 @@ class LessonSubstitution(models.Model):
if self.subject and self.cancelled:
raise ValidationError(_("Lessons can only be either substituted or cancelled."))
+ @property
+ def color(self):
+ if self.cancelled:
+ return "green"
+ # Add cases for purple and blue (events and supervisements)
+ else:
+ return "black"
+
class Meta:
unique_together = [["lesson_period", "week"]]
ordering = [
diff --git a/aleksis/apps/chronos/templates/chronos/groups.html b/aleksis/apps/chronos/templates/chronos/groups.html
new file mode 100644
index 00000000..4548c39d
--- /dev/null
+++ b/aleksis/apps/chronos/templates/chronos/groups.html
@@ -0,0 +1,5 @@
+{% for group in groups %}
+ <a href="{% url "timetable" "group" group.pk %}">
+ {{ group.short_name }}
+ </a>
+{% endfor %}
diff --git a/aleksis/apps/chronos/templates/chronos/lesson.html b/aleksis/apps/chronos/templates/chronos/lesson.html
index 9e54f526..a794932b 100644
--- a/aleksis/apps/chronos/templates/chronos/lesson.html
+++ b/aleksis/apps/chronos/templates/chronos/lesson.html
@@ -21,14 +21,19 @@
{# Add CSS class for sub when it's a sub #}
class="
+
+
+
+
+
{% if lesson_period.get_substitution %}{% if lesson_period.substitution.table.is_event %}lesson-with-event{% else %}lesson-with-sub{% endif %}{% endif %}"
>
<p>
{% if lesson_period.is_hol %}
{# Do nothing #}
- {% elif lesson_period.substitution %}
+ {% elif lesson_period.get_substitution %}
{# SUBSTITUTION #}
- {% if type == 1 and lesson_period.is_old %}
+ {% if type == "room" and lesson_period.is_old %}
{# When it's the old room, let it empty #}
{% elif lesson_period.substitution.table.badge %}
@@ -54,21 +59,21 @@
{% else %}
{# Display sub #}
- {% with sub=lesson_period.substitution.table %}
+ {% with sub=lesson_period.get_substitution %}
{# Teacher or room > display classes #}
- {% if type == 0 or type == 1 %}
- {{ lesson_period.substitution.table.classes }}
+ {% if type == "teacher" or type == "room" %}
+ {% include "chronos/groups.html" with groups=lesson_period.lesson.groups.all %}
{% endif %}
{# Display teacher with tooltip #}
- {% include "timetable/subs/teacher.html" %}
+ {% include "chronos/subs/teacher.html" %}
{# Display subject #}
- {% include "timetable/subs/subject.html" %}
+ {% include "chronos/subs/subject.html" %}
{# Teacher or class > display room #}
- {% if type == 0 or type == 2 %}
- {% include "timetable/subs/room.html" %}
+ {% if type == "teacher" or type == "group" %}
+ {% include "chronos/subs/room.html" %}
{% endif %}
{% endwith %}
{% endif %}
@@ -102,40 +107,41 @@
{# Normal plan #}
{# Teacher or room > Display classes #}
- {% if type == 0 or type == 1 %}
+ {% if type == "teacher" or type == "room" %}
{# {{ element_container.element.classes }}#}
- {% if lesson_period.element.classes %}
- <a href="{% url "timetable_smart_plan" "class" lesson_period.element.classes.0.id %}">
- {{ lesson_period.classes_formatted }}
- </a>
+ {% if lesson_period.lesson.groups %}
+ {% include "chronos/groups.html" with groups=lesson_period.lesson.groups.all %}
{% endif %}
{% endif %}
{# Class or room > Display teacher #}
- {% if type == 2 or type == 1 %}
- {% if lesson_period.element.teacher %}
+ {% if type == "room" or type == "group" %}
+ {% for teacher in lesson_period.lesson.teachers.all %}
<span data-position="bottom" class="tooltipped"
- data-tooltip="{{ lesson_period.element.teacher }}">
- <a href="{% url "timetable_smart_plan" "teacher" lesson_period.element.teacher.id %}">
- {{ lesson_period.element.teacher.shortcode }}
+ data-tooltip="{{ teacher }}">
+ <a href="{% url "timetable" "teacher" teacher.pk %}">
+ {{ teacher.short_name }}
</a>
</span>
- {% endif %}
+ {% endfor %}
{% endif %}
{# Display subject #}
- <strong>{{ lesson_period.element.subject.shortcode }}</strong>
+ <strong>
+ <span data-position="bottom" class="tooltipped"
+ data-tooltip="{{ lesson_period.lesson.subject.name }}">{{ lesson_period.lesson.subject.abbrev }}</span>
+ </strong>
{# Teacher or class > Display room #}
- {% if type == 0 or type == 2 %}
- <span class="tooltipped" data-position="bottom"
- data-tooltip="{{ lesson_period.room.name }}">
- {% if lesson_period.room %}
- <a href="{% url "timetable_smart_plan" "room" lesson_period.room.id %}">
- {{ lesson_period.room.shortcode }}
+ {% if type == "teacher" or type == "group" %}
+ {% if lesson_period.room %}
+ <span class="tooltipped" data-position="bottom"
+ data-tooltip="{{ lesson_period.room.name }}">
+ <a href="{% url "timetable" "room" lesson_period.room.pk %}">
+ {{ lesson_period.room.short_name }}
</a>
- {% endif %}
</span>
+ {% endif %}
{% endif %}
{% endif %}
</p>
--
GitLab