e0801c1f0ec7fcac8f4d43e3640ffd6da9cd6fb9 to main · KIF / AKPlanning

Some changes are not shown.

For a faster browsing experience, only 50 of 194 files are shown. Download one of the files below to see all changes.

.docker/extra_requirements.txt

+1 −1

Original line number	Diff line number	Diff line
		uwsgi==2.0.25.1
		uwsgi==2.0.30

.gitlab-ci.yml

+3 −4

Original line number	Diff line number	Diff line
		image: python:3.9
		image: python:3.11

		services:
		- mysql
		@@ -26,10 +26,9 @@ cache:
		- pip install pylint-gitlab pylint-django
		- mysql --version

		check:
		migrations:
		extends: .before_script_template
		script:
		- ./Utils/check.sh --all
		- source venv/bin/activate
		- ./manage.py makemigrations --dry-run --check

		@@ -38,7 +37,7 @@ test:
		script:
		- source venv/bin/activate
		- echo "GRANT ALL on . to '${MYSQL_USER}';"\| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql
		- pip install pytest-cov unittest-xml-reporting
		- pip install pytest-cov
		- coverage run --source='.' manage.py test --settings AKPlanning.settings_ci
		after_script:
		- source venv/bin/activate

AKDashboard/locale/de_DE/LC_MESSAGES/django.po

+28 −16

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ msgid ""
		msgstr ""
		"Project-Id-Version: PACKAGE VERSION\n"
		"Report-Msgid-Bugs-To: \n"
		"POT-Creation-Date: 2023-08-16 16:30+0200\n"
		"POT-Creation-Date: 2025-06-21 18:09+0000\n"
		"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
		"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
		"Language-Team: LANGUAGE <LL@li.org>\n"
		@@ -61,66 +61,78 @@ msgstr "Veranstaltung"
		msgid "Event this button belongs to"
		msgstr "Veranstaltung, zu der dieser Button gehört"

		#: AKDashboard/templates/AKDashboard/dashboard.html:17
		#: AKDashboard/templates/AKDashboard/dashboard_event.html:29
		#: AKDashboard/templates/AKDashboard/dashboard.html:19
		#: AKDashboard/templates/AKDashboard/dashboard_event.html:30
		#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:53
		msgid "Write to organizers of this event for questions and comments"
		msgstr ""
		"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"

		#: AKDashboard/templates/AKDashboard/dashboard.html:24
		#: AKDashboard/templates/AKDashboard/dashboard.html:25
		msgid "Old events"
		msgstr "Frühere Veranstaltungen"

		#: AKDashboard/templates/AKDashboard/dashboard.html:35
		msgid "Currently, there are no Events!"
		msgstr "Aktuell gibt es keine Events!"

		#: AKDashboard/templates/AKDashboard/dashboard.html:27
		#: AKDashboard/templates/AKDashboard/dashboard.html:38
		msgid "Please contact an administrator if you want to use AKPlanning."
		msgstr ""
		"Bitte kontaktiere einen Administratorin, falls du AKPlanning verwenden "
		"möchtest."

		#: AKDashboard/templates/AKDashboard/dashboard_event.html:19
		#: AKDashboard/templates/AKDashboard/dashboard_event.html:20
		msgid "Recent"
		msgstr "Kürzlich"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:12
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:18
		#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:20
		msgid "AK List"
		msgstr "AK-Liste"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:23
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:29
		msgid "Current AKs"
		msgstr "Aktuelle AKs"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:30
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:36
		msgid "AK Wall"
		msgstr "AK-Wall"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:38
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:44
		#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:30
		msgid "Schedule"
		msgstr "AK-Plan"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:49
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:55
		msgid "AK Submission"
		msgstr "AK-Einreichung"

		#: AKDashboard/templates/AKDashboard/dashboard_row.html:57
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:63
		#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:39
		msgid "AK History"
		msgstr "AK-Verlauf"

		#: AKDashboard/views.py:59
		#: AKDashboard/templates/AKDashboard/dashboard_row.html:72
		msgid "AK Preferences"
		msgstr "AK-Präferenzen"

		#: AKDashboard/views.py:70
		#, python-format
		msgid "New AK: %(ak)s."
		msgstr "Neuer AK: %(ak)s."

		#: AKDashboard/views.py:62
		#: AKDashboard/views.py:73
		#, python-format
		msgid "AK \"%(ak)s\" edited."
		msgstr "AK \"%(ak)s\" bearbeitet."

		#: AKDashboard/views.py:65
		#: AKDashboard/views.py:76
		#, python-format
		msgid "AK \"%(ak)s\" deleted."
		msgstr "AK \"%(ak)s\" gelöscht."

		#: AKDashboard/views.py:80
		#: AKDashboard/views.py:91
		#, python-format
		msgid "AK \"%(ak)s\" (re-)scheduled."
		msgstr "AK \"%(ak)s\" (um-)geplant."

AKDashboard/static/AKDashboard/style.css

+4 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@
		margin-bottom: 5em;
		}

		.dashboard-row-small {
		margin-bottom: 3em;
		}

		.dashboard-row > .row {
		margin-left: 0;
		padding-bottom: 1em;

AKDashboard/templates/AKDashboard/dashboard.html

+22 −11

Original line number	Diff line number	Diff line
		@@ -9,7 +9,9 @@
		{% endblock %}

		{% block content %}
		{% for event in events %}
		{% include "messages.html" %}
		{% if total_event_count > 0 %}
		{% for event in active_and_current_events %}
		<div class="dashboard-row">
		{% include "AKDashboard/dashboard_row.html" %}
		{% if event.contact_email %}
		@@ -18,7 +20,16 @@
		</p>
		{% endif %}
		</div>
		{% empty %}
		{% endfor %}
		{% if old_event_count > 0 %}
		<h2 class="mb-3">{% trans "Old events" %}</h2>
		{% for event in old_events %}
		<div class="dashboard-row-small">
		{% include "AKDashboard/dashboard_row_old_event.html" %}
		</div>
		{% endfor %}
		{% endif %}
		{% else %}
		<div class="jumbotron">
		<h2 class="display-4">
		{% trans 'Currently, there are no Events!' %}
		@@ -27,5 +38,5 @@
		{% trans 'Please contact an administrator if you want to use AKPlanning.' %}
		</p>
		</div>
		{% endfor %}
		{% endif %}
		{% endblock %}

AKDashboard/templates/AKDashboard/dashboard_event.html

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		{% endblock %}

		{% block content %}
		{% include "messages.html" %}
		<div class="dashboard-row">
		{% include "AKDashboard/dashboard_row.html" %}

AKDashboard/templates/AKDashboard/dashboard_row.html

+17 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,12 @@
		{% load fontawesome_6 %}

		<h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2>
		<h4 class="text-muted">
		{% if event.place %}
		<b>{{ event.place }} ·</b>
		{% endif %}
		{{ event \| event_month_year }}
		</h4>
		<div class="mt-2">
		{% if 'AKSubmission'\|check_app_installed %}
		<a class="dashboard-box btn btn-primary"
		@@ -57,6 +63,17 @@
		<span class='text'>{% trans 'AK History' %}</span>
		</div>
		</a>
		{% if 'AKPreference'\|check_app_installed and event.active %}
		{% if not event.poll_hidden or user.is_staff %}
		<a class="dashboard-box btn btn-primary"
		href="{% url 'poll:poll' event_slug=event.slug %}">
		<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
		<span class="fa fa-poll"></span>
		<span class='text'>{% trans 'AK Preferences' %}</span>
		</div>
		</a>
		{% endif %}
		{% endif %}
		{% for button in event.dashboardbutton_set.all %}
		<a class="dashboard-box btn btn-{{ button.get_color_display }}"
		href="{{ button.url }}">

AKDashboard/templates/AKDashboard/dashboard_row_old_event.html

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		{% load i18n %}
		{% load tags_AKModel %}
		{% load fontawesome_6 %}

		<h3><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a>
		<span class="text-muted">
		·
		{% if event.place %}
		{{ event.place }} ·
		{% endif %}
		{{ event \| event_month_year }}
		</span>
		</h3>
		<div class="mt-2">
		{% if 'AKSubmission'\|check_app_installed %}
		<a class="btn btn-primary"
		href="{% url 'submit:ak_list' event_slug=event.slug %}">
		<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
		<span class="fa fa-list-ul"></span>
		<span class='text'>{% trans 'AK List' %}</span>
		</div>
		</a>
		{% endif %}
		{% if 'AKPlan'\|check_app_installed %}
		{% if not event.plan_hidden or user.is_staff %}
		<a class="btn btn-primary"
		href="{% url 'plan:plan_overview' event_slug=event.slug %}">
		<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
		<span class="fa fa-calendar-alt"></span>
		<span class='text'>{% trans 'Schedule' %}</span>
		</div>
		</a>
		{% endif %}
		{% endif %}
		<a class="btn btn-primary"
		href="{% url 'dashboard:dashboard_event' slug=event.slug %}#history">
		<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
		<span class="fa fa-history"></span>
		<span class='text'>{% trans 'AK History' %}</span>
		</div>
		</a>
		{% for button in event.dashboardbutton_set.all %}
		<a class="btn btn-{{ button.get_color_display }}"
		href="{{ button.url }}">
		<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
		{% if button.icon %}<span class="fa">{{ button.icon.as_html }}</span>{% endif %}
		<span class='text'>{{ button.text }}</span>
		</div>
		</a>
		{% endfor %}
		<a class="btn btn-info"
		href=mailto:{{ event.contact_email }}"
		title="{% trans 'Write to organizers of this event for questions and comments' %}">
		{% fa6_icon "envelope" "fas" %}
		</a>
		</div>

AKDashboard/tests.py

+44 −20

Original line number	Diff line number	Diff line
		import zoneinfo

		from django.apps import apps
		from django.test import TestCase, override_settings
		from django.test import override_settings, TestCase
		from django.urls import reverse
		from django.utils.timezone import now

		from AKDashboard.models import DashboardButton
		from AKModel.models import Event, AK, AKCategory
		from AKModel.tests import BasicViewTests
		from AKModel.models import AK, AKCategory, Event
		from AKModel.tests.test_views import BasicViewTests


		class DashboardTests(TestCase):
		"""
		Specific Dashboard Tests
		"""

		@classmethod
		def setUpTestData(cls):
		"""
		@@ -27,6 +29,7 @@ class DashboardTests(TestCase):
		end=now(),
		active=True,
		plan_hidden=False,
		poll_hidden=False,
		)
		cls.default_category = AKCategory.objects.create(
		name="Test Category",
		@@ -62,7 +65,7 @@ class DashboardTests(TestCase):

		# History should be empty
		response = self.client.get(url)
		self.assertQuerysetEqual(response.context["recent_changes"], [])
		self.assertQuerySetEqual(response.context["recent_changes"], [])

		AK.objects.create(
		name="Test AK",
		@@ -90,7 +93,8 @@ class DashboardTests(TestCase):
		self.event.save()
		response = self.client.get(url_dashboard_index)
		self.assertEqual(response.status_code, 200)
		self.assertFalse(self.event in response.context["events"])
		self.assertFalse(self.event in response.context["active_and_current_events"])
		self.assertFalse(self.event in response.context["old_events"])
		response = self.client.get(url_event_dashboard)
		self.assertEqual(response.status_code, 200)
		self.assertEqual(response.context["event"], self.event)
		@@ -100,7 +104,7 @@ class DashboardTests(TestCase):
		self.event.save()
		response = self.client.get(url_dashboard_index)
		self.assertEqual(response.status_code, 200)
		self.assertTrue(self.event in response.context["events"])
		self.assertTrue(self.event in response.context["active_and_current_events"])

		def test_active(self):
		"""
		@@ -143,6 +147,26 @@ class DashboardTests(TestCase):
		self.assertContains(response, "Current AKs")
		self.assertContains(response, "AK Wall")

		def test_poll_hidden(self):
		"""
		Test visibility of poll buttons with regard to poll visibility status for a given event
		"""
		url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})

		if apps.is_installed('AKPreference'):
		# Poll hidden? No buttons should show up
		self.event.poll_hidden = True
		self.event.save()
		response = self.client.get(url_event_dashboard)
		self.assertNotContains(response, "AK Preferences")

		# Poll not hidden?
		# Buttons to preference poll should be on the page
		self.event.poll_hidden = False
		self.event.save()
		response = self.client.get(url_event_dashboard)
		self.assertContains(response, "AK Preferences")

		def test_dashboard_buttons(self):
		"""
		Make sure manually added buttons are displayed correctly

AKDashboard/views.py

+12 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,18 @@ class DashboardView(TemplateView):

		def get_context_data(self, **kwargs):
		context = super().get_context_data(**kwargs)
		context['events'] = Event.objects.filter(public=True).prefetch_related('dashboardbutton_set')
		# Load events and split between active and current/featured events and those that should show smaller below
		context["active_and_current_events"] = []
		context["old_events"] = []
		events = Event.objects.filter(public=True).order_by("-active", "-pk").prefetch_related('dashboardbutton_set')
		for event in events:
		if event.active or len(context["active_and_current_events"]) < settings.DASHBOARD_MAX_FEATURED_EVENTS:
		context["active_and_current_events"].append(event)
		else:
		context["old_events"].append(event)
		context["active_event_count"] = len(context["active_and_current_events"])
		context["old_event_count"] = len(context["old_events"])
		context["total_event_count"] = context["active_event_count"] + context["old_event_count"]
		return context

AKModel/admin.py

+138 −9

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ from django import forms
		from django.apps import apps
		from django.contrib import admin, messages
		from django.contrib.admin import SimpleListFilter, RelatedFieldListFilter, action, display
		from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
		from django.contrib.auth.models import User # pylint: disable=E5142
		from django.db.models import Count, F
		from django.http import HttpResponseRedirect
		from django.shortcuts import render, redirect
		@@ -15,10 +17,10 @@ from simple_history.admin import SimpleHistoryAdmin
		from AKModel.availability.models import Availability
		from AKModel.forms import RoomFormWithAvailabilities
		from AKModel.models import Event, AKOwner, AKCategory, AKTrack, AKRequirement, AK, AKSlot, Room, AKOrgaMessage, \
		ConstraintViolation, DefaultSlot
		ConstraintViolation, DefaultSlot, AKType
		from AKModel.urls import get_admin_urls_event_wizard, get_admin_urls_event
		from AKModel.views.ak import AKResetInterestView, AKResetInterestCounterView
		from AKModel.views.manage import CVMarkResolvedView, CVSetLevelViolationView, CVSetLevelWarningView
		from AKModel.views.manage import CVMarkResolvedView, CVSetLevelViolationView, CVSetLevelWarningView, ClearScheduleView


		class EventRelatedFieldListFilter(RelatedFieldListFilter):
		@@ -49,12 +51,16 @@ class EventAdmin(admin.ModelAdmin):
		wizard.
		"""
		model = Event
		list_display = ['name', 'status_url', 'place', 'start', 'end', 'active', 'plan_hidden']
		list_display = ['name', 'status_url', 'place', 'start', 'end', 'active', 'plan_hidden', 'poll_hidden']
		list_filter = ['active']
		list_editable = ['active']
		ordering = ['-start']
		readonly_fields = ['status_url', 'plan_hidden', 'plan_published_at', 'toggle_plan_visibility']
		actions = ['publish', 'unpublish']
		readonly_fields = [
		'status_url',
		'plan_hidden', 'plan_published_at', 'toggle_plan_visibility',
		'poll_hidden', 'poll_published_at', 'toggle_poll_visibility',
		]
		actions = ['publish_plan', 'unpublish_plan', 'publish_poll', 'unpublish_poll']

		def add_view(self, request, form_url='', extra_context=None):
		# Override
		@@ -79,6 +85,10 @@ class EventAdmin(admin.ModelAdmin):
		from AKScheduling.urls import get_admin_urls_scheduling # pylint: disable=import-outside-toplevel
		urls.extend(get_admin_urls_scheduling(self.admin_site))

		if apps.is_installed("AKSolverInterface"):
		from AKSolverInterface.urls import get_admin_urls_solver_interface # pylint: disable=import-outside-toplevel
		urls.extend(get_admin_urls_solver_interface(self.admin_site))

		# Make sure built-in URLs are available as well
		urls.extend(super().get_urls())
		return urls
		@@ -113,13 +123,31 @@ class EventAdmin(admin.ModelAdmin):
		text = _('Unpublish plan')
		return format_html("<a href='{url}'>{text}</a>", url=url, text=text)

		@display(description=_("Toggle poll visibility"))
		def toggle_poll_visibility(self, obj):
		"""
		Define a read-only field to toggle the visibility of the preference poll of this event
		This will choose from two different link targets/views depending on the current visibility status

		:param obj: event to change the visibility of the poll for
		:return: toggling link (HTML)
		:rtype: str
		"""
		if obj.poll_hidden:
		url = f"{reverse_lazy('admin:poll-publish')}?pks={obj.pk}"
		text = _('Publish preference poll')
		else:
		url = f"{reverse_lazy('admin:poll-unpublish')}?pks={obj.pk}"
		text = _('Unpublish preference poll')
		return format_html("<a href='{url}'>{text}</a>", url=url, text=text)

		def get_form(self, request, obj=None, change=False, **kwargs):
		# Override (update) form rendering to make sure the timezone of the event is used
		timezone.activate(obj.timezone)
		return super().get_form(request, obj, change, **kwargs)

		@action(description=_('Publish plan'))
		def publish(self, request, queryset):
		def publish_plan(self, request, queryset):
		"""
		Admin action to publish the plan
		"""
		@@ -127,7 +155,7 @@ class EventAdmin(admin.ModelAdmin):
		return HttpResponseRedirect(f"{reverse_lazy('admin:plan-publish')}?pks={','.join(str(pk) for pk in selected)}")

		@action(description=_('Unpublish plan'))
		def unpublish(self, request, queryset):
		def unpublish_plan(self, request, queryset):
		"""
		Admin action to hide the plan
		"""
		@@ -135,6 +163,23 @@ class EventAdmin(admin.ModelAdmin):
		return HttpResponseRedirect(
		f"{reverse_lazy('admin:plan-unpublish')}?pks={','.join(str(pk) for pk in selected)}")

		@action(description=_('Publish preference poll'))
		def publish_poll(self, request, queryset):
		"""
		Admin action to publish the preference poll
		"""
		selected = queryset.values_list('pk', flat=True)
		return HttpResponseRedirect(f"{reverse_lazy('admin:poll-publish')}?pks={','.join(str(pk) for pk in selected)}")

		@action(description=_('Unpublish preference poll'))
		def unpublish_poll(self, request, queryset):
		"""
		Admin action to hide the preference poll
		"""
		selected = queryset.values_list('pk', flat=True)
		return HttpResponseRedirect(
		f"{reverse_lazy('admin:poll-unpublish')}?pks={','.join(str(pk) for pk in selected)}")


		class PrepopulateWithNextActiveEventMixin:
		"""
		@@ -215,6 +260,18 @@ class AKRequirementAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
		ordering = ['name']


		@admin.register(AKType)
		class AKTypeAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
		"""
		Admin interface for AKRequirements
		"""
		model = AKType
		list_display = ['name', 'event']
		list_filter = ['event']
		list_editable = []
		ordering = ['name']


		class WishFilter(SimpleListFilter):
		"""
		Re-usable filter for wishes
		@@ -257,6 +314,7 @@ class AKAdminForm(forms.ModelForm):
		self.fields["requirements"].queryset = AKRequirement.objects.filter(event=self.instance.event)
		self.fields["conflicts"].queryset = AK.objects.filter(event=self.instance.event)
		self.fields["prerequisites"].queryset = AK.objects.filter(event=self.instance.event)
		self.fields["types"].queryset = AKType.objects.filter(event=self.instance.event)


		@admin.register(AK)
		@@ -271,7 +329,8 @@ class AKAdmin(PrepopulateWithNextActiveEventMixin, SimpleHistoryAdmin):
		list_filter = ['event',
		WishFilter,
		('category', EventRelatedFieldListFilter),
		('requirements', EventRelatedFieldListFilter)
		('requirements', EventRelatedFieldListFilter),
		('types', EventRelatedFieldListFilter),
		]
		list_editable = ['short_name', 'track', 'interest_counter']
		ordering = ['pk']
		@@ -421,10 +480,12 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
		"""
		model = AKSlot
		list_display = ['id', 'ak', 'room', 'start', 'duration', 'event']
		list_filter = ['event', ('room', EventRelatedFieldListFilter)]
		list_filter = ['event', "fixed", ('room', EventRelatedFieldListFilter),
		('ak__category', EventRelatedFieldListFilter)]
		ordering = ['start']
		readonly_fields = ['ak_details_link', 'updated']
		form = AKSlotAdminForm
		actions = ["reset_scheduling"]

		@display(description=_('AK Details'))
		def ak_details_link(self, akslot):
		@@ -440,6 +501,36 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
		return mark_safe(str(link))
		return "-"

		def get_urls(self):
		"""
		Add additional URLs/views
		"""
		urls = [
		path('clear-schedule/', ClearScheduleView.as_view(), name="clear-schedule"),
		]
		urls.extend(super().get_urls())
		return urls

		@action(description=_("Clear start/rooms"))
		def reset_scheduling(self, request, queryset):
		"""
		Action: Reset start and room field for the given AKs
		Will use a typical admin confirmation view flow
		"""
		if queryset.filter(fixed=True).exists():
		self.message_user(
		request,
		_(
		"Cannot reset scheduling for fixed AKs. "
		"Please make sure to filter out fixed AKs first."
		),
		messages.ERROR,
		)
		return redirect('admin:AKModel_akslot_changelist')
		selected = queryset.values_list('pk', flat=True)
		return HttpResponseRedirect(
		f"{reverse_lazy('admin:clear-schedule')}?pks={','.join(str(pk) for pk in selected)}")

		ak_details_link.short_description = _('AK Details')


		@@ -555,3 +646,41 @@ class DefaultSlotAdmin(EventTimezoneFormMixin, admin.ModelAdmin):
		list_display = ['start_simplified', 'end_simplified', 'event']
		list_filter = ['event']
		form = DefaultSlotAdminForm


		# Define a new User admin
		class UserAdmin(BaseUserAdmin):
		"""
		Admin interface for Users
		Enhances the built-in UserAdmin with additional actions to activate and deactivate users and a custom selection
		of displayed properties in overview list
		"""
		list_display = ["username", "email", "is_active", "is_staff", "is_superuser"]
		actions = ['activate', 'deactivate']

		@admin.action(description=_("Activate selected users"))
		def activate(self, request, queryset):
		"""
		Bulk activate users

		:param request: HTTP request
		:param queryset: queryset containing all users that should be activated
		"""
		queryset.update(is_active=True)
		self.message_user(request, _("The selected users have been activated."))

		@admin.action(description=_("Deactivate selected users"))
		def deactivate(self, request, queryset):
		"""
		Bulk deactivate users

		:param request: HTTP request
		:param queryset: queryset containing all users that should be deactivated
		"""
		queryset.update(is_active=False)
		self.message_user(request, _("The selected users have been deactivated."))


		# Re-register UserAdmin
		admin.site.unregister(User)
		admin.site.register(User, UserAdmin)

AKModel/availability/forms.py

+7 −17

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ from django.utils.dateparse import parse_datetime
		from django.utils.translation import gettext_lazy as _

		from AKModel.availability.models import Availability
		from AKModel.availability.serializers import AvailabilitySerializer
		from AKModel.availability.serializers import AvailabilityFormSerializer
		from AKModel.models import Event


		@@ -41,22 +41,11 @@ class AvailabilitiesFormMixin(forms.Form):
		:rtype: str
		"""
		if instance:
		availabilities = AvailabilitySerializer(
		instance.availabilities.all(), many=True
		).data
		availabilities = instance.availabilities.all()
		else:
		availabilities = []

		return json.dumps(
		{
		'availabilities': availabilities,
		'event': {
		# 'timezone': event.timezone,
		'date_from': str(event.start),
		'date_to': str(event.end),
		},
		}
		)
		return json.dumps(AvailabilityFormSerializer((availabilities, event)).data)

		def __init__(self, args, *kwargs):
		super().__init__(args, *kwargs)
		@@ -65,9 +54,10 @@ class AvailabilitiesFormMixin(forms.Form):
		if isinstance(self.event, int):
		self.event = Event.objects.get(pk=self.event)
		initial = kwargs.pop('initial', {})
		initial['availabilities'] = self._serialize(self.event, kwargs['instance'])
		if 'availabilities' not in initial:
		initial['availabilities'] = self._serialize(self.event, kwargs.get('instance'))
		if not isinstance(self, forms.BaseModelForm):
		kwargs.pop('instance')
		kwargs.pop('instance', None)
		kwargs['initial'] = initial

		def _parse_availabilities_json(self, jsonavailabilities):
		@@ -183,7 +173,7 @@ class AvailabilitiesFormMixin(forms.Form):
		for avail in availabilities:
		setattr(avail, reference_name, instance.id)

		def _replace_availabilities(self, instance, availabilities: [Availability]):
		def _replace_availabilities(self, instance, availabilities: list[Availability]):
		"""
		Replace the existing list of availabilities belonging to an entity with a new, updated one

AKModel/availability/models.py

+76 −7

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@ from django.utils.functional import cached_property
		from django.utils.translation import gettext_lazy as _

		from AKModel.models import Event, AKOwner, Room, AK, AKCategory
		# TODO: Decouple from AKPreference app
		from AKPreference.models import EventParticipant

		zero_time = datetime.time(0, 0)

		@@ -24,6 +26,7 @@ zero_time = datetime.time(0, 0)
		# enable availabilities for AKs and AKCategories
		# add verbose names and help texts to model attributes
		# adapt or extemd documentation
		# add participants


		class Availability(models.Model):
		@@ -79,20 +82,48 @@ class Availability(models.Model):
		verbose_name=_('AK Category'),
		help_text=_('AK Category whose availability this is'),
		)
		participant = models.ForeignKey(
		to=EventParticipant,
		related_name='availabilities',
		on_delete=models.CASCADE,
		null=True,
		blank=True,
		verbose_name=_('Participant'),
		help_text=_('Participant whose availability this is'),
		)
		start = models.DateTimeField()
		end = models.DateTimeField()

		def __str__(self) -> str:
		person = self.person.name if self.person else None
		participant = str(self.participant) if self.participant else None
		room = getattr(self.room, 'name', None)
		event = getattr(getattr(self, 'event', None), 'name', None)
		ak = getattr(self.ak, 'name', None)
		ak_category = getattr(self.ak_category, 'name', None)
		return f'Availability(event={event}, person={person}, room={room}, ak={ak}, ak category={ak_category})'
		arg_list = [
		f"event={event}",
		f"person={person}",
		f"room={room}",
		f"ak={ak}",
		f"ak category={ak_category}",
		f"participant={participant}",
		]
		return f'Availability({", ".join(arg_list)})'

		def __hash__(self):
		return hash(
		(getattr(self, 'event', None), self.person, self.room, self.ak, self.ak_category, self.start, self.end))
		(
		getattr(self, 'event', None),
		self.person,
		self.room,
		self.ak,
		self.ak_category,
		self.participant,
		self.start,
		self.end,
		)
		)

		def __eq__(self, other: 'Availability') -> bool:
		"""Comparisons like ``availability1 == availability2``.
		@@ -103,7 +134,7 @@ class Availability(models.Model):
		return all(
		(
		getattr(self, attribute, None) == getattr(other, attribute, None)
		for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'start', 'end']
		for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'participant', 'start', 'end']
		)
		)

		@@ -151,9 +182,12 @@ class Availability(models.Model):
		if not other.overlaps(self, strict=False):
		raise Exception('Only overlapping Availabilities can be merged.')

		return Availability(
		avail = Availability(
		start=min(self.start, other.start), end=max(self.end, other.end)
		)
		if self.event == other.event:
		avail.event = self.event
		return avail

		def __or__(self, other: 'Availability') -> 'Availability':
		"""Performs the merge operation: ``availability1 \| availability2``"""
		@@ -168,9 +202,12 @@ class Availability(models.Model):
		if not other.overlaps(self, False):
		raise Exception('Only overlapping Availabilities can be intersected.')

		return Availability(
		avail = Availability(
		start=max(self.start, other.start), end=min(self.end, other.end)
		)
		if self.event == other.event:
		avail.event = self.event
		return avail

		def __and__(self, other: 'Availability') -> 'Availability':
		"""Performs the intersect operation: ``availability1 &
		@@ -247,7 +284,15 @@ class Availability(models.Model):
		f'{self.end.astimezone(self.event.timezone).strftime("%a %H:%M")}')

		@classmethod
		def with_event_length(cls, event, person=None, room=None, ak=None, ak_category=None):
		def with_event_length(
		cls,
		event: Event,
		person: AKOwner \| None = None,
		room: Room \| None = None,
		ak: AK \| None = None,
		ak_category: AKCategory \| None = None,
		participant: EventParticipant \| None = None,
		) -> "Availability":
		"""
		Create an availability covering exactly the time between event start and event end.
		Can e.g., be used to create default availabilities.
		@@ -265,7 +310,31 @@ class Availability(models.Model):
		timeframe_end = event.end # adapt to our event model
		timeframe_end = timeframe_end + datetime.timedelta(days=1)
		return Availability(start=timeframe_start, end=timeframe_end, event=event, person=person,
		room=room, ak=ak, ak_category=ak_category)
		room=room, ak=ak, ak_category=ak_category, participant=participant)

		def is_covered(self, availabilities: List['Availability']):
		"""Check if list of availibilities cover this object.

		:param availabilities: availabilities to check.
		:return: whether the availabilities cover full event.
		:rtype: bool
		"""
		avail_union = Availability.union(availabilities)
		return any(avail.contains(self) for avail in avail_union)

		@classmethod
		def is_event_covered(cls, event: Event, availabilities: List['Availability']) -> bool:
		"""Check if list of availibilities cover whole event.

		:param event: event to check.
		:param availabilities: availabilities to check.
		:return: whether the availabilities cover full event.
		:rtype: bool
		"""
		# NOTE: Cannot use `Availability.with_event_length` as its end is the
		# event end + 1 day
		full_event = Availability(event=event, start=event.start, end=event.end)
		return full_event.is_covered(availabilities)

		class Meta:
		verbose_name = _('Availability')

AKModel/availability/serializers.py

+27 −1

Original line number	Diff line number	Diff line
		@@ -4,9 +4,10 @@
		# Documentation was mainly added by us, other changes are marked in the code
		from django.utils import timezone
		from rest_framework.fields import SerializerMethodField
		from rest_framework.serializers import ModelSerializer
		from rest_framework.serializers import BaseSerializer, ModelSerializer

		from AKModel.availability.models import Availability
		from AKModel.models import Event


		class AvailabilitySerializer(ModelSerializer):
		@@ -44,3 +45,28 @@ class AvailabilitySerializer(ModelSerializer):
		class Meta:
		model = Availability
		fields = ('id', 'start', 'end', 'allDay')


		class AvailabilityFormSerializer(BaseSerializer):
		"""Serializer to configure an availability form."""

		def create(self, validated_data):
		raise ValueError("`AvailabilityFormSerializer` is read-only.")

		def to_internal_value(self, data):
		raise ValueError("`AvailabilityFormSerializer` is read-only.")

		def update(self, instance, validated_data):
		raise ValueError("`AvailabilityFormSerializer` is read-only.")

		def to_representation(self, instance: tuple[Availability, Event], **kwargs):
		availabilities, event = instance

		return {
		'availabilities': AvailabilitySerializer(availabilities, many=True).data,
		'event': {
		# 'timezone': event.timezone,
		'date_from': str(event.start),
		'date_to': str(event.end),
		},
		}

AKModel/fixtures/model.json

+210 −11

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@
		"model": "AKModel.akcategory",
		"pk": 1,
		"fields": {
		"name": "Spa▀",
		"name": "Spaß",
		"color": "275246",
		"description": "",
		"present_by_default": true,
		@@ -115,7 +115,7 @@
		"model": "AKModel.akcategory",
		"pk": 3,
		"fields": {
		"name": "Spa▀/Kultur",
		"name": "Spaß/Kultur",
		"color": "333333",
		"description": "",
		"present_by_default": true,
		@@ -193,6 +193,15 @@
		"event": 2
		}
		},
		{
		"model": "AKModel.aktype",
		"pk": 1,
		"fields": {
		"name": "Input",
		"event": 2,
		"slug": "input"
		}
		},
		{
		"model": "AKModel.historicalak",
		"pk": 1,
		@@ -206,7 +215,6 @@
		"reso": false,
		"present": true,
		"notes": "",
		"interest": -1,
		"category": 4,
		"track": null,
		"event": 2,
		@@ -229,7 +237,6 @@
		"reso": false,
		"present": true,
		"notes": "",
		"interest": -1,
		"category": 4,
		"track": null,
		"event": 2,
		@@ -252,7 +259,6 @@
		"reso": false,
		"present": null,
		"notes": "",
		"interest": -1,
		"category": 5,
		"track": null,
		"event": 2,
		@@ -275,7 +281,6 @@
		"reso": false,
		"present": null,
		"notes": "",
		"interest": -1,
		"category": 5,
		"track": null,
		"event": 2,
		@@ -298,7 +303,6 @@
		"reso": false,
		"present": null,
		"notes": "We need to find a volunteer first...",
		"interest": -1,
		"category": 3,
		"track": null,
		"event": 2,
		@@ -321,7 +325,6 @@
		"reso": false,
		"present": null,
		"notes": "We need to find a volunteer first...",
		"interest": -1,
		"category": 3,
		"track": null,
		"event": 2,
		@@ -344,7 +347,6 @@
		"reso": false,
		"present": null,
		"notes": "",
		"interest": -1,
		"category": 5,
		"track": 1,
		"event": 2,
		@@ -360,7 +362,9 @@
		"fields": {
		"name": "Test AK Inhalt",
		"short_name": "test1",
		"description": "",
		"description": "-",
		"goal": "-",
		"info": "",
		"link": "",
		"protocol_link": "",
		"category": 4,
		@@ -388,7 +392,9 @@
		"fields": {
		"name": "Test AK Meta",
		"short_name": "test2",
		"description": "",
		"description": "-",
		"goal": "-",
		"info": "",
		"link": "",
		"protocol_link": "",
		"category": 5,
		@@ -414,6 +420,8 @@
		"name": "AK Wish",
		"short_name": "wish1",
		"description": "Description of my Wish",
		"goal": "-",
		"info": "",
		"link": "",
		"protocol_link": "",
		"category": 3,
		@@ -436,6 +444,66 @@
		]
		}
		},
		{
		"model": "AKModel.ak",
		"pk": 4,
		"fields": {
		"name": "Test AK fixed slots",
		"short_name": "testfixed",
		"description": "-",
		"goal": "-",
		"info": "",
		"link": "",
		"protocol_link": "",
		"category": 4,
		"track": null,
		"reso": false,
		"present": true,
		"notes": "",
		"interest": -1,
		"interest_counter": 0,
		"include_in_export": false,
		"event": 2,
		"owners": [
		1
		],
		"requirements": [
		3
		],
		"conflicts": [],
		"prerequisites": []
		}
		},
		{
		"model": "AKModel.ak",
		"pk": 5,
		"fields": {
		"name": "Test AK Ernst",
		"short_name": "testernst",
		"description": "-",
		"goal": "-",
		"info": "",
		"link": "",
		"protocol_link": "",
		"category": 2,
		"track": null,
		"reso": false,
		"present": true,
		"notes": "",
		"interest": -1,
		"interest_counter": 0,
		"include_in_export": false,
		"event": 1,
		"owners": [
		3
		],
		"requirements": [
		2
		],
		"conflicts": [],
		"prerequisites": []
		}
		},
		{
		"model": "AKModel.room",
		"pk": 1,
		@@ -460,6 +528,19 @@
		"properties": []
		}
		},
		{
		"model": "AKModel.room",
		"pk": 3,
		"fields": {
		"name": "BBB Session 1",
		"location": "",
		"capacity": -1,
		"event": 1,
		"properties": [
		2
		]
		}
		},
		{
		"model": "AKModel.akslot",
		"pk": 1,
		@@ -525,6 +606,58 @@
		"updated": "2022-12-02T12:23:11.856Z"
		}
		},
		{
		"model": "AKModel.akslot",
		"pk": 6,
		"fields": {
		"ak": 4,
		"room": null,
		"start": "2020-11-08T18:30:00Z",
		"duration": "2.00",
		"fixed": true,
		"event": 2,
		"updated": "2022-12-02T12:23:11.856Z"
		}
		},
		{
		"model": "AKModel.akslot",
		"pk": 7,
		"fields": {
		"ak": 4,
		"room": 2,
		"start": null,
		"duration": "2.00",
		"fixed": true,
		"event": 2,
		"updated": "2022-12-02T12:23:11.856Z"
		}
		},
		{
		"model": "AKModel.akslot",
		"pk": 8,
		"fields": {
		"ak": 4,
		"room": 2,
		"start": "2020-11-07T16:00:00Z",
		"duration": "2.00",
		"fixed": true,
		"event": 2,
		"updated": "2022-12-02T12:23:11.856Z"
		}
		},
		{
		"model": "AKModel.akslot",
		"pk": 9,
		"fields": {
		"ak": 5,
		"room": null,
		"start": null,
		"duration": "2.00",
		"fixed": false,
		"event": 1,
		"updated": "2022-12-02T12:23:11.856Z"
		}
		},
		{
		"model": "AKModel.constraintviolation",
		"pk": 1,
		@@ -668,5 +801,71 @@
		"start": "2020-11-07T18:30:00Z",
		"end": "2020-11-07T21:30:00Z"
		}
		},
		{
		"model": "AKModel.availability",
		"pk": 7,
		"fields": {
		"event": 1,
		"person": null,
		"room": null,
		"ak": 5,
		"ak_category": null,
		"start": "2020-10-01T17:41:22Z",
		"end": "2020-10-04T17:41:30Z"
		}
		},
		{
		"model": "AKModel.availability",
		"pk": 8,
		"fields": {
		"event": 1,
		"person": null,
		"room": 3,
		"ak": null,
		"ak_category": null,
		"start": "2020-10-01T17:41:22Z",
		"end": "2020-10-04T17:41:30Z"
		}
		},
		{
		"model": "AKModel.defaultslot",
		"pk": 1,
		"fields": {
		"event": 2,
		"start": "2020-11-07T08:00:00Z",
		"end": "2020-11-07T12:00:00Z",
		"primary_categories": [5]
		}
		},
		{
		"model": "AKModel.defaultslot",
		"pk": 2,
		"fields": {
		"event": 2,
		"start": "2020-11-07T14:00:00Z",
		"end": "2020-11-07T17:00:00Z",
		"primary_categories": [4]
		}
		},
		{
		"model": "AKModel.defaultslot",
		"pk": 3,
		"fields": {
		"event": 2,
		"start": "2020-11-08T08:00:00Z",
		"end": "2020-11-08T19:00:00Z",
		"primary_categories": [4, 5]
		}
		},
		{
		"model": "AKModel.defaultslot",
		"pk": 4,
		"fields": {
		"event": 2,
		"start": "2020-11-09T17:00:00Z",
		"end": "2020-11-10T01:00:00Z",
		"primary_categories": [4, 5, 3]
		}
		}
		]

AKModel/forms.py

+26 −3

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ from django.forms.utils import ErrorList
		from django.utils.translation import gettext_lazy as _

		from AKModel.availability.forms import AvailabilitiesFormMixin
		from AKModel.models import Event, AKCategory, AKRequirement, Room
		from AKModel.models import Event, AKCategory, AKRequirement, Room, AKType


		class DateTimeInput(forms.DateInput):
		@@ -34,9 +34,10 @@ class NewEventWizardStartForm(forms.ModelForm):
		"""
		class Meta:
		model = Event
		fields = ['name', 'slug', 'timezone', 'plan_hidden']
		fields = ['name', 'slug', 'timezone', 'plan_hidden', 'poll_hidden']
		widgets = {
		'plan_hidden': forms.HiddenInput(),
		'poll_hidden': forms.HiddenInput(),
		}

		# Special hidden field for wizard state handling
		@@ -53,7 +54,7 @@ class NewEventWizardSettingsForm(forms.ModelForm):
		class Meta:
		model = Event
		fields = "__all__"
		exclude = ['plan_published_at']
		exclude = ['plan_published_at', 'poll_published_at']
		widgets = {
		'name': forms.HiddenInput(),
		'slug': forms.HiddenInput(),
		@@ -65,6 +66,7 @@ class NewEventWizardSettingsForm(forms.ModelForm):
		'interest_end': DateTimeInput(),
		'reso_deadline': DateTimeInput(),
		'plan_hidden': forms.HiddenInput(),
		'poll_hidden': forms.HiddenInput(),
		}


		@@ -101,6 +103,13 @@ class NewEventWizardImportForm(forms.Form):
		required=False,
		)

		import_types = forms.ModelMultipleChoiceField(
		queryset=AKType.objects.all(),
		widget=forms.CheckboxSelectMultiple,
		label=_("Copy types"),
		required=False,
		)

		# pylint: disable=too-many-arguments
		def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList,
		label_suffix=None, empty_permitted=False, field_order=None, use_required_attribute=None,
		@@ -111,6 +120,8 @@ class NewEventWizardImportForm(forms.Form):
		event=self.initial["import_event"])
		self.fields["import_requirements"].queryset = self.fields["import_requirements"].queryset.filter(
		event=self.initial["import_event"])
		self.fields["import_types"].queryset = self.fields["import_types"].queryset.filter(
		event=self.initial["import_event"])

		# pylint: disable=import-outside-toplevel
		# Local imports used to prevent cyclic imports and to only import when AKDashboard is available
		@@ -164,6 +175,18 @@ class SlideExportForm(AdminIntermediateForm):
		initial=3,
		label=_("# next AKs"),
		help_text=_("How many next AKs should be shown on a slide?"))
		types = forms.MultipleChoiceField(
		label=_("AK Types"),
		help_text=_("Which AK types should be included in the slides?"),
		widget=forms.CheckboxSelectMultiple,
		choices=[],
		required=False)
		types_all_selected_only = forms.BooleanField(
		initial=False,
		label=_("Only show AKs with all selected types?"),
		help_text=_("If checked, only AKs that have all selected types will be shown in the slides. "
		"If unchecked, AKs with at least one of the selected types will be shown."),
		required=False)
		presentation_mode = forms.TypedChoiceField(
		initial=False,
		label=_("Presentation only?"),

AKModel/locale/de_DE/LC_MESSAGES/django.po

+506 −267

File changed.

Preview size limit exceeded, changes collapsed.

AKModel/migrations/0061_types.py

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-02-25 20:58

		from django.db import migrations, models
		import django.db.models.deletion


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0060_orga_message_resolved'),
		]

		operations = [
		migrations.CreateModel(
		name='AKType',
		fields=[
		('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
		('name', models.CharField(help_text='Name describing the type', max_length=128, verbose_name='Name')),
		('event', models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE, to='AKModel.event', verbose_name='Event')),
		],
		options={
		'verbose_name': 'AK Type',
		'verbose_name_plural': 'AK Types',
		'ordering': ['name'],
		'unique_together': {('event', 'name')},
		},
		),
		migrations.AddField(
		model_name='ak',
		name='types',
		field=models.ManyToManyField(blank=True, help_text='This AK is', to='AKModel.aktype', verbose_name='Types'),
		),
		]

AKModel/migrations/0062_interest_no_history.py

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-02-26 22:35

		from django.db import migrations


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0061_types'),
		]

		operations = [
		migrations.RemoveField(
		model_name='historicalak',
		name='interest',
		),
		]

AKModel/migrations/0063_field_validators.py

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-03-03 19:59

		import django.core.validators
		from django.db import migrations, models


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0062_interest_no_history'),
		]

		operations = [
		migrations.AlterField(
		model_name='ak',
		name='name',
		field=models.CharField(help_text='Name of the AK', max_length=256, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Name'),
		),
		migrations.AlterField(
		model_name='ak',
		name='short_name',
		field=models.CharField(blank=True, help_text='Name displayed in the schedule', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+')], verbose_name='Short Name'),
		),
		migrations.AlterField(
		model_name='akowner',
		name='name',
		field=models.CharField(help_text='Name to identify an AK owner by', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Nickname'),
		),
		migrations.AlterField(
		model_name='historicalak',
		name='name',
		field=models.CharField(help_text='Name of the AK', max_length=256, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+'), django.core.validators.RegexValidator(message='Must contain at least one letter or digit', regex='[\\w\\s]+')], verbose_name='Name'),
		),
		migrations.AlterField(
		model_name='historicalak',
		name='short_name',
		field=models.CharField(blank=True, help_text='Name displayed in the schedule', max_length=64, validators=[django.core.validators.RegexValidator(inverse_match=True, message='May not contain quotation marks', regex='[\'\\"´`]+')], verbose_name='Short Name'),
		),
		]

AKModel/migrations/0064_event_export_slot.py

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.1.6 on 2025-03-29 22:05

		from django.db import migrations, models


		class Migration(migrations.Migration):

		dependencies = [
		("AKModel", "0063_field_validators"),
		]

		operations = [
		migrations.AddField(
		model_name="event",
		name="export_slot",
		field=models.DecimalField(
		decimal_places=2,
		default=1,
		help_text="Slot duration in hours that is used in the timeslot discretization, when this event is exported for the solver.",
		max_digits=4,
		verbose_name="Export Slot Length",
		),
		),
		]

AKModel/migrations/0065_eventparticipant_akpreference_and_more.py

0 → 100644

+132 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-02-10 10:23

		from django.db import migrations, models
		import django.db.models.deletion


		class Migration(migrations.Migration):

		dependencies = [
		("AKModel", "0064_event_export_slot"),
		]

		operations = [
		migrations.CreateModel(
		name="EventParticipant",
		fields=[
		(
		"id",
		models.AutoField(
		auto_created=True,
		primary_key=True,
		serialize=False,
		verbose_name="ID",
		),
		),
		(
		"name",
		models.CharField(
		blank=True,
		help_text="Name to identify a participant by (in case of questions from the organizers)",
		max_length=64,
		verbose_name="Nickname",
		),
		),
		(
		"institution",
		models.CharField(
		blank=True,
		help_text="Uni etc.",
		max_length=128,
		verbose_name="Institution",
		),
		),
		(
		"event",
		models.ForeignKey(
		help_text="Associated event",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.event",
		verbose_name="Event",
		),
		),
		],
		options={
		"verbose_name": "Participant",
		"verbose_name_plural": "Participants",
		"ordering": ["name"],
		},
		),
		migrations.CreateModel(
		name="AKPreference",
		fields=[
		(
		"id",
		models.AutoField(
		auto_created=True,
		primary_key=True,
		serialize=False,
		verbose_name="ID",
		),
		),
		(
		"preference",
		models.PositiveSmallIntegerField(
		choices=[
		(0, "Ignore"),
		(1, "Prefer"),
		(2, "Strong prefer"),
		(3, "Required"),
		],
		default=0,
		help_text="Preference level for the AK",
		verbose_name="Preference",
		),
		),
		(
		"ak",
		models.ForeignKey(
		help_text="AK this preference belongs to",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.ak",
		verbose_name="AK",
		),
		),
		(
		"event",
		models.ForeignKey(
		help_text="Associated event",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.event",
		verbose_name="Event",
		),
		),
		(
		"participant",
		models.ForeignKey(
		help_text="Participant this preference belongs to",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.eventparticipant",
		verbose_name="Participant",
		),
		),
		],
		options={
		"verbose_name": "AK Preference",
		"verbose_name_plural": "AK Preferences",
		},
		),
		migrations.AddField(
		model_name="availability",
		name="participant",
		field=models.ForeignKey(
		blank=True,
		help_text="Participant whose availability this is",
		null=True,
		on_delete=django.db.models.deletion.CASCADE,
		related_name="availabilities",
		to="AKModel.eventparticipant",
		verbose_name="Participant",
		),
		),
		]

AKModel/migrations/0066_akpreference_slot_alter_akpreference_unique_together_and_more.py

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-02-10 22:31

		from django.db import migrations, models
		import django.db.models.deletion


		class Migration(migrations.Migration):

		dependencies = [
		("AKModel", "0065_eventparticipant_akpreference_and_more"),
		]

		operations = [
		migrations.AddField(
		model_name="akpreference",
		name="slot",
		field=models.ForeignKey(
		default=None,
		help_text="AKSlot this preference belongs to",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.akslot",
		verbose_name="AKSlot",
		),
		preserve_default=False,
		),
		migrations.AlterUniqueTogether(
		name="akpreference",
		unique_together={("event", "participant", "slot")},
		),
		migrations.RemoveField(
		model_name="akpreference",
		name="ak",
		),
		]

AKModel/migrations/0067_eventparticipant_requirements_and_more.py

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		# Generated by Django 4.2.13 on 2025-02-11 00:23

		from django.db import migrations, models
		import django.db.models.deletion


		class Migration(migrations.Migration):

		dependencies = [
		(
		"AKModel",
		"0066_akpreference_slot_alter_akpreference_unique_together_and_more",
		),
		]

		operations = [
		migrations.AddField(
		model_name="eventparticipant",
		name="requirements",
		field=models.ManyToManyField(
		blank=True,
		help_text="Participant's Requirements",
		to="AKModel.akrequirement",
		verbose_name="Requirements",
		),
		),
		migrations.AlterField(
		model_name="akpreference",
		name="slot",
		field=models.ForeignKey(
		help_text="AK Slot this preference belongs to",
		on_delete=django.db.models.deletion.CASCADE,
		to="AKModel.akslot",
		verbose_name="AK Slot",
		),
		),
		]

AKModel/migrations/0068_aktype_slug.py

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.1.6 on 2025-05-11 15:21

		from django.db import migrations, models


		def create_slugs(apps, schema_editor):
		"""
		Automatically generate slugs from existing type names
		"""
		AKType = apps.get_model("AKModel", "AKType")
		for ak_type in AKType.objects.all():
		slug = ak_type.name.lower().split(" ")[0]
		ak_type.slug = slug[:30] if len(slug) > 30 else slug
		ak_type.save()


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0067_eventparticipant_requirements_and_more'),
		]

		operations = [
		migrations.AddField(
		model_name='aktype',
		name='slug',
		field=models.SlugField(max_length=30, null=True, verbose_name='Slug'),
		),
		migrations.RunPython(create_slugs, migrations.RunPython.noop),
		migrations.AlterUniqueTogether(
		name='aktype',
		unique_together={('event', 'name')},
		),
		migrations.AlterField(
		model_name='aktype',
		name='slug',
		field=models.SlugField(max_length=30, verbose_name='Slug'),
		),
		migrations.AlterUniqueTogether(
		name='aktype',
		unique_together={('event', 'name'), ('event', 'slug')},
		),
		]

AKModel/migrations/0068_event_export_delete_preferences_participants.py

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.2.1 on 2025-06-17 15:57

		import django.db.models.deletion
		from django.db import migrations, models


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0067_eventparticipant_requirements_and_more'),
		('AKPreference', '0001_initial'),
		]

		operations = [
		migrations.RemoveField(
		model_name='eventparticipant',
		name='event',
		),
		migrations.RemoveField(
		model_name='eventparticipant',
		name='requirements',
		),
		migrations.RemoveField(
		model_name='availability',
		name='participant',
		),
		migrations.AddField(
		model_name='event',
		name='poll_hidden',
		field=models.BooleanField(default=True, help_text='Hides preference poll for non-staff users', verbose_name='Poll Hidden'),
		),
		migrations.AddField(
		model_name='event',
		name='poll_published_at',
		field=models.DateTimeField(blank=True, help_text='Timestamp at which the preference poll was published', null=True, verbose_name='Poll published at'),
		),
		migrations.DeleteModel(
		name='AKPreference',
		),
		migrations.DeleteModel(
		name='EventParticipant',
		),
		migrations.AddField(
		model_name='availability',
		name='participant',
		field=models.ForeignKey(blank=True, help_text='Participant whose availability this is', null=True,
		on_delete=django.db.models.deletion.CASCADE, related_name='availabilities',
		to='AKPreference.eventparticipant', verbose_name='Participant'),
		),
		]

AKModel/migrations/0069_merge_20250617_1844.py

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.2.1 on 2025-06-17 18:44

		from django.db import migrations


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0068_aktype_slug'),
		('AKModel', '0068_event_export_delete_preferences_participants'),
		]

		operations = [
		]

AKModel/migrations/0070_requirements_relevant_for_participants.py

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.2.3 on 2025-06-18 10:47

		from django.db import migrations, models


		class Migration(migrations.Migration):

		dependencies = [
		('AKModel', '0069_merge_20250617_1844'),
		]

		operations = [
		migrations.AddField(
		model_name='akrequirement',
		name='relevant_for_participants',
		field=models.BooleanField(default=False, help_text='Show this requirement when collecting participant preferences', verbose_name='Relevant for Participants?'),
		),
		]

AKModel/migrations/0071_alter_event_slug.py

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.2.3 on 2025-06-21 18:58

		from django.db import migrations, models


		class Migration(migrations.Migration):
		dependencies = [
		('AKModel', '0070_requirements_relevant_for_participants'),
		]

		operations = [
		migrations.AlterField(
		model_name='event',
		name='slug',
		field=models.SlugField(help_text='Short name of letters/numbers/dashes/underscores used in URLs.',
		max_length=32, unique=True, verbose_name='Short Form'),
		),
		]

AKModel/migrations/0072_AK_new_fields.py

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		# Generated by Django 5.2.3 on 2025-06-23 12:54

		from django.db import migrations, models


		class Migration(migrations.Migration):
		dependencies = [
		('AKModel', '0071_alter_event_slug'),
		]

		operations = [
		migrations.AddField(
		model_name='ak',
		name='goal',
		field=models.CharField(default='-',
		help_text='Design of the AK (e.g. discussion, problem solving, brainstorming, input, output) and/or goal (e.g. Reso, solution, collection of ideas, document, exchange) in a few words',
		max_length=512, verbose_name='Design/Goal'),
		preserve_default=False,
		),
		migrations.AddField(
		model_name='ak',
		name='info',
		field=models.TextField(blank=True,
		help_text='Anything else about the AK, e.g. links, stories, detailed description',
		verbose_name='Further Information'),
		),
		migrations.AddField(
		model_name='historicalak',
		name='goal',
		field=models.CharField(default='-',
		help_text='Design of the AK (e.g. discussion, problem solving, brainstorming, input, output) and/or goal (e.g. Reso, solution, collection of ideas, document, exchange) in a few words',
		max_length=512, verbose_name='Design/Goal'),
		preserve_default=False,
		),
		migrations.AddField(
		model_name='historicalak',
		name='info',
		field=models.TextField(blank=True,
		help_text='Anything else about the AK, e.g. links, stories, detailed description',
		verbose_name='Further Information'),
		),
		migrations.AlterField(
		model_name='ak',
		name='description',
		field=models.TextField(help_text='1-2 sentences of AK description', verbose_name='Brief Description'),
		),
		migrations.AlterField(
		model_name='historicalak',
		name='description',
		field=models.TextField(help_text='1-2 sentences of AK description', verbose_name='Brief Description'),
		),
		]

AKModel/models.py

+609 −38

File changed.

Preview size limit exceeded, changes collapsed.

AKModel/serializers.py

+13 −1

Original line number	Diff line number	Diff line
		from rest_framework import serializers

		from AKModel.models import AK, Room, AKSlot, AKTrack, AKCategory, AKOwner
		from AKModel.models import AK, AKCategory, AKOwner, AKSlot, AKTrack, Room


		class StringListField(serializers.ListField):
		"""List field containing strings."""

		child = serializers.CharField()


		class IntListField(serializers.ListField):
		"""List field containing integers."""

		child = serializers.IntegerField()


		class AKOwnerSerializer(serializers.ModelSerializer):

AKModel/templates/admin/AKModel/ak_csv_export.html

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,8 @@

		{% block content %}
		<pre>
		title;duration;who;requirements;prerequisites;conflicts;availabilities;category;track;reso;notes;
		{% for slot in slots %}{{ slot.ak.short_name }};{{ slot.duration }};{{ slot.ak.owners.all\|join:", " }};{{ slot.ak.requirements.all\|join:", " }};{{ slot.ak.prerequisites.all\|join:", " }};{{ slot.ak.conflicts.all\|join:", " }};{% for a in slot.ak.availabilities.all %}{{ a.start \| timezone:event.timezone \| date:"l H:i" }} - {{ a.end \| timezone:event.timezone \| date:"l H:i" }}, {% endfor %};{{ slot.ak.category }};{{ slot.ak.track }};{{ slot.ak.reso }};{{ slot.ak.notes }};
		title;duration;who;requirements;prerequisites;conflicts;availabilities;category;types;track;reso;notes;
		{% for slot in slots %}{{ slot.ak.short_name }};{{ slot.duration }};{{ slot.ak.owners.all\|join:", " }};{{ slot.ak.requirements.all\|join:", " }};{{ slot.ak.prerequisites.all\|join:", " }};{{ slot.ak.conflicts.all\|join:", " }};{% for a in slot.ak.availabilities.all %}{{ a.start \| timezone:event.timezone \| date:"l H:i" }} - {{ a.end \| timezone:event.timezone \| date:"l H:i" }}, {% endfor %};{{ slot.ak.category }};{{ slot.ak.types.all\|join:", " }};{{ slot.ak.track }};{{ slot.ak.reso }};{{ slot.ak.notes }};
		{% endfor %}
		</pre>
		{% endblock %}

AKModel/templates/admin/AKModel/aks_by_user.html

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		{% extends "admin/base_site.html" %}
		{% load tags_AKModel %}

		{% load i18n %}
		{% load tz %}
		{% load fontawesome_6 %}

		{% block title %}{% trans "AKs by Owner" %}: {{owner}}{% endblock %}

		{% block content %}
		{% timezone event.timezone %}
		<h2>[{{event}}] <a href="{% url 'admin:AKModel_akowner_change' owner.pk %}">{{owner}}</a> - {% trans "AKs" %}</h2>

		<div class="row mt-4">
		<table class="table table-striped">
		{% for ak in owner.ak_set.all %}
		<tr>
		<td>{{ ak }}</td>
		{% if "AKSubmission"\|check_app_installed %}
		<td class="text-end">
		<a href="{{ ak.detail_url }}" data-bs-toggle="tooltip"
		title="{% trans 'Details' %}"
		class="btn btn-primary">{% fa6_icon 'info' 'fas' %}</a>
		{% if event.active %}
		<a href="{{ ak.edit_url }}" data-bs-toggle="tooltip"
		title="{% trans 'Edit' %}"
		class="btn btn-success">{% fa6_icon 'pencil-alt' 'fas' %}</a>
		{% endif %}
		{% endif %}
		</td>
		</tr>
		{% empty %}
		<tr><td>{% trans "This user does not have any AKs currently" %}</td></tr>
		{% endfor %}
		</table>
		</div>
		{% endtimezone %}
		{% endblock %}

AKModel/templates/admin/AKModel/export/slides.tex

+8 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@

		\faUser~ {{ translations.who }}

		{% if show_types %}
		\faList~ {{ translations.types }}
		{% endif %}

		\faClock~ {{ translations.duration }}

		\faScroll~{{ translations.reso }}
		@@ -45,6 +49,10 @@

		\faUser~ {{ ak.owners_list \| latex_escape }}

		{% if show_types %}
		\faList~ {{ak.types_list }}
		{% endif %}

		{% if not result_presentation_mode %}
		\faClock~ {{ak.durations_list}}
		{% endif %}

AKModel/templatetags/tags_AKModel.py

+18 −0

Original line number	Diff line number	Diff line
		@@ -3,8 +3,11 @@ from django.apps import apps
		from django.conf import settings
		from django.utils.html import format_html, mark_safe, conditional_escape
		from django.templatetags.static import static
		from django.template.defaultfilters import date
		from fontawesome_6.app_settings import get_css

		from AKModel.models import Event

		register = template.Library()


		@@ -71,6 +74,21 @@ def wiki_owners_export(owners, event):
		return ", ".join(to_link(owner) for owner in owners.all())


		@register.filter
		def event_month_year(event:Event):
		"""
		Print rough event date (month and year)
		:param event: event to print the date for
		:return: string containing rough date information for event
		"""
		if event.start.month == event.end.month:
		return f"{date(event.start, 'F')} {event.start.year}"
		event_start_string = date(event.start, 'F')
		if event.start.year != event.end.year:
		event_start_string = f"{event_start_string} {event.start.year}"
		return f"{event_start_string} - {date(event.end, 'F')} {event.end.year}"


		# get list of relevant css fontawesome css files for this instance
		css = get_css()

AKModel/tests/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKModel/tests.py→AKModel/tests/test_views.py

+144 −59

Original line number	Diff line number	Diff line
		@@ -5,10 +5,21 @@ from django.contrib.auth import get_user_model
		from django.contrib.messages import get_messages
		from django.contrib.messages.storage.base import Message
		from django.test import TestCase
		from django.urls import reverse_lazy, reverse

		from AKModel.models import Event, AKOwner, AKCategory, AKTrack, AKRequirement, AK, Room, AKSlot, AKOrgaMessage, \
		ConstraintViolation, DefaultSlot
		from django.urls import reverse, reverse_lazy

		from AKModel.models import (
		AK,
		AKCategory,
		AKOrgaMessage,
		AKOwner,
		AKRequirement,
		AKSlot,
		AKTrack,
		ConstraintViolation,
		DefaultSlot,
		Event,
		Room,
		)


		class BasicViewTests:
		@@ -29,9 +40,10 @@ class BasicViewTests:
		since the test framework does not understand the concept of abstract test definitions and would handle this class
		as real test case otherwise, distorting the test results.
		"""

		# pylint: disable=no-member
		VIEWS = []
		APP_NAME = ''
		APP_NAME = ""
		VIEWS_STAFF_ONLY = []
		EDIT_TESTCASES = []

		@@ -41,16 +53,26 @@ class BasicViewTests:
		"""
		user_model = get_user_model()
		self.staff_user = user_model.objects.create(
		username='Test Staff User', email='teststaff@example.com', password='staffpw',
		is_staff=True, is_active=True
		username="Test Staff User",
		email="teststaff@example.com",
		password="staffpw",
		is_staff=True,
		is_active=True,
		)
		self.admin_user = user_model.objects.create(
		username='Test Admin User', email='testadmin@example.com', password='adminpw',
		is_staff=True, is_superuser=True, is_active=True
		username="Test Admin User",
		email="testadmin@example.com",
		password="adminpw",
		is_staff=True,
		is_superuser=True,
		is_active=True,
		)
		self.deactivated_user = user_model.objects.create(
		username='Test Deactivated User', email='testdeactivated@example.com', password='deactivatedpw',
		is_staff=True, is_active=False
		username="Test Deactivated User",
		email="testdeactivated@example.com",
		password="deactivatedpw",
		is_staff=True,
		is_active=False,
		)

		def _name_and_url(self, view_name):
		@@ -62,7 +84,9 @@ class BasicViewTests:
		:return: full view name with prefix if applicable, url of the view
		:rtype: str, str
		"""
		view_name_with_prefix = f"{self.APP_NAME}:{view_name[0]}" if self.APP_NAME != "" else view_name[0]
		view_name_with_prefix = (
		f"{self.APP_NAME}:{view_name[0]}" if self.APP_NAME != "" else view_name[0]
		)
		url = reverse(view_name_with_prefix, kwargs=view_name[1])
		return view_name_with_prefix, url

		@@ -95,10 +119,16 @@ class BasicViewTests:
		view_name_with_prefix, url = self._name_and_url(view_name)
		try:
		response = self.client.get(url)
		self.assertEqual(response.status_code, 200, msg=f"{view_name_with_prefix} ({url}) broken")
		self.assertEqual(
		response.status_code,
		200,
		msg=f"{view_name_with_prefix} ({url}) broken",
		)
		except Exception: # pylint: disable=broad-exception-caught
		self.fail(f"An error occurred during rendering of {view_name_with_prefix} ({url}):"
		f"\n\n{traceback.format_exc()}")
		self.fail(
		f"An error occurred during rendering of {view_name_with_prefix} ({url}):"
		f"\n\n{traceback.format_exc()}"
		)

		def test_access_control_staff_only(self):
		"""
		@@ -107,11 +137,16 @@ class BasicViewTests:
		# Not logged in? Views should not be visible
		self.client.logout()
		for view_name_info in self.VIEWS_STAFF_ONLY:
		expected_response_code = 302 if len(view_name_info) == 2 else view_name_info[2]
		expected_response_code = (
		302 if len(view_name_info) == 2 else view_name_info[2]
		)
		view_name_with_prefix, url = self._name_and_url(view_name_info)
		response = self.client.get(url)
		self.assertEqual(response.status_code, expected_response_code,
		msg=f"{view_name_with_prefix} ({url}) accessible by non-staff")
		self.assertEqual(
		response.status_code,
		expected_response_code,
		msg=f"{view_name_with_prefix} ({url}) accessible by non-staff",
		)

		# Logged in? Views should be visible
		self.client.force_login(self.staff_user)
		@@ -119,20 +154,30 @@ class BasicViewTests:
		view_name_with_prefix, url = self._name_and_url(view_name_info)
		try:
		response = self.client.get(url)
		self.assertEqual(response.status_code, 200,
		msg=f"{view_name_with_prefix} ({url}) should be accessible for staff (but isn't)")
		self.assertEqual(
		response.status_code,
		200,
		msg=f"{view_name_with_prefix} ({url}) should be accessible for staff (but isn't)",
		)
		except Exception: # pylint: disable=broad-exception-caught
		self.fail(f"An error occurred during rendering of {view_name_with_prefix} ({url}):"
		f"\n\n{traceback.format_exc()}")
		self.fail(
		f"An error occurred during rendering of {view_name_with_prefix} ({url}):"
		f"\n\n{traceback.format_exc()}"
		)

		# Disabled user? Views should not be visible
		self.client.force_login(self.deactivated_user)
		for view_name_info in self.VIEWS_STAFF_ONLY:
		expected_response_code = 302 if len(view_name_info) == 2 else view_name_info[2]
		expected_response_code = (
		302 if len(view_name_info) == 2 else view_name_info[2]
		)
		view_name_with_prefix, url = self._name_and_url(view_name_info)
		response = self.client.get(url)
		self.assertEqual(response.status_code, expected_response_code,
		msg=f"{view_name_with_prefix} ({url}) still accessible for deactivated user")
		self.assertEqual(
		response.status_code,
		expected_response_code,
		msg=f"{view_name_with_prefix} ({url}) still accessible for deactivated user",
		)

		def _to_sendable_value(self, val):
		"""
		@@ -182,16 +227,26 @@ class BasicViewTests:
		self.client.logout()

		response = self.client.get(url)
		self.assertEqual(response.status_code, 200, msg=f"{name}: Could not load edit form via GET ({url})")
		self.assertEqual(
		response.status_code,
		200,
		msg=f"{name}: Could not load edit form via GET ({url})",
		)

		form = response.context[form_name]
		data = {k: self._to_sendable_value(v) for k, v in form.initial.items()}

		response = self.client.post(url, data=data)
		if expected_code == 200:
		self.assertEqual(response.status_code, 200, msg=f"{name}: Did not return 200 ({url}")
		self.assertEqual(
		response.status_code, 200, msg=f"{name}: Did not return 200 ({url}"
		)
		elif expected_code == 302:
		self.assertRedirects(response, target_url, msg_prefix=f"{name}: Did not redirect ({url} -> {target_url}")
		self.assertRedirects(
		response,
		target_url,
		msg_prefix=f"{name}: Did not redirect ({url} -> {target_url}",
		)
		if expected_message != "":
		self._assert_message(response, expected_message, msg_prefix=f"{name}")

		@@ -200,30 +255,42 @@ class ModelViewTests(BasicViewTests, TestCase):
		"""
		Basic view test cases for views from AKModel plus some custom tests
		"""
		fixtures = ['model.json']

		fixtures = ["model.json"]

		ADMIN_MODELS = [
		(Event, 'event'), (AKOwner, 'akowner'), (AKCategory, 'akcategory'), (AKTrack, 'aktrack'),
		(AKRequirement, 'akrequirement'), (AK, 'ak'), (Room, 'room'), (AKSlot, 'akslot'),
		(AKOrgaMessage, 'akorgamessage'), (ConstraintViolation, 'constraintviolation'),
		(DefaultSlot, 'defaultslot')
		(Event, "event"),
		(AKOwner, "akowner"),
		(AKCategory, "akcategory"),
		(AKTrack, "aktrack"),
		(AKRequirement, "akrequirement"),
		(AK, "ak"),
		(Room, "room"),
		(AKSlot, "akslot"),
		(AKOrgaMessage, "akorgamessage"),
		(ConstraintViolation, "constraintviolation"),
		(DefaultSlot, "defaultslot"),
		]

		VIEWS_STAFF_ONLY = [
		('admin:index', {}),
		('admin:event_status', {'event_slug': 'kif42'}),
		('admin:event_requirement_overview', {'event_slug': 'kif42'}),
		('admin:ak_csv_export', {'event_slug': 'kif42'}),
		('admin:ak_wiki_export', {'slug': 'kif42'}),
		('admin:ak_delete_orga_messages', {'event_slug': 'kif42'}),
		('admin:ak_slide_export', {'event_slug': 'kif42'}),
		('admin:default-slots-editor', {'event_slug': 'kif42'}),
		('admin:room-import', {'event_slug': 'kif42'}),
		('admin:new_event_wizard_start', {}),
		("admin:index", {}),
		("admin:event_status", {"event_slug": "kif42"}),
		("admin:event_requirement_overview", {"event_slug": "kif42"}),
		("admin:ak_csv_export", {"event_slug": "kif42"}),
		("admin:ak_wiki_export", {"slug": "kif42"}),
		("admin:ak_delete_orga_messages", {"event_slug": "kif42"}),
		("admin:ak_slide_export", {"event_slug": "kif42"}),
		("admin:default-slots-editor", {"event_slug": "kif42"}),
		("admin:room-import", {"event_slug": "kif42"}),
		("admin:new_event_wizard_start", {}),
		]

		EDIT_TESTCASES = [
		{'view': 'admin:default-slots-editor', 'kwargs': {'event_slug': 'kif42'}, "admin": True},
		{
		"view": "admin:default-slots-editor",
		"kwargs": {"event_slug": "kif42"},
		"admin": True,
		},
		]

		def test_admin(self):
		@@ -234,24 +301,32 @@ class ModelViewTests(BasicViewTests, TestCase):
		for model in self.ADMIN_MODELS:
		# Special treatment for a subset of views (where we exchanged default functionality, e.g., create views)
		if model[1] == "event":
		_, url = self._name_and_url(('admin:new_event_wizard_start', {}))
		_, url = self._name_and_url(("admin:new_event_wizard_start", {}))
		elif model[1] == "room":
		_, url = self._name_and_url(('admin:room-new', {}))
		_, url = self._name_and_url(("admin:room-new", {}))
		# Otherwise, just call the creation form view
		else:
		_, url = self._name_and_url((f'admin:AKModel_{model[1]}_add', {}))
		_, url = self._name_and_url((f"admin:AKModel_{model[1]}_add", {}))
		response = self.client.get(url)
		self.assertEqual(response.status_code, 200, msg=f"Add form for model {model[1]} ({url}) broken")
		self.assertEqual(
		response.status_code,
		200,
		msg=f"Add form for model {model[1]} ({url}) broken",
		)

		for model in self.ADMIN_MODELS:
		# Test the update view using the first existing instance of each model
		m = model[0].objects.first()
		if m is not None:
		_, url = self._name_and_url(
		(f'admin:AKModel_{model[1]}_change', {'object_id': m.pk})
		(f"admin:AKModel_{model[1]}_change", {"object_id": m.pk})
		)
		response = self.client.get(url)
		self.assertEqual(response.status_code, 200, msg=f"Edit form for model {model[1]} ({url}) broken")
		self.assertEqual(
		response.status_code,
		200,
		msg=f"Edit form for model {model[1]} ({url}) broken",
		)

		def test_wiki_export(self):
		"""
		@@ -260,17 +335,27 @@ class ModelViewTests(BasicViewTests, TestCase):
		"""
		self.client.force_login(self.admin_user)

		export_url = reverse_lazy("admin:ak_wiki_export", kwargs={'slug': 'kif42'})
		export_url = reverse_lazy("admin:ak_wiki_export", kwargs={"slug": "kif42"})
		response = self.client.get(export_url)
		self.assertEqual(response.status_code, 200, "Export not working at all")

		export_count = 0
		for _, aks in response.context["categories_with_aks"]:
		for ak in aks:
		self.assertEqual(ak.include_in_export, True,
		f"AK with export flag set to False (pk={ak.pk}) included in export")
		self.assertNotEqual(ak.pk, 1, "AK known to be excluded from export (PK 1) included in export")
		self.assertEqual(
		ak.include_in_export,
		True,
		f"AK with export flag set to False (pk={ak.pk}) included in export",
		)
		self.assertNotEqual(
		ak.pk,
		1,
		"AK known to be excluded from export (PK 1) included in export",
		)
		export_count += 1

		self.assertEqual(export_count, AK.objects.filter(event_id=2, include_in_export=True).count(),
		"Wiki export contained the wrong number of AKs")
		self.assertEqual(
		export_count,
		AK.objects.filter(event_id=2, include_in_export=True).count(),
		"Wiki export contained the wrong number of AKs",
		)

AKModel/urls.py

+15 −6

Original line number	Diff line number	Diff line
		@@ -4,11 +4,11 @@ from django.urls import include, path
		from rest_framework.routers import DefaultRouter

		import AKModel.views.api
		from AKModel.views.manage import ExportSlidesView, PlanPublishView, PlanUnpublishView, DefaultSlotEditorView, \
		AKsByUserView
		from AKModel.views.ak import AKRequirementOverview, AKCSVExportView, AKWikiExportView, AKMessageDeleteView
		from AKModel.views.event_wizard import NewEventWizardStartView, NewEventWizardPrepareImportView, \
		NewEventWizardImportView, NewEventWizardActivateView, NewEventWizardFinishView, NewEventWizardSettingsView
		from AKModel.views.ak import AKCSVExportView, AKMessageDeleteView, AKRequirementOverview, AKWikiExportView
		from AKModel.views.event_wizard import NewEventWizardActivateView, NewEventWizardFinishView, NewEventWizardImportView, \
		NewEventWizardPrepareImportView, NewEventWizardSettingsView, NewEventWizardStartView
		from AKModel.views.manage import AKsByUserView, DefaultSlotEditorView, ExportSlidesView, PlanPublishView, \
		PlanUnpublishView, PollPublishView, PollUnpublishView
		from AKModel.views.room import RoomBatchCreationView
		from AKModel.views.status import EventStatusView

		@@ -44,6 +44,11 @@ if apps.is_installed("AKSubmission"):
		from AKSubmission.api import increment_interest_counter
		extra_paths.append(path('api/ak/<pk>/indicate-interest/', increment_interest_counter, name='submission-ak-indicate-interest'))

		# If AKSolverInterface is active, register additional API endpoints
		if apps.is_installed("AKSolverInterface"):
		from AKSolverInterface.api import ExportEventForSolverViewSet
		api_router.register("solver-export", ExportEventForSolverViewSet, basename="solver-export")

		event_specific_paths = [
		path('api/', include(api_router.urls), name='api'),
		]
		@@ -68,7 +73,9 @@ def get_admin_urls_event_wizard(admin_site):
		return [
		path('add/wizard/start/', admin_site.admin_view(NewEventWizardStartView.as_view()),
		name="new_event_wizard_start"),
		path('add/wizard/settings/', csp_update(FONT_SRC=["maxcdn.bootstrapcdn.com"], SCRIPT_SRC=["cdnjs.cloudflare.com"], STYLE_SRC=["cdnjs.cloudflare.com"])(admin_site.admin_view(NewEventWizardSettingsView.as_view())),
		path('add/wizard/settings/', csp_update(
		{"font-src": ["maxcdn.bootstrapcdn.com"], "script-src": ["cdnjs.cloudflare.com"],
		"style-src": ["cdnjs.cloudflare.com"]})(admin_site.admin_view(NewEventWizardSettingsView.as_view())),
		name="new_event_wizard_settings"),
		path('add/wizard/created/<slug:event_slug>/', admin_site.admin_view(NewEventWizardPrepareImportView.as_view()),
		name="new_event_wizard_prepare_import"),
		@@ -103,6 +110,8 @@ def get_admin_urls_event(admin_site):
		path('<slug:event_slug>/ak-slide-export/', admin_site.admin_view(ExportSlidesView.as_view()), name="ak_slide_export"),
		path('plan/publish/', admin_site.admin_view(PlanPublishView.as_view()), name="plan-publish"),
		path('plan/unpublish/', admin_site.admin_view(PlanUnpublishView.as_view()), name="plan-unpublish"),
		path('poll/publish/', admin_site.admin_view(PollPublishView.as_view()), name="poll-publish"),
		path('poll/unpublish/', admin_site.admin_view(PollUnpublishView.as_view()), name="poll-unpublish"),
		path('<slug:event_slug>/defaultSlots/', admin_site.admin_view(DefaultSlotEditorView.as_view()),
		name="default-slots-editor"),
		path('<slug:event_slug>/importRooms/', admin_site.admin_view(RoomBatchCreationView.as_view()),

AKModel/views/manage.py

+79 −5

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@ from django.contrib import messages
		from django.db.models.functions import Now
		from django.utils.dateparse import parse_datetime
		from django.utils.translation import gettext_lazy as _
		from django.views.generic import TemplateView, DetailView
		from django.views.generic import DetailView, ListView, TemplateView
		from django_tex.core import render_template_with_context, run_tex_in_directory
		from django_tex.response import PDFResponse

		from AKModel.forms import SlideExportForm, DefaultSlotEditorForm
		from AKModel.metaviews.admin import EventSlugMixin, IntermediateAdminView, IntermediateAdminActionView, AdminViewMixin
		from AKModel.models import ConstraintViolation, Event, DefaultSlot, AKOwner
		from AKModel.models import ConstraintViolation, Event, DefaultSlot, AKOwner, AKSlot, AKType


		class UserView(TemplateView):
		@@ -35,6 +35,19 @@ class ExportSlidesView(EventSlugMixin, IntermediateAdminView):
		title = _('Export AK Slides')
		form_class = SlideExportForm

		def get_form(self, form_class=None):
		# Filter type choices to those of the current event
		# or completely hide the field if no types are specified for this event
		form = super().get_form(form_class)
		if self.event.aktype_set.count() > 0:
		form.fields['types'].choices = [
		(ak_type.id, ak_type.name) for ak_type in self.event.aktype_set.all()
		]
		else:
		form.fields['types'].widget = form.fields['types'].hidden_widget()
		form.fields['types_all_selected_only'].widget = form.fields['types_all_selected_only'].hidden_widget()
		return form

		def form_valid(self, form):
		# pylint: disable=invalid-name
		template_name = 'admin/AKModel/export/slides.tex'
		@@ -51,6 +64,7 @@ class ExportSlidesView(EventSlugMixin, IntermediateAdminView):
		'reso': _("Reso intention?"),
		'category': _("Category (for Wishes)"),
		'wishes': _("Wishes"),
		'types': _("Types"),
		}

		def build_ak_list_with_next_aks(ak_list):
		@@ -58,23 +72,36 @@ class ExportSlidesView(EventSlugMixin, IntermediateAdminView):
		Create a list of tuples cosisting of an AK and a list of upcoming AKs (list length depending on setting)
		"""
		next_aks_list = zip_longest(*[ak_list[i + 1:] for i in range(NEXT_AK_LIST_LENGTH)], fillvalue=None)
		return [(ak, next_aks) for ak, next_aks in zip_longest(ak_list, next_aks_list, fillvalue=[])]
		return list(zip_longest(ak_list, next_aks_list, fillvalue=[]))

		# Create a list of types to filter AKs by (if at least one type was selected)
		types = None
		types_filter_string = ""
		show_types = self.event.aktype_set.count() > 0
		if len(form.cleaned_data['types']) > 0:
		types = AKType.objects.filter(id__in=form.cleaned_data['types'])
		names_string = ', '.join(AKType.objects.get(pk=t).name for t in form.cleaned_data['types'])
		types_filter_string = f"[{_('Type(s)')}: {names_string}]"
		types_all_selected_only = form.cleaned_data['types_all_selected_only']

		# Get all relevant AKs (wishes separately, and either all AKs or only those who should directly or indirectly
		# be presented when restriction setting was chosen)
		categories_with_aks, ak_wishes = self.event.get_categories_with_aks(wishes_seperately=True, filter_func=lambda
		ak: not RESULT_PRESENTATION_MODE or (ak.present or (ak.present is None and ak.category.present_by_default)))
		ak: not RESULT_PRESENTATION_MODE or (ak.present or (ak.present is None and ak.category.present_by_default)),
		types=types,
		types_all_selected_only=types_all_selected_only)

		# Create context for LaTeX rendering
		context = {
		'title': self.event.name,
		'categories_with_aks': [(category, build_ak_list_with_next_aks(ak_list)) for category, ak_list in
		categories_with_aks],
		'subtitle': _("AKs"),
		'subtitle': _("AKs") + " " + types_filter_string,
		"wishes": build_ak_list_with_next_aks(ak_wishes),
		"translations": translations,
		"result_presentation_mode": RESULT_PRESENTATION_MODE,
		"space_for_notes_in_wishes": SPACE_FOR_NOTES_IN_WISHES,
		"show_types": show_types,
		}

		source = render_template_with_context(template_name, context)
		@@ -130,6 +157,28 @@ class CVSetLevelWarningView(IntermediateAdminActionView):
		def action(self, form):
		self.entities.update(level=ConstraintViolation.ViolationLevel.WARNING)

		class ClearScheduleView(IntermediateAdminActionView, ListView):
		"""
		Admin action view: Clear schedule
		"""
		title = _('Clear schedule')
		model = AKSlot
		confirmation_message = _('Clear schedule. The following scheduled AKSlots will be reset')
		success_message = _('Schedule cleared')

		def __init__(self, args, *kwargs):
		super().__init__(args, *kwargs)
		self.entities = AKSlot.objects.none()

		def get_queryset(self, args, *kwargs):
		query_set = super().get_queryset(args, *kwargs)
		# do not reset fixed AKs
		query_set = query_set.filter(fixed=False)
		return query_set

		def action(self, form):
		"""Reset rooms and start for all selected slots."""
		self.entities.update(room=None, start=None)

		class PlanPublishView(IntermediateAdminActionView):
		"""
		@@ -157,6 +206,31 @@ class PlanUnpublishView(IntermediateAdminActionView):
		self.entities.update(plan_published_at=None, plan_hidden=True)


		class PollPublishView(IntermediateAdminActionView):
		"""
		Admin action view: Publish the preference poll of one or multitple event(s)
		"""
		title = _('Publish preference poll')
		model = Event
		confirmation_message = _('Publish the poll(s) of:')
		success_message = _('Preference poll published')

		def action(self, form):
		self.entities.update(poll_published_at=Now(), poll_hidden=False)


		class PollUnpublishView(IntermediateAdminActionView):
		"""
		Admin action view: Unpublish the preference poll of one or multitple event(s)
		"""
		title = _('Unpublish preference poll')
		model = Event
		confirmation_message = _('Unpublish the preference poll(s) of:')
		success_message = _('Preference poll unpublished')

		def action(self, form):
		self.entities.update(poll_published_at=None, poll_hidden=True)

		class DefaultSlotEditorView(EventSlugMixin, IntermediateAdminView):
		"""
		Admin view: Allow to edit the default slots of an event

AKModel/views/status.py

+17 −1

Original line number	Diff line number	Diff line
		@@ -76,10 +76,15 @@ class EventRoomsWidget(TemplateStatusWidget):
		def render_actions(self, context: {}) -> list[dict]:
		actions = super().render_actions(context)
		# Action has to be added here since it depends on the event for URL building
		import_room_url = reverse_lazy("admin:room-import", kwargs={"event_slug": context["event"].slug})
		for action in actions:
		if action["url"] == import_room_url:
		return actions

		actions.append(
		{
		"text": _("Import Rooms from CSV"),
		"url": reverse_lazy("admin:room-import", kwargs={"event_slug": context["event"].slug}),
		"url": import_room_url,
		}
		)
		return actions
		@@ -147,6 +152,17 @@ class EventAKsWidget(TemplateStatusWidget):
		},
		]
		)
		if apps.is_installed("AKSolverInterface"):
		actions.extend([
		{
		"text": _("Export AKs as JSON"),
		"url": reverse_lazy("admin:ak_json_export", kwargs={"event_slug": context["event"].slug}),
		},
		{
		"text": _("Import AK schedule from JSON"),
		"url": reverse_lazy("admin:ak_schedule_json_import", kwargs={"event_slug": context["event"].slug}),
		},
		])
		return actions

AKPlan/locale/de_DE/LC_MESSAGES/django.po

+37 −13

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ msgid ""
		msgstr ""
		"Project-Id-Version: PACKAGE VERSION\n"
		"Report-Msgid-Bugs-To: \n"
		"POT-Creation-Date: 2023-05-15 20:03+0200\n"
		"POT-Creation-Date: 2025-06-16 12:44+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"
		@@ -38,45 +38,65 @@ msgstr "Veranstaltung"
		#: AKPlan/templates/AKPlan/plan_index.html:59
		#: AKPlan/templates/AKPlan/plan_room.html:13
		#: AKPlan/templates/AKPlan/plan_room.html:59
		#: AKPlan/templates/AKPlan/plan_wall.html:65
		#: AKPlan/templates/AKPlan/plan_wall.html:67
		msgid "Room"
		msgstr "Raum"

		#: AKPlan/templates/AKPlan/plan_index.html:80
		#: AKPlan/templates/AKPlan/plan_index.html:120
		#: 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_index.html:134
		#: AKPlan/templates/AKPlan/plan_room.html:49
		msgid "Rooms"
		msgstr "Räume"

		#: AKPlan/templates/AKPlan/plan_index.html:105
		#: AKPlan/templates/AKPlan/plan_index.html:147
		#: AKPlan/templates/AKPlan/plan_track.html:36
		msgid "Tracks"
		msgstr "Tracks"

		#: AKPlan/templates/AKPlan/plan_index.html:117
		#: AKPlan/templates/AKPlan/plan_index.html:159
		msgid "AK Wall"
		msgstr "AK-Wall"

		#: AKPlan/templates/AKPlan/plan_index.html:130
		#: AKPlan/templates/AKPlan/plan_wall.html:130
		#: AKPlan/templates/AKPlan/plan_index.html:165
		msgid "Plan:"
		msgstr "Plan:"

		#: AKPlan/templates/AKPlan/plan_index.html:171
		msgid "Filter by types"
		msgstr "Nach Typen filtern"

		#: AKPlan/templates/AKPlan/plan_index.html:174
		msgid "Types:"
		msgstr "Typen:"

		#: AKPlan/templates/AKPlan/plan_index.html:182
		msgid "AKs without type"
		msgstr "AKs ohne Typ"

		#: AKPlan/templates/AKPlan/plan_index.html:186
		msgid "No AKs with additional other types"
		msgstr "Keine AKs, die noch zusätzlich andere Typen haben"

		#: AKPlan/templates/AKPlan/plan_index.html:198
		#: AKPlan/templates/AKPlan/plan_wall.html:132
		msgid "Current AKs"
		msgstr "Aktuelle AKs"

		#: AKPlan/templates/AKPlan/plan_index.html:137
		#: AKPlan/templates/AKPlan/plan_wall.html:135
		#: AKPlan/templates/AKPlan/plan_index.html:205
		#: AKPlan/templates/AKPlan/plan_wall.html:137
		msgid "Next AKs"
		msgstr "Nächste AKs"

		#: AKPlan/templates/AKPlan/plan_index.html:145
		#: AKPlan/templates/AKPlan/plan_index.html:213
		msgid "This event is not active."
		msgstr "Dieses Event ist nicht aktiv."

		#: AKPlan/templates/AKPlan/plan_index.html:158
		#: AKPlan/templates/AKPlan/plan_index.html:226
		#: AKPlan/templates/AKPlan/plan_room.html:77
		#: AKPlan/templates/AKPlan/plan_track.html:58
		msgid "Plan is not visible (yet)."
		@@ -99,10 +119,14 @@ msgstr "Eigenschaften"
		msgid "Track"
		msgstr "Track"

		#: AKPlan/templates/AKPlan/plan_wall.html:145
		#: AKPlan/templates/AKPlan/plan_wall.html:147
		msgid "Reload page automatically?"
		msgstr "Seite automatisch neu laden?"

		#: AKPlan/templates/AKPlan/slots_table.html:14
		msgid "No AKs"
		msgstr "Keine AKs"

		#: AKPlan/views.py:64
		msgid "Invalid type filter"
		msgstr "Ungültiger Typ-Filter"

AKPlan/templates/AKPlan/plan_index.html

+70 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,46 @@
		}
		});
		</script>

		{% if type_filtering_active %}
		{# Type filter script #}
		<script type="module">
		const { createApp } = Vue

		createApp({
		delimiters: ["[[", "]]"],
		data() {
		return {
		types: JSON.parse("{{ types \| escapejs }}"),
		strict: {{ types_filter_strict\|yesno:"true,false" }},
		empty: {{ types_filter_empty\|yesno:"true,false" }}
		}
		},
		methods: {
		onFilterChange(type) {
		// Re-generate filter url
		const typeString = "types="
		+ this.types
		.map(t => `${t.slug}:${t.state ? 'yes' : 'no'}`)
		.join(',')
		+ `&strict=${this.strict ? 'yes' : 'no'}`
		+ `&empty=${this.empty ? 'yes' : 'no'}`;

		// Redirect to the new url including the adjusted filters
		const baseUrl = window.location.origin + window.location.pathname;
		window.location.href = `${baseUrl}?${typeString}`;
		}
		}
		}).mount('#filter');

		// Prevent showing of cached form values for filter inputs when using broswer navigation
		window.addEventListener('pageshow', function(event) {
		if (event.persisted) {
		window.location.reload();
		}
		});
		</script>
		{% endif %}
		{% endif %}
		{% endblock %}

		@@ -83,6 +123,8 @@


		{% block content %}
		{% include "messages.html" %}

		<div class="float-end">
		<ul class="nav nav-pills">
		{% if rooms\|length > 0 %}
		@@ -114,13 +156,39 @@
		{% if event.active %}
		<li class="nav-item">
		<a class="nav-link active"
		href="{% url 'plan:plan_wall' event_slug=event.slug %}">{% fa6_icon 'desktop' 'fas' %}  {% trans "AK Wall" %}</a>
		href="{% url 'plan:plan_wall' event_slug=event.slug %}?{{ query_string }}">{% fa6_icon 'desktop' 'fas' %}  {% trans "AK Wall" %}</a>
		</li>
		{% endif %}
		</ul>
		</div>

		<h1>Plan: {{ event }}</h1>
		<h1 class="mb-3">{% trans "Plan:" %} {{ event }}</h1>

		{% if type_filtering_active %}
		{# Type filter HTML #}
		<div class="card border-primary mb-3">
		<div class="card-header">
		{% trans 'Filter by types' %}
		</div>
		<div class="card-body d-flex" id="filter">
		{% trans "Types:" %}
		<div id="filterTypes" class="d-flex">
		<div class="form-check form-switch ms-3" v-for="type in types">
		<label class="form-check-label" :for="'typeFilterType' + type.slug">[[ type.name ]]</label>
		<input class="form-check-input" type="checkbox" :id="'typeFilterType' + type.slug " v-model="type.state" @change="onFilterChange()">
		</div>
		</div>
		<div class="form-check form-switch ms-5">
		<label class="form-check-label" for="typeFilterEmpty">{% trans "AKs without type" %}</label>
		<input class="form-check-input" type="checkbox" id="typeFilterEmpty" v-model="empty" @change="onFilterChange()">
		</div>
		<div class="form-check form-switch ms-5">
		<label class="form-check-label" for="typeFilterStrict">{% trans "No AKs with additional other types" %}</label>
		<input class="form-check-input" type="checkbox" id="typeFilterStrict" v-model="strict" @change="onFilterChange()">>
		</div>
		</div>
		</div>
		{% endif %}

		{% timezone event.timezone %}
		<div class="row" style="margin-top:30px;">

AKPlan/tests.py

+1 −1

Original line number	Diff line number	Diff line
		from django.test import TestCase

		from AKModel.tests import BasicViewTests
		from AKModel.tests.test_views import BasicViewTests


		class PlanViewTests(BasicViewTests, TestCase):

AKPlan/urls.py

+9 −8

Original line number	Diff line number	Diff line
		from csp.decorators import csp_replace
		from django.urls import path, include
		from django.urls import include, path

		from . import views

		@@ -10,7 +10,8 @@ urlpatterns = [
		'<slug:event_slug>/plan/',
		include([
		path('', views.PlanIndexView.as_view(), name='plan_overview'),
		path('wall/', csp_replace(FRAME_ANCESTORS="*")(views.PlanScreenView.as_view()), name='plan_wall'),
		path('wall/', csp_replace({"frame-ancestors": ("*",)})(views.PlanScreenView.as_view()),
		name='plan_wall'),
		path('room/<int:pk>/', views.PlanRoomView.as_view(), name='plan_room'),
		path('track/<int:pk>/', views.PlanTrackView.as_view(), name='plan_track'),
		])

AKPlan/views.py

+115 −23

File changed.

Preview size limit exceeded, changes collapsed.

AKPlanning/locale/de_DE/LC_MESSAGES/django.po

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

AKPlanning/settings.py

+27 −8

File changed.

Preview size limit exceeded, changes collapsed.

AKPlanning/urls.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,3 +37,5 @@ if apps.is_installed("AKDashboard"):
		urlpatterns.append(path('', include('AKDashboard.urls', namespace='dashboard')))
		if apps.is_installed("AKPlan"):
		urlpatterns.append(path('', include('AKPlan.urls', namespace='plan')))
		if apps.is_installed("AKPreference"):
		urlpatterns.append(path('', include('AKPreference.urls', namespace='poll')))

AKPreference/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKPreference/admin.py

0 → 100644

+49 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/apps.py

0 → 100644

+9 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/forms.py

0 → 100644

+51 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/locale/de_DE/LC_MESSAGES/django.po

0 → 100644

+189 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/migrations/0001_initial.py

0 → 100644

+140 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/migrations/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKPreference/models.py

0 → 100644

+126 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/serializers.py

0 → 100644

+95 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/templates/AKPreference/poll.html

0 → 100644

+123 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/templates/AKPreference/poll_base.html

0 → 100644

+16 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/templates/AKPreference/poll_breadcrumbs.html

0 → 100644

+16 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/templates/AKPreference/poll_not_configured.html

0 → 100644

+22 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/tests.py

0 → 100644

+40 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/urls.py

0 → 100644

+16 −0

File added.

Preview size limit exceeded, changes collapsed.

AKPreference/views.py

0 → 100644

+144 −0

File added.

Preview size limit exceeded, changes collapsed.

AKScheduling/api.py

+3 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/forms.py

+2 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/locale/de_DE/LC_MESSAGES/django.po

+44 −35

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/models.py

+4 −2

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/templates/admin/AKScheduling/scheduling.html

+5 −2

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/templates/admin/AKScheduling/special_attention.html

+14 −4

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/tests.py

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKScheduling/views.py

+10 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKSolverInterface/api.py

0 → 100644

+40 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/apps.py

0 → 100644

+9 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/forms.py

0 → 100644

+158 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/locale/de_DE/LC_MESSAGES/django.po

0 → 100644

+140 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/migrations/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKSolverInterface/serializers.py

0 → 100644

+586 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/templates/admin/AKSolverInterface/ak_json_export.html

0 → 100644

+24 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/templates/admin/AKSolverInterface/ak_json_export_control.html

0 → 100644

+38 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/templates/admin/AKSolverInterface/import_json.html

0 → 100644

+30 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/tests/init.py

0 → 100644

+0 −0

Original line number	Diff line number	Diff line

AKSolverInterface/tests/test_json_export.py

0 → 100644

+880 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/tests/test_views.py

0 → 100644

+16 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/urls.py

0 → 100644

+18 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/utils.py

0 → 100644

+43 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSolverInterface/views.py

0 → 100644

+151 −0

File added.

Preview size limit exceeded, changes collapsed.

AKSubmission/api.py

+2 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/forms.py

+15 −1

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/locale/de_DE/LC_MESSAGES/django.po

+147 −109

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/templates/AKSubmission/ak_detail.html

+113 −44

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/templates/AKSubmission/ak_list.html

+13 −0

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/templates/AKSubmission/ak_table.html

+26 −4

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/templates/AKSubmission/submission_overview.html

+4 −0

File changed.

Preview size limit exceeded, changes collapsed.

AKSubmission/templates/AKSubmission/submit_new.html

+60 −23

File changed.

Preview size limit exceeded, changes collapsed.

Source

Target

Files

Some changes are not shown.