From b2c7dd1af1b83bf8f3aad2c4e9c07708ac052f1b Mon Sep 17 00:00:00 2001
From: HanseGucker <joniweth@gmx.de>
Date: Mon, 22 Apr 2019 18:53:12 +0200
Subject: [PATCH] Links in sub table
---
schoolapps/static/common/style.css | 2 +-
.../templates/timetable/substitution.html | 41 +++++++++++++------
2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/schoolapps/static/common/style.css b/schoolapps/static/common/style.css
index eda1ba48a..6d8492298 100755
--- a/schoolapps/static/common/style.css
+++ b/schoolapps/static/common/style.css
@@ -199,7 +199,7 @@ table.substitutions td, table.substitutions th {
margin: 0;
}
-.lesson-card a {
+.lesson-card a, .substitutions a {
color: black;
}
diff --git a/schoolapps/timetable/templates/timetable/substitution.html b/schoolapps/timetable/templates/timetable/substitution.html
index 053c55a02..0a23353ff 100755
--- a/schoolapps/timetable/templates/timetable/substitution.html
+++ b/schoolapps/timetable/templates/timetable/substitution.html
@@ -50,27 +50,34 @@
{% if sub.sub.type == 1 %}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.teacher_old.name }}">
-
- <s>{{ sub.sub.teacher_old.shortcode }}</s>
+ <a href="{% url "timetable_smart_plan" "teacher" sub.sub.teacher_old.id %}">
+ <s>{{ sub.sub.teacher_old.shortcode }}</s>
+ </a>
</span>
{% elif sub.sub.teacher_new and sub.sub.teacher_old %}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.teacher_old.name }} → {{ sub.sub.teacher_new.name }}">
-
- <s>{{ sub.sub.teacher_old.shortcode }}</s> →
- <strong>{{ sub.sub.teacher_new.shortcode }}</strong>
+ <a href="{% url "timetable_smart_plan" "teacher" sub.sub.teacher_old.id %}">
+ <s>{{ sub.sub.teacher_old.shortcode }}</s>
+ </a>
+ →
+ <a href="{% url "timetable_smart_plan" "teacher" sub.sub.teacher_new.id %}">
+ <strong>{{ sub.sub.teacher_new.shortcode }}</strong>
+ </a>
</span>
{% elif sub.sub.teacher_new and not sub.sub.teacher_old %}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.teacher_new.name }}">
-
- <strong>{{ sub.sub.teacher_new.shortcode }}</strong>
+ <a href="{% url "timetable_smart_plan" "teacher" sub.sub.teacher_new.id %}">
+ <strong>{{ sub.sub.teacher_new.shortcode }}</strong>
+ </a>
</span>
{% elif sub.sub.teacher_old %}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.teacher_old.name }}">
-
- <strong>{{ sub.sub.teacher_old.shortcode }}</strong>
+ <a href="{% url "timetable_smart_plan" "teacher" sub.sub.teacher_old.id %}">
+ <strong>{{ sub.sub.teacher_old.shortcode }}</strong>
+ </a>
</span>
{% endif %}
{# <span class="tooltipped" data-position="bottom"#}
@@ -102,13 +109,21 @@
{# New and old room available #}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.room_old.name }} → {{ sub.sub.room_new.name }}">
- <s>{{ sub.sub.room_old.shortcode }}</s> → <strong>{{ sub.sub.room_new.shortcode }}</strong>
+ <a href="{% url "timetable_smart_plan" "room" sub.sub.room_old.id %}">
+ <s>{{ sub.sub.room_old.shortcode }}</s>
+ </a>
+ →
+ <a href="{% url "timetable_smart_plan" "room" sub.sub.room_new.id %}">
+ <strong>{{ sub.sub.room_new.shortcode }}</strong>
+ </a>
</span>
{% elif sub.sub.room_new and not sub.sub.room_old %}
{# Only new room available #}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.room_new.name }}">
- {{ sub.sub.room_new.shortcode }}
+ <a href="{% url "timetable_smart_plan" "room" sub.sub.room_new.id %}">
+ {{ sub.sub.room_new.shortcode }}
+ </a>
</span>
{% elif not sub.sub.room_new and not sub.sub.room_old %}
{# Nothing to view #}
@@ -116,7 +131,9 @@
{# Only old room available #}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ sub.sub.room_old.name }}">
- {{ sub.sub.room_old.shortcode }}
+ <a href="{% url "timetable_smart_plan" "room" sub.sub.room_old.id %}">
+ {{ sub.sub.room_old.shortcode }}
+ </a>
</span>
{% endif %}
{# <span class="tooltipped" data-position="bottom"#}
--
GitLab