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-05-11 22:27+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,62 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKPlan/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"
 
-#: AKPlan/templates/AKPlan/plan_breadcrumbs.html:13
-msgid "AK Plan"
-msgstr "AK-Plan"
-
-#: AKPlan/templates/AKPlan/plan_index.html:40
+#: AKPlan/templates/AKPlan/plan_index.html:36
 msgid "Day"
 msgstr "Tag"
 
-#: AKPlan/templates/AKPlan/plan_index.html:50
+#: AKPlan/templates/AKPlan/plan_index.html:46
 msgid "Event"
 msgstr "Veranstaltung"
 
 #: AKPlan/templates/AKPlan/plan_index.html:59
-#: AKPlan/templates/AKPlan/plan_room.html:8
-#: AKPlan/templates/AKPlan/plan_room.html:44
-#: AKPlan/templates/AKPlan/plan_wall.html:64
+#: 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"
 
-#: AKPlan/templates/AKPlan/plan_index.html:82
-#: AKPlan/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"
 
-#: AKPlan/templates/AKPlan/plan_index.html:94
-#: AKPlan/templates/AKPlan/plan_track.html:34
+#: AKPlan/templates/AKPlan/plan_index.html:105
+#: AKPlan/templates/AKPlan/plan_track.html:36
 msgid "Tracks"
 msgstr "Tracks"
 
-#: AKPlan/templates/AKPlan/plan_index.html:106
+#: AKPlan/templates/AKPlan/plan_index.html:117
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: AKPlan/templates/AKPlan/plan_index.html:118
-#: AKPlan/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"
 
-#: AKPlan/templates/AKPlan/plan_index.html:125
-#: AKPlan/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"
 
-#: AKPlan/templates/AKPlan/plan_index.html:133
+#: AKPlan/templates/AKPlan/plan_index.html:145
 msgid "This event is not active."
 msgstr "Dieses Event ist nicht aktiv."
 
-#: AKPlan/templates/AKPlan/plan_track.html:8
-#: AKPlan/templates/AKPlan/plan_track.html:44
+#: 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"
 
-#: AKPlan/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)

AKPlan/static/AKPlan/fullcalendar/bootstrap/main.css

-.fc.fc-bootstrap a {
-  text-decoration: none;
-}
-
-.fc.fc-bootstrap a[data-goto]:hover {
-  text-decoration: underline;
-}
-
-.fc-bootstrap hr.fc-divider {
-  border-color: inherit;
-}
-
-.fc-bootstrap .fc-today.alert {
-  border-radius: 0;
-}
-
-.fc-bootstrap a.fc-event:not([href]):not([tabindex]) {
-  color: #fff;
-}
-
-.fc-bootstrap .fc-popover.card {
-  position: absolute;
-}
-
-/* Popover
---------------------------------------------------------------------------------------------------*/
-.fc-bootstrap .fc-popover .card-body {
-  padding: 0;
-}
-
-/* TimeGrid Slats (lines that run horizontally)
---------------------------------------------------------------------------------------------------*/
-.fc-bootstrap .fc-time-grid .fc-slats table {
-  /* some themes have background color. see through to slats */
-  background: none;
-}

AKPlan/static/AKPlan/fullcalendar/bootstrap/main.d.ts

-// Generated by dts-bundle v0.7.3-fork.1
-// Dependencies for this module:
-//   ../../../../../@fullcalendar/core
-
-declare module '@fullcalendar/bootstrap' {
-    import { Theme } from '@fullcalendar/core';
-    export class BootstrapTheme extends Theme {
-    }
-    const _default: import("@fullcalendar/core").PluginDef;
-    export default _default;
-}
-

AKPlan/static/AKPlan/fullcalendar/bootstrap/main.esm.js

-/*!
-FullCalendar Bootstrap Plugin v4.3.0
-Docs & License: https://fullcalendar.io/
-(c) 2019 Adam Shaw
-*/
-
-import { createPlugin, Theme } from '@fullcalendar/core';
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var BootstrapTheme = /** @class */ (function (_super) {
-    __extends(BootstrapTheme, _super);
-    function BootstrapTheme() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return BootstrapTheme;
-}(Theme));
-BootstrapTheme.prototype.classes = {
-    widget: 'fc-bootstrap',
-    tableGrid: 'table-bordered',
-    tableList: 'table',
-    tableListHeading: 'table-active',
-    buttonGroup: 'btn-group',
-    button: 'btn btn-primary',
-    buttonActive: 'active',
-    today: 'alert alert-info',
-    popover: 'card card-primary',
-    popoverHeader: 'card-header',
-    popoverContent: 'card-body',
-    // day grid
-    // for left/right border color when border is inset from edges (all-day in timeGrid view)
-    // avoid `table` class b/c don't want margins/padding/structure. only border color.
-    headerRow: 'table-bordered',
-    dayRow: 'table-bordered',
-    // list view
-    listView: 'card card-primary'
-};
-BootstrapTheme.prototype.baseIconClass = 'fa';
-BootstrapTheme.prototype.iconClasses = {
-    close: 'fa-times',
-    prev: 'fa-chevron-left',
-    next: 'fa-chevron-right',
-    prevYear: 'fa-angle-double-left',
-    nextYear: 'fa-angle-double-right'
-};
-BootstrapTheme.prototype.iconOverrideOption = 'bootstrapFontAwesome';
-BootstrapTheme.prototype.iconOverrideCustomButtonOption = 'bootstrapFontAwesome';
-BootstrapTheme.prototype.iconOverridePrefix = 'fa-';
-var main = createPlugin({
-    themeClasses: {
-        bootstrap: BootstrapTheme
-    }
-});
-
-export default main;
-export { BootstrapTheme };

AKPlan/static/AKPlan/fullcalendar/bootstrap/main.js

-/*!
-FullCalendar Bootstrap Plugin v4.3.0
-Docs & License: https://fullcalendar.io/
-(c) 2019 Adam Shaw
-*/
-
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@fullcalendar/core')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@fullcalendar/core'], factory) :
-    (global = global || self, factory(global.FullCalendarBootstrap = {}, global.FullCalendar));
-}(this, function (exports, core) { 'use strict';
-
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-    /* global Reflect, Promise */
-
-    var extendStatics = function(d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-
-    function __extends(d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    }
-
-    var BootstrapTheme = /** @class */ (function (_super) {
-        __extends(BootstrapTheme, _super);
-        function BootstrapTheme() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BootstrapTheme;
-    }(core.Theme));
-    BootstrapTheme.prototype.classes = {
-        widget: 'fc-bootstrap',
-        tableGrid: 'table-bordered',
-        tableList: 'table',
-        tableListHeading: 'table-active',
-        buttonGroup: 'btn-group',
-        button: 'btn btn-primary',
-        buttonActive: 'active',
-        today: 'alert alert-info',
-        popover: 'card card-primary',
-        popoverHeader: 'card-header',
-        popoverContent: 'card-body',
-        // day grid
-        // for left/right border color when border is inset from edges (all-day in timeGrid view)
-        // avoid `table` class b/c don't want margins/padding/structure. only border color.
-        headerRow: 'table-bordered',
-        dayRow: 'table-bordered',
-        // list view
-        listView: 'card card-primary'
-    };
-    BootstrapTheme.prototype.baseIconClass = 'fa';
-    BootstrapTheme.prototype.iconClasses = {
-        close: 'fa-times',
-        prev: 'fa-chevron-left',
-        next: 'fa-chevron-right',
-        prevYear: 'fa-angle-double-left',
-        nextYear: 'fa-angle-double-right'
-    };
-    BootstrapTheme.prototype.iconOverrideOption = 'bootstrapFontAwesome';
-    BootstrapTheme.prototype.iconOverrideCustomButtonOption = 'bootstrapFontAwesome';
-    BootstrapTheme.prototype.iconOverridePrefix = 'fa-';
-    var main = core.createPlugin({
-        themeClasses: {
-            bootstrap: BootstrapTheme
-        }
-    });
-
-    exports.BootstrapTheme = BootstrapTheme;
-    exports.default = main;
-
-    Object.defineProperty(exports, '__esModule', { value: true });
-
-}));