AKOnline/apps.py

+from django.apps import AppConfig
+
+
+class AkonlineConfig(AppConfig):
+    """
+    App configuration (default -- only to set the app name)
+    """
+    name = 'AKOnline'

AKOnline/forms.py

+from betterforms.multiform import MultiModelForm
+from django.forms import ModelForm
+
+from AKModel.forms import RoomForm
+from AKOnline.models import VirtualRoom
+
+
+class VirtualRoomForm(ModelForm):
+    """
+    Form to create a virtual room
+
+    Should be used as part of a multi form (see :class:`RoomWithVirtualForm` below)
+    """
+    class Meta:
+        model = VirtualRoom
+        # Show all fields except for room
+        exclude = ['room'] #pylint: disable=modelform-uses-exclude
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Make the URL field optional to allow submitting the multi form without creating a virtual room
+        self.fields['url'].required = False
+
+
+class RoomWithVirtualForm(MultiModelForm):
+    """
+    Combined form to create rooms and optionally virtual rooms
+
+    Multi-Form that combines a :class:`RoomForm` (from AKModel) and a :class:`VirtualRoomForm` (see above).
+
+    The form will always create a room on valid input
+    and may additionally create a virtual room if the url field of the virtual room form part is set.
+    """
+    form_classes = {
+        'room': RoomForm,
+        'virtual': VirtualRoomForm
+    }
+
+    def save(self, commit=True):
+        objects = super().save(commit=False)
+
+        if commit:
+            room = objects['room']
+            room.save()
+
+            virtual = objects['virtual']
+            if virtual.url != "":
+                virtual.room = room
+                virtual.save()
+            else:
+                objects['virtual'] = None
+
+        return objects

AKOnline/locale/de_DE/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-08-16 16:30+0200\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: AKOnline/models.py:11
+msgid "URL"
+msgstr "URL"
+
+#: AKOnline/models.py:11
+msgid "URL to the room or server"
+msgstr "URL zum Raum oder Server"
+
+#: AKOnline/models.py:12
+msgid "Room"
+msgstr "Raum"
+
+#: AKOnline/models.py:16
+#: AKOnline/templates/admin/AKOnline/room_create_with_virtual.html:10
+msgid "Virtual Room"
+msgstr "Virtueller Raum"
+
+#: AKOnline/models.py:17 AKOnline/views.py:38
+msgid "Virtual Rooms"
+msgstr "Virtuelle Räume"
+
+#: AKOnline/templates/admin/AKOnline/room_create_with_virtual.html:11
+msgid "Leave empty if that room is not virtual/hybrid."
+msgstr "Leer lassen wenn der Raum nicht virtuell/hybrid ist"
+
+#: AKOnline/views.py:25
+#, python-format
+msgid "Created Room '%(room)s'"
+msgstr "Raum '%(room)s' angelegt"
+
+#: AKOnline/views.py:28
+#, python-format
+msgid "Created related Virtual Room '%(vroom)s'"
+msgstr "Verbundenen virtuellen Raum '%(vroom)s' angelegt"

AKOnline/migrations/0001_AKOnline.py

+# Generated by Django 3.0.6 on 2020-05-17 20:02
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ('AKModel', '0033_AKOnline'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VirtualRoom',
+            fields=[
+                ('room_ptr',
+                 models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True,
+                                      primary_key=True, serialize=False, to='AKModel.Room')),
+                ('url', models.URLField(blank=True, help_text='URL to the room or server', verbose_name='URL')),
+            ],
+            options={
+                'verbose_name': 'Virtual Room',
+                'verbose_name_plural': 'Virtual Rooms',
+            },
+            bases=('AKModel.room',),
+        ),
+    ]

AKOnline/migrations/0001_virtualroom_new.py

+# Generated by Django 4.1.5 on 2023-03-22 12:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('AKOnline', '0001_AKOnline'), ('AKOnline', '0002_rework_virtual'), ('AKOnline', '0003_rework_virtual_2'), ('AKOnline', '0004_rework_virtual_3'), ('AKOnline', '0005_rework_virtual_4')]
+
+    initial = True
+
+    dependencies = [
+        ('AKModel', '0033_AKOnline'),
+        ('AKModel', '0057_upgrades'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VirtualRoom',
+            fields=[
+                ('room', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='virtual', serialize=False, to='AKModel.room', verbose_name='Room')),
+                ('url', models.URLField(blank=True, help_text='URL to the room or server', verbose_name='URL')),
+            ],
+            options={
+                'verbose_name': 'Virtual Room',
+                'verbose_name_plural': 'Virtual Rooms',
+            },
+        ),
+    ]

AKOnline/migrations/0002_rework_virtual.py

+# Generated by Django 4.1.5 on 2023-03-21 23:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKModel', '0057_upgrades'),
+        ('AKOnline', '0001_AKOnline'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            'VirtualRoom',
+            'VirtualRoomOld'
+        ),
+
+    ]

AKOnline/migrations/0003_rework_virtual_2.py

+# Generated by Django 4.1.5 on 2023-03-21 23:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKOnline', '0002_rework_virtual'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VirtualRoom',
+            fields=[
+                ('room', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True,
+                                              related_name='virtual', serialize=False, to='AKModel.room',
+                                              verbose_name='Room')),
+                ('url', models.URLField(blank=True, help_text='URL to the room or server', verbose_name='URL')),
+            ],
+            options={
+                'verbose_name': 'Virtual Room',
+                'verbose_name_plural': 'Virtual Rooms',
+            },
+        ),
+    ]

AKOnline/migrations/0004_rework_virtual_3.py

+# Generated by Django 4.1.5 on 2023-03-21 23:21
+
+from django.db import migrations
+
+
+
+class Migration(migrations.Migration):
+
+    atomic = False
+
+    dependencies = [
+        ('AKOnline', '0003_rework_virtual_2'),
+    ]
+
+    def copy_rooms(apps, schema_editor):
+        VirtualRoomOld = apps.get_model('AKOnline', 'VirtualRoomOld')
+        VirtualRoom = apps.get_model('AKOnline', 'VirtualRoom')
+        for row in VirtualRoomOld.objects.all():
+            v = VirtualRoom(room_id=row.pk, url=row.url)
+            v.save()
+
+    operations = [
+        migrations.RunPython(
+            copy_rooms,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        )
+    ]

AKOnline/migrations/0005_rework_virtual_4.py

+# Generated by Django 4.1.5 on 2023-03-21 23:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKOnline', '0004_rework_virtual_3'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='VirtualRoomOld',
+        ),
+    ]

AKOnline/models.py

+from django.db import models
+from django.utils.translation import gettext_lazy as _
+
+from AKModel.models import Room
+
+
+class VirtualRoom(models.Model):
+    """
+    Add details about a virtual or hybrid version of a room to it
+    """
+    url = models.URLField(verbose_name=_("URL"), help_text=_("URL to the room or server"), blank=True)
+    room = models.OneToOneField(Room, verbose_name=_("Room"), on_delete=models.CASCADE,
+                                related_name='virtual', primary_key=True)
+
+    class Meta:
+        verbose_name = _('Virtual Room')
+        verbose_name_plural = _('Virtual Rooms')
+
+    @property
+    def event(self):
+        """
+        Property: Event this virtual room belongs to.
+
+        :return: Event this virtual room belongs to
+        :rtype: Event
+        """
+        return self.room.event
+
+    def __str__(self):
+        return f"{self.room.title}: {self.url}"

AKOnline/templates/admin/AKOnline/room_create_with_virtual.html

+{% extends "admin/AKModel/room_create.html" %}
+{% load tags_AKModel %}
+
+{% load i18n %}
+{% load django_bootstrap5 %}
+
+{% block form_details %}
+    {% bootstrap_form form.room %}
+
+    <h3>{% trans "Virtual Room" %}</h3>
+    <p>{% trans "Leave empty if that room is not virtual/hybrid." %}</p>
+    {% bootstrap_form form.virtual %}
+{% endblock %}

AKOnline/templates/admin/AKOnline/status/event_virtual_rooms.html

+{% load i18n %}
+
+<ul>
+    {% for room in event.room_set.all %}
+        {% if room.virtual and room.virtual.url %}
+        <li>
+            <a href="{% url 'admin:AKOnline_virtualroom_change' room.pk %}">{{ room }} ({{ room.virtual.url | truncatechars:30 }})</a>
+        </li>
+        {% endif %}
+    {% endfor %}
+</ul>

AKOnline/views.py

+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.utils.translation import gettext_lazy as _
+
+from AKModel.metaviews import status_manager
+from AKModel.metaviews.status import TemplateStatusWidget
+from AKModel.views.room import RoomCreationView
+from AKOnline.forms import RoomWithVirtualForm
+
+
+class RoomCreationWithVirtualView(RoomCreationView):
+    """
+    View to create both rooms and optionally virtual rooms by filling one form
+    """
+    form_class = RoomWithVirtualForm
+    template_name = 'admin/AKOnline/room_create_with_virtual.html'
+    room = None
+
+    def form_valid(self, form):
+        # This will create the room and additionally a virtual room if the url field is not blank
+        # objects['room'] will always a room instance afterwards, objects['virtual'] may be empty
+        objects = form.save()
+        self.room = objects['room']
+        # Create a (translated) success message containing information about the created room
+        messages.success(self.request, _("Created Room '%(room)s'" % {'room': objects['room']})) #pylint: disable=consider-using-f-string, line-too-long
+        if objects['virtual'] is not None:
+            # Create a (translated) success message containing information about the created virtual room
+            messages.success(self.request, _("Created related Virtual Room '%(vroom)s'" % {'vroom': objects['virtual']})) #pylint: disable=consider-using-f-string, line-too-long
+        return HttpResponseRedirect(self.get_success_url())
+
+
+@status_manager.register(name="event_virtual_rooms")
+class EventVirtualRoomsWidget(TemplateStatusWidget):
+    """
+    Status page widget to contain information about all virtual rooms belonging to the given event
+    """
+    required_context_type = "event"
+    title = _("Virtual Rooms")
+    template_name = "admin/AKOnline/status/event_virtual_rooms.html"

AKPlan/admin.py

-# Register your models here.

AKPlan/apps.py

@@ -2,4 +2,7 @@ from django.apps import AppConfig
 
 
 class AkplanConfig(AppConfig):
+    """
+    App configuration (default, only specifies name of the app)
+    """
     name = 'AKPlan'

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-03-04 00:53+0000\n"
+"POT-Creation-Date: 2023-05-15 20:03+0200\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"
@@ -17,51 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/AKPlan/plan_base.html:24
+#: AKPlan/templates/AKPlan/plan_base.html:9
+#, fuzzy
+#| msgid "AK Plan"
+msgid "Plan"
+msgstr "Plan"
+
+#: AKPlan/templates/AKPlan/plan_base.html:21
 msgid "Write to organizers of this event for questions and comments"
 msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
 
-#: templates/AKPlan/plan_breadcrumbs.html:13
-msgid "AK Plan"
-msgstr "AK-Plan"
-
-#: templates/AKPlan/plan_index.html:40
+#: AKPlan/templates/AKPlan/plan_index.html:36
 msgid "Day"
 msgstr "Tag"
 
-#: templates/AKPlan/plan_index.html:50
+#: AKPlan/templates/AKPlan/plan_index.html:46
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: templates/AKPlan/plan_index.html:59 templates/AKPlan/plan_room.html:8
-#: templates/AKPlan/plan_room.html:44 templates/AKPlan/plan_wall.html:64
+#: AKPlan/templates/AKPlan/plan_index.html:59
+#: AKPlan/templates/AKPlan/plan_room.html:13
+#: AKPlan/templates/AKPlan/plan_room.html:59
+#: AKPlan/templates/AKPlan/plan_wall.html:65
 msgid "Room"
 msgstr "Raum"
 
-#: templates/AKPlan/plan_index.html:80 templates/AKPlan/plan_room.html:34
+#: AKPlan/templates/AKPlan/plan_index.html:80
+#: 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:92
+#: AKPlan/templates/AKPlan/plan_room.html:49
 msgid "Rooms"
 msgstr "Räume"
 
-#: templates/AKPlan/plan_index.html:88 templates/AKPlan/plan_track.html:34
+#: AKPlan/templates/AKPlan/plan_index.html:105
+#: AKPlan/templates/AKPlan/plan_track.html:36
 msgid "Tracks"
 msgstr "Tracks"
 
-#: templates/AKPlan/plan_index.html:96
+#: AKPlan/templates/AKPlan/plan_index.html:117
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: templates/AKPlan/plan_index.html:106 templates/AKPlan/plan_wall.html:88
+#: AKPlan/templates/AKPlan/plan_index.html:130
+#: AKPlan/templates/AKPlan/plan_wall.html:130
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: templates/AKPlan/plan_index.html:113 templates/AKPlan/plan_wall.html:93
+#: AKPlan/templates/AKPlan/plan_index.html:137
+#: AKPlan/templates/AKPlan/plan_wall.html:135
 msgid "Next AKs"
 msgstr "Nächste AKs"
 
-#: templates/AKPlan/plan_track.html:8 templates/AKPlan/plan_track.html:44
+#: AKPlan/templates/AKPlan/plan_index.html:145
+msgid "This event is not active."
+msgstr "Dieses Event ist nicht aktiv."
+
+#: AKPlan/templates/AKPlan/plan_index.html:158
+#: AKPlan/templates/AKPlan/plan_room.html:77
+#: AKPlan/templates/AKPlan/plan_track.html:58
+msgid "Plan is not visible (yet)."
+msgstr "Plan ist (noch) nicht sichtbar"
+
+#: AKPlan/templates/AKPlan/plan_room.html:63
+msgid "Go to virtual room"
+msgstr "Zum virtuellen Raum"
+
+#: AKPlan/templates/AKPlan/plan_room.html:84
+msgid "Capacity"
+msgstr "Kapazität"
+
+#: AKPlan/templates/AKPlan/plan_room.html:88
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: AKPlan/templates/AKPlan/plan_track.html:11
+#: AKPlan/templates/AKPlan/plan_track.html:46
 msgid "Track"
 msgstr "Track"
 
-#: templates/AKPlan/slots_table.html:12
+#: AKPlan/templates/AKPlan/plan_wall.html:145
+msgid "Reload page automatically?"
+msgstr "Seite automatisch neu laden?"
+
+#: AKPlan/templates/AKPlan/slots_table.html:14
 msgid "No AKs"
 msgstr "Keine AKs"

AKPlan/models.py

-# Create your models here.

AKPlan/static/AKPlan/fullcalendar/bootstrap/LICENSE.txt

-Copyright (c) 2019 Adam Shaw
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

AKPlan/static/AKPlan/fullcalendar/bootstrap/README.md

-
-# FullCalendar Bootstrap Plugin
-
-Bootstrap 4 theming for your calendar
-
-[View the docs »](https://fullcalendar.io/docs/bootstrap-theme)
-
-This package was created from the [FullCalendar monorepo »](https://github.com/fullcalendar/fullcalendar)