AKScheduling/templates/admin/AKScheduling/special_attention.html

+{% extends "admin/base_site.html" %}
+{% load tags_AKModel %}
+
+{% load i18n %}
+{% load l10n %}
+{% load tz %}
+{% load static %}
+{% load tags_AKPlan %}
+{% load fontawesome_6 %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+    <h4 class="mt-4 mb-4">{% trans "AKs with public notes" %}</h4>
+    {% for ak in aks_with_comment %}
+        <a href="{{ ak.detail_url }}">{{ ak }}</a>
+        <a href="{{ ak.edit_url }}">{% fa6_icon "pen-to-square" %}</a>
+        <a class="link-warning" href="{% url "admin:AKModel_ak_change" object_id=ak.pk %}">{% fa6_icon "pen-to-square" %}</a><br>
+        {{ ak.notes }}<br><br>
+    {% empty %}
+        -
+    {% endfor %}
+
+    <h4 class="mt-4 mb-4">{% trans "AKs without availabilities" %}</h4>
+    {% for ak in aks_without_availabilities %}
+        <a href="{{ ak.detail_url }}">{{ ak }}</a>
+        <a href="{{ ak.edit_url }}">{% fa6_icon "pen-to-square" %}</a>
+        <a class="link-warning" href="{% url "admin:AKModel_ak_change" object_id=ak.pk %}">{% fa6_icon "pen-to-square" %}</a><br>
+    {% empty %}
+        -<br>
+    {% endfor %}
+
+    <a class="btn btn-warning mt-2" href="{% url "admin:autocreate-availabilities" event_slug=event.slug %}">{% trans "Create default availabilities" %}</a>
+
+
+    <h4 class="mt-4 mb-4">{% trans "AK wishes with slots" %}</h4>
+    {% for ak in ak_wishes_with_slots %}
+        <a href="{% url "admin:AKModel_akslot_changelist" %}?ak={{ ak.pk }}">({{ ak.akslot__count }})</a>
+        <a href="{{ ak.detail_url }}">{{ ak }}</a>
+        <a href="{{ ak.edit_url }}">{% fa6_icon "pen-to-square" %}</a>
+        <a class="link-warning" href="{% url "admin:AKModel_ak_change" object_id=ak.pk %}">{% fa6_icon "pen-to-square" %}</a><br>
+    {% empty %}
+        -<br>
+    {% endfor %}
+
+    <a class="btn btn-warning mt-2" href="{% url "admin:cleanup-wish-slots" event_slug=event.slug %}">{% trans "Delete slots for wishes" %}</a>
+
+    <h4 class="mt-4 mb-4">{% trans "AKs without slots" %}</h4>
+    {% for ak in aks_without_slots %}
+        <a href="{{ ak.detail_url }}">{{ ak }}</a>
+        <a href="{{ ak.edit_url }}">{% fa6_icon "pen-to-square" %}</a>
+        <a class="link-warning" href="{% url "admin:AKModel_ak_change" object_id=ak.pk %}">{% fa6_icon "pen-to-square" %}</a><br>
+    {% empty %}
+        -<br>
+    {% endfor %}
+
+    <div class="mt-5">
+        <a href="{% url 'admin:event_status' event.slug %}">{% trans "Event Status" %}</a>
+    </div>
+{% endblock %}

AKScheduling/templates/admin/AKScheduling/status/cvs.html

+{% load i18n %}
+
+<div class="text-center">
+    <a href="{% url 'admin:constraint-violations' slug=event.slug %}">
+        <h1>{{ constraint_violations_count }}</h1>
+        {% blocktrans count constraint_violations_count=constraint_violations_count %}
+            <h3>Constraint Violation</h3>
+            {% plural %}
+            <h3>Constraint Violations</h3>
+        {% endblocktrans %}
+    </a>
+</div>

AKScheduling/templates/admin/AKScheduling/unscheduled.html

+{% extends "admin/base_site.html" %}
+{% load tags_AKModel %}
+
+{% load i18n %}
+{% load tz %}
+
+{% block title %}{% trans "Unscheduled AK Slots" %}: {{event}}{% endblock %}
+
+{% block content %}
+
+    <h3>{% trans "Count" %}: {{ akslots.count }}</h3>
+
+    {% regroup akslots by ak as unscheduled_by_ak %}
+
+    <ul>
+    {% for group in unscheduled_by_ak %}
+        <li>
+            {% with group.grouper as ak %}
+                {% if "AKSubmission"|check_app_installed %}
+                    <a href="{{ ak.detail_url }}">{{ ak }}</a>
+                {% else %}
+                    {{ ak }}
+                {% endif %}
+            {% endwith %}
+            <ul>
+                {% for slot in group.list %}
+                    <li><a href="{% url 'admin:AKModel_akslot_change' slot.pk %}">{{ slot.duration }}</a></li>
+                {% endfor %}
+            </ul>
+        </li>
+    {% endfor %}
+    </ul>
+
+    <a href="{% url 'admin:event_status' event.slug %}">{% trans "Event Status" %}</a>
+{% endblock %}

AKScheduling/tests.py

-# Create your tests here.
+import json
+from datetime import timedelta
+
+from django.test import TestCase
+from django.utils import timezone
+
+from AKModel.tests import BasicViewTests
+from AKModel.models import AKSlot, Event, Room
+
+class ModelViewTests(BasicViewTests, TestCase):
+    """
+    Tests for AKScheduling
+    """
+    fixtures = ['model.json']
+
+    VIEWS_STAFF_ONLY = [
+        # Views
+        ('admin:schedule', {'event_slug': 'kif42'}),
+        ('admin:slots_unscheduled', {'event_slug': 'kif42'}),
+        ('admin:constraint-violations', {'slug': 'kif42'}),
+        ('admin:special-attention', {'slug': 'kif42'}),
+        ('admin:cleanup-wish-slots', {'event_slug': 'kif42'}),
+        ('admin:autocreate-availabilities', {'event_slug': 'kif42'}),
+        ('admin:tracks_manage', {'event_slug': 'kif42'}),
+        ('admin:enter-interest', {'event_slug': 'kif42', 'pk': 1}),
+        # API (Read)
+        ('model:scheduling-resources-list', {'event_slug': 'kif42'}, 403),
+        ('model:scheduling-constraint-violations-list', {'event_slug': 'kif42'}, 403),
+        ('model:scheduling-events', {'event_slug': 'kif42'}),
+        ('model:scheduling-room-availabilities', {'event_slug': 'kif42'}),
+        ('model:scheduling-default-slots', {'event_slug': 'kif42'}),
+    ]
+
+    def test_scheduling_of_slot_update(self):
+        """
+        Test rescheduling a slot to a different time or room
+        """
+        self.client.force_login(self.admin_user)
+
+        event = Event.get_by_slug('kif42')
+
+        # Get the first already scheduled slot belonging to this event
+        slot = event.akslot_set.filter(start__isnull=False).first()
+        pk = slot.pk
+        room_id = slot.room_id
+        events_api_url = f"/kif42/api/scheduling-event/{pk}/"
+
+        # Create updated time
+        offset = timedelta(hours=1)
+        new_start_time = slot.start + offset
+        new_end_time = slot.end + offset
+        new_start_time_string = timezone.localtime(new_start_time, event.timezone).strftime("%Y-%m-%d %H:%M:%S")
+        new_end_time_string = timezone.localtime(new_end_time, event.timezone).strftime("%Y-%m-%d %H:%M:%S")
+
+        # Try API call
+        response = self.client.put(
+            events_api_url,
+            json.dumps({
+                'start': new_start_time_string,
+                'end': new_end_time_string,
+                'roomId': room_id,
+            }),
+            content_type = 'application/json'
+        )
+        self.assertEqual(response.status_code, 200, "PUT to API endpoint did not work")
+
+        # Make sure API call did update the slot as expected
+        slot = AKSlot.objects.get(pk=pk)
+        self.assertEqual(new_start_time, slot.start, "Update did not work")
+
+        # Test updating room
+        new_room = Room.objects.exclude(pk=room_id).first()
+
+        # Try second API call
+        response = self.client.put(
+            events_api_url,
+            json.dumps({
+                'start': new_start_time_string,
+                'end': new_end_time_string,
+                'roomId': new_room.pk,
+            }),
+            content_type = 'application/json'
+        )
+        self.assertEqual(response.status_code, 200, "Second PUT to API endpoint did not work")
+
+        # Make sure API call did update the slot as expected
+        slot = AKSlot.objects.get(pk=pk)
+        self.assertEqual(new_room.pk, slot.room.pk, "Update did not work")

AKScheduling/urls.py

+from django.urls import path
+
+from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView, \
+    ConstraintViolationsAdminView, SpecialAttentionAKsAdminView, InterestEnteringAdminView, WishSlotCleanupView, \
+    AvailabilityAutocreateView
+
+
+def get_admin_urls_scheduling(admin_site):
+    return [
+        path('<slug:event_slug>/schedule/', admin_site.admin_view(SchedulingAdminView.as_view()),
+             name="schedule"),
+        path('<slug:event_slug>/unscheduled/', admin_site.admin_view(UnscheduledSlotsAdminView.as_view()),
+             name="slots_unscheduled"),
+        path('<slug:slug>/constraint-violations/', admin_site.admin_view(ConstraintViolationsAdminView.as_view()),
+             name="constraint-violations"),
+        path('<slug:slug>/special-attention/', admin_site.admin_view(SpecialAttentionAKsAdminView.as_view()),
+             name="special-attention"),
+        path('<slug:event_slug>/cleanup-wish-slots/', admin_site.admin_view(WishSlotCleanupView.as_view()),
+             name="cleanup-wish-slots"),
+        path('<slug:event_slug>/autocreate-availabilities/', admin_site.admin_view(AvailabilityAutocreateView.as_view()),
+             name="autocreate-availabilities"),
+        path('<slug:event_slug>/tracks/', admin_site.admin_view(TrackAdminView.as_view()),
+             name="tracks_manage"),
+        path('<slug:event_slug>/enter-interest/<int:pk>', admin_site.admin_view(InterestEnteringAdminView.as_view()),
+             name="enter-interest"),
+    ]

AKScheduling/views.py

-# Create your views here.
+from django.contrib import messages
+from django.contrib.messages.views import SuccessMessageMixin
+from django.db.models import Count
+from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import ListView, DetailView, UpdateView
+
+from AKModel.metaviews import status_manager
+from AKModel.metaviews.status import TemplateStatusWidget
+from AKModel.models import AKSlot, AKTrack, Event, AK, AKCategory
+from AKModel.metaviews.admin import EventSlugMixin, FilterByEventSlugMixin, AdminViewMixin, IntermediateAdminView
+from AKScheduling.forms import AKInterestForm, AKAddSlotForm
+
+
+class UnscheduledSlotsAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
+    """
+    Admin view: Get a list of all unscheduled slots
+    """
+    template_name = "admin/AKScheduling/unscheduled.html"
+    model = AKSlot
+    context_object_name = "akslots"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["title"] = f"{_('Unscheduled AK Slots')} for {context['event']}"
+        return context
+
+    def get_queryset(self):
+        return super().get_queryset().filter(start=None)
+
+
+class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
+    """
+    Admin view: Scheduler
+
+    View and adapt the schedule of an event. This view heavily uses JavaScript to display a calendar view plus
+    a list of unscheduled slots and to allow dragging slots in and into the calendar
+    """
+    template_name = "admin/AKScheduling/scheduling.html"
+    model = AKSlot
+    context_object_name = "slots_unscheduled"
+
+    def get_queryset(self):
+        return super().get_queryset().filter(start__isnull=True).select_related('event', 'ak', 'ak__track',
+            'ak__category').prefetch_related('ak__types', 'ak__owners', 'ak__conflicts', 'ak__prerequisites',
+            'ak__requirements', 'ak__conflict').order_by('ak__track', 'ak')
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
+        context["title"] = f"{_('Scheduling')} for {context['event']}"
+
+        context["event"] = self.event
+        context["start"] = self.event.start
+        context["end"] = self.event.end
+
+        context["akSlotAddForm"] = AKAddSlotForm(self.event)
+
+        return context
+
+
+class TrackAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
+    """
+    Admin view: Distribute AKs to tracks
+
+    Again using JavaScript, the user can here see a list of all AKs split-up by tracks and can move them to other or
+    even new tracks using drag and drop. The state is then automatically synchronized via API calls in the background
+    """
+    template_name = "admin/AKScheduling/manage_tracks.html"
+    model = AKTrack
+    context_object_name = "tracks"
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
+        context["aks_without_track"] = self.event.ak_set.select_related('category').filter(track=None)
+        return context
+
+
+class ConstraintViolationsAdminView(AdminViewMixin, DetailView):
+    """
+    Admin view: Inspect and adjust all constraint violations of the event
+
+    This view populates a table of constraint violations via background API call (JavaScript), offers the option to
+    see details or edit each of them and provides an auto-reload feature.
+    """
+    template_name = "admin/AKScheduling/constraint_violations.html"
+    model = Event
+    context_object_name = "event"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["title"] = f"{_('Constraint violations for')} {context['event']}"
+        return context
+
+
+class SpecialAttentionAKsAdminView(AdminViewMixin, DetailView):
+    """
+    Admin view: List all AKs that require special attention via scheduling, e.g., because of free-form comments,
+    since there are slots even though it is a wish, or no slots even though it is an AK etc.
+    """
+    template_name = "admin/AKScheduling/special_attention.html"
+    model = Event
+    context_object_name = "event"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["title"] = f"{_('AKs requiring special attention for')} {context['event']}"
+
+        # Load all "special" AKs from the database using annotations to reduce the amount of necessary queries
+        aks = (AK.objects.filter(event=context["event"]).annotate(Count('owners', distinct=True))
+               .annotate(Count('akslot', distinct=True)).annotate(Count('availabilities', distinct=True)))
+        aks_with_comment = []
+        ak_wishes_with_slots = []
+        aks_without_availabilities = []
+        aks_without_slots = []
+
+        # Loop over all AKs of this event and identify all relevant factors that make the AK "special" and add them to
+        # the respective lists if the AK fullfills an condition
+        for ak in aks:
+            if ak.notes != "":
+                aks_with_comment.append(ak)
+
+            if ak.owners__count == 0:
+                if ak.akslot__count > 0:
+                    ak_wishes_with_slots.append(ak)
+            else:
+                if ak.akslot__count == 0:
+                    aks_without_slots.append(ak)
+                if ak.availabilities__count == 0:
+                    aks_without_availabilities.append(ak)
+
+        context["aks_with_comment"] = aks_with_comment
+        context["ak_wishes_with_slots"] = ak_wishes_with_slots
+        context["aks_without_slots"] = aks_without_slots
+        context["aks_without_availabilities"] = aks_without_availabilities
+
+        return context
+
+
+class InterestEnteringAdminView(SuccessMessageMixin, AdminViewMixin, EventSlugMixin, UpdateView):
+    """
+    Admin view: Form view to quickly store information about the interest in an AK
+    (e.g., during presentation of the AK list)
+
+    The view offers a field to update interest and manually set a comment for the current AK, but also features links
+    to the AKs before and probably coming up next, as well as links to other AKs sorted by category, for quick
+    and hazzle-free navigation during the AK presentation
+    """
+    template_name = "admin/AKScheduling/interest.html"
+    model = AK
+    context_object_name = "ak"
+    form_class = AKInterestForm
+    success_message = _("Interest updated")
+
+    def get_success_url(self):
+        return self.request.path
+
+    def form_valid(self, form):
+        # Don't create a history entry for this change
+        form.instance.skip_history_when_saving = True
+        r = super().form_valid(form)
+        del form.instance.skip_history_when_saving
+        return r
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["title"] = f"{_('Enter interest')}"
+
+        # Sort AKs into different lists (by their category)
+        ak_wishes = []
+        categories_with_aks = []
+
+        context["previous_ak"] = None
+        context["next_ak"] = None
+        last_ak = None
+        next_is_next = False
+
+        # Building the right navigation is a bit tricky since wishes have to be treated as an own category here
+        # Hence, depending on the AK we are currently at (displaying the form for) we need to either:
+        # Find other AK wishes (regardless of the category)...
+        if context['ak'].wish:
+            other_aks = [ak for ak in context['event'].ak_set.prefetch_related('owners').all() if ak.wish]
+        # or other AKs of this category
+        else:
+            other_aks = [ak for ak in context['ak'].category.ak_set.prefetch_related('owners').all() if not ak.wish]
+
+        # Use that list of other AKs belonging to this category to identify the previous and next AK (if any)
+        for other_ak in other_aks:
+            if next_is_next:
+                context['next_ak'] = other_ak
+                next_is_next = False
+            elif other_ak.pk == context['ak'].pk :
+                context['previous_ak'] = last_ak
+                next_is_next = True
+            last_ak = other_ak
+
+        # Gather information for link lists for all categories (and wishes)
+        for category in context['event'].akcategory_set.prefetch_related('ak_set').all():
+            aks_for_category = []
+            for ak in category.ak_set.prefetch_related('owners').all():
+                if ak.wish:
+                    ak_wishes.append(ak)
+                else:
+                    aks_for_category.append(ak)
+            categories_with_aks.append((category, aks_for_category))
+
+        # Make sure wishes have the right order (since the list was filled category by category before, this requires
+        # explicitly reordering them by their primary key)
+        ak_wishes.sort(key=lambda x: x.pk)
+        categories_with_aks.append(
+                (AKCategory(name=_("Wishes"), pk=0, description="-"), ak_wishes))
+
+        context["categories_with_aks"] = categories_with_aks
+
+        return context
+
+
+class WishSlotCleanupView(EventSlugMixin, IntermediateAdminView):
+    """
+    Admin action view: Allow to delete all unscheduled slots for wishes
+
+    The view will render a preview of all slots that are affected by this. It is not possible to manually choose
+    which slots should be deleted (either all or none) and the functionality will therefore delete slots that were
+    created in the time between rendering of the preview and running the action ofter confirmation as well.
+
+    Due to the automated slot cleanup functionality for wishes in the AKSubmission app, this functionality should be
+    rarely needed/used
+    """
+    title = _('Cleanup: Delete unscheduled slots for wishes')
+
+    def get_success_url(self):
+        return reverse_lazy('admin:special-attention', kwargs={'slug': self.event.slug})
+
+    def get_preview(self):
+        slots = self.event.get_unscheduled_wish_slots()
+        return _("The following {count} unscheduled slots of wishes will be deleted:\n\n {slots}").format(
+            count=len(slots),
+            slots=", ".join(str(s.ak) for s in slots)
+        )
+
+    def form_valid(self, form):
+        self.event.get_unscheduled_wish_slots().delete()
+        messages.add_message(self.request, messages.SUCCESS, _("Unscheduled slots for wishes successfully deleted"))
+        return super().form_valid(form)
+
+
+class AvailabilityAutocreateView(EventSlugMixin, IntermediateAdminView):
+    """
+    Admin action view: Allow to automatically create default availabilities (event start to end) for all AKs without
+    any manually specified availability information
+
+    The view will render a preview of all AKs that are affected by this. It is not possible to manually choose
+    which AKs should be affected (either all or none) and the functionality will therefore create availability entries
+    for AKs that were created in the time between rendering of the preview and running the action ofter confirmation
+    as well.
+    """
+    title = _('Create default availabilities for AKs')
+
+    def get_success_url(self):
+        return reverse_lazy('admin:special-attention', kwargs={'slug': self.event.slug})
+
+    def get_preview(self):
+        aks = self.event.get_aks_without_availabilities()
+        return _("The following {count} AKs don't have any availability information. "
+                 "Create default availability for them:\n\n {aks}").format(
+            count=len(aks),
+            aks=", ".join(str(ak) for ak in aks)
+        )
+
+    def form_valid(self, form):
+        # Local import to prevent cyclic imports
+        # pylint: disable=import-outside-toplevel
+        from AKModel.availability.models import Availability
+
+        success_count = 0
+        for ak in self.event.get_aks_without_availabilities():
+            try:
+                availability = Availability.with_event_length(event=self.event, ak=ak)
+                availability.save()
+                success_count += 1
+            except: # pylint: disable=bare-except
+                messages.add_message(
+                    self.request, messages.WARNING,
+                    _("Could not create default availabilities for AK: {ak}").format(ak=ak)
+                )
+
+        messages.add_message(
+            self.request, messages.SUCCESS,
+            _("Created default availabilities for {count} AKs").format(count=success_count)
+        )
+        return super().form_valid(form)
+
+
+@status_manager.register(name="scheduling_constraint_violations")
+class CVWidget(TemplateStatusWidget):
+    """
+    Status page widget: Constraint violations
+    """
+    required_context_type = "event"
+    title = _("Constraint Violations")
+    template_name = "admin/AKScheduling/status/cvs.html"
+
+    def render_status(self, context: {}) -> str:
+        return "success" if context["constraint_violations_count"] == 0 else "warning"
+
+    def get_context_data(self, context) -> dict:
+        context = super().get_context_data(context)
+        context["constraint_violations_count"] = (context["event"].constraintviolation_set
+                                                  .filter(manually_resolved=False).count())
+        return context

AKSubmission/admin.py

-# Register your models here.

AKSubmission/api.py

+from datetime import datetime
+
+from rest_framework import status
+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+
+from AKModel.models import AK
+
+
+def ak_interest_indication_active(event, current_timestamp):
+    """
+    Check whether indication of interest is currently allowed for a given event
+
+    :param event: event to check for
+    :type event: Event
+    :param current_timestamp: current timestamp
+    :type current_timestamp: datetime
+    :return: True if indication is allowed, False if not
+    :rtype: Bool
+    """
+    return (event.active and event.interest_start is not None and event.interest_end is not None
+            and event.interest_start <= current_timestamp <= event.interest_end)
+
+
+@api_view(['POST'])
+def increment_interest_counter(request, event_slug, pk, **kwargs):
+    """
+    Increment interest counter for AK
+
+    This view either returns an HTTP 200 if the counter was incremented,
+    an HTTP 403 if indicating interest is currently not allowed,
+    or an HTTP 404 if there is no matching AK for the given primary key and event slug.
+    """
+    try:
+        ak = AK.objects.get(pk=pk, event__slug=event_slug)
+        # Check whether interest indication is currently allowed
+        current_timestamp = datetime.now().astimezone(ak.event.timezone)
+        if ak_interest_indication_active(ak.event, current_timestamp):
+            ak.interest_counter += 1
+            ak.save()
+            return Response({'interest_counter': ak.interest_counter}, status=status.HTTP_200_OK)
+        return Response(status=status.HTTP_403_FORBIDDEN)
+    except AK.DoesNotExist:
+        return Response(status=status.HTTP_404_NOT_FOUND)

AKSubmission/apps.py

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

AKSubmission/forms.py

+"""
+Submission-specific forms
+"""
+
 import itertools
+import re
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
+
+from AKModel.availability.forms import AvailabilitiesFormMixin
+from AKModel.availability.models import Availability
+from AKModel.models import AK, AKOwner, AKCategory, AKRequirement, AKSlot, AKOrgaMessage, AKType
 
-from AKModel.models import AK, AKOwner, AKCategory, AKRequirement, AKSlot
 
+class AKForm(AvailabilitiesFormMixin, forms.ModelForm):
+    """
+    Base form to add and edit AKs
 
-class AKForm(forms.ModelForm):
+    Contains suitable widgets for the different data types, restricts querysets (e.g., of requirements) to entries
+    belonging to the event this AK belongs to.
+    Prepares initial slot creation (by accepting multiple input formats and a list of slots to generate),
+    automatically generate short names and wiki links if necessary
+
+    Will be modified/used by :class:`AKSubmissionForm` (that allows to add slots and excludes links)
+    and :class:`AKWishForm`
+    """
     required_css_class = 'required'
+    split_string = re.compile('[,;]')
 
     class Meta:
         model = AK
         fields = ['name',
                   'short_name',
-                  'link',
+                  'protocol_link',
                   'owners',
                   'description',
                   'category',
+                  'types',
                   'reso',
                   'present',
                   'requirements',
@@ -29,35 +49,45 @@ class AKForm(forms.ModelForm):
 
         widgets = {
             'requirements': forms.CheckboxSelectMultiple,
+            'types': forms.CheckboxSelectMultiple,
             'event': forms.HiddenInput,
         }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.initial = {**self.initial, **kwargs['initial']}
         # Use better multiple select input for owners, conflicts and prerequisites
         if "owners" in self.fields:
             self.fields["owners"].widget.attrs = {'class': 'chosen-select'}
         self.fields["conflicts"].widget.attrs = {'class': 'chosen-select'}
         self.fields["prerequisites"].widget.attrs = {'class': 'chosen-select'}
 
-        help_tags_addition = _('Separate multiple tags with semicolon')
-
-        # Add text fields for tags
-        self.fields["tags_raw"] = forms.CharField(
-            required=False,
-            label=AK.tags.field.verbose_name,
-            help_text=f"{AK.tags.field.help_text} ({help_tags_addition})")
-
         self.fields['category'].queryset = AKCategory.objects.filter(event=self.initial.get('event'))
+        self.fields['types'].queryset = AKType.objects.filter(event=self.initial.get('event'))
+        # Don't ask for types if there are no types configured for this event
+        if self.fields['types'].queryset.count() == 0:
+            self.fields.pop('types')
         self.fields['requirements'].queryset = AKRequirement.objects.filter(event=self.initial.get('event'))
-        self.fields['prerequisites'].queryset = AK.objects.filter(event=self.initial.get('event')).exclude(pk=self.instance.pk)
-        self.fields['conflicts'].queryset = AK.objects.filter(event=self.initial.get('event')).exclude(pk=self.instance.pk)
+        # Don't ask for requirements if there are no requirements configured for this event
+        if self.fields['requirements'].queryset.count() == 0:
+            self.fields.pop('requirements')
+        self.fields['prerequisites'].queryset = AK.objects.filter(event=self.initial.get('event')).exclude(
+            pk=self.instance.pk)
+        self.fields['conflicts'].queryset = AK.objects.filter(event=self.initial.get('event')).exclude(
+            pk=self.instance.pk)
         if "owners" in self.fields:
             self.fields['owners'].queryset = AKOwner.objects.filter(event=self.initial.get('event'))
 
     @staticmethod
     def _clean_duration(duration):
-        # Handle different duration formats (h:mm and decimal comma instead of point)
+        """
+        Clean/convert input format for the duration(s) of the slot(s)
+
+        Handle different duration formats (h:mm and decimal comma instead of point)
+
+        :param duration: raw input, either with ":", "," or "."
+        :return: normalized duration (point-separated hour float)
+        """
         if ":" in duration:
             h, m = duration.split(":")
             duration = int(h) + int(m) / 60
@@ -65,37 +95,47 @@ class AKForm(forms.ModelForm):
             duration = float(duration.replace(",", "."))
 
         try:
-            float(duration)
-        except ValueError:
+            duration = float(duration)
+        except ValueError as exc:
             raise ValidationError(
                 _('"%(duration)s" is not a valid duration'),
                 code='invalid',
                 params={'duration': duration},
-            )
+            ) from exc
 
         return duration
 
     def clean(self):
+        """
+        Normalize/clean inputs
+
+        Generate a (not yet used) short name if field was left blank,
+        create a list of normalized slot durations
+
+        :return: cleaned inputs
+        """
         cleaned_data = super().clean()
 
         # Generate short name if not given
         short_name = self.cleaned_data["short_name"]
         if len(short_name) == 0:
             short_name = self.cleaned_data['name']
+            # First try to split AK name at positions with semantic value (e.g., where the full name is separated
+            # by a ':'), if not possible, do a hard cut at the maximum specified length
             short_name = short_name.partition(':')[0]
             short_name = short_name.partition(' - ')[0]
             short_name = short_name.partition(' (')[0]
             short_name = short_name[:AK._meta.get_field('short_name').max_length]
+            # Check whether this short name already exists...
             for i in itertools.count(1):
+                # ...and either use it...
                 if not AK.objects.filter(short_name=short_name, event=self.cleaned_data["event"]).exists():
                     break
+                # ... or postfix a number starting at 1 and growing until an unused short name is found
                 digits = len(str(i))
-                short_name = '{}-{}'.format(short_name[:-(digits + 1)], i)
+                short_name = f'{short_name[:-(digits + 1)]}-{i}'
             cleaned_data["short_name"] = short_name
 
-        # Get tag names from raw tags
-        cleaned_data["tag_names"] = [name.strip().lower() for name in cleaned_data["tags_raw"].split(";")]
-
         # Get durations from raw durations field
         if "durations" in cleaned_data:
             cleaned_data["durations"] = [self._clean_duration(d) for d in self.cleaned_data["durations"].split()]
@@ -103,37 +143,63 @@ class AKForm(forms.ModelForm):
 
 
 class AKSubmissionForm(AKForm):
+    """
+    Form for Submitting new AKs
+
+    Is a special variant of :class:`AKForm` that does not allow to manually edit wiki and protocol links and enforces
+    the generation of at least one slot.
+    """
     class Meta(AKForm.Meta):
-        exclude = ['link']
+        # Exclude fields again that were previously included in the parent class
+        exclude = ['link', 'protocol_link'] #pylint: disable=modelform-uses-exclude
+        widgets = AKForm.Meta.widgets | {
+            'types': forms.CheckboxSelectMultiple(attrs={'checked' : 'checked'}),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # Add field for durations
+        # Add field for durations (cleaning will be handled by parent class)
         self.fields["durations"] = forms.CharField(
             widget=forms.Textarea,
             label=_("Duration(s)"),
             help_text=_(
-                "Enter at least one planned duration (in hours). If your AK should have multiple slots, use multiple lines"),
-            initial=
-            self.initial.get('event').default_slot
+                "Enter at least one planned duration (in hours). "
+                "If your AK should have multiple slots, use multiple lines"),
+            initial=self.initial.get('event').default_slot
         )
 
-
-class AKEditForm(AKForm):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Add existing tags to tag raw field
-        self.fields["tags_raw"].initial = "; ".join(str(tag) for tag in self.instance.tags.all())
-
-
-class AKWishForm(AKSubmissionForm):
+    def clean_availabilities(self):
+        """
+        Automatically improve availabilities entered.
+        If the user did not specify availabilities assume the full event duration is possible
+        :return: cleaned availabilities
+        (either user input or one availability for the full length of the event if user input was empty)
+        """
+        availabilities = super().clean_availabilities()
+        if len(availabilities) == 0:
+            availabilities.append(Availability.with_event_length(event=self.cleaned_data["event"]))
+        return availabilities
+
+
+class AKWishForm(AKForm):
+    """
+    Form for submitting or editing wishes
+
+    Is a special variant of :class:`AKForm` that does not allow to specify owner(s) or
+    manually edit wiki and protocol links
+    """
     class Meta(AKForm.Meta):
-        exclude = ['owners', 'link']
+        # Exclude fields again that were previously included in the parent class
+        exclude = ['owners', 'link', 'protocol_link'] #pylint: disable=modelform-uses-exclude
+        widgets = AKForm.Meta.widgets | {
+            'types': forms.CheckboxSelectMultiple(attrs={'checked': 'checked'}),
+        }
 
 
 class AKOwnerForm(forms.ModelForm):
+    """
+    Form to create/edit AK owners
+    """
     required_css_class = 'required'
 
     class Meta:
@@ -145,6 +211,9 @@ class AKOwnerForm(forms.ModelForm):
 
 
 class AKDurationForm(forms.ModelForm):
+    """
+    Form to add an additional slot to a given AK
+    """
     class Meta:
         model = AKSlot
         fields = ['duration', 'ak', 'event']
@@ -152,3 +221,17 @@ class AKDurationForm(forms.ModelForm):
             'ak': forms.HiddenInput,
             'event': forms.HiddenInput
         }
+
+
+class AKOrgaMessageForm(forms.ModelForm):
+    """
+    Form to create a confidential message to the organizers  belonging to a given AK
+    """
+    class Meta:
+        model = AKOrgaMessage
+        fields = ['ak', 'text', 'event']
+        widgets = {
+            'ak': forms.HiddenInput,
+            'event': forms.HiddenInput,
+            'text': forms.Textarea,
+        }

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-12 22:53+0000\n"
+"POT-Creation-Date: 2025-03-25 15:58+0100\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,20 +17,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKSubmission/forms.py:43
-msgid "Separate multiple tags with semicolon"
-msgstr "Mehrere Tags mit Semikolon trennen"
-
-#: AKSubmission/forms.py:71
+#: AKSubmission/forms.py:101
 #, python-format
 msgid "\"%(duration)s\" is not a valid duration"
 msgstr "\"%(duration)s\" ist keine gültige Dauer"
 
-#: AKSubmission/forms.py:114
+#: AKSubmission/forms.py:164
 msgid "Duration(s)"
 msgstr "Dauer(n)"
 
-#: AKSubmission/forms.py:116
+#: AKSubmission/forms.py:166
 msgid ""
 "Enter at least one planned duration (in hours). If your AK should have "
 "multiple slots, use multiple lines"
@@ -38,141 +34,223 @@ msgstr ""
 "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere "
 "Slots haben soll, mehrere Zeilen verwenden"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:10
-#: AKSubmission/templates/AKSubmission/ak_edit.html:8
-#: AKSubmission/templates/AKSubmission/ak_history.html:11
-#: AKSubmission/templates/AKSubmission/ak_overview.html:8
-#: AKSubmission/templates/AKSubmission/ak_overview.html:27
-#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
-#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
-#: AKSubmission/templates/AKSubmission/submission_overview.html:6
-#: AKSubmission/templates/AKSubmission/submission_overview.html:23
-#: AKSubmission/templates/AKSubmission/submit_new.html:8
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
-msgid "AKs"
-msgstr "AKs"
-
-#: AKSubmission/templates/AKSubmission/ak_detail.html:10
-#: AKSubmission/templates/AKSubmission/ak_history.html:11
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
-msgid "AK"
-msgstr "AK"
-
-#: AKSubmission/templates/AKSubmission/ak_detail.html:15
+#: AKSubmission/templates/AKSubmission/ak_detail.html:22
 #: AKSubmission/templates/AKSubmission/ak_edit.html:13
 #: AKSubmission/templates/AKSubmission/ak_history.html:16
 #: AKSubmission/templates/AKSubmission/ak_overview.html:22
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:13
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:12
 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:12
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:12
-#: AKSubmission/templates/AKSubmission/submission_overview.html:6
-#: AKSubmission/templates/AKSubmission/submission_overview.html:19
-#: AKSubmission/templates/AKSubmission/submit_new.html:18
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:10
+#: AKSubmission/templates/AKSubmission/submission_not_configured.html:7
+#: AKSubmission/templates/AKSubmission/submission_not_configured.html:11
+#: AKSubmission/templates/AKSubmission/submission_overview.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:11
+#: AKSubmission/templates/AKSubmission/submission_overview.html:36
+#: AKSubmission/templates/AKSubmission/submit_new.html:38
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:13
 msgid "AK Submission"
 msgstr "AK-Eintragung"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:30
+#: AKSubmission/templates/AKSubmission/ak_detail.html:126
+#: AKSubmission/templates/AKSubmission/ak_interest_script.html:50
+msgid "Interest indication currently not allowed. Sorry."
+msgstr "Interessenangabe aktuell nicht erlaubt. Sorry."
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:128
+#: AKSubmission/templates/AKSubmission/ak_interest_script.html:52
+msgid "Could not save your interest. Sorry."
+msgstr "Interesse konnte nicht gespeichert werden. Sorry."
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:149
 msgid "Interest"
 msgstr "Interesse"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:33
-#, fuzzy
-#| msgid "Interest"
+#: AKSubmission/templates/AKSubmission/ak_detail.html:151
+#: AKSubmission/templates/AKSubmission/ak_table.html:65
 msgid "Show Interest"
-msgstr "Interesse"
+msgstr "Interesse bekunden"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:39
-#: AKSubmission/templates/AKSubmission/ak_table.html:48
+#: AKSubmission/templates/AKSubmission/ak_detail.html:157
+#: AKSubmission/templates/AKSubmission/ak_table.html:56
 msgid "Open external link"
 msgstr "Externen Link öffnen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:44
+#: AKSubmission/templates/AKSubmission/ak_detail.html:162
+msgid "Open protocol link"
+msgstr "Protokolllink öffnen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:167
 #: AKSubmission/templates/AKSubmission/ak_history.html:19
 #: AKSubmission/templates/AKSubmission/ak_history.html:31
 msgid "History"
 msgstr "Versionsgeschichte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:47
-#: AKSubmission/templates/AKSubmission/ak_detail.html:146
+#: AKSubmission/templates/AKSubmission/ak_detail.html:170
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:8
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:16
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:22
+msgid "Add confidential message to organizers"
+msgstr "Sende eine private Nachricht an das Organisationsteam"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:173
+#: AKSubmission/templates/AKSubmission/ak_detail.html:326
 #: AKSubmission/templates/AKSubmission/ak_edit.html:16
-#: AKSubmission/templates/AKSubmission/ak_table.html:53
+#: AKSubmission/templates/AKSubmission/ak_table.html:61
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:52
+#: AKSubmission/templates/AKSubmission/ak_detail.html:178
 #: AKSubmission/templates/AKSubmission/ak_history.html:31
-#: AKSubmission/templates/AKSubmission/ak_table.html:35
+#: AKSubmission/templates/AKSubmission/ak_table.html:37
 msgid "AK Wish"
 msgstr "AK-Wunsch"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:56
+#: AKSubmission/templates/AKSubmission/ak_detail.html:186
+#, python-format
+msgid ""
+"This AK currently takes place for another <span v-html=\"timeUntilEnd\">"
+"%(featured_slot_remaining)s</span> minute(s) in %(room)s.&nbsp;"
+msgstr ""
+"Dieser AK findet noch <span v-html=\"timeUntilEnd\">"
+"%(featured_slot_remaining)s</span> Minute(n) in %(room)s statt.&nbsp;\n"
+"                    "
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:189
+#, python-format
+msgid ""
+"This AK starts in <span v-html=\"timeUntilStart\">"
+"%(featured_slot_remaining)s</span> minute(s) in %(room)s.&nbsp;"
+msgstr ""
+"Dieser AK beginnt in <span v-html=\"timeUntilStart\">"
+"%(featured_slot_remaining)s</span> Minute(n) in %(room)s.&nbsp;\n"
+"                    "
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:194
+#: AKSubmission/templates/AKSubmission/ak_detail.html:334
+msgid "Go to virtual room"
+msgstr "Zum virtuellen Raum"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:205
 #: AKSubmission/templates/AKSubmission/ak_table.html:10
 msgid "Who?"
 msgstr "Wer?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:62
+#: AKSubmission/templates/AKSubmission/ak_detail.html:211
 #: AKSubmission/templates/AKSubmission/ak_history.html:36
 #: AKSubmission/templates/AKSubmission/ak_table.html:11
 msgid "Category"
 msgstr "Kategorie"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:68
+#: AKSubmission/templates/AKSubmission/ak_detail.html:218
+#: AKSubmission/templates/AKSubmission/ak_table.html:13
+msgid "Types"
+msgstr "Typen"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:228
+#: AKSubmission/templates/AKSubmission/ak_history.html:37
+msgid "Track"
+msgstr "Track"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:234
 msgid "Present this AK"
 msgstr "Diesen AK vorstellen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:72
-#: AKSubmission/templates/AKSubmission/ak_table.html:12
-msgid "Tags"
-msgstr "Tags"
+#: AKSubmission/templates/AKSubmission/ak_detail.html:239
+msgid "(Category Default)"
+msgstr "(Kategorievoreinstellung)"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:78
-msgid "Reso?"
-msgstr "Reso?"
+#: AKSubmission/templates/AKSubmission/ak_detail.html:245
+msgid "Reso intention?"
+msgstr "Resoabsicht?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:85
+#: AKSubmission/templates/AKSubmission/ak_detail.html:252
 msgid "Requirements"
 msgstr "Anforderungen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:98
+#: AKSubmission/templates/AKSubmission/ak_detail.html:265
 msgid "Conflicting AKs"
-msgstr "AK Konflikte"
+msgstr "AK-Konflikte"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:106
+#: AKSubmission/templates/AKSubmission/ak_detail.html:273
 msgid "Prerequisite AKs"
-msgstr "AK Voraussetzungen"
+msgstr "Vorausgesetzte AKs"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:114
+#: AKSubmission/templates/AKSubmission/ak_detail.html:281
 msgid "Notes"
 msgstr "Notizen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:131
+#: AKSubmission/templates/AKSubmission/ak_detail.html:294
 msgid "When?"
 msgstr "Wann?"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:132
+#: AKSubmission/templates/AKSubmission/ak_detail.html:296
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:35
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:133
+#: AKSubmission/templates/AKSubmission/ak_detail.html:298
 msgid "Room"
 msgstr "Raum"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:149
+#: AKSubmission/templates/AKSubmission/ak_detail.html:329
 msgid "Delete"
 msgstr "Löschen"
 
-#: AKSubmission/templates/AKSubmission/ak_detail.html:161
+#: AKSubmission/templates/AKSubmission/ak_detail.html:340
+msgid "Schedule"
+msgstr "Schedule"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:352
 msgid "Add another slot"
 msgstr "Einen neuen AK-Slot hinzufügen"
 
+#: AKSubmission/templates/AKSubmission/ak_detail.html:362
+msgid "Possible Times"
+msgstr "Mögliche Zeiten"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:366
+msgid "Start"
+msgstr "Start"
+
+#: AKSubmission/templates/AKSubmission/ak_detail.html:367
+msgid "End"
+msgstr "Ende"
+
 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
-#: AKSubmission/templates/AKSubmission/ak_edit.html:21
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/ak_overview.html:8
+#: AKSubmission/templates/AKSubmission/ak_overview.html:12
+#: AKSubmission/templates/AKSubmission/ak_overview.html:33
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:7
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:7
+#: AKSubmission/templates/AKSubmission/submission_not_configured.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:7
+#: AKSubmission/templates/AKSubmission/submission_overview.html:40
+#: AKSubmission/templates/AKSubmission/submit_new.html:9
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:7
+msgid "AKs"
+msgstr "AKs"
+
+#: AKSubmission/templates/AKSubmission/ak_edit.html:8
+#: AKSubmission/templates/AKSubmission/ak_edit.html:32
 msgid "Edit AK"
 msgstr "AK bearbeiten"
 
+#: AKSubmission/templates/AKSubmission/ak_edit.html:24
+msgid ""
+"Add person not in the list yet. Unsaved changes in this form will be lost."
+msgstr ""
+"Person hinzufügen, die noch nicht in der Liste ist. Ungespeicherte "
+"Änderungen in diesem Formular gehen verloren."
+
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
+msgid "AK"
+msgstr "AK"
+
 #: AKSubmission/templates/AKSubmission/ak_history.html:27
 msgid "Back"
 msgstr "Zurück"
@@ -182,25 +260,21 @@ msgstr "Zurück"
 msgid "Name"
 msgstr "Name"
 
-#: AKSubmission/templates/AKSubmission/ak_history.html:37
-msgid "Track"
-msgstr "Track"
-
 #: AKSubmission/templates/AKSubmission/ak_history.html:38
 msgid "Time"
 msgstr "Zeit"
 
 #: AKSubmission/templates/AKSubmission/ak_history.html:48
-#: AKSubmission/templates/AKSubmission/ak_table.html:26
-msgid "present this AK"
-msgstr "Diesen AK vorstellen"
+#: AKSubmission/templates/AKSubmission/ak_table.html:28
+msgid "Present results of this AK"
+msgstr "Die Ergebnisse dieses AKs vorstellen"
 
 #: AKSubmission/templates/AKSubmission/ak_history.html:52
-#: AKSubmission/templates/AKSubmission/ak_table.html:30
-msgid "Reso"
-msgstr "Reso"
+#: AKSubmission/templates/AKSubmission/ak_table.html:32
+msgid "Intends to submit a resolution"
+msgstr "Beabsichtigt eine Resolution einzureichen"
 
-#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:29
+#: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:82
 msgid "All AKs"
 msgstr "Alle AKs"
 
@@ -212,35 +286,45 @@ msgstr "Tracks"
 msgid "AK List"
 msgstr "AK-Liste"
 
-#: AKSubmission/templates/AKSubmission/ak_table.html:44
+#: AKSubmission/templates/AKSubmission/ak_overview.html:29
+msgid "Add AK"
+msgstr "AK hinzufügen"
+
+#: AKSubmission/templates/AKSubmission/ak_table.html:52
 msgid "Details"
 msgstr "Details"
 
-#: AKSubmission/templates/AKSubmission/ak_table.html:63
+#: AKSubmission/templates/AKSubmission/ak_table.html:76
 msgid "There are no AKs in this category yet"
 msgstr "Es gibt noch keine AKs in dieser Kategorie"
 
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:27
+msgid "Send"
+msgstr "Senden"
+
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:31
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:26
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:29
+#: AKSubmission/templates/AKSubmission/submit_new.html:59
+msgid "Reset Form"
+msgstr "Formular leeren"
+
+#: AKSubmission/templates/AKSubmission/akmessage_add.html:35
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:30
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:33
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:45
+#: AKSubmission/templates/AKSubmission/submit_new.html:63
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:7
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:13
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:18
 msgid "AK Owner"
 msgstr "AK-Leitung"
 
-#: AKSubmission/templates/AKSubmission/akowner_create_update.html:24
-#: AKSubmission/templates/AKSubmission/akslot_add_update.html:26
-#: AKSubmission/templates/AKSubmission/submit_new.html:34
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: AKSubmission/templates/AKSubmission/akowner_create_update.html:28
-#: AKSubmission/templates/AKSubmission/akslot_add_update.html:30
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:42
-#: AKSubmission/templates/AKSubmission/submit_new.html:38
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: AKSubmission/templates/AKSubmission/akowner_create_update.html:31
-#: AKSubmission/templates/AKSubmission/akslot_add_update.html:33
+#: AKSubmission/templates/AKSubmission/akowner_create_update.html:23
+#: AKSubmission/templates/AKSubmission/akslot_add_update.html:25
 msgid "Continue"
 msgstr "Weiter"
 
@@ -257,7 +341,7 @@ msgstr "AK-Dauer(n)"
 msgid "Do you really want to delete this AK Slot?"
 msgstr "Willst du diesen AK-Slot wirklich löschen?"
 
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:45
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:41
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -265,103 +349,143 @@ msgstr "Bestätigen"
 msgid "Write to organizers of this event for questions and comments"
 msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:27
+#: AKSubmission/templates/AKSubmission/submission_not_configured.html:20
+msgid ""
+"System is not yet configured for AK submission and listing. Please try again "
+"later."
+msgstr ""
+"Das System ist bisher nicht für Eintragen und Anzeige von AKs konfiguriert. "
+"Bitte versuche es später wieder."
+
+#: AKSubmission/templates/AKSubmission/submission_overview.html:44
 msgid ""
 "On this page you can see a list of current AKs, change them and add new ones."
 msgstr ""
 "Auf dieser Seite kannst du eine Liste von aktuellen AKs sehen, diese "
 "bearbeiten und neue hinzufügen."
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:34
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:11
-#: AKSubmission/templates/AKSubmission/submit_new_wish.html:15
+#: AKSubmission/templates/AKSubmission/submission_overview.html:52
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:7
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:14
+#: AKSubmission/templates/AKSubmission/submit_new_wish.html:18
 msgid "New AK Wish"
 msgstr "Neuer AK-Wunsch"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:38
+#: AKSubmission/templates/AKSubmission/submission_overview.html:56
 msgid "Who"
 msgstr "Wer"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:41
+#: AKSubmission/templates/AKSubmission/submission_overview.html:59
 msgid "I do not own AKs yet"
 msgstr "Ich leite bisher keine AKs"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:49
-#: AKSubmission/templates/AKSubmission/submit_new.html:8
-#: AKSubmission/templates/AKSubmission/submit_new.html:21
-#: AKSubmission/templates/AKSubmission/submit_new.html:28
+#: AKSubmission/templates/AKSubmission/submission_overview.html:67
+#: AKSubmission/templates/AKSubmission/submit_new.html:9
+#: AKSubmission/templates/AKSubmission/submit_new.html:41
+#: AKSubmission/templates/AKSubmission/submit_new.html:48
 msgid "New AK"
 msgstr "Neuer AK"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:55
+#: AKSubmission/templates/AKSubmission/submission_overview.html:73
 msgid "Edit Person Info"
 msgstr "Personen-Info bearbeiten"
 
-#: AKSubmission/templates/AKSubmission/submission_overview.html:62
+#: AKSubmission/templates/AKSubmission/submission_overview.html:81
 msgid "This event is not active. You cannot add or change AKs"
 msgstr ""
 "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet "
 "werden"
 
-#: AKSubmission/templates/AKSubmission/submit_new.html:41
+#: AKSubmission/templates/AKSubmission/submit_new.html:29
+msgid ""
+"only relevant for KIF-AKs - determines whether the AK appears in the slides "
+"for the closing plenary session"
+msgstr "nur relevant für KIF-AKs - entscheidet, ob der AK in den Folien fürs Abschlussplenum auftaucht"
+
+#: AKSubmission/templates/AKSubmission/submit_new.html:55
 msgid "Submit"
 msgstr "Eintragen"
 
-#: AKSubmission/views.py:49
+#: AKSubmission/views.py:125
 msgid "Wishes"
 msgstr "Wünsche"
 
-#: AKSubmission/views.py:49
+#: AKSubmission/views.py:125
 msgid "AKs one would like to have"
 msgstr ""
 "AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie "
 "macht. Falls du dir das vorstellen kannst, trag dich einfach ein"
 
-#: AKSubmission/views.py:65
-
+#: AKSubmission/views.py:167
 msgid "Currently planned AKs"
 msgstr "Aktuell geplante AKs"
 
-#: AKSubmission/views.py:136
+#: AKSubmission/views.py:305
 msgid "Event inactive. Cannot create or update."
 msgstr "Event inaktiv. Hinzufügen/Bearbeiten nicht möglich."
 
-#: AKSubmission/views.py:152
+#: AKSubmission/views.py:330
 msgid "AK successfully created"
 msgstr "AK erfolgreich angelegt"
 
-#: AKSubmission/views.py:210
+#: AKSubmission/views.py:404
 msgid "AK successfully updated"
 msgstr "AK erfolgreich aktualisiert"
 
-#: AKSubmission/views.py:288
-msgid "Person Info successfully updated"
-msgstr "Personen-Info erfolgreich aktualisiert"
+#: AKSubmission/views.py:455
+#, python-brace-format
+msgid "Added '{owner}' as new owner of '{ak.name}'"
+msgstr "'{owner}' als neue Leitung von '{ak.name}' hinzugefügt"
 
-#: AKSubmission/views.py:308
+#: AKSubmission/views.py:558
 msgid "No user selected"
 msgstr "Keine Person ausgewählt"
 
-#: AKSubmission/views.py:334
+#: AKSubmission/views.py:574
+msgid "Person Info successfully updated"
+msgstr "Personen-Info erfolgreich aktualisiert"
+
+#: AKSubmission/views.py:610
 msgid "AK Slot successfully added"
 msgstr "AK-Slot erfolgreich angelegt"
 
-#: AKSubmission/views.py:348
+#: AKSubmission/views.py:629
 msgid "You cannot edit a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"
 
-#: AKSubmission/views.py:358
+#: AKSubmission/views.py:639
 msgid "AK Slot successfully updated"
 msgstr "AK-Slot erfolgreich aktualisiert"
 
-#: AKSubmission/views.py:371
+#: AKSubmission/views.py:657
 msgid "You cannot delete a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"
 
-#: AKSubmission/views.py:381
+#: AKSubmission/views.py:667
 msgid "AK Slot successfully deleted"
 msgstr "AK-Slot erfolgreich angelegt"
 
-#~ msgid "Categories"
-#~ msgstr "Kategorie"
+#: AKSubmission/views.py:679
+msgid "Messages"
+msgstr "Nachrichten"
+
+#: AKSubmission/views.py:689
+msgid "Delete all messages"
+msgstr "Alle Nachrichten löschen"
+
+#: AKSubmission/views.py:716
+msgid "Message to organizers successfully saved"
+msgstr "Nachricht an die Organisator*innen erfolgreich gespeichert"
+
+#~ msgid ""
+#~ "Due to technical reasons, the link you entered was truncated to a length "
+#~ "of 200 characters"
+#~ msgstr ""
+#~ "Aus technischen Gründen wurde der eingegebeneLink auf eine Länge von 200 "
+#~ "Zeichen gekürzt"
+
+#~ msgid "Interest saved"
+#~ msgstr "Interesse gespeichert"
+
+#~ msgid "Present AK results"
+#~ msgstr "AK-Ergebnisse vorstellen"

AKSubmission/models.py

-# Create your models here.
+from django.apps import apps
+from django.conf import settings
+from django.core.mail import EmailMessage
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from AKModel.models import AKOrgaMessage, AKSlot
+
+
+@receiver(post_save, sender=AKOrgaMessage)
+def orga_message_saved_handler(sender, instance: AKOrgaMessage, created, **kwargs): # pylint: disable=unused-argument
+    """
+    React to newly created Orga message by sending an email
+    """
+
+    if created and settings.SEND_MAILS:
+        host = 'https://' + settings.ALLOWED_HOSTS[0] if len(settings.ALLOWED_HOSTS) > 0 else 'http://127.0.0.1:8000'
+        url = f"{host}{instance.ak.detail_url}"
+
+        mail = EmailMessage(
+            f"[AKPlanning] New message for AK '{instance.ak}' ({instance.ak.event})",
+            f"{instance.text}\n\n{url}",
+            settings.DEFAULT_FROM_EMAIL,
+            [instance.ak.event.contact_email]
+        )
+        mail.send(fail_silently=True)
+
+
+@receiver(post_save, sender=AKSlot)
+def slot_created_handler(sender, instance: AKSlot, created, **kwargs): # pylint: disable=unused-argument
+    """
+    React to slots that are created after the plan was already published by sending an email
+    """
+    if created and settings.SEND_MAILS and apps.is_installed("AKPlan") \
+            and not instance.event.plan_hidden and instance.room is None and instance.start is None: # pylint: disable=too-many-boolean-expressions,line-too-long
+        host = 'https://' + settings.ALLOWED_HOSTS[0] if len(settings.ALLOWED_HOSTS) > 0 else 'http://127.0.0.1:8000'
+        url = f"{host}{instance.ak.detail_url}"
+
+        mail = EmailMessage(
+            f"[AKPlanning] New slot for AK '{instance.ak}' ({instance.ak.event}) added",
+            f"New slot requested.\n\nAK: {instance.ak}\nDuration: {instance.duration}\n\n{url}",
+            settings.DEFAULT_FROM_EMAIL,
+            [instance.ak.event.contact_email]
+        )
+        mail.send(fail_silently=True)

AKSubmission/templates/AKSubmission/ak_detail.html

 {% extends 'AKSubmission/submission_base.html' %}
 
 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
+{% load tz %}
 
 {% load tags_AKSubmission %}
 {% load tags_AKModel %}
 
 
-{% block title %}{% trans "AKs" %}: {{ ak.event.name }} - {% trans "AK" %}: {{ ak.name }}{% endblock %}
+{% block title %}{{ ak.name }} ({{ ak.event.name }}) {% endblock %}
+
+{% block meta %}
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:title" content="{{ak.name}} ({{ak.event.name }})" />
+    <meta name="twitter:description" content="{{ ak.description }}" />
+{% endblock %}
 
 {% block breadcrumbs %}
     {% include "AKSubmission/submission_breadcrumbs.html" %}
@@ -19,38 +26,180 @@
 {% if 'AKPlan'|check_app_installed %}
     {% block imports %}
         {% include "AKPlan/plan_akslot.html" %}
+
+        <script type="module">
+          const { createApp } = Vue
+
+          function getCurrentTimestamp() {
+                return Date.now() / 1000
+            }
+
+          createApp({
+            delimiters: ["[[", "]]"],
+            data() {
+              return {
+                  featuredSlot: "{% if featured_slot %}true{% else %}false{% endif %}",
+                  timer: null,
+                  now: getCurrentTimestamp(),
+                  akStart: "{{ featured_slot.start | date:'U' }}",
+                  akEnd: "{{ featured_slot.end | date:'U' }}",
+                  showBoxWithoutJS: false,
+              }
+            },
+            computed: {
+                showFeatured() {
+                    return this.featuredSlot && this.now < this.akEnd
+                },
+                isBefore() {
+                    return this.featuredSlot && this.now < this.akStart
+                },
+                isDuring() {
+                    return this.featuredSlot && this.akStart < this.now && this.now < this.akEnd
+                },
+                timeUntilStart() {
+                    return Math.ceil((this.akStart - this.now) / 60)
+                },
+                timeUntilEnd() {
+                    return Math.floor((this.akEnd - this.now) / 60)
+                }
+            },
+            mounted: function () {
+                if(this.featuredSlot) {
+                    this.timer = setInterval(() => {
+                        this.now = getCurrentTimestamp()
+                    }, 10000)
+                }
+            },
+            beforeUnmount() {
+                clearInterval(this.timer)
+            }
+          }).mount('#app')
+        </script>
+
+        <script>
+            document.addEventListener('DOMContentLoaded', function () {
+                // CSRF Protection/Authentication
+                function getCookie(name) {
+                    let cookieValue = null;
+                    if (document.cookie && document.cookie !== '') {
+                        const cookies = document.cookie.split(';');
+                        for (let i = 0; i < cookies.length; i++) {
+                            const cookie = cookies[i].trim();
+                            // Does this cookie string begin with the name we want?
+                            if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                                break;
+                            }
+                        }
+                    }
+                    return cookieValue;
+                }
+
+                const csrftoken = getCookie('csrftoken');
+
+                function csrfSafeMethod(method) {
+                    // these HTTP methods do not require CSRF protection
+                    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+                }
+
+                $.ajaxSetup({
+                    beforeSend: function (xhr, settings) {
+                        if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+                            xhr.setRequestHeader("X-CSRFToken", csrftoken);
+                        }
+                    }
+                });
+
+                function indicate_interest(ak_id, btn) {
+                    $.ajax({
+                           url: "{% url "model:AK-list" event_slug=event.slug %}" + ak_id + "/indicate-interest/",
+                            type: 'POST',
+                            data: {
+                            },
+                            success: function (response) {
+                               btn.html('{% fa6_icon 'check' 'fas' %}');
+                               btn.off('click');
+                               $('#interest-counter').html(response.interest_counter);
+                            },
+                            error: function (response) {
+                               if(response.status === 403)
+                                    alert("{% trans 'Interest indication currently not allowed. Sorry.' %}");
+                               else
+                                   alert("{% trans 'Could not save your interest. Sorry.' %}");
+                            }
+                       });
+                }
+
+                // Update counter
+                $('#btn-indicate-interest').click(function () {
+                    indicate_interest({{ ak.pk }}, $(this));
+                });
+            });
+        </script>
+
     {% endblock %}
 {% endif %}
 
 {% block content %}
     {% include "messages.html" %}
 
-    <div class="text-right">
+    <div class="text-end">
         {% if ak.interest_counter >= 0 %}
-            {% trans 'Interest' %}: <b class='mx-1 text-muted'>{{ ak.interest_counter }}</b>
-            {% if ak.event.active %}
-                <a href="{% url 'submit:inc_interest' event_slug=ak.event.slug pk=ak.pk %}" data-toggle="tooltip"
+            {% if ak.event.active and interest_indication_active %}
+                {% trans 'Interest' %}: <b class='mx-1 text-muted' id="interest-counter">{{ ak.interest_counter }}</b>
+                <a href="#" data-bs-toggle="tooltip"
                    title="{% trans 'Show Interest' %}"
-                   class="btn btn-primary">{% fa5_icon 'thumbs-up' 'fas' %}</a>
+                   class="btn btn-primary" id="btn-indicate-interest">{% fa6_icon 'thumbs-up' 'fas' %}</a>
             {% endif %}
         {% endif %}
         {% if ak.link != "" %}
-            <a href="{{ ak.link }}" data-toggle="tooltip"
+            <a href="{{ ak.link }}" data-bs-toggle="tooltip"
                title="{% trans 'Open external link' %}"
-               class="btn btn-info">{% fa5_icon 'external-link-alt' 'fas' %}</a>
+               class="btn btn-info">{% fa6_icon 'external-link-alt' 'fas' %}</a>
+        {% endif %}
+        {% if ak.protocol_link != "" %}
+            <a href="{{ ak.protocol_link }}" data-bs-toggle="tooltip"
+               title="{% trans 'Open protocol link' %}"
+               class="btn btn-warning">{% fa6_icon 'file-alt' 'far' %}</a>
         {% endif %}
         <a href="{% url 'submit:ak_history' event_slug=ak.event.slug pk=ak.pk %}"
-           data-toggle="tooltip"
-           title="{% trans 'History' %}" class="btn btn-light">{% fa5_icon 'clock' 'fas' %}</a>
+           data-bs-toggle="tooltip"
+           title="{% trans 'History' %}" class="btn btn-light">{% fa6_icon 'clock' 'fas' %}</a>
         {% if ak.event.active %}
-            <a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" data-toggle="tooltip"
+            <a href="{% url 'submit:akmessage_add' event_slug=ak.event.slug pk=ak.pk %}" data-bs-toggle="tooltip"
+               title="{% trans 'Add confidential message to organizers' %}"
+               class="btn btn-warning">{% fa6_icon 'envelope' 'fas' %}</a>
+            <a href="{{ ak.edit_url }}" data-bs-toggle="tooltip"
                title="{% trans 'Edit' %}"
-               class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
+               class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
         {% endif %}
     </div>
 
     <h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2>
 
+    <div id="app">
+        {# Show current or upcoming slot featured in a box on top of the plage #}
+        {% if featured_slot_type != "NONE" %}
+            <div class="card border-success mt-3 mb-3" v-show="showFeatured">
+                <div class="card-body font-weight-bold">
+                    <span v-show="isDuring" style="{% if not featured_slot_type == "CURRENT" %}display:none;{% endif %}">
+                        {% blocktrans with room=featured_slot.room %}This AK currently takes place for another <span v-html="timeUntilEnd">{{ featured_slot_remaining }}</span> minute(s) in {{ room }}.&nbsp;{% endblocktrans %}
+                    </span>
+                    <span v-show="isBefore" style="{% if not featured_slot_type == "UPCOMING" %}display:none;{% endif %}">
+                        {% blocktrans with room=featured_slot.room %}This AK starts in <span v-html="timeUntilStart">{{ featured_slot_remaining }}</span> minute(s) in {{ room }}.&nbsp;{% endblocktrans %}
+                    </span>
+
+                    {% if "AKOnline"|check_app_installed and featured_slot.room.virtual and featured_slot.room.virtual.url != '' %}
+                        <a class="btn btn-success" target="_parent" href="{{ featured_slot.room.virtual.url }}">
+                            {% fa6_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+                        </a>
+                    {% endif %}
+                </div>
+            </div>
+        {% endif %}
+    </div>
+
+
     <table class="table table-borderless">
         <tr>
             <td>{% trans "Who?" %}</td>
@@ -64,18 +213,36 @@
                 {% category_linked_badge ak.category ak.event.slug %}
             </td>
         </tr>
+        {% if ak.types.count > 0 %}
+            <tr>
+                <td>{% trans "Types" %}</td>
+                <td>
+                    {% for type in ak.types.all %}
+                        <span class="badge bg-info">{{ type }}</span>
+                    {% endfor %}
+                </td>
+            </tr>
+        {% endif %}
+        {% if ak.track %}
+            <tr>
+                <td>{% trans 'Track' %}</td>
+                <td>{{ ak.track }}</td>
+            </tr>
+        {% endif %}
+        {% if not ak.wish %}
+            <tr>
+                <td>{% trans "Present this AK" %}</td>
+                <td>
+                    {% if ak.present != None %}
+                        {{ ak.present | bool_symbol }}
+                    {% else %}
+                        {{ ak.category.present_by_default | bool_symbol }} <span class="text-muted">{% trans "(Category Default)" %}</span>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
         <tr>
-            <td>{% trans "Present this AK" %}</td>
-            <td>{{ ak.present | bool_symbol }}</td>
-        </tr>
-        <tr>
-            <td>{% trans "Tags" %}</td>
-            <td>
-                {% tag_list ak.tags.all ak.event.slug %}
-            </td>
-        </tr>
-        <tr>
-            <td>{% trans "Reso?" %}</td>
+            <td>{% trans "Reso intention?" %}</td>
             <td>
                 {{ ak.reso | bool_symbol }}
             </td>
@@ -119,47 +286,96 @@
 
     <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description|linebreaks }}</p>
 
+    {% if not ak.wish %}
+        <table class="table">
+            <thead>
+            <tr>
+                {% if not ak.event.plan_hidden or user.is_staff %}
+                    <th>{% trans "When?" %}</th>
+                {% endif %}
+                <th>{% trans "Duration" %}</th>
+                {% if not ak.event.plan_hidden or user.is_staff %}
+                    <th>{% trans "Room" %}</th>
+                {% endif %}
+                <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for slot in ak.akslot_set.all %}
+                <tr>
+                    {% if not ak.event.plan_hidden or user.is_staff %}
+                        <td>{{ slot.time_simplified }}</td>
+                    {% endif %}
+                    <td>{{ slot.duration_simplified }}</td>
+                    {% if not ak.event.plan_hidden or user.is_staff %}
+                        <td>
+                            {% if slot.room %}
+                                {% 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 %}
+                            {% else %}
+                                -
+                            {% endif %}
+                        </td>
+                    {% endif %}
+                    <td>
+                        {% if not slot.start %}
+                            <a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
+                               data-bs-toggle="tooltip" title="{% trans 'Edit' %}"
+                               class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
+                            <a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
+                               data-bs-toggle="tooltip" title="{% trans 'Delete' %}"
+                               class="btn btn-danger">{% fa6_icon 'times' 'fas' %}</a>
+                        {% else %}
+                            {% if "AKOnline"|check_app_installed and slot.room and slot.room.virtual and slot.room.virtual.url != '' %}
+                                <a class="btn btn-success" target="_parent" href="{{ slot.room.virtual.url }}">
+                                    {% fa6_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+                                </a>
+                            {% endif %}
+                        {% endif %}
+                        {% if user.is_staff %}
+                            <a href="{% url 'admin:AKModel_akslot_change' slot.pk %}"
+                               data-bs-toggle="tooltip" title="{% trans 'Schedule' %}"
+                               class="btn btn-outline-success">{% fa6_icon 'stream' 'fas' %}</a>
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
 
-    {% if 'AKPlan'|check_app_installed %}
-        <div id='akSlotCalendar' style="margin-bottom: 50px;"></div>
-    {% endif %}
+        {% if ak.event.active %}
+            <div class="">
+                <a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}"
+                   class="btn btn-success">{% fa6_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a>
+            </div>
+        {% endif %}
 
 
-    <table class="table">
-        <thead>
-        <tr>
-            <th>{% trans "When?" %}</th>
-            <th>{% trans "Duration" %}</th>
-            <th>{% trans "Room" %}</th>
-            <th></th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for slot in ak.akslot_set.all %}
+        {% if 'AKPlan'|check_app_installed %}
+            <div id='akSlotCalendar' style="margin-top: 50px;margin-bottom: 50px;"></div>
+        {% endif %}
+
+
+        <h4 style="margin-top: 30px;">{% trans "Possible Times" %}</h4>
+        <table class="table">
+            <thead>
             <tr>
-                <td>{{ slot.start_simplified }}</td>
-                <td>{{ slot.duration }}</td>
-                <td>{{ slot.room }}</td>
-                <td>
-                    {% if not slot.start %}
-                        <a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}"
-                           data-toggle="tooltip" title="{% trans 'Edit' %}"
-                           class="btn btn-success">{% fa5_icon 'pencil-alt' 'fas' %}</a>
-                        <a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
-                           data-toggle="tooltip" title="{% trans 'Delete' %}"
-                           class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
-                    {% endif %}
-                </td>
+                <th>{% trans "Start" %}</th>
+                <th>{% trans "End" %}</th>
             </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-    {% if ak.event.active %}
-        <div class="">
-            <a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}"
-               class="btn btn-success">{% fa5_icon 'plus' 'fas' %} {% trans "Add another slot" %}</a>
-        </div>
+            </thead>
+            <tbody>
+            {% for a in availabilities %}
+                <tr>
+                    <td>{{ a.start | timezone:event.timezone | date:"l H:i"  }}</td>
+                    <td>{{ a.end | timezone:event.timezone | date:"l H:i" }}</td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
     {% endif %}
 
 {% endblock %}

AKSubmission/templates/AKSubmission/ak_edit.html

 {% extends 'AKSubmission/submit_new.html' %}
 
 {% load i18n %}
-{% load bootstrap4 %}
-{% load fontawesome_5 %}
+{% load django_bootstrap5 %}
+{% load fontawesome_6 %}
 {% load static %}
 
 {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %}
@@ -12,10 +12,21 @@
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li>
     <li class="breadcrumb-item"><a
-            href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li>
+            href="{{ ak.detail_url }}">{{ ak.short_name }}</a></li>
     <li class="breadcrumb-item active">{% trans "Edit" %}</li>
 {% endblock %}
 
+{% block form_contents %}
+    {% bootstrap_field form.name %}
+    <div class="form-group">
+        {% bootstrap_field form.owners form_group_class="" %}
+        <a href="{% url 'submit:akowner_create' event_slug=event.slug %}?add_to_existing_ak={{ ak.pk }}">
+            {% fa6_icon "plus" "fas" %} {% trans "Add person not in the list yet. Unsaved changes in this form will be lost." %}
+        </a>
+    </div>
+    {% bootstrap_form form exclude='name,owners' %}
+{% endblock %}
+
 
 {% block headline %}
     <h2>{% trans 'Edit AK' %}</h2>

AKSubmission/templates/AKSubmission/ak_history.html

@@ -2,7 +2,7 @@
 {% load tz %}
 
 {% load i18n %}
-{% load fontawesome_5 %}
+{% load fontawesome_6 %}
 
 {% load tags_AKSubmission %}
 {% load tags_AKModel %}
@@ -15,17 +15,17 @@
     <li class="breadcrumb-item"><a
             href="{% url 'submit:submission_overview' event_slug=ak.event.slug %}">{% trans "AK Submission" %}</a></li>
     <li class="breadcrumb-item"><a
-            href='{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}'>{{ ak.short_name }}</a></li>
+            href='{{ ak.detail_url }}'>{{ ak.short_name }}</a></li>
     <li class="breadcrumb-item active">{% trans 'History' %}</li>
 {% endblock %}
 
 {% block content %}
     {% include "messages.html" %}
 
-    <div class="float-right">
-        <a href='{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}' data-toggle="tooltip"
+    <div class="float-end">
+        <a href='{{ ak.detail_url }}' data-bs-toggle="tooltip"
            title="{% trans 'Back' %}"
-           class="btn btn-info">{% fa5_icon 'arrow-circle-left' 'fas' %}</a>
+           class="btn btn-info">{% fa6_icon 'arrow-circle-left' 'fas' %}</a>
     </div>
 
     <h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }} ({% trans 'History' %})</h2>
@@ -44,16 +44,16 @@
                 <td>
                     <b>{{ h.name }}</b>
                     {% if h.present %}
-                        <span class="badge badge-dark badge-pill"
-                              title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+                        <span class="badge bg-dark rounded-pill"
+                              title="{% trans 'Present results of this AK' %}">{% fa6_icon "bullhorn" 'fas' %}</span>
                     {% endif %}
                     {% if h.reso %}
-                        <span class="badge badge-dark badge-pill"
-                              title="{% trans 'Reso' %}">{% fa5_icon "scroll" 'fas' %}</span>
+                        <span class="badge bg-dark rounded-pill"
+                              title="{% trans 'Intends to submit a resolution' %}">{% fa6_icon "scroll" 'fas' %}</span>
                     {% endif %}
                 </td>
                 <td>{% category_linked_badge h.category event.slug %}</td>
-                <td><span class="badge badge-success badge-pill">{{ h.track }}</span></td>
+                <td><span class="badge bg-success rounded-pill">{{ h.track }}</span></td>
                 <td>{{ h.history_date | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}</td>
             </tr>
             <tr>

AKSubmission/templates/AKSubmission/ak_interest_script.html

+{% load i18n %}
+{% load fontawesome_6 %}
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        // CSRF Protection/Authentication
+        function getCookie(name) {
+            let cookieValue = null;
+            if (document.cookie && document.cookie !== '') {
+                const cookies = document.cookie.split(';');
+                for (let i = 0; i < cookies.length; i++) {
+                    const cookie = cookies[i].trim();
+                    // Does this cookie string begin with the name we want?
+                    if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                        cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                        break;
+                    }
+                }
+            }
+            return cookieValue;
+        }
+
+        const csrftoken = getCookie('csrftoken');
+
+        function csrfSafeMethod(method) {
+            // these HTTP methods do not require CSRF protection
+            return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+        }
+
+        $.ajaxSetup({
+            beforeSend: function (xhr, settings) {
+                if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+                    xhr.setRequestHeader("X-CSRFToken", csrftoken);
+                }
+            }
+        });
+
+        function indicate_interest(ak_id, btn) {
+            $.ajax({
+                   url: "{% url "model:AK-list" event_slug=event.slug %}" + ak_id + "/indicate-interest/",
+                    type: 'POST',
+                    data: {
+                    },
+                    success: function (response) {
+                       btn.html('{% fa6_icon 'check' 'fas' %}');
+                       btn.off('click');
+                    },
+                    error: function (response) {
+                       if(response.status === 403)
+                            alert("{% trans 'Interest indication currently not allowed. Sorry.' %}");
+                       else
+                           alert("{% trans 'Could not save your interest. Sorry.' %}");
+                    }
+               });
+        }
+
+        // Update counter
+        $('.btn-interest').click(function () {
+            indicate_interest($(this).data('ak_id'), $(this));
+        });
+    });
+</script>

AKSubmission/templates/AKSubmission/ak_linked_list_inline.html

@@ -2,7 +2,7 @@
     {% if forloop.counter0 > 0 %}
         , 
     {% endif %}
-    <a href="{% url 'submit:ak_detail' event_slug=slug pk=ak.pk %}">{{ ak }}</a>
+    <a href="{{ ak.detail_url }}">{{ ak }}</a>
 {% empty %}
     -
 {% endfor %}

AKSubmission/templates/AKSubmission/ak_list.html

 {% load i18n %}
 
-<div class="float-right">
+<div class="float-end">
     <ul class="nav nav-pills">
         <li class="nav-item">
             <a class="nav-link" href="{% url 'submit:ak_list' event_slug=event.slug %}">{% trans "All AKs" %}</a>
         </li>
         {% if event.aktrack_set.count > 0 %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
+                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true"
                    aria-expanded="false">{% trans "Tracks" %}</a>
                 <div class="dropdown-menu" style="">
                     {% for track in event.aktrack_set.all %}
@@ -30,7 +30,7 @@
 <ul class="nav nav-tabs" style="margin-bottom:15px">
     {% for category, _ in categories_with_aks %}
         <li class="nav-item">
-            <a class="nav-link {% if category.name == active_category %}active{% endif %}" data-toggle="tab"
+            <a class="nav-link {% if category.name == active_category %}active{% endif %}" data-bs-toggle="tab"
                href="#category_{{ category.pk }}">{{ category.name }}</a>
         </li>
     {% endfor %}