Merge branch 'feature-room-detail' into 'master'

Improve room view in plan and better link it

Closes #77

See merge request kif/akplanning!40

AKPlan/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-16 20:26+0000\n"
+"POT-Creation-Date: 2020-05-19 07:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,20 +30,20 @@ msgid "Event"
 msgstr "Veranstaltung"
 
 #: AKPlan/templates/AKPlan/plan_index.html:59
-#: AKPlan/templates/AKPlan/plan_room.html:11
-#: AKPlan/templates/AKPlan/plan_room.html:46
+#: AKPlan/templates/AKPlan/plan_room.html:13
+#: AKPlan/templates/AKPlan/plan_room.html:48
 #: AKPlan/templates/AKPlan/plan_wall.html:64
 msgid "Room"
 msgstr "Raum"
 
 #: AKPlan/templates/AKPlan/plan_index.html:74
-#: AKPlan/templates/AKPlan/plan_room.html:9
+#: AKPlan/templates/AKPlan/plan_room.html:11
 #: AKPlan/templates/AKPlan/plan_track.html:9
 msgid "AK Plan"
 msgstr "AK-Plan"
 
 #: AKPlan/templates/AKPlan/plan_index.html:86
-#: AKPlan/templates/AKPlan/plan_room.html:36
+#: AKPlan/templates/AKPlan/plan_room.html:38
 msgid "Rooms"
 msgstr "Räume"
 
@@ -70,6 +70,18 @@ msgstr "Nächste AKs"
 msgid "This event is not active."
 msgstr "Dieses Event ist nicht aktiv."
 
+#: AKPlan/templates/AKPlan/plan_room.html:52
+msgid "Go to virtual room"
+msgstr "Zum virtuellen Raum"
+
+#: AKPlan/templates/AKPlan/plan_room.html:67
+msgid "Capacity"
+msgstr "Kapazität"
+
+#: AKPlan/templates/AKPlan/plan_room.html:71
+msgid "Properties"
+msgstr "Eigenschaften"
+
 #: AKPlan/templates/AKPlan/plan_track.html:11
 #: AKPlan/templates/AKPlan/plan_track.html:46
 msgid "Track"

AKPlan/templates/AKPlan/plan_akslot.html

@@ -51,7 +51,8 @@
                         {
                             'title': '{{ slot.room }}',
                             'start': '{{ slot.start | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}',
-                            'end': '{{ slot.end | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}'
+                            'end': '{{ slot.end | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}',
+                            'url' : '{% url "plan:plan_room" event_slug=ak.event.slug pk=slot.room.pk %}'
                         },
                     {% endif %}
                 {% endfor %}

AKPlan/templates/AKPlan/plan_room.html

 {% extends "AKPlan/plan_detail.html" %}
+{% load fontawesome_5 %}
+{% load tags_AKModel %}
 
 {% load tz %}
 {% load i18n %}
@@ -43,7 +45,13 @@
         </ul>
     </div>
 
-    <h1>Plan: {{ event }} ({% trans "Room" %}: {{ room }})</h1>
+    <h1>{% trans "Room" %}: {{ room.name }} {% if room.location != '' %}({{ room.location }}){% endif %}</h1>
+
+    {% if "AKOnline"|check_app_installed and room.virtualroom and room.virtualroom.url != '' %}
+        <a class="btn btn-success" href="{{ room.virtualroom.url }}">
+            {% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+        </a>
+    {% endif %}
 
     {% timezone event.timezone %}
         <div class="row" style="margin-top:30px;clear:both;">
@@ -52,4 +60,25 @@
             </div>
         </div>
     {% endtimezone %}
+
+    <table class="table table-borderless" style="margin-top: 30px;">
+        <tbody>
+            <tr>
+                <td>{% trans "Capacity" %}:</td><td>{{ room.capacity }}</td>
+            </tr>
+            {% if room.properties.count > 0 %}
+                <tr>
+                    <td>{% trans "Properties" %}:</td>
+                    <td>
+                        {% for property in room.properties.all %}
+                            {% if forloop.counter0 > 0 %}
+                                ,&nbsp;
+                            {% endif %}
+                            {{ property }}
+                        {% endfor %}
+                    </td>
+                </tr>
+            {% endif %}
+        </tbody>
+    </table>
 {% endblock %}

AKSubmission/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-16 20:26+0000\n"
+"POT-Creation-Date: 2020-05-19 07:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,7 +96,7 @@ msgid "History"
 msgstr "Versionsgeschichte"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:48
-#: AKSubmission/templates/AKSubmission/ak_detail.html:147
+#: AKSubmission/templates/AKSubmission/ak_detail.html:153
 #: AKSubmission/templates/AKSubmission/ak_edit.html:16
 #: AKSubmission/templates/AKSubmission/ak_table.html:53
 msgid "Edit"
@@ -161,23 +161,23 @@ msgstr "Dauer"
 msgid "Room"
 msgstr "Raum"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:150
+#: AKSubmission/templates/AKSubmission/ak_detail.html:156
 msgid "Delete"
 msgstr "Löschen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:162
+#: AKSubmission/templates/AKSubmission/ak_detail.html:168
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:166
+#: AKSubmission/templates/AKSubmission/ak_detail.html:172
 msgid "Possible Times"
 msgstr "Mögliche Zeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:170
+#: AKSubmission/templates/AKSubmission/ak_detail.html:176
 msgid "Start"
 msgstr "Start"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:171
+#: AKSubmission/templates/AKSubmission/ak_detail.html:177
 msgid "End"
 msgstr "Ende"
 

AKSubmission/templates/AKSubmission/ak_detail.html

@@ -140,7 +140,13 @@
             <tr>
                 <td>{{ slot.start_simplified }}</td>
                 <td>{{ slot.duration }}</td>
-                <td>{{ slot.room }}</td>
+                <td>
+                    {% if "AKPlan"|check_app_installed %}
+                        <a href="{% url 'plan:plan_room' event_slug=ak.event.slug pk=slot.room.pk %}">{{ slot.room }}</a>
+                    {% else %}
+                        {{ slot.room }}
+                    {% endif %}
+                </td>
                 <td>
                     {% if not slot.start %}
                         <a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"