From 09f1a14e426b4b8c5608d5b40c8167804d340565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Thu, 21 May 2020 06:08:40 +0200
Subject: [PATCH] Fix and improve plan view
Add link to room detail view in slot table
Fix location based nesting in plan
---
AKPlan/templates/AKPlan/encode_rooms.html | 2 +-
AKPlan/templates/AKPlan/slots_table.html | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/AKPlan/templates/AKPlan/encode_rooms.html b/AKPlan/templates/AKPlan/encode_rooms.html
index 55138df0..69574e92 100644
--- a/AKPlan/templates/AKPlan/encode_rooms.html
+++ b/AKPlan/templates/AKPlan/encode_rooms.html
@@ -3,7 +3,7 @@
{
'id': '{{ room.title }}',
'title': '{{ room.title }}',
- 'parentId': '{{ room.building }}',
+ 'parentId': '{{ room.location }}',
},
{% endfor %}
{% for building in buildings %}
diff --git a/AKPlan/templates/AKPlan/slots_table.html b/AKPlan/templates/AKPlan/slots_table.html
index cb246dbd..93d8ba12 100644
--- a/AKPlan/templates/AKPlan/slots_table.html
+++ b/AKPlan/templates/AKPlan/slots_table.html
@@ -6,7 +6,9 @@
<tr>
<td><b><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=akslot.ak.pk %}">{{ akslot.ak.name }}</a></b></td>
<td>{{ akslot.start | time:"H:i" }} - {{ akslot.end | time:"H:i" }}</td>
- <td>{{ akslot.room }}</td>
+ <td>{% if akslot.room and akslot.room.pk != '' %}
+ <a href="{% url 'plan:plan_room' event_slug=event.slug pk=akslot.room.pk %}">{{ akslot.room }}</a>
+ {% endif %}</td>
</tr>
{% empty %}
{% trans "No AKs" %}
--
GitLab