Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • konstantin/akplanning
  • matedealer/akplanning
  • kif/akplanning
  • mirco/akplanning
  • lordofthevoid/akplanning
  • voidptr/akplanning
  • xayomer/akplanning-fork
  • mollux/akplanning
  • neumantm/akplanning
  • mmarx/akplanning
  • nerf/akplanning
  • felix_bonn/akplanning
  • sebastian.uschmann/akplanning
13 results
Select Git revision
Loading items
Show changes
Commits on Source (384)
Showing
with 1337 additions and 405 deletions
uwsgi==2.0.23 uwsgi==2.0.30
image: python:3.9 image: python:3.11
services: services:
- mysql - mysql
...@@ -14,6 +14,7 @@ cache: ...@@ -14,6 +14,7 @@ cache:
paths: paths:
- ~/.cache/pip/ - ~/.cache/pip/
.before_script_template:
before_script: before_script:
- python -V # Print out python version for debugging - python -V # Print out python version for debugging
- apt-get -qq update - apt-get -qq update
...@@ -25,17 +26,18 @@ before_script: ...@@ -25,17 +26,18 @@ before_script:
- pip install pylint-gitlab pylint-django - pip install pylint-gitlab pylint-django
- mysql --version - mysql --version
check: migrations:
extends: .before_script_template
script: script:
- ./Utils/check.sh --all
- source venv/bin/activate - source venv/bin/activate
- ./manage.py makemigrations --dry-run --check - ./manage.py makemigrations --dry-run --check
test: test:
extends: .before_script_template
script: script:
- source venv/bin/activate - source venv/bin/activate
- echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql - 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 - coverage run --source='.' manage.py test --settings AKPlanning.settings_ci
after_script: after_script:
- source venv/bin/activate - source venv/bin/activate
...@@ -50,6 +52,7 @@ test: ...@@ -50,6 +52,7 @@ test:
junit: unit.xml junit: unit.xml
lint: lint:
extends: .before_script_template
stage: test stage: test
script: script:
- pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=text AK* | tee /tmp/pylint.txt - pylint --load-plugins pylint_django --django-settings-module=AKPlanning.settings_ci --rcfile pylintrc --exit-zero --output-format=text AK* | tee /tmp/pylint.txt
...@@ -67,6 +70,7 @@ lint: ...@@ -67,6 +70,7 @@ lint:
when: always when: always
doc: doc:
extends: .before_script_template
stage: test stage: test
script: script:
- cd docs - cd docs
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -61,66 +61,78 @@ msgstr "Veranstaltung" ...@@ -61,66 +61,78 @@ msgstr "Veranstaltung"
msgid "Event this button belongs to" msgid "Event this button belongs to"
msgstr "Veranstaltung, zu der dieser Button gehört" msgstr "Veranstaltung, zu der dieser Button gehört"
#: AKDashboard/templates/AKDashboard/dashboard.html:17 #: AKDashboard/templates/AKDashboard/dashboard.html:19
#: AKDashboard/templates/AKDashboard/dashboard_event.html:29 #: 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" msgid "Write to organizers of this event for questions and comments"
msgstr "" msgstr ""
"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren" "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!" msgid "Currently, there are no Events!"
msgstr "Aktuell gibt es keine 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." msgid "Please contact an administrator if you want to use AKPlanning."
msgstr "" msgstr ""
"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden " "Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "
"möchtest." "möchtest."
#: AKDashboard/templates/AKDashboard/dashboard_event.html:19 #: AKDashboard/templates/AKDashboard/dashboard_event.html:20
msgid "Recent" msgid "Recent"
msgstr "Kürzlich" 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" msgid "AK List"
msgstr "AK-Liste" msgstr "AK-Liste"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:23 #: AKDashboard/templates/AKDashboard/dashboard_row.html:29
msgid "Current AKs" msgid "Current AKs"
msgstr "Aktuelle AKs" msgstr "Aktuelle AKs"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:30 #: AKDashboard/templates/AKDashboard/dashboard_row.html:36
msgid "AK Wall" msgid "AK Wall"
msgstr "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" msgid "Schedule"
msgstr "AK-Plan" msgstr "AK-Plan"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:49 #: AKDashboard/templates/AKDashboard/dashboard_row.html:55
msgid "AK Submission" msgid "AK Submission"
msgstr "AK-Einreichung" 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" msgid "AK History"
msgstr "AK-Verlauf" 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 #, python-format
msgid "New AK: %(ak)s." msgid "New AK: %(ak)s."
msgstr "Neuer AK: %(ak)s." msgstr "Neuer AK: %(ak)s."
#: AKDashboard/views.py:62 #: AKDashboard/views.py:73
#, python-format #, python-format
msgid "AK \"%(ak)s\" edited." msgid "AK \"%(ak)s\" edited."
msgstr "AK \"%(ak)s\" bearbeitet." msgstr "AK \"%(ak)s\" bearbeitet."
#: AKDashboard/views.py:65 #: AKDashboard/views.py:76
#, python-format #, python-format
msgid "AK \"%(ak)s\" deleted." msgid "AK \"%(ak)s\" deleted."
msgstr "AK \"%(ak)s\" gelöscht." msgstr "AK \"%(ak)s\" gelöscht."
#: AKDashboard/views.py:80 #: AKDashboard/views.py:91
#, python-format #, python-format
msgid "AK \"%(ak)s\" (re-)scheduled." msgid "AK \"%(ak)s\" (re-)scheduled."
msgstr "AK \"%(ak)s\" (um-)geplant." msgstr "AK \"%(ak)s\" (um-)geplant."
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
margin-bottom: 5em; margin-bottom: 5em;
} }
.dashboard-row-small {
margin-bottom: 3em;
}
.dashboard-row > .row { .dashboard-row > .row {
margin-left: 0; margin-left: 0;
padding-bottom: 1em; padding-bottom: 1em;
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
{% endblock %} {% endblock %}
{% block content %} {% 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"> <div class="dashboard-row">
{% include "AKDashboard/dashboard_row.html" %} {% include "AKDashboard/dashboard_row.html" %}
{% if event.contact_email %} {% if event.contact_email %}
...@@ -18,7 +20,16 @@ ...@@ -18,7 +20,16 @@
</p> </p>
{% endif %} {% endif %}
</div> </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"> <div class="jumbotron">
<h2 class="display-4"> <h2 class="display-4">
{% trans 'Currently, there are no Events!' %} {% trans 'Currently, there are no Events!' %}
...@@ -27,5 +38,5 @@ ...@@ -27,5 +38,5 @@
{% trans 'Please contact an administrator if you want to use AKPlanning.' %} {% trans 'Please contact an administrator if you want to use AKPlanning.' %}
</p> </p>
</div> </div>
{% endfor %} {% endif %}
{% endblock %} {% endblock %}
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% include "messages.html" %}
<div class="dashboard-row"> <div class="dashboard-row">
{% include "AKDashboard/dashboard_row.html" %} {% include "AKDashboard/dashboard_row.html" %}
......
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
{% load fontawesome_6 %} {% load fontawesome_6 %}
<h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2> <h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2>
<h4 class="text-muted">
{% if event.place %}
<b>{{ event.place }} &middot;</b>
{% endif %}
{{ event | event_month_year }}
</h4>
<div class="mt-2"> <div class="mt-2">
{% if 'AKSubmission'|check_app_installed %} {% if 'AKSubmission'|check_app_installed %}
<a class="dashboard-box btn btn-primary" <a class="dashboard-box btn btn-primary"
...@@ -57,6 +63,17 @@ ...@@ -57,6 +63,17 @@
<span class='text'>{% trans 'AK History' %}</span> <span class='text'>{% trans 'AK History' %}</span>
</div> </div>
</a> </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 %} {% for button in event.dashboardbutton_set.all %}
<a class="dashboard-box btn btn-{{ button.get_color_display }}" <a class="dashboard-box btn btn-{{ button.get_color_display }}"
href="{{ button.url }}"> href="{{ button.url }}">
......
{% 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">
&middot;
{% if event.place %}
{{ event.place }} &middot;
{% 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>
import pytz import zoneinfo
from django.apps import apps 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.urls import reverse
from django.utils.timezone import now from django.utils.timezone import now
from AKDashboard.models import DashboardButton from AKDashboard.models import DashboardButton
from AKModel.models import Event, AK, AKCategory from AKModel.models import AK, AKCategory, Event
from AKModel.tests import BasicViewTests from AKModel.tests.test_views import BasicViewTests
class DashboardTests(TestCase): class DashboardTests(TestCase):
""" """
Specific Dashboard Tests Specific Dashboard Tests
""" """
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
""" """
...@@ -22,11 +24,12 @@ class DashboardTests(TestCase): ...@@ -22,11 +24,12 @@ class DashboardTests(TestCase):
cls.event = Event.objects.create( cls.event = Event.objects.create(
name="Dashboard Test Event", name="Dashboard Test Event",
slug="dashboardtest", slug="dashboardtest",
timezone=pytz.utc, timezone=zoneinfo.ZoneInfo("Europe/Berlin"),
start=now(), start=now(),
end=now(), end=now(),
active=True, active=True,
plan_hidden=False, plan_hidden=False,
poll_hidden=False,
) )
cls.default_category = AKCategory.objects.create( cls.default_category = AKCategory.objects.create(
name="Test Category", name="Test Category",
...@@ -62,7 +65,7 @@ class DashboardTests(TestCase): ...@@ -62,7 +65,7 @@ class DashboardTests(TestCase):
# History should be empty # History should be empty
response = self.client.get(url) response = self.client.get(url)
self.assertQuerysetEqual(response.context["recent_changes"], []) self.assertQuerySetEqual(response.context["recent_changes"], [])
AK.objects.create( AK.objects.create(
name="Test AK", name="Test AK",
...@@ -90,7 +93,8 @@ class DashboardTests(TestCase): ...@@ -90,7 +93,8 @@ class DashboardTests(TestCase):
self.event.save() self.event.save()
response = self.client.get(url_dashboard_index) response = self.client.get(url_dashboard_index)
self.assertEqual(response.status_code, 200) 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) response = self.client.get(url_event_dashboard)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.context["event"], self.event) self.assertEqual(response.context["event"], self.event)
...@@ -100,7 +104,7 @@ class DashboardTests(TestCase): ...@@ -100,7 +104,7 @@ class DashboardTests(TestCase):
self.event.save() self.event.save()
response = self.client.get(url_dashboard_index) response = self.client.get(url_dashboard_index)
self.assertEqual(response.status_code, 200) 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): def test_active(self):
""" """
...@@ -143,6 +147,26 @@ class DashboardTests(TestCase): ...@@ -143,6 +147,26 @@ class DashboardTests(TestCase):
self.assertContains(response, "Current AKs") self.assertContains(response, "Current AKs")
self.assertContains(response, "AK Wall") 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): def test_dashboard_buttons(self):
""" """
Make sure manually added buttons are displayed correctly Make sure manually added buttons are displayed correctly
......
...@@ -22,7 +22,18 @@ class DashboardView(TemplateView): ...@@ -22,7 +22,18 @@ class DashboardView(TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**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 return context
......
...@@ -2,6 +2,8 @@ from django import forms ...@@ -2,6 +2,8 @@ from django import forms
from django.apps import apps from django.apps import apps
from django.contrib import admin, messages from django.contrib import admin, messages
from django.contrib.admin import SimpleListFilter, RelatedFieldListFilter, action, display 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.db.models import Count, F
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
...@@ -15,10 +17,10 @@ from simple_history.admin import SimpleHistoryAdmin ...@@ -15,10 +17,10 @@ from simple_history.admin import SimpleHistoryAdmin
from AKModel.availability.models import Availability from AKModel.availability.models import Availability
from AKModel.forms import RoomFormWithAvailabilities from AKModel.forms import RoomFormWithAvailabilities
from AKModel.models import Event, AKOwner, AKCategory, AKTrack, AKRequirement, AK, AKSlot, Room, AKOrgaMessage, \ 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.urls import get_admin_urls_event_wizard, get_admin_urls_event
from AKModel.views.ak import AKResetInterestView, AKResetInterestCounterView 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): class EventRelatedFieldListFilter(RelatedFieldListFilter):
...@@ -49,12 +51,16 @@ class EventAdmin(admin.ModelAdmin): ...@@ -49,12 +51,16 @@ class EventAdmin(admin.ModelAdmin):
wizard. wizard.
""" """
model = Event 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_filter = ['active']
list_editable = ['active'] list_editable = ['active']
ordering = ['-start'] ordering = ['-start']
readonly_fields = ['status_url', 'plan_hidden', 'plan_published_at', 'toggle_plan_visibility'] readonly_fields = [
actions = ['publish', 'unpublish'] '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): def add_view(self, request, form_url='', extra_context=None):
# Override # Override
...@@ -79,6 +85,10 @@ class EventAdmin(admin.ModelAdmin): ...@@ -79,6 +85,10 @@ class EventAdmin(admin.ModelAdmin):
from AKScheduling.urls import get_admin_urls_scheduling # pylint: disable=import-outside-toplevel from AKScheduling.urls import get_admin_urls_scheduling # pylint: disable=import-outside-toplevel
urls.extend(get_admin_urls_scheduling(self.admin_site)) 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 # Make sure built-in URLs are available as well
urls.extend(super().get_urls()) urls.extend(super().get_urls())
return urls return urls
...@@ -113,13 +123,31 @@ class EventAdmin(admin.ModelAdmin): ...@@ -113,13 +123,31 @@ class EventAdmin(admin.ModelAdmin):
text = _('Unpublish plan') text = _('Unpublish plan')
return format_html("<a href='{url}'>{text}</a>", url=url, text=text) 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): def get_form(self, request, obj=None, change=False, **kwargs):
# Override (update) form rendering to make sure the timezone of the event is used # Override (update) form rendering to make sure the timezone of the event is used
timezone.activate(obj.timezone) timezone.activate(obj.timezone)
return super().get_form(request, obj, change, **kwargs) return super().get_form(request, obj, change, **kwargs)
@action(description=_('Publish plan')) @action(description=_('Publish plan'))
def publish(self, request, queryset): def publish_plan(self, request, queryset):
""" """
Admin action to publish the plan Admin action to publish the plan
""" """
...@@ -127,7 +155,7 @@ class EventAdmin(admin.ModelAdmin): ...@@ -127,7 +155,7 @@ class EventAdmin(admin.ModelAdmin):
return HttpResponseRedirect(f"{reverse_lazy('admin:plan-publish')}?pks={','.join(str(pk) for pk in selected)}") return HttpResponseRedirect(f"{reverse_lazy('admin:plan-publish')}?pks={','.join(str(pk) for pk in selected)}")
@action(description=_('Unpublish plan')) @action(description=_('Unpublish plan'))
def unpublish(self, request, queryset): def unpublish_plan(self, request, queryset):
""" """
Admin action to hide the plan Admin action to hide the plan
""" """
...@@ -135,6 +163,23 @@ class EventAdmin(admin.ModelAdmin): ...@@ -135,6 +163,23 @@ class EventAdmin(admin.ModelAdmin):
return HttpResponseRedirect( return HttpResponseRedirect(
f"{reverse_lazy('admin:plan-unpublish')}?pks={','.join(str(pk) for pk in selected)}") 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: class PrepopulateWithNextActiveEventMixin:
""" """
...@@ -159,10 +204,24 @@ class AKOwnerAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin): ...@@ -159,10 +204,24 @@ class AKOwnerAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
Admin interface for AKOwner Admin interface for AKOwner
""" """
model = AKOwner model = AKOwner
list_display = ['name', 'institution', 'event'] list_display = ['name', 'institution', 'event', 'aks_url']
list_filter = ['event', 'institution'] list_filter = ['event', 'institution']
list_editable = [] list_editable = []
ordering = ['name'] ordering = ['name']
readonly_fields = ['aks_url']
@display(description=_("AKs"))
def aks_url(self, obj):
"""
Define a read-only field to go to the list of all AKs by this user
:param obj: user
:return: AK list page link (HTML)
:rtype: str
"""
return format_html("<a href='{url}'>{text}</a>",
url=reverse_lazy('admin:aks_by_owner', kwargs={'event_slug': obj.event.slug, 'pk': obj.pk}),
text=obj.ak_set.count())
@admin.register(AKCategory) @admin.register(AKCategory)
...@@ -201,6 +260,18 @@ class AKRequirementAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin): ...@@ -201,6 +260,18 @@ class AKRequirementAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
ordering = ['name'] 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): class WishFilter(SimpleListFilter):
""" """
Re-usable filter for wishes Re-usable filter for wishes
...@@ -243,6 +314,7 @@ class AKAdminForm(forms.ModelForm): ...@@ -243,6 +314,7 @@ class AKAdminForm(forms.ModelForm):
self.fields["requirements"].queryset = AKRequirement.objects.filter(event=self.instance.event) self.fields["requirements"].queryset = AKRequirement.objects.filter(event=self.instance.event)
self.fields["conflicts"].queryset = AK.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["prerequisites"].queryset = AK.objects.filter(event=self.instance.event)
self.fields["types"].queryset = AKType.objects.filter(event=self.instance.event)
@admin.register(AK) @admin.register(AK)
...@@ -257,7 +329,8 @@ class AKAdmin(PrepopulateWithNextActiveEventMixin, SimpleHistoryAdmin): ...@@ -257,7 +329,8 @@ class AKAdmin(PrepopulateWithNextActiveEventMixin, SimpleHistoryAdmin):
list_filter = ['event', list_filter = ['event',
WishFilter, WishFilter,
('category', EventRelatedFieldListFilter), ('category', EventRelatedFieldListFilter),
('requirements', EventRelatedFieldListFilter) ('requirements', EventRelatedFieldListFilter),
('types', EventRelatedFieldListFilter),
] ]
list_editable = ['short_name', 'track', 'interest_counter'] list_editable = ['short_name', 'track', 'interest_counter']
ordering = ['pk'] ordering = ['pk']
...@@ -407,10 +480,12 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a ...@@ -407,10 +480,12 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
""" """
model = AKSlot model = AKSlot
list_display = ['id', 'ak', 'room', 'start', 'duration', 'event'] list_display = ['id', 'ak', 'room', 'start', 'duration', 'event']
list_filter = ['event', ('room', EventRelatedFieldListFilter)] list_filter = ['event', "fixed", ('room', EventRelatedFieldListFilter),
('ak__category', EventRelatedFieldListFilter)]
ordering = ['start'] ordering = ['start']
readonly_fields = ['ak_details_link', 'updated'] readonly_fields = ['ak_details_link', 'updated']
form = AKSlotAdminForm form = AKSlotAdminForm
actions = ["reset_scheduling"]
@display(description=_('AK Details')) @display(description=_('AK Details'))
def ak_details_link(self, akslot): def ak_details_link(self, akslot):
...@@ -422,10 +497,40 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a ...@@ -422,10 +497,40 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
:rtype: str :rtype: str
""" """
if apps.is_installed("AKSubmission") and akslot.ak is not None: if apps.is_installed("AKSubmission") and akslot.ak is not None:
link = f"<a href={{ akslot.detail_url }}>{str(akslot.ak)}</a>" link = f"<a href='{ akslot.ak.detail_url }'>{str(akslot.ak)}</a>"
return mark_safe(link) return mark_safe(str(link))
return "-" 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') ak_details_link.short_description = _('AK Details')
...@@ -443,7 +548,7 @@ class AKOrgaMessageAdmin(admin.ModelAdmin): ...@@ -443,7 +548,7 @@ class AKOrgaMessageAdmin(admin.ModelAdmin):
""" """
Admin interface for AKOrgaMessages Admin interface for AKOrgaMessages
""" """
list_display = ['timestamp', 'ak', 'text'] list_display = ['timestamp', 'ak', 'text', 'resolved']
list_filter = ['ak__event'] list_filter = ['ak__event']
readonly_fields = ['timestamp', 'ak', 'text'] readonly_fields = ['timestamp', 'ak', 'text']
...@@ -541,3 +646,41 @@ class DefaultSlotAdmin(EventTimezoneFormMixin, admin.ModelAdmin): ...@@ -541,3 +646,41 @@ class DefaultSlotAdmin(EventTimezoneFormMixin, admin.ModelAdmin):
list_display = ['start_simplified', 'end_simplified', 'event'] list_display = ['start_simplified', 'end_simplified', 'event']
list_filter = ['event'] list_filter = ['event']
form = DefaultSlotAdminForm 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)
...@@ -12,7 +12,7 @@ from django.utils.dateparse import parse_datetime ...@@ -12,7 +12,7 @@ from django.utils.dateparse import parse_datetime
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from AKModel.availability.models import Availability from AKModel.availability.models import Availability
from AKModel.availability.serializers import AvailabilitySerializer from AKModel.availability.serializers import AvailabilityFormSerializer
from AKModel.models import Event from AKModel.models import Event
...@@ -41,22 +41,11 @@ class AvailabilitiesFormMixin(forms.Form): ...@@ -41,22 +41,11 @@ class AvailabilitiesFormMixin(forms.Form):
:rtype: str :rtype: str
""" """
if instance: if instance:
availabilities = AvailabilitySerializer( availabilities = instance.availabilities.all()
instance.availabilities.all(), many=True
).data
else: else:
availabilities = [] availabilities = []
return json.dumps( return json.dumps(AvailabilityFormSerializer((availabilities, event)).data)
{
'availabilities': availabilities,
'event': {
# 'timezone': event.timezone,
'date_from': str(event.start),
'date_to': str(event.end),
},
}
)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
...@@ -65,9 +54,10 @@ class AvailabilitiesFormMixin(forms.Form): ...@@ -65,9 +54,10 @@ class AvailabilitiesFormMixin(forms.Form):
if isinstance(self.event, int): if isinstance(self.event, int):
self.event = Event.objects.get(pk=self.event) self.event = Event.objects.get(pk=self.event)
initial = kwargs.pop('initial', {}) 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): if not isinstance(self, forms.BaseModelForm):
kwargs.pop('instance') kwargs.pop('instance', None)
kwargs['initial'] = initial kwargs['initial'] = initial
def _parse_availabilities_json(self, jsonavailabilities): def _parse_availabilities_json(self, jsonavailabilities):
...@@ -183,7 +173,7 @@ class AvailabilitiesFormMixin(forms.Form): ...@@ -183,7 +173,7 @@ class AvailabilitiesFormMixin(forms.Form):
for avail in availabilities: for avail in availabilities:
setattr(avail, reference_name, instance.id) 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 Replace the existing list of availabilities belonging to an entity with a new, updated one
......
...@@ -11,6 +11,8 @@ from django.utils.functional import cached_property ...@@ -11,6 +11,8 @@ from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from AKModel.models import Event, AKOwner, Room, AK, AKCategory 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) zero_time = datetime.time(0, 0)
...@@ -24,6 +26,7 @@ zero_time = datetime.time(0, 0) ...@@ -24,6 +26,7 @@ zero_time = datetime.time(0, 0)
# enable availabilities for AKs and AKCategories # enable availabilities for AKs and AKCategories
# add verbose names and help texts to model attributes # add verbose names and help texts to model attributes
# adapt or extemd documentation # adapt or extemd documentation
# add participants
class Availability(models.Model): class Availability(models.Model):
...@@ -79,20 +82,48 @@ class Availability(models.Model): ...@@ -79,20 +82,48 @@ class Availability(models.Model):
verbose_name=_('AK Category'), verbose_name=_('AK Category'),
help_text=_('AK Category whose availability this is'), 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() start = models.DateTimeField()
end = models.DateTimeField() end = models.DateTimeField()
def __str__(self) -> str: def __str__(self) -> str:
person = self.person.name if self.person else None person = self.person.name if self.person else None
participant = str(self.participant) if self.participant else None
room = getattr(self.room, 'name', None) room = getattr(self.room, 'name', None)
event = getattr(getattr(self, 'event', None), 'name', None) event = getattr(getattr(self, 'event', None), 'name', None)
ak = getattr(self.ak, 'name', None) ak = getattr(self.ak, 'name', None)
ak_category = getattr(self.ak_category, '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): def __hash__(self):
return hash( 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: def __eq__(self, other: 'Availability') -> bool:
"""Comparisons like ``availability1 == availability2``. """Comparisons like ``availability1 == availability2``.
...@@ -103,7 +134,7 @@ class Availability(models.Model): ...@@ -103,7 +134,7 @@ class Availability(models.Model):
return all( return all(
( (
getattr(self, attribute, None) == getattr(other, attribute, None) 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): ...@@ -151,9 +182,12 @@ class Availability(models.Model):
if not other.overlaps(self, strict=False): if not other.overlaps(self, strict=False):
raise Exception('Only overlapping Availabilities can be merged.') raise Exception('Only overlapping Availabilities can be merged.')
return Availability( avail = Availability(
start=min(self.start, other.start), end=max(self.end, other.end) 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': def __or__(self, other: 'Availability') -> 'Availability':
"""Performs the merge operation: ``availability1 | availability2``""" """Performs the merge operation: ``availability1 | availability2``"""
...@@ -168,9 +202,12 @@ class Availability(models.Model): ...@@ -168,9 +202,12 @@ class Availability(models.Model):
if not other.overlaps(self, False): if not other.overlaps(self, False):
raise Exception('Only overlapping Availabilities can be intersected.') raise Exception('Only overlapping Availabilities can be intersected.')
return Availability( avail = Availability(
start=max(self.start, other.start), end=min(self.end, other.end) 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': def __and__(self, other: 'Availability') -> 'Availability':
"""Performs the intersect operation: ``availability1 & """Performs the intersect operation: ``availability1 &
...@@ -247,7 +284,15 @@ class Availability(models.Model): ...@@ -247,7 +284,15 @@ class Availability(models.Model):
f'{self.end.astimezone(self.event.timezone).strftime("%a %H:%M")}') f'{self.end.astimezone(self.event.timezone).strftime("%a %H:%M")}')
@classmethod @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. Create an availability covering exactly the time between event start and event end.
Can e.g., be used to create default availabilities. Can e.g., be used to create default availabilities.
...@@ -265,7 +310,31 @@ class Availability(models.Model): ...@@ -265,7 +310,31 @@ class Availability(models.Model):
timeframe_end = event.end # adapt to our event model timeframe_end = event.end # adapt to our event model
timeframe_end = timeframe_end + datetime.timedelta(days=1) timeframe_end = timeframe_end + datetime.timedelta(days=1)
return Availability(start=timeframe_start, end=timeframe_end, event=event, person=person, 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: class Meta:
verbose_name = _('Availability') verbose_name = _('Availability')
......
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
# Documentation was mainly added by us, other changes are marked in the code # Documentation was mainly added by us, other changes are marked in the code
from django.utils import timezone from django.utils import timezone
from rest_framework.fields import SerializerMethodField 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.availability.models import Availability
from AKModel.models import Event
class AvailabilitySerializer(ModelSerializer): class AvailabilitySerializer(ModelSerializer):
...@@ -44,3 +45,28 @@ class AvailabilitySerializer(ModelSerializer): ...@@ -44,3 +45,28 @@ class AvailabilitySerializer(ModelSerializer):
class Meta: class Meta:
model = Availability model = Availability
fields = ('id', 'start', 'end', 'allDay') 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),
},
}
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
"model": "AKModel.akcategory", "model": "AKModel.akcategory",
"pk": 1, "pk": 1,
"fields": { "fields": {
"name": "Spa", "name": "Spaß",
"color": "275246", "color": "275246",
"description": "", "description": "",
"present_by_default": true, "present_by_default": true,
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
"model": "AKModel.akcategory", "model": "AKModel.akcategory",
"pk": 3, "pk": 3,
"fields": { "fields": {
"name": "Spa/Kultur", "name": "Spaß/Kultur",
"color": "333333", "color": "333333",
"description": "", "description": "",
"present_by_default": true, "present_by_default": true,
...@@ -193,6 +193,15 @@ ...@@ -193,6 +193,15 @@
"event": 2 "event": 2
} }
}, },
{
"model": "AKModel.aktype",
"pk": 1,
"fields": {
"name": "Input",
"event": 2,
"slug": "input"
}
},
{ {
"model": "AKModel.historicalak", "model": "AKModel.historicalak",
"pk": 1, "pk": 1,
...@@ -206,7 +215,6 @@ ...@@ -206,7 +215,6 @@
"reso": false, "reso": false,
"present": true, "present": true,
"notes": "", "notes": "",
"interest": -1,
"category": 4, "category": 4,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -229,7 +237,6 @@ ...@@ -229,7 +237,6 @@
"reso": false, "reso": false,
"present": true, "present": true,
"notes": "", "notes": "",
"interest": -1,
"category": 4, "category": 4,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -252,7 +259,6 @@ ...@@ -252,7 +259,6 @@
"reso": false, "reso": false,
"present": null, "present": null,
"notes": "", "notes": "",
"interest": -1,
"category": 5, "category": 5,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -275,7 +281,6 @@ ...@@ -275,7 +281,6 @@
"reso": false, "reso": false,
"present": null, "present": null,
"notes": "", "notes": "",
"interest": -1,
"category": 5, "category": 5,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -298,7 +303,6 @@ ...@@ -298,7 +303,6 @@
"reso": false, "reso": false,
"present": null, "present": null,
"notes": "We need to find a volunteer first...", "notes": "We need to find a volunteer first...",
"interest": -1,
"category": 3, "category": 3,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -321,7 +325,6 @@ ...@@ -321,7 +325,6 @@
"reso": false, "reso": false,
"present": null, "present": null,
"notes": "We need to find a volunteer first...", "notes": "We need to find a volunteer first...",
"interest": -1,
"category": 3, "category": 3,
"track": null, "track": null,
"event": 2, "event": 2,
...@@ -344,7 +347,6 @@ ...@@ -344,7 +347,6 @@
"reso": false, "reso": false,
"present": null, "present": null,
"notes": "", "notes": "",
"interest": -1,
"category": 5, "category": 5,
"track": 1, "track": 1,
"event": 2, "event": 2,
...@@ -360,7 +362,9 @@ ...@@ -360,7 +362,9 @@
"fields": { "fields": {
"name": "Test AK Inhalt", "name": "Test AK Inhalt",
"short_name": "test1", "short_name": "test1",
"description": "", "description": "-",
"goal": "-",
"info": "",
"link": "", "link": "",
"protocol_link": "", "protocol_link": "",
"category": 4, "category": 4,
...@@ -388,7 +392,9 @@ ...@@ -388,7 +392,9 @@
"fields": { "fields": {
"name": "Test AK Meta", "name": "Test AK Meta",
"short_name": "test2", "short_name": "test2",
"description": "", "description": "-",
"goal": "-",
"info": "",
"link": "", "link": "",
"protocol_link": "", "protocol_link": "",
"category": 5, "category": 5,
...@@ -414,6 +420,8 @@ ...@@ -414,6 +420,8 @@
"name": "AK Wish", "name": "AK Wish",
"short_name": "wish1", "short_name": "wish1",
"description": "Description of my Wish", "description": "Description of my Wish",
"goal": "-",
"info": "",
"link": "", "link": "",
"protocol_link": "", "protocol_link": "",
"category": 3, "category": 3,
...@@ -436,6 +444,66 @@ ...@@ -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", "model": "AKModel.room",
"pk": 1, "pk": 1,
...@@ -460,6 +528,19 @@ ...@@ -460,6 +528,19 @@
"properties": [] "properties": []
} }
}, },
{
"model": "AKModel.room",
"pk": 3,
"fields": {
"name": "BBB Session 1",
"location": "",
"capacity": -1,
"event": 1,
"properties": [
2
]
}
},
{ {
"model": "AKModel.akslot", "model": "AKModel.akslot",
"pk": 1, "pk": 1,
...@@ -525,6 +606,58 @@ ...@@ -525,6 +606,58 @@
"updated": "2022-12-02T12:23:11.856Z" "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", "model": "AKModel.constraintviolation",
"pk": 1, "pk": 1,
...@@ -668,5 +801,71 @@ ...@@ -668,5 +801,71 @@
"start": "2020-11-07T18:30:00Z", "start": "2020-11-07T18:30:00Z",
"end": "2020-11-07T21: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]
}
} }
] ]
...@@ -5,13 +5,19 @@ Central and admin forms ...@@ -5,13 +5,19 @@ Central and admin forms
import csv import csv
import io import io
from bootstrap_datepicker_plus.widgets import DateTimePickerInput
from django import forms from django import forms
from django.forms.utils import ErrorList from django.forms.utils import ErrorList
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from AKModel.availability.forms import AvailabilitiesFormMixin 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):
"""
Simple widget for datetime input fields using the HTML5 datetime-local input type
"""
input_type = 'datetime-local'
class NewEventWizardStartForm(forms.ModelForm): class NewEventWizardStartForm(forms.ModelForm):
...@@ -28,9 +34,10 @@ class NewEventWizardStartForm(forms.ModelForm): ...@@ -28,9 +34,10 @@ class NewEventWizardStartForm(forms.ModelForm):
""" """
class Meta: class Meta:
model = Event model = Event
fields = ['name', 'slug', 'timezone', 'plan_hidden'] fields = ['name', 'slug', 'timezone', 'plan_hidden', 'poll_hidden']
widgets = { widgets = {
'plan_hidden': forms.HiddenInput(), 'plan_hidden': forms.HiddenInput(),
'poll_hidden': forms.HiddenInput(),
} }
# Special hidden field for wizard state handling # Special hidden field for wizard state handling
...@@ -47,15 +54,19 @@ class NewEventWizardSettingsForm(forms.ModelForm): ...@@ -47,15 +54,19 @@ class NewEventWizardSettingsForm(forms.ModelForm):
class Meta: class Meta:
model = Event model = Event
fields = "__all__" fields = "__all__"
exclude = ['plan_published_at', 'poll_published_at']
widgets = { widgets = {
'name': forms.HiddenInput(), 'name': forms.HiddenInput(),
'slug': forms.HiddenInput(), 'slug': forms.HiddenInput(),
'timezone': forms.HiddenInput(), 'timezone': forms.HiddenInput(),
'active': forms.HiddenInput(), 'active': forms.HiddenInput(),
'start': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), 'start': DateTimeInput(),
'end': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), 'end': DateTimeInput(),
'reso_deadline': DateTimePickerInput(options={"format": "YYYY-MM-DD HH:mm"}), 'interest_start': DateTimeInput(),
'interest_end': DateTimeInput(),
'reso_deadline': DateTimeInput(),
'plan_hidden': forms.HiddenInput(), 'plan_hidden': forms.HiddenInput(),
'poll_hidden': forms.HiddenInput(),
} }
...@@ -92,6 +103,13 @@ class NewEventWizardImportForm(forms.Form): ...@@ -92,6 +103,13 @@ class NewEventWizardImportForm(forms.Form):
required=False, required=False,
) )
import_types = forms.ModelMultipleChoiceField(
queryset=AKType.objects.all(),
widget=forms.CheckboxSelectMultiple,
label=_("Copy types"),
required=False,
)
# pylint: disable=too-many-arguments # pylint: disable=too-many-arguments
def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList, 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, label_suffix=None, empty_permitted=False, field_order=None, use_required_attribute=None,
...@@ -102,6 +120,8 @@ class NewEventWizardImportForm(forms.Form): ...@@ -102,6 +120,8 @@ class NewEventWizardImportForm(forms.Form):
event=self.initial["import_event"]) event=self.initial["import_event"])
self.fields["import_requirements"].queryset = self.fields["import_requirements"].queryset.filter( self.fields["import_requirements"].queryset = self.fields["import_requirements"].queryset.filter(
event=self.initial["import_event"]) 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 # pylint: disable=import-outside-toplevel
# Local imports used to prevent cyclic imports and to only import when AKDashboard is available # Local imports used to prevent cyclic imports and to only import when AKDashboard is available
...@@ -155,6 +175,18 @@ class SlideExportForm(AdminIntermediateForm): ...@@ -155,6 +175,18 @@ class SlideExportForm(AdminIntermediateForm):
initial=3, initial=3,
label=_("# next AKs"), label=_("# next AKs"),
help_text=_("How many next AKs should be shown on a slide?")) 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( presentation_mode = forms.TypedChoiceField(
initial=False, initial=False,
label=_("Presentation only?"), label=_("Presentation only?"),
......
...@@ -2,7 +2,7 @@ msgid "" ...@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-16 16:30+0200\n" "POT-Creation-Date: 2025-06-24 10:36+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -11,9 +11,9 @@ msgstr "" ...@@ -11,9 +11,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: AKModel/admin.py:86 AKModel/admin.py:96 #: AKModel/admin.py:96 AKModel/admin.py:106
#: AKModel/templates/admin/AKModel/event_wizard/activate.html:32 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:35
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:48 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:51
#: AKModel/templates/admin/AKModel/event_wizard/finish.html:21 #: AKModel/templates/admin/AKModel/event_wizard/finish.html:21
#: AKModel/templates/admin/AKModel/requirements_overview.html:8 #: AKModel/templates/admin/AKModel/requirements_overview.html:8
#: AKModel/templates/admin/AKModel/status/status.html:8 #: AKModel/templates/admin/AKModel/status/status.html:8
...@@ -21,63 +21,110 @@ msgstr "" ...@@ -21,63 +21,110 @@ msgstr ""
msgid "Status" msgid "Status"
msgstr "Status" msgstr "Status"
#: AKModel/admin.py:98 #: AKModel/admin.py:108
msgid "Toggle plan visibility" msgid "Toggle plan visibility"
msgstr "Plansichtbarkeit ändern" msgstr "Plansichtbarkeit ändern"
#: AKModel/admin.py:110 AKModel/admin.py:121 AKModel/views/manage.py:138 #: AKModel/admin.py:120 AKModel/admin.py:149 AKModel/views/manage.py:187
msgid "Publish plan" msgid "Publish plan"
msgstr "Plan veröffentlichen" msgstr "Plan veröffentlichen"
#: AKModel/admin.py:113 AKModel/admin.py:129 AKModel/views/manage.py:151 #: AKModel/admin.py:123 AKModel/admin.py:157 AKModel/views/manage.py:200
msgid "Unpublish plan" msgid "Unpublish plan"
msgstr "Plan verbergen" msgstr "Plan verbergen"
#: AKModel/admin.py:208 #: AKModel/admin.py:126
msgid "Toggle poll visibility"
msgstr "Sichtbarkeit der Abfrage ändern"
#: AKModel/admin.py:138 AKModel/admin.py:166 AKModel/views/manage.py:213
msgid "Publish preference poll"
msgstr "Präferenzen-Abfrage veröffentlichen"
#: AKModel/admin.py:141 AKModel/admin.py:174 AKModel/views/manage.py:226
msgid "Unpublish preference poll"
msgstr "Präferenzen-Abfrage verbergen"
#: AKModel/admin.py:213 AKModel/models.py:800 AKModel/models.py:1251
#: AKModel/templates/admin/AKModel/aks_by_user.html:12
#: AKModel/templates/admin/AKModel/status/event_aks.html:10
#: AKModel/views/manage.py:99 AKModel/views/status.py:102
msgid "AKs"
msgstr "AKs"
#: AKModel/admin.py:279
msgid "Wish" msgid "Wish"
msgstr "AK-Wunsch" msgstr "AK-Wunsch"
#: AKModel/admin.py:214 #: AKModel/admin.py:285
msgid "Is wish" msgid "Is wish"
msgstr "Ist ein Wunsch" msgstr "Ist ein Wunsch"
#: AKModel/admin.py:215 #: AKModel/admin.py:286
msgid "Is not a wish" msgid "Is not a wish"
msgstr "Ist kein Wunsch" msgstr "Ist kein Wunsch"
#: AKModel/admin.py:274 #: AKModel/admin.py:347
msgid "Export to wiki syntax" msgid "Export to wiki syntax"
msgstr "In Wiki-Syntax exportieren" msgstr "In Wiki-Syntax exportieren"
#: AKModel/admin.py:291 #: AKModel/admin.py:364
msgid "Cannot export AKs from more than one event at the same time." msgid "Cannot export AKs from more than one event at the same time."
msgstr "Kann nicht AKs von mehreren Events zur selben Zeit exportieren." msgstr "Kann nicht AKs von mehreren Events zur selben Zeit exportieren."
#: AKModel/admin.py:306 AKModel/views/ak.py:99 #: AKModel/admin.py:379 AKModel/views/ak.py:99
msgid "Reset interest in AKs" msgid "Reset interest in AKs"
msgstr "Interesse an AKs zurücksetzen" msgstr "Interesse an AKs zurücksetzen"
#: AKModel/admin.py:316 AKModel/views/ak.py:114 #: AKModel/admin.py:389 AKModel/views/ak.py:114
msgid "Reset AKs' interest counters" msgid "Reset AKs' interest counters"
msgstr "Interessenszähler der AKs zurücksetzen" msgstr "Interessenszähler der AKs zurücksetzen"
#: AKModel/admin.py:415 AKModel/admin.py:429 #: AKModel/admin.py:490 AKModel/admin.py:534
msgid "AK Details" msgid "AK Details"
msgstr "AK-Details" msgstr "AK-Details"
#: AKModel/admin.py:491 AKModel/views/manage.py:99 #: AKModel/admin.py:514
msgid "Clear start/rooms"
msgstr "Zugewiesenen Start/Räume zurücksetzen"
#: AKModel/admin.py:524
msgid ""
"Cannot reset scheduling for fixed AKs. Please make sure to filter out fixed "
"AKs first."
msgstr ""
"Planung von fixierten AKs kann nicht zurückgesetzt werden. Stelle bitte "
"sicher, dass alle fixierten AKs zunächst rausgefiltert sind."
#: AKModel/admin.py:596 AKModel/views/manage.py:126
msgid "Mark Constraint Violations as manually resolved" msgid "Mark Constraint Violations as manually resolved"
msgstr "Markiere Constraintverletzungen als manuell behoben" msgstr "Markiere Constraintverletzungen als manuell behoben"
#: AKModel/admin.py:500 AKModel/views/manage.py:112 #: AKModel/admin.py:605 AKModel/views/manage.py:139
msgid "Set Constraint Violations to level \"violation\"" msgid "Set Constraint Violations to level \"violation\""
msgstr "Constraintverletzungen auf Level \"Violation\" setzen" msgstr "Constraintverletzungen auf Level \"Violation\" setzen"
#: AKModel/admin.py:509 AKModel/views/manage.py:125 #: AKModel/admin.py:614 AKModel/views/manage.py:152
msgid "Set Constraint Violations to level \"warning\"" msgid "Set Constraint Violations to level \"warning\""
msgstr "Constraintverletzungen auf Level \"Warning\" setzen" msgstr "Constraintverletzungen auf Level \"Warning\" setzen"
#: AKModel/availability/forms.py:25 AKModel/availability/models.py:271 #: AKModel/admin.py:661
msgid "Activate selected users"
msgstr "Ausgewählte Benutzer*innen aktivieren"
#: AKModel/admin.py:670
msgid "The selected users have been activated."
msgstr "Benutzer*innen aktiviert"
#: AKModel/admin.py:672
msgid "Deactivate selected users"
msgstr "Ausgewählte Benutzer*innen deaktivieren"
#: AKModel/admin.py:681
msgid "The selected users have been deactivated."
msgstr "Benutzer*innen deaktiviert"
#: AKModel/availability/forms.py:25 AKModel/availability/models.py:340
msgid "Availability" msgid "Availability"
msgstr "Verfügbarkeit" msgstr "Verfügbarkeit"
...@@ -90,121 +137,157 @@ msgstr "" ...@@ -90,121 +137,157 @@ msgstr ""
"Doppelt klicken um Einträge zu löschen. Oder Start- und End-Eingabe " "Doppelt klicken um Einträge zu löschen. Oder Start- und End-Eingabe "
"verwenden, um der Kalenderansicht neue Einträge hinzuzufügen." "verwenden, um der Kalenderansicht neue Einträge hinzuzufügen."
#: AKModel/availability/forms.py:123 #: AKModel/availability/forms.py:113
msgid "The submitted availability does not comply with the required format." msgid "The submitted availability does not comply with the required format."
msgstr "Die eingetragenen Verfügbarkeit haben nicht das notwendige Format." msgstr "Die eingetragenen Verfügbarkeit haben nicht das notwendige Format."
#: AKModel/availability/forms.py:137 #: AKModel/availability/forms.py:127
msgid "The submitted availability contains an invalid date." msgid "The submitted availability contains an invalid date."
msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum." msgstr "Die eingegebene Verfügbarkeit enthält ein ungültiges Datum."
#: AKModel/availability/forms.py:162 AKModel/availability/forms.py:172 #: AKModel/availability/forms.py:152 AKModel/availability/forms.py:162
msgid "Please fill in your availabilities!" msgid "Please fill in your availabilities!"
msgstr "Bitte Verfügbarkeiten eintragen!" msgstr "Bitte Verfügbarkeiten eintragen!"
#: AKModel/availability/models.py:43 AKModel/models.py:58 AKModel/models.py:172 #: AKModel/availability/models.py:46 AKModel/models.py:182
#: AKModel/models.py:249 AKModel/models.py:268 AKModel/models.py:294 #: AKModel/models.py:569 AKModel/models.py:646 AKModel/models.py:679
#: AKModel/models.py:348 AKModel/models.py:475 AKModel/models.py:514 #: AKModel/models.py:708 AKModel/models.py:727 AKModel/models.py:790
#: AKModel/models.py:596 AKModel/models.py:651 AKModel/models.py:842 #: AKModel/models.py:959 AKModel/models.py:1024 AKModel/models.py:1189
#: AKModel/models.py:1247 AKModel/models.py:1439
msgid "Event" msgid "Event"
msgstr "Event" msgstr "Event"
#: AKModel/availability/models.py:44 AKModel/models.py:173 #: AKModel/availability/models.py:47 AKModel/models.py:570
#: AKModel/models.py:250 AKModel/models.py:269 AKModel/models.py:295 #: AKModel/models.py:647 AKModel/models.py:680 AKModel/models.py:709
#: AKModel/models.py:349 AKModel/models.py:476 AKModel/models.py:515 #: AKModel/models.py:728 AKModel/models.py:791 AKModel/models.py:960
#: AKModel/models.py:597 AKModel/models.py:652 AKModel/models.py:843 #: AKModel/models.py:1025 AKModel/models.py:1190 AKModel/models.py:1248
#: AKModel/models.py:1440
msgid "Associated event" msgid "Associated event"
msgstr "Zugehöriges Event" msgstr "Zugehöriges Event"
#: AKModel/availability/models.py:52 #: AKModel/availability/models.py:55
msgid "Person" msgid "Person"
msgstr "Person" msgstr "Person"
#: AKModel/availability/models.py:53 #: AKModel/availability/models.py:56
msgid "Person whose availability this is" msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird" msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:61 AKModel/models.py:479 #: AKModel/availability/models.py:64 AKModel/models.py:963
#: AKModel/models.py:504 AKModel/models.py:661 #: AKModel/models.py:1014 AKModel/models.py:1257
msgid "Room" msgid "Room"
msgstr "Raum" msgstr "Raum"
#: AKModel/availability/models.py:62 #: AKModel/availability/models.py:65
msgid "Room whose availability this is" msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird" msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:70 AKModel/models.py:357 #: AKModel/availability/models.py:73 AKModel/models.py:799
#: AKModel/models.py:503 AKModel/models.py:591 #: AKModel/models.py:1013 AKModel/models.py:1184
msgid "AK" msgid "AK"
msgstr "AK" msgstr "AK"
#: AKModel/availability/models.py:71 #: AKModel/availability/models.py:74
msgid "AK whose availability this is" msgid "AK whose availability this is"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: AKModel/availability/models.py:79 AKModel/models.py:253 #: AKModel/availability/models.py:82 AKModel/models.py:650
#: AKModel/models.py:667 #: AKModel/models.py:1263
msgid "AK Category" msgid "AK Category"
msgstr "AK-Kategorie" msgstr "AK-Kategorie"
#: AKModel/availability/models.py:80 #: AKModel/availability/models.py:83
msgid "AK Category whose availability this is" msgid "AK Category whose availability this is"
msgstr "AK-Kategorie, deren Verfügbarkeit hier abgebildet wird" msgstr "AK-Kategorie, deren Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:272 #: AKModel/availability/models.py:91
msgid "Participant"
msgstr "Teilnehmer*in"
#: AKModel/availability/models.py:92
msgid "Participant whose availability this is"
msgstr "Teilnehmer*in, deren Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:341
msgid "Availabilities" msgid "Availabilities"
msgstr "Verfügbarkeiten" msgstr "Verfügbarkeiten"
#: AKModel/forms.py:69 #: AKModel/forms.py:80
msgid "Copy ak requirements and ak categories of existing event" msgid "Copy ak requirements and ak categories of existing event"
msgstr "AK-Anforderungen und AK-Kategorien eines existierenden Events kopieren" msgstr "AK-Anforderungen und AK-Kategorien eines existierenden Events kopieren"
#: AKModel/forms.py:70 #: AKModel/forms.py:81
msgid "You can choose what to copy in the next step" msgid "You can choose what to copy in the next step"
msgstr "" msgstr ""
"Im nächsten Schritt kann ausgewählt werden, was genau kopiert werden soll" "Im nächsten Schritt kann ausgewählt werden, was genau kopiert werden soll"
#: AKModel/forms.py:84 #: AKModel/forms.py:95
msgid "Copy ak categories" msgid "Copy ak categories"
msgstr "AK-Kategorien kopieren" msgstr "AK-Kategorien kopieren"
#: AKModel/forms.py:91 #: AKModel/forms.py:102
msgid "Copy ak requirements" msgid "Copy ak requirements"
msgstr "AK-Anforderungen kopieren" msgstr "AK-Anforderungen kopieren"
#: AKModel/forms.py:115 #: AKModel/forms.py:109
msgid "Copy types"
msgstr "Typen kopieren"
#: AKModel/forms.py:135
msgid "Copy dashboard buttons" msgid "Copy dashboard buttons"
msgstr "Dashboard-Buttons kopieren" msgstr "Dashboard-Buttons kopieren"
#: AKModel/forms.py:156 #: AKModel/forms.py:176
msgid "# next AKs" msgid "# next AKs"
msgstr "# nächste AKs" msgstr "# nächste AKs"
#: AKModel/forms.py:157 #: AKModel/forms.py:177
msgid "How many next AKs should be shown on a slide?" msgid "How many next AKs should be shown on a slide?"
msgstr "Wie viele nächste AKs sollen auf einer Folie angezeigt werden?" msgstr "Wie viele nächste AKs sollen auf einer Folie angezeigt werden?"
#: AKModel/forms.py:160 #: AKModel/forms.py:179 AKModel/models.py:732
msgid "AK Types"
msgstr "AK-Typen"
#: AKModel/forms.py:180
msgid "Which AK types should be included in the slides?"
msgstr "Welche AK-Typen sollen in den Folien enthalten sein?"
#: AKModel/forms.py:186
msgid "Only show AKs with all selected types?"
msgstr "Nur AKs mit dem ausgewählten Typ anzeigen?"
#: AKModel/forms.py:187
msgid ""
"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."
msgstr ""
"Wenn ausgewählt werden nur AKs, die alle spezifizierten Typen erfüllen, in "
"die Folien aufgenommen. Wenn nicht ausgewählt werden AKs, die mindestens "
"einen der spezifizierten Typen erfüllen, in die Folien aufgenommen."
#: AKModel/forms.py:192
msgid "Presentation only?" msgid "Presentation only?"
msgstr "Nur Vorstellung?" msgstr "Nur Vorstellung?"
#: AKModel/forms.py:162 AKModel/forms.py:169 #: AKModel/forms.py:194 AKModel/forms.py:201
msgid "Yes" msgid "Yes"
msgstr "Ja" msgstr "Ja"
#: AKModel/forms.py:162 AKModel/forms.py:169 #: AKModel/forms.py:194 AKModel/forms.py:201
msgid "No" msgid "No"
msgstr "Nein" msgstr "Nein"
#: AKModel/forms.py:164 #: AKModel/forms.py:196
msgid "Restrict AKs to those that asked for chance to be presented?" msgid "Restrict AKs to those that asked for chance to be presented?"
msgstr "AKs auf solche, die um eine Vorstellung gebeten haben, einschränken?" msgstr "AKs auf solche, die um eine Vorstellung gebeten haben, einschränken?"
#: AKModel/forms.py:167 #: AKModel/forms.py:199
msgid "Space for notes in wishes?" msgid "Space for notes in wishes?"
msgstr "Platz für Notizen bei den Wünschen?" msgstr "Platz für Notizen bei den Wünschen?"
#: AKModel/forms.py:171 #: AKModel/forms.py:203
msgid "" msgid ""
"Create symbols indicating space to note down owners and timeslots for " "Create symbols indicating space to note down owners and timeslots for "
"wishes, e.g., to be filled out on a touch screen while presenting?" "wishes, e.g., to be filled out on a touch screen while presenting?"
...@@ -213,11 +296,11 @@ msgstr "" ...@@ -213,11 +296,11 @@ msgstr ""
"fürWünsche markieren, z.B. um während der Präsentation auf einem Touchscreen " "fürWünsche markieren, z.B. um während der Präsentation auf einem Touchscreen "
"ausgefüllt zu werden?" "ausgefüllt zu werden?"
#: AKModel/forms.py:180 AKModel/models.py:836 #: AKModel/forms.py:212 AKModel/models.py:1433
msgid "Default Slots" msgid "Default Slots"
msgstr "Standardslots" msgstr "Standardslots"
#: AKModel/forms.py:182 #: AKModel/forms.py:214
msgid "" msgid ""
"Click and drag to add default slots, double-click to delete. Or use the " "Click and drag to add default slots, double-click to delete. Or use the "
"start and end inputs to add entries to the calendar view." "start and end inputs to add entries to the calendar view."
...@@ -226,11 +309,11 @@ msgstr "" ...@@ -226,11 +309,11 @@ msgstr ""
"Einträge zu löschen. Oder Start- und End-Eingabe verwenden, um der " "Einträge zu löschen. Oder Start- und End-Eingabe verwenden, um der "
"Kalenderansicht neue Einträge hinzuzufügen." "Kalenderansicht neue Einträge hinzuzufügen."
#: AKModel/forms.py:198 #: AKModel/forms.py:230
msgid "New rooms" msgid "New rooms"
msgstr "Neue Räume" msgstr "Neue Räume"
#: AKModel/forms.py:199 #: AKModel/forms.py:231
msgid "" msgid ""
"Enter room details in CSV format. Required colum is \"name\", optional " "Enter room details in CSV format. Required colum is \"name\", optional "
"colums are \"location\", \"capacity\", and \"url\" for online/hybrid rooms. " "colums are \"location\", \"capacity\", and \"url\" for online/hybrid rooms. "
...@@ -240,19 +323,19 @@ msgstr "" ...@@ -240,19 +323,19 @@ msgstr ""
"Spalten sind \"location\", \"capacity\", und \"url\" for Online-/" "Spalten sind \"location\", \"capacity\", und \"url\" for Online-/"
"HybridräumeTrennzeichen: Semikolon" "HybridräumeTrennzeichen: Semikolon"
#: AKModel/forms.py:205 #: AKModel/forms.py:237
msgid "Default availabilities?" msgid "Default availabilities?"
msgstr "Standardverfügbarkeiten?" msgstr "Standardverfügbarkeiten?"
#: AKModel/forms.py:206 #: AKModel/forms.py:238
msgid "Create default availabilities for all rooms?" msgid "Create default availabilities for all rooms?"
msgstr "Standardverfügbarkeiten für alle Räume anlegen?" msgstr "Standardverfügbarkeiten für alle Räume anlegen?"
#: AKModel/forms.py:222 #: AKModel/forms.py:254
msgid "CSV must contain a name column" msgid "CSV must contain a name column"
msgstr "CSV muss eine name-Spalte enthalten" msgstr "CSV muss eine name-Spalte enthalten"
#: AKModel/metaviews/admin.py:156 AKModel/models.py:29 #: AKModel/metaviews/admin.py:156 AKModel/models.py:139
msgid "Start" msgid "Start"
msgstr "Start" msgstr "Start"
...@@ -273,138 +356,180 @@ msgid "Activate?" ...@@ -273,138 +356,180 @@ msgid "Activate?"
msgstr "Aktivieren?" msgstr "Aktivieren?"
#: AKModel/metaviews/admin.py:161 #: AKModel/metaviews/admin.py:161
#: AKModel/templates/admin/AKModel/event_wizard/activate.html:27 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:30
msgid "Finish" msgid "Finish"
msgstr "Abschluss" msgstr "Abschluss"
#: AKModel/models.py:20 AKModel/models.py:241 AKModel/models.py:265 #: AKModel/models.py:24
#: AKModel/models.py:292 AKModel/models.py:310 AKModel/models.py:467 msgid "May not contain quotation marks"
msgstr "Darf keine Anführungszeichen enthalten"
#: AKModel/models.py:27
msgid "Must contain at least one letter or digit"
msgstr "Muss mindestens einen Buchstaben oder eine Ziffer enthalten"
#: AKModel/models.py:130 AKModel/models.py:638 AKModel/models.py:676
#: AKModel/models.py:703 AKModel/models.py:725 AKModel/models.py:743
#: AKModel/models.py:951
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: AKModel/models.py:21 #: AKModel/models.py:131
msgid "Name or iteration of the event" msgid "Name or iteration of the event"
msgstr "Name oder Iteration des Events" msgstr "Name oder Iteration des Events"
#: AKModel/models.py:22 #: AKModel/models.py:132
msgid "Short Form" msgid "Short Form"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: AKModel/models.py:23 #: AKModel/models.py:133
msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs." msgid "Short name of letters/numbers/dashes/underscores used in URLs."
msgstr "" msgstr ""
"Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur " "Kurzname bestehend aus Buchstaben, Nummern, Bindestrichen und Unterstrichen "
"Nutzung in URLs" "zur Nutzung in URLs"
#: AKModel/models.py:25 #: AKModel/models.py:135
msgid "Place" msgid "Place"
msgstr "Ort" msgstr "Ort"
#: AKModel/models.py:26 #: AKModel/models.py:136
msgid "City etc. the event takes place in" msgid "City etc. the event takes place in"
msgstr "Stadt o.ä. in der das Event stattfindet" msgstr "Stadt o.ä. in der das Event stattfindet"
#: AKModel/models.py:28 #: AKModel/models.py:138
msgid "Time Zone" msgid "Time Zone"
msgstr "Zeitzone" msgstr "Zeitzone"
#: AKModel/models.py:28 #: AKModel/models.py:138
msgid "Time Zone where this event takes place in" msgid "Time Zone where this event takes place in"
msgstr "Zeitzone in der das Event stattfindet" msgstr "Zeitzone in der das Event stattfindet"
#: AKModel/models.py:29 #: AKModel/models.py:139
msgid "Time the event begins" msgid "Time the event begins"
msgstr "Zeit zu der das Event beginnt" msgstr "Zeit zu der das Event beginnt"
#: AKModel/models.py:30 #: AKModel/models.py:140
msgid "End" msgid "End"
msgstr "Ende" msgstr "Ende"
#: AKModel/models.py:30 #: AKModel/models.py:140
msgid "Time the event ends" msgid "Time the event ends"
msgstr "Zeit zu der das Event endet" msgstr "Zeit zu der das Event endet"
#: AKModel/models.py:31 #: AKModel/models.py:141
msgid "Resolution Deadline" msgid "Resolution Deadline"
msgstr "Resolutionsdeadline" msgstr "Resolutionsdeadline"
#: AKModel/models.py:32 #: AKModel/models.py:142
msgid "When should AKs with intention to submit a resolution be done?" msgid "When should AKs with intention to submit a resolution be done?"
msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?" msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?"
#: AKModel/models.py:34 #: AKModel/models.py:144
msgid "Interest Window Start" msgid "Interest Window Start"
msgstr "Beginn Interessensbekundung" msgstr "Beginn Interessensbekundung"
#: AKModel/models.py:35 #: AKModel/models.py:146
msgid "Opening time for expression of interest." msgid ""
msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs." "Opening time for expression of interest. When left blank, no interest "
"indication will be possible."
msgstr ""
"Öffnungszeitpunkt für die Angabe von Interesse an AKs.Wenn das Feld leer "
"bleibt, wird keine Abgabe von Interesse möglich sein."
#: AKModel/models.py:36 #: AKModel/models.py:149
msgid "Interest Window End" msgid "Interest Window End"
msgstr "Ende Interessensbekundung" msgstr "Ende Interessensbekundung"
#: AKModel/models.py:37 #: AKModel/models.py:150
msgid "Closing time for expression of interest." msgid "Closing time for expression of interest."
msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs." msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
#: AKModel/models.py:39 #: AKModel/models.py:152
msgid "Public event" msgid "Public event"
msgstr "Öffentliches Event" msgstr "Öffentliches Event"
#: AKModel/models.py:40 #: AKModel/models.py:153
msgid "Show this event on overview page." msgid "Show this event on overview page."
msgstr "Zeige dieses Event auf der Übersichtseite an" msgstr "Zeige dieses Event auf der Übersichtseite an"
#: AKModel/models.py:42 #: AKModel/models.py:155
msgid "Active State" msgid "Active State"
msgstr "Aktiver Status" msgstr "Aktiver Status"
#: AKModel/models.py:42 #: AKModel/models.py:155
msgid "Marks currently active events" msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events" msgstr "Markiert aktuell aktive Events"
#: AKModel/models.py:43 #: AKModel/models.py:156
msgid "Plan Hidden" msgid "Plan Hidden"
msgstr "Plan verborgen" msgstr "Plan verborgen"
#: AKModel/models.py:43 #: AKModel/models.py:156
msgid "Hides plan for non-staff users" msgid "Hides plan for non-staff users"
msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte" msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte"
#: AKModel/models.py:45 #: AKModel/models.py:158
msgid "Plan published at" msgid "Plan published at"
msgstr "Plan veröffentlicht am/um" msgstr "Plan veröffentlicht am/um"
#: AKModel/models.py:46 #: AKModel/models.py:159
msgid "Timestamp at which the plan was published" msgid "Timestamp at which the plan was published"
msgstr "Zeitpunkt, zu dem der Plan veröffentlicht wurde" msgstr "Zeitpunkt, zu dem der Plan veröffentlicht wurde"
#: AKModel/models.py:48 #: AKModel/models.py:161
msgid "Poll Hidden"
msgstr "Präferenzen-Abfrage verborgen"
#: AKModel/models.py:162
msgid "Hides preference poll for non-staff users"
msgstr ""
"Verbirgt die Präferenzen-Abfrage für Nutzer*innen ohne erweiterte Rechte"
#: AKModel/models.py:164
msgid "Poll published at"
msgstr "Präferenzen-Abfrage veröffentlicht am/um"
#: AKModel/models.py:165
msgid "Timestamp at which the preference poll was published"
msgstr "Zeitpunkt, zu dem die Präferenzen-Abfrage veröffentlicht wurde"
#: AKModel/models.py:167
msgid "Base URL" msgid "Base URL"
msgstr "URL-Prefix" msgstr "URL-Prefix"
#: AKModel/models.py:48 #: AKModel/models.py:167
msgid "Prefix for wiki link construction" msgid "Prefix for wiki link construction"
msgstr "Prefix für die automatische Generierung von Wiki-Links" msgstr "Prefix für die automatische Generierung von Wiki-Links"
#: AKModel/models.py:49 #: AKModel/models.py:168
msgid "Wiki Export Template Name" msgid "Wiki Export Template Name"
msgstr "Wiki-Export Templatename" msgstr "Wiki-Export Templatename"
#: AKModel/models.py:50 #: AKModel/models.py:169
msgid "Default Slot Length" msgid "Default Slot Length"
msgstr "Standardslotlänge" msgstr "Standardslotlänge"
#: AKModel/models.py:51 #: AKModel/models.py:170
msgid "Default length in hours that is assumed for AKs in this event." msgid "Default length in hours that is assumed for AKs in this event."
msgstr "Standardlänge von Slots (in Stunden) für dieses Event" msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
#: AKModel/models.py:53 #: AKModel/models.py:171
msgid "Export Slot Length"
msgstr "Export-Slotlänge"
#: AKModel/models.py:173
msgid ""
"Slot duration in hours that is used in the timeslot discretization, when "
"this event is exported for the solver."
msgstr ""
"Länge von Slots (in Stunden) in der Zeitslot-Diskretisierung beim JSON-"
"Export dieses Events."
#: AKModel/models.py:177
msgid "Contact email address" msgid "Contact email address"
msgstr "E-Mail Kontaktadresse" msgstr "E-Mail Kontaktadresse"
#: AKModel/models.py:54 #: AKModel/models.py:178
msgid "" msgid ""
"An email address that is displayed on every page and can be used for all " "An email address that is displayed on every page and can be used for all "
"kinds of questions" "kinds of questions"
...@@ -412,75 +537,118 @@ msgstr "" ...@@ -412,75 +537,118 @@ msgstr ""
"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von " "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
"Fragen genutzt werden kann" "Fragen genutzt werden kann"
#: AKModel/models.py:59 #: AKModel/models.py:183
msgid "Events" msgid "Events"
msgstr "Events" msgstr "Events"
#: AKModel/models.py:167 #: AKModel/models.py:458
msgid "Cannot parse malformed JSON input."
msgstr "Kann fehlerhafte JSON-Eingabe nicht verarbeiten"
#: AKModel/models.py:465
msgid "Data has changed since the export. Reexport and run the solver again."
msgstr ""
"Seit dem Export wurden die Daten verändert. Wiederhole den Export und führe "
"den Solver erneut aus."
#: AKModel/models.py:482
#, python-brace-format
msgid "AK {ak_name} is not assigned any timeslot by the solver"
msgstr "Dem AK {ak_name} wurde vom Solver kein Zeitslot zugewiesen"
#: AKModel/models.py:492
#, python-brace-format
msgid ""
"Duration of AK {ak_name} assigned by solver ({solver_duration} hours) is "
"less than the duration required by the slot ({slot_duration} hours)"
msgstr ""
"Die dem AK {ak_name} vom Solver zugewiesene Dauer ({solver_duration} "
"Stunden) ist kürzer als die aktuell vorgesehene Dauer des Slots "
"({slot_duration} Stunden)"
#: AKModel/models.py:506
#, python-brace-format
msgid ""
"Fixed AK {ak_name} assigned by solver to room {solver_room} is fixed to room "
"{slot_room}"
msgstr ""
"Dem fix geplanten AK {ak_name} wurde vom Solver Raum {solver_room} "
"zugewiesen, dabei ist der AK bereits fix in Raum {slot_room} eingeplant."
#: AKModel/models.py:517
#, python-brace-format
msgid ""
"Fixed AK {ak_name} assigned by solver to start at {solver_start} is fixed to "
"start at {slot_start}"
msgstr ""
"Dem fix geplanten AK {ak_name} wurde vom Solver die Startzeit {solver_start} "
"zugewiesen, dabei ist der AK bereits für {slot_start} eingeplant."
#: AKModel/models.py:562
msgid "Nickname" msgid "Nickname"
msgstr "Spitzname" msgstr "Spitzname"
#: AKModel/models.py:167 #: AKModel/models.py:564
msgid "Name to identify an AK owner by" msgid "Name to identify an AK owner by"
msgstr "Name, durch den eine AK-Leitung identifiziert wird" msgstr "Name, durch den eine AK-Leitung identifiziert wird"
#: AKModel/models.py:168 #: AKModel/models.py:565 AKModel/models.py:726
msgid "Slug" msgid "Slug"
msgstr "Slug" msgstr "Slug"
#: AKModel/models.py:168 #: AKModel/models.py:565
msgid "Slug for URL generation" msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung" msgstr "Slug für URL-Generierung"
#: AKModel/models.py:169 #: AKModel/models.py:566
msgid "Institution" msgid "Institution"
msgstr "Instutution" msgstr "Institution"
#: AKModel/models.py:169 #: AKModel/models.py:566
msgid "Uni etc." msgid "Uni etc."
msgstr "Universität o.ä." msgstr "Universität o.ä."
#: AKModel/models.py:170 AKModel/models.py:319 #: AKModel/models.py:567 AKModel/models.py:759
msgid "Web Link" msgid "Web Link"
msgstr "Internet Link" msgstr "Internet Link"
#: AKModel/models.py:170 #: AKModel/models.py:567
msgid "Link to Homepage" msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite" msgstr "Link zu Homepage oder Webseite"
#: AKModel/models.py:176 AKModel/models.py:660 #: AKModel/models.py:573 AKModel/models.py:1256
msgid "AK Owner" msgid "AK Owner"
msgstr "AK-Leitung" msgstr "AK-Leitung"
#: AKModel/models.py:177 #: AKModel/models.py:574
msgid "AK Owners" msgid "AK Owners"
msgstr "AK-Leitungen" msgstr "AK-Leitungen"
#: AKModel/models.py:241 #: AKModel/models.py:638
msgid "Name of the AK Category" msgid "Name of the AK Category"
msgstr "Name der AK-Kategorie" msgstr "Name der AK-Kategorie"
#: AKModel/models.py:242 AKModel/models.py:266 #: AKModel/models.py:639 AKModel/models.py:677
msgid "Color" msgid "Color"
msgstr "Farbe" msgstr "Farbe"
#: AKModel/models.py:242 AKModel/models.py:266 #: AKModel/models.py:639 AKModel/models.py:677
msgid "Color for displaying" msgid "Color for displaying"
msgstr "Farbe für die Anzeige" msgstr "Farbe für die Anzeige"
#: AKModel/models.py:243 AKModel/models.py:313 #: AKModel/models.py:640
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr "Beschreibung"
#: AKModel/models.py:244 #: AKModel/models.py:641
msgid "Short description of this AK Category" msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie" msgstr "Beschreibung der AK-Kategorie"
#: AKModel/models.py:245 #: AKModel/models.py:642
msgid "Present by default" msgid "Present by default"
msgstr "Defaultmäßig präsentieren" msgstr "Defaultmäßig präsentieren"
#: AKModel/models.py:246 #: AKModel/models.py:643
msgid "" msgid ""
"Present AKs of this category by default if AK owner did not specify whether " "Present AKs of this category by default if AK owner did not specify whether "
"this AK should be presented?" "this AK should be presented?"
...@@ -488,132 +656,182 @@ msgstr "" ...@@ -488,132 +656,182 @@ msgstr ""
"AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für " "AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für "
"ihren AK nicht explizit spezifiziert haben?" "ihren AK nicht explizit spezifiziert haben?"
#: AKModel/models.py:254 #: AKModel/models.py:651
msgid "AK Categories" msgid "AK Categories"
msgstr "AK-Kategorien" msgstr "AK-Kategorien"
#: AKModel/models.py:265 #: AKModel/models.py:676
msgid "Name of the AK Track" msgid "Name of the AK Track"
msgstr "Name des AK-Tracks" msgstr "Name des AK-Tracks"
#: AKModel/models.py:272 #: AKModel/models.py:683
msgid "AK Track" msgid "AK Track"
msgstr "AK-Track" msgstr "AK-Track"
#: AKModel/models.py:273 #: AKModel/models.py:684
msgid "AK Tracks" msgid "AK Tracks"
msgstr "AK-Tracks" msgstr "AK-Tracks"
#: AKModel/models.py:292 #: AKModel/models.py:703
msgid "Name of the Requirement" msgid "Name of the Requirement"
msgstr "Name der Anforderung" msgstr "Name der Anforderung"
#: AKModel/models.py:298 AKModel/models.py:664 #: AKModel/models.py:704
msgid "Relevant for Participants?"
msgstr "Relevant für Teilnehmende?"
#: AKModel/models.py:706
msgid "Show this requirement when collecting participant preferences"
msgstr ""
"Diese Voraussetzung anzeigen, wenn Präferenzen der Teilnehmenden abgefragt "
"werden."
#: AKModel/models.py:712 AKModel/models.py:1260
msgid "AK Requirement" msgid "AK Requirement"
msgstr "AK-Anforderung" msgstr "AK-Anforderung"
#: AKModel/models.py:299 #: AKModel/models.py:713
msgid "AK Requirements" msgid "AK Requirements"
msgstr "AK-Anforderungen" msgstr "AK-Anforderungen"
#: AKModel/models.py:310 #: AKModel/models.py:725
msgid "Name describing the type"
msgstr "Name, der den Typ beschreibt"
#: AKModel/models.py:731
msgid "AK Type"
msgstr "AK Typ"
#: AKModel/models.py:743
msgid "Name of the AK" msgid "Name of the AK"
msgstr "Name des AKs" msgstr "Name des AKs"
#: AKModel/models.py:311 #: AKModel/models.py:745
msgid "Short Name" msgid "Short Name"
msgstr "Kurzer Name" msgstr "Kurzer Name"
#: AKModel/models.py:312 #: AKModel/models.py:747
msgid "Name displayed in the schedule" msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK-Plan" msgstr "Name zur Anzeige im AK-Plan"
#: AKModel/models.py:313 #: AKModel/models.py:748
msgid "Description of the AK" msgid "Brief Description"
msgstr "Beschreibung des AKs" msgstr "Kurzbeschreibung"
#: AKModel/models.py:748
msgid "1-2 sentences of AK description"
msgstr "1-2 repräsentative Sätze, die den AK beschreiben"
#: AKModel/models.py:315 #: AKModel/models.py:749
msgid "Design/Goal"
msgstr "Art/Ziel"
#: AKModel/models.py:750
msgid ""
"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"
msgstr "Art bzw. Gestaltung des AKs (z.B. Diskussion, Problemlösung, Brainstorming, Input) "
"und/oder Ziel des AKs (z.B. Reso, Lösungsausarbeitung, Ideensammlung, ein Dokument, Austausch) in wenigen Worten"
#: AKModel/models.py:752
msgid "Further Information"
msgstr "Weitere Infos"
#: AKModel/models.py:753
msgid "Anything else about the AK, e.g. links, stories, detailed description"
msgstr "alles weitere zu dem AK, z.B. Links, Anekdoten, detailiertere Beschreibung des Inhalts/Ablaufs"
#: AKModel/models.py:755
msgid "Owners" msgid "Owners"
msgstr "Leitungen" msgstr "Leitungen"
#: AKModel/models.py:316 #: AKModel/models.py:756
msgid "Those organizing the AK" msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten" msgstr "Menschen, die den AK organisieren und halten"
#: AKModel/models.py:319 #: AKModel/models.py:759
msgid "Link to wiki page" msgid "Link to wiki page"
msgstr "Link zur Wiki Seite" msgstr "Link zur Wiki Seite"
#: AKModel/models.py:320 #: AKModel/models.py:760
msgid "Protocol Link" msgid "Protocol Link"
msgstr "Protokolllink" msgstr "Protokolllink"
#: AKModel/models.py:320 #: AKModel/models.py:760
msgid "Link to protocol" msgid "Link to protocol"
msgstr "Link zum Protokoll" msgstr "Link zum Protokoll"
#: AKModel/models.py:322 #: AKModel/models.py:762
msgid "Category" msgid "Category"
msgstr "Kategorie" msgstr "Kategorie"
#: AKModel/models.py:323 #: AKModel/models.py:763
msgid "Category of the AK" msgid "Category of the AK"
msgstr "Kategorie des AKs" msgstr "Kategorie des AKs"
#: AKModel/models.py:324 #: AKModel/models.py:764 AKModel/views/manage.py:67
msgid "Types"
msgstr "Typen"
#: AKModel/models.py:765
msgid "This AK is"
msgstr "Dieser AK ist"
#: AKModel/models.py:766
msgid "Track" msgid "Track"
msgstr "Track" msgstr "Track"
#: AKModel/models.py:325 #: AKModel/models.py:767
msgid "Track the AK belongs to" msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört" msgstr "Track zu dem der AK gehört"
#: AKModel/models.py:327 #: AKModel/models.py:769
msgid "Resolution Intention" msgid "Resolution Intention"
msgstr "Resolutionsabsicht" msgstr "Resolutionsabsicht"
#: AKModel/models.py:328 #: AKModel/models.py:770
msgid "Intends to submit a resolution" msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen" msgstr "Beabsichtigt eine Resolution einzureichen"
#: AKModel/models.py:329 #: AKModel/models.py:771
msgid "Present this AK" msgid "Present this AK"
msgstr "AK präsentieren" msgstr "AK präsentieren"
#: AKModel/models.py:330 #: AKModel/models.py:772
msgid "Present results of this AK" msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen" msgstr "Die Ergebnisse dieses AKs vorstellen"
#: AKModel/models.py:332 AKModel/views/status.py:168 #: AKModel/models.py:774 AKModel/views/status.py:178
msgid "Requirements" msgid "Requirements"
msgstr "Anforderungen" msgstr "Anforderungen"
#: AKModel/models.py:333 #: AKModel/models.py:775
msgid "AK's Requirements" msgid "AK's Requirements"
msgstr "Anforderungen des AKs" msgstr "Anforderungen des AKs"
#: AKModel/models.py:335 #: AKModel/models.py:777
msgid "Conflicting AKs" msgid "Conflicting AKs"
msgstr "AK-Konflikte" msgstr "AK-Konflikte"
#: AKModel/models.py:336 #: AKModel/models.py:778
msgid "AKs that conflict and thus must not take place at the same time" msgid "AKs that conflict and thus must not take place at the same time"
msgstr "" msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: AKModel/models.py:337 #: AKModel/models.py:779
msgid "Prerequisite AKs" msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs" msgstr "Vorausgesetzte AKs"
#: AKModel/models.py:338 #: AKModel/models.py:780
msgid "AKs that should precede this AK in the schedule" msgid "AKs that should precede this AK in the schedule"
msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen" msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen"
#: AKModel/models.py:340 #: AKModel/models.py:782
msgid "Organizational Notes" msgid "Organizational Notes"
msgstr "Notizen zur Organisation" msgstr "Notizen zur Organisation"
#: AKModel/models.py:341 #: AKModel/models.py:783
msgid "" msgid ""
"Notes to organizers. These are public. For private notes, please use the " "Notes to organizers. These are public. For private notes, please use the "
"button for private messages on the detail page of this AK (after creation/" "button for private messages on the detail page of this AK (after creation/"
...@@ -623,287 +841,291 @@ msgstr "" ...@@ -623,287 +841,291 @@ msgstr ""
"Anmerkungen bitte den Button für Direktnachrichten verwenden (nach dem " "Anmerkungen bitte den Button für Direktnachrichten verwenden (nach dem "
"Anlegen/Bearbeiten)." "Anlegen/Bearbeiten)."
#: AKModel/models.py:344 #: AKModel/models.py:786
msgid "Interest" msgid "Interest"
msgstr "Interesse" msgstr "Interesse"
#: AKModel/models.py:344 #: AKModel/models.py:786
msgid "Expected number of people" msgid "Expected number of people"
msgstr "Erwartete Personenzahl" msgstr "Erwartete Personenzahl"
#: AKModel/models.py:345 #: AKModel/models.py:787
msgid "Interest Counter" msgid "Interest Counter"
msgstr "Interessenszähler" msgstr "Interessenszähler"
#: AKModel/models.py:346 #: AKModel/models.py:788
msgid "People who have indicated interest online" msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben" msgstr "Anzahl Personen, die online Interesse bekundet haben"
#: AKModel/models.py:351 #: AKModel/models.py:793
msgid "Export?" msgid "Export?"
msgstr "Export?" msgstr "Export?"
#: AKModel/models.py:352 #: AKModel/models.py:794
msgid "Include AK in wiki export?" msgid "Include AK in wiki export?"
msgstr "AK bei Wiki-Export berücksichtigen?" msgstr "AK bei Wiki-Export berücksichtigen?"
#: AKModel/models.py:358 AKModel/models.py:655 #: AKModel/models.py:951
#: AKModel/templates/admin/AKModel/status/event_aks.html:10
#: AKModel/views/manage.py:73 AKModel/views/status.py:98
msgid "AKs"
msgstr "AKs"
#: AKModel/models.py:467
msgid "Name or number of the room" msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums" msgstr "Name oder Nummer des Raums"
#: AKModel/models.py:468 #: AKModel/models.py:952
msgid "Location" msgid "Location"
msgstr "Ort" msgstr "Ort"
#: AKModel/models.py:469 #: AKModel/models.py:953
msgid "Name or number of the location" msgid "Name or number of the location"
msgstr "Name oder Nummer des Ortes" msgstr "Name oder Nummer des Ortes"
#: AKModel/models.py:470 #: AKModel/models.py:954
msgid "Capacity" msgid "Capacity"
msgstr "Kapazität" msgstr "Kapazität"
#: AKModel/models.py:471 #: AKModel/models.py:955
msgid "Maximum number of people (-1 for unlimited)." msgid "Maximum number of people (-1 for unlimited)."
msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)." msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)."
#: AKModel/models.py:472 #: AKModel/models.py:956
msgid "Properties" msgid "Properties"
msgstr "Eigenschaften" msgstr "Eigenschaften"
#: AKModel/models.py:473 #: AKModel/models.py:957
msgid "AK requirements fulfilled by the room" msgid "AK requirements fulfilled by the room"
msgstr "AK-Anforderungen, die dieser Raum erfüllt" msgstr "AK-Anforderungen, die dieser Raum erfüllt"
#: AKModel/models.py:480 AKModel/views/status.py:60 #: AKModel/models.py:964 AKModel/views/status.py:59
msgid "Rooms" msgid "Rooms"
msgstr "Räume" msgstr "Räume"
#: AKModel/models.py:503 #: AKModel/models.py:1013
msgid "AK being mapped" msgid "AK being mapped"
msgstr "AK, der zugeordnet wird" msgstr "AK, der zugeordnet wird"
#: AKModel/models.py:505 #: AKModel/models.py:1015
msgid "Room the AK will take place in" msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet" msgstr "Raum in dem der AK stattfindet"
#: AKModel/models.py:506 AKModel/models.py:839 #: AKModel/models.py:1016 AKModel/models.py:1436
msgid "Slot Begin" msgid "Slot Begin"
msgstr "Beginn des Slots" msgstr "Beginn des Slots"
#: AKModel/models.py:506 AKModel/models.py:839 #: AKModel/models.py:1016 AKModel/models.py:1436
msgid "Time and date the slot begins" msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt" msgstr "Zeit und Datum zu der der AK beginnt"
#: AKModel/models.py:508 #: AKModel/models.py:1018
msgid "Duration" msgid "Duration"
msgstr "Dauer" msgstr "Dauer"
#: AKModel/models.py:509 #: AKModel/models.py:1019
msgid "Length in hours" msgid "Length in hours"
msgstr "Länge in Stunden" msgstr "Länge in Stunden"
#: AKModel/models.py:511 #: AKModel/models.py:1021
msgid "Scheduling fixed" msgid "Scheduling fixed"
msgstr "Planung fix" msgstr "Planung fix"
#: AKModel/models.py:512 #: AKModel/models.py:1022
msgid "Length and time of this AK should not be changed" msgid "Length and time of this AK should not be changed"
msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden" msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden"
#: AKModel/models.py:517 #: AKModel/models.py:1027
msgid "Last update" msgid "Last update"
msgstr "Letzte Aktualisierung" msgstr "Letzte Aktualisierung"
#: AKModel/models.py:520 #: AKModel/models.py:1030
msgid "AK Slot" msgid "AK Slot"
msgstr "AK-Slot" msgstr "AK-Slot"
#: AKModel/models.py:521 AKModel/models.py:657 #: AKModel/models.py:1031 AKModel/models.py:1253
msgid "AK Slots" msgid "AK Slots"
msgstr "AK-Slot" msgstr "AK-Slot"
#: AKModel/models.py:543 AKModel/models.py:552 #: AKModel/models.py:1053 AKModel/models.py:1062
msgid "Not scheduled yet" msgid "Not scheduled yet"
msgstr "Noch nicht geplant" msgstr "Noch nicht geplant"
#: AKModel/models.py:592 #: AKModel/models.py:1185
msgid "AK this message belongs to" msgid "AK this message belongs to"
msgstr "AK zu dem die Nachricht gehört" msgstr "AK zu dem die Nachricht gehört"
#: AKModel/models.py:593 #: AKModel/models.py:1186
msgid "Message text" msgid "Message text"
msgstr "Nachrichtentext" msgstr "Nachrichtentext"
#: AKModel/models.py:594 #: AKModel/models.py:1187
msgid "Message to the organizers. This is not publicly visible." msgid "Message to the organizers. This is not publicly visible."
msgstr "" msgstr ""
"Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar." "Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
#: AKModel/models.py:600 #: AKModel/models.py:1191
msgid "Resolved"
msgstr "Erledigt"
#: AKModel/models.py:1192
msgid "This message has been resolved (no further action needed)"
msgstr ""
"Diese Nachricht wurde vollständig bearbeitet (keine weiteren Aktionen "
"notwendig)"
#: AKModel/models.py:1195
msgid "AK Orga Message" msgid "AK Orga Message"
msgstr "AK-Organachricht" msgstr "AK-Organachricht"
#: AKModel/models.py:601 #: AKModel/models.py:1196
msgid "AK Orga Messages" msgid "AK Orga Messages"
msgstr "AK-Organachrichten" msgstr "AK-Organachrichten"
#: AKModel/models.py:618 #: AKModel/models.py:1214
msgid "Constraint Violation" msgid "Constraint Violation"
msgstr "Constraintverletzung" msgstr "Constraintverletzung"
#: AKModel/models.py:619 AKModel/views/status.py:117 #: AKModel/models.py:1215
msgid "Constraint Violations" msgid "Constraint Violations"
msgstr "Constraintverletzungen" msgstr "Constraintverletzungen"
#: AKModel/models.py:626 #: AKModel/models.py:1222
msgid "Owner has two parallel slots" msgid "Owner has two parallel slots"
msgstr "Leitung hat zwei Slots parallel" msgstr "Leitung hat zwei Slots parallel"
#: AKModel/models.py:627 #: AKModel/models.py:1223
msgid "AK Slot was scheduled outside the AK's availabilities" msgid "AK Slot was scheduled outside the AK's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert" msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert"
#: AKModel/models.py:628 #: AKModel/models.py:1224
msgid "Room has two AK slots scheduled at the same time" msgid "Room has two AK slots scheduled at the same time"
msgstr "Raum hat zwei AK Slots gleichzeitig" msgstr "Raum hat zwei AK Slots gleichzeitig"
#: AKModel/models.py:629 #: AKModel/models.py:1225
msgid "Room does not satisfy the requirement of the scheduled AK" msgid "Room does not satisfy the requirement of the scheduled AK"
msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht" msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
#: AKModel/models.py:630 #: AKModel/models.py:1226
msgid "AK Slot is scheduled at the same time as an AK listed as a conflict" msgid "AK Slot is scheduled at the same time as an AK listed as a conflict"
msgstr "" msgstr ""
"AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert" "AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert"
#: AKModel/models.py:631 #: AKModel/models.py:1227
msgid "AK Slot is scheduled before an AK listed as a prerequisite" msgid "AK Slot is scheduled before an AK listed as a prerequisite"
msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert" msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert"
#: AKModel/models.py:633 #: AKModel/models.py:1229
msgid "" msgid ""
"AK Slot for AK with intention to submit a resolution is scheduled after " "AK Slot for AK with intention to submit a resolution is scheduled after "
"resolution deadline" "resolution deadline"
msgstr "" msgstr ""
"AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert" "AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert"
#: AKModel/models.py:634 #: AKModel/models.py:1230
msgid "AK Slot in a category is outside that categories availabilities" msgid "AK Slot in a category is outside that categories availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie" msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie"
#: AKModel/models.py:635 #: AKModel/models.py:1231
msgid "Two AK Slots for the same AK scheduled at the same time" msgid "Two AK Slots for the same AK scheduled at the same time"
msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert" msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert"
#: AKModel/models.py:636 #: AKModel/models.py:1232
msgid "Room does not have enough space for interest in scheduled AK Slot" msgid "Room does not have enough space for interest in scheduled AK Slot"
msgstr "Room hat nicht genug Platz für das Interesse am geplanten AK-Slot" msgstr "Room hat nicht genug Platz für das Interesse am geplanten AK-Slot"
#: AKModel/models.py:637 #: AKModel/models.py:1233
msgid "AK Slot is scheduled outside the event's availabilities" msgid "AK Slot is scheduled outside the event's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert" msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert"
#: AKModel/models.py:643 #: AKModel/models.py:1239
msgid "Warning" msgid "Warning"
msgstr "Warnung" msgstr "Warnung"
#: AKModel/models.py:644 #: AKModel/models.py:1240
msgid "Violation" msgid "Violation"
msgstr "Verletzung" msgstr "Verletzung"
#: AKModel/models.py:646 #: AKModel/models.py:1242
msgid "Type" msgid "Type"
msgstr "Art" msgstr "Art"
#: AKModel/models.py:647 #: AKModel/models.py:1243
msgid "Type of violation, i.e. what kind of constraint was violated" msgid "Type of violation, i.e. what kind of constraint was violated"
msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde" msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde"
#: AKModel/models.py:648 #: AKModel/models.py:1244
msgid "Level" msgid "Level"
msgstr "Level" msgstr "Level"
#: AKModel/models.py:649 #: AKModel/models.py:1245
msgid "Severity level of the violation" msgid "Severity level of the violation"
msgstr "Schweregrad der Verletzung" msgstr "Schweregrad der Verletzung"
#: AKModel/models.py:656 #: AKModel/models.py:1252
msgid "AK(s) belonging to this constraint" msgid "AK(s) belonging to this constraint"
msgstr "AK(s), die zu diesem Constraint gehören" msgstr "AK(s), die zu diesem Constraint gehören"
#: AKModel/models.py:658 #: AKModel/models.py:1254
msgid "AK Slot(s) belonging to this constraint" msgid "AK Slot(s) belonging to this constraint"
msgstr "AK Slot(s), die zu diesem Constraint gehören" msgstr "AK Slot(s), die zu diesem Constraint gehören"
#: AKModel/models.py:660 #: AKModel/models.py:1256
msgid "AK Owner belonging to this constraint" msgid "AK Owner belonging to this constraint"
msgstr "AK Leitung(en), die zu diesem Constraint gehören" msgstr "AK Leitung(en), die zu diesem Constraint gehören"
#: AKModel/models.py:662 #: AKModel/models.py:1258
msgid "Room belonging to this constraint" msgid "Room belonging to this constraint"
msgstr "Raum, der zu diesem Constraint gehört" msgstr "Raum, der zu diesem Constraint gehört"
#: AKModel/models.py:665 #: AKModel/models.py:1261
msgid "AK Requirement belonging to this constraint" msgid "AK Requirement belonging to this constraint"
msgstr "AK Anforderung, die zu diesem Constraint gehört" msgstr "AK Anforderung, die zu diesem Constraint gehört"
#: AKModel/models.py:667 #: AKModel/models.py:1263
msgid "AK Category belonging to this constraint" msgid "AK Category belonging to this constraint"
msgstr "AK Kategorie, di zu diesem Constraint gehört" msgstr "AK Kategorie, di zu diesem Constraint gehört"
#: AKModel/models.py:669 #: AKModel/models.py:1265
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: AKModel/models.py:669 #: AKModel/models.py:1265
msgid "Comment or further details for this violation" msgid "Comment or further details for this violation"
msgstr "Kommentar oder weitere Details zu dieser Vereletzung" msgstr "Kommentar oder weitere Details zu dieser Verletzung"
#: AKModel/models.py:672 #: AKModel/models.py:1268
msgid "Timestamp" msgid "Timestamp"
msgstr "Timestamp" msgstr "Timestamp"
#: AKModel/models.py:672 #: AKModel/models.py:1268
msgid "Time of creation" msgid "Time of creation"
msgstr "Zeitpunkt der ERstellung" msgstr "Zeitpunkt der Erstellung"
#: AKModel/models.py:673 #: AKModel/models.py:1269
msgid "Manually Resolved" msgid "Manually Resolved"
msgstr "Manuell behoben" msgstr "Manuell behoben"
#: AKModel/models.py:674 #: AKModel/models.py:1270
msgid "Mark this violation manually as resolved" msgid "Mark this violation manually as resolved"
msgstr "Markiere diese Verletzung manuell als behoben" msgstr "Markiere diese Verletzung manuell als behoben"
#: AKModel/models.py:701 #: AKModel/models.py:1297 AKModel/templates/admin/AKModel/aks_by_user.html:22
#: AKModel/templates/admin/AKModel/requirements_overview.html:27 #: AKModel/templates/admin/AKModel/requirements_overview.html:27
msgid "Details" msgid "Details"
msgstr "Details" msgstr "Details"
#: AKModel/models.py:835 #: AKModel/models.py:1432
msgid "Default Slot" msgid "Default Slot"
msgstr "Standardslot" msgstr "Standardslot"
#: AKModel/models.py:840 #: AKModel/models.py:1437
msgid "Slot End" msgid "Slot End"
msgstr "Ende des Slots" msgstr "Ende des Slots"
#: AKModel/models.py:840 #: AKModel/models.py:1437
msgid "Time and date the slot ends" msgid "Time and date the slot ends"
msgstr "Zeit und Datum zu der der Slot endet" msgstr "Zeit und Datum zu der der Slot endet"
#: AKModel/models.py:845 #: AKModel/models.py:1442
msgid "Primary categories" msgid "Primary categories"
msgstr "Primäre Kategorien" msgstr "Primäre Kategorien"
#: AKModel/models.py:846 #: AKModel/models.py:1444
msgid "Categories that should be assigned to this slot primarily" msgid "Categories that should be assigned to this slot primarily"
msgstr "Kategorieren, die diesem Slot primär zugewiesen werden sollen" msgstr "Kategorieren, die diesem Slot primär zugewiesen werden sollen"
...@@ -933,13 +1155,26 @@ msgid "Confirm" ...@@ -933,13 +1155,26 @@ msgid "Confirm"
msgstr "Bestätigen" msgstr "Bestätigen"
#: AKModel/templates/admin/AKModel/action_intermediate.html:27 #: AKModel/templates/admin/AKModel/action_intermediate.html:27
#: AKModel/templates/admin/AKModel/event_wizard/import.html:24 #: AKModel/templates/admin/AKModel/event_wizard/import.html:27
#: AKModel/templates/admin/AKModel/event_wizard/settings.html:29 #: AKModel/templates/admin/AKModel/event_wizard/settings.html:32
#: AKModel/templates/admin/AKModel/event_wizard/start.html:23 #: AKModel/templates/admin/AKModel/event_wizard/start.html:28
#: AKModel/templates/admin/AKModel/room_create.html:30 #: AKModel/templates/admin/AKModel/room_create.html:30
msgid "Cancel" msgid "Cancel"
msgstr "Abbrechen" msgstr "Abbrechen"
#: AKModel/templates/admin/AKModel/aks_by_user.html:8
msgid "AKs by Owner"
msgstr "AKs der Leitung"
#: AKModel/templates/admin/AKModel/aks_by_user.html:26
#: AKModel/templates/admin/AKModel/requirements_overview.html:31
msgid "Edit"
msgstr "Bearbeiten"
#: AKModel/templates/admin/AKModel/aks_by_user.html:33
msgid "This user does not have any AKs currently"
msgstr "Diese Leitung hat aktuell keine AKs"
#: AKModel/templates/admin/AKModel/event_wizard/activate.html:9 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:9
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:9 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:9
#: AKModel/templates/admin/AKModel/event_wizard/finish.html:9 #: AKModel/templates/admin/AKModel/event_wizard/finish.html:9
...@@ -950,26 +1185,26 @@ msgstr "Abbrechen" ...@@ -950,26 +1185,26 @@ msgstr "Abbrechen"
msgid "New event wizard" msgid "New event wizard"
msgstr "Assistent zum Anlegen eines neuen Events" msgstr "Assistent zum Anlegen eines neuen Events"
#: AKModel/templates/admin/AKModel/event_wizard/activate.html:18 #: AKModel/templates/admin/AKModel/event_wizard/activate.html:23
msgid "Successfully imported.<br><br>Do you want to activate your event now?" msgid "Successfully imported.<br><br>Do you want to activate your event now?"
msgstr "Erfolgreich importiert.<br><br>Soll das Event jetzt aktiviert werden?" msgstr "Erfolgreich importiert.<br><br>Soll das Event jetzt aktiviert werden?"
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:16 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:21
msgid "New event:" msgid "New event:"
msgstr "Neues Event:" msgstr "Neues Event:"
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:30 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:35
msgid "Your event was created and can now be further configured." msgid "Your event was created and can now be further configured."
msgstr "Das Event wurde angelegt und kann nun weiter konfiguriert werden." msgstr "Das Event wurde angelegt und kann nun weiter konfiguriert werden."
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:39 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:42
msgid "Skip Import" msgid "Skip Import"
msgstr "Import überspringen" msgstr "Import überspringen"
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:43 #: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:46
#: AKModel/templates/admin/AKModel/event_wizard/import.html:20 #: AKModel/templates/admin/AKModel/event_wizard/import.html:23
#: AKModel/templates/admin/AKModel/event_wizard/settings.html:22 #: AKModel/templates/admin/AKModel/event_wizard/settings.html:25
#: AKModel/templates/admin/AKModel/event_wizard/start.html:19 #: AKModel/templates/admin/AKModel/event_wizard/start.html:24
msgid "Continue" msgid "Continue"
msgstr "Fortfahren" msgstr "Fortfahren"
...@@ -977,11 +1212,11 @@ msgstr "Fortfahren" ...@@ -977,11 +1212,11 @@ msgstr "Fortfahren"
msgid "Congratulations. Everything is set up!" msgid "Congratulations. Everything is set up!"
msgstr "Herzlichen Glückwunsch. Alles ist eingerichtet!" msgstr "Herzlichen Glückwunsch. Alles ist eingerichtet!"
#: AKModel/templates/admin/AKModel/event_wizard/settings.html:26 #: AKModel/templates/admin/AKModel/event_wizard/settings.html:29
msgid "Back" msgid "Back"
msgstr "Zurück" msgstr "Zurück"
#: AKModel/templates/admin/AKModel/event_wizard/start.html:13 #: AKModel/templates/admin/AKModel/event_wizard/start.html:18
msgid "" msgid ""
"Add a new event. Please start by filling these basic properties. You can " "Add a new event. Please start by filling these basic properties. You can "
"specify more settings later." "specify more settings later."
...@@ -1006,16 +1241,12 @@ msgstr "" ...@@ -1006,16 +1241,12 @@ msgstr ""
msgid "Requirements Overview" msgid "Requirements Overview"
msgstr "Übersicht Anforderungen" msgstr "Übersicht Anforderungen"
#: AKModel/templates/admin/AKModel/requirements_overview.html:31
msgid "Edit"
msgstr "Bearbeiten"
#: AKModel/templates/admin/AKModel/requirements_overview.html:38 #: AKModel/templates/admin/AKModel/requirements_overview.html:38
msgid "No AKs with this requirement" msgid "No AKs with this requirement"
msgstr "Kein AK mit dieser Anforderung" msgstr "Kein AK mit dieser Anforderung"
#: AKModel/templates/admin/AKModel/requirements_overview.html:45 #: AKModel/templates/admin/AKModel/requirements_overview.html:45
#: AKModel/views/status.py:184 #: AKModel/views/status.py:194
msgid "Add Requirement" msgid "Add Requirement"
msgstr "Anforderung hinzufügen" msgstr "Anforderung hinzufügen"
...@@ -1068,7 +1299,7 @@ msgstr "Bisher keine Räume" ...@@ -1068,7 +1299,7 @@ msgstr "Bisher keine Räume"
msgid "Active Events" msgid "Active Events"
msgstr "Aktive Events" msgstr "Aktive Events"
#: AKModel/templates/admin/ak_index.html:16 AKModel/views/status.py:109 #: AKModel/templates/admin/ak_index.html:16 AKModel/views/status.py:113
msgid "Scheduling" msgid "Scheduling"
msgstr "Scheduling" msgstr "Scheduling"
...@@ -1113,7 +1344,7 @@ msgstr "AK-CSV-Export" ...@@ -1113,7 +1344,7 @@ msgstr "AK-CSV-Export"
msgid "AK Wiki Export" msgid "AK Wiki Export"
msgstr "AK-Wiki-Export" msgstr "AK-Wiki-Export"
#: AKModel/views/ak.py:59 AKModel/views/manage.py:53 #: AKModel/views/ak.py:59 AKModel/views/manage.py:66
msgid "Wishes" msgid "Wishes"
msgstr "Wünsche" msgstr "Wünsche"
...@@ -1151,85 +1382,113 @@ msgstr "'%(obj)s' kopiert" ...@@ -1151,85 +1382,113 @@ msgstr "'%(obj)s' kopiert"
msgid "Could not copy '%(obj)s' (%(error)s)" msgid "Could not copy '%(obj)s' (%(error)s)"
msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)" msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)"
#: AKModel/views/manage.py:35 AKModel/views/status.py:151 #: AKModel/views/manage.py:35 AKModel/views/status.py:150
msgid "Export AK Slides" msgid "Export AK Slides"
msgstr "AK-Folien exportieren" msgstr "AK-Folien exportieren"
#: AKModel/views/manage.py:48 #: AKModel/views/manage.py:61
msgid "Symbols" msgid "Symbols"
msgstr "Symbole" msgstr "Symbole"
#: AKModel/views/manage.py:49 #: AKModel/views/manage.py:62
msgid "Who?" msgid "Who?"
msgstr "Wer?" msgstr "Wer?"
#: AKModel/views/manage.py:50 #: AKModel/views/manage.py:63
msgid "Duration(s)" msgid "Duration(s)"
msgstr "Dauer(n)" msgstr "Dauer(n)"
#: AKModel/views/manage.py:51 #: AKModel/views/manage.py:64
msgid "Reso intention?" msgid "Reso intention?"
msgstr "Resolutionsabsicht?" msgstr "Resolutionsabsicht?"
#: AKModel/views/manage.py:52 #: AKModel/views/manage.py:65
msgid "Category (for Wishes)" msgid "Category (for Wishes)"
msgstr "Kategorie (für Wünsche)" msgstr "Kategorie (für Wünsche)"
#: AKModel/views/manage.py:101 #: AKModel/views/manage.py:128
msgid "The following Constraint Violations will be marked as manually resolved" msgid "The following Constraint Violations will be marked as manually resolved"
msgstr "" msgstr ""
"Die folgenden Constraintverletzungen werden als manuell behoben markiert." "Die folgenden Constraintverletzungen werden als manuell behoben markiert."
#: AKModel/views/manage.py:102 #: AKModel/views/manage.py:129
msgid "Constraint Violations marked as resolved" msgid "Constraint Violations marked as resolved"
msgstr "Constraintverletzungen als manuell behoben markiert" msgstr "Constraintverletzungen als manuell behoben markiert"
#: AKModel/views/manage.py:114 #: AKModel/views/manage.py:141
msgid "The following Constraint Violations will be set to level 'violation'" msgid "The following Constraint Violations will be set to level 'violation'"
msgstr "" msgstr ""
"Die folgenden Constraintverletzungen werden auf das Level \"Violation\" " "Die folgenden Constraintverletzungen werden auf das Level \"Violation\" "
"gesetzt." "gesetzt."
#: AKModel/views/manage.py:115 #: AKModel/views/manage.py:142
msgid "Constraint Violations set to level 'violation'" msgid "Constraint Violations set to level 'violation'"
msgstr "Constraintverletzungen auf Level \"Violation\" gesetzt" msgstr "Constraintverletzungen auf Level \"Violation\" gesetzt"
#: AKModel/views/manage.py:127 #: AKModel/views/manage.py:154
msgid "The following Constraint Violations will be set to level 'warning'" msgid "The following Constraint Violations will be set to level 'warning'"
msgstr "" msgstr ""
"Die folgenden Constraintverletzungen werden auf das Level 'warning' gesetzt." "Die folgenden Constraintverletzungen werden auf das Level 'warning' gesetzt."
#: AKModel/views/manage.py:128 #: AKModel/views/manage.py:155
msgid "Constraint Violations set to level 'warning'" msgid "Constraint Violations set to level 'warning'"
msgstr "Constraintverletzungen auf Level \"Warning\" gesetzt" msgstr "Constraintverletzungen auf Level \"Warning\" gesetzt"
#: AKModel/views/manage.py:140 #: AKModel/views/manage.py:164
msgid "Clear schedule"
msgstr "Planung zurücksetzen"
#: AKModel/views/manage.py:166
msgid "Clear schedule. The following scheduled AKSlots will be reset"
msgstr "Die Planung (Start, Räume) der folgenden AKs wird zurückgesetzt"
#: AKModel/views/manage.py:167
msgid "Schedule cleared"
msgstr "Planung zurückgesetzt"
#: AKModel/views/manage.py:189
msgid "Publish the plan(s) of:" msgid "Publish the plan(s) of:"
msgstr "Den Plan/die Pläne veröffentlichen von:" msgstr "Den Plan/die Pläne veröffentlichen von:"
#: AKModel/views/manage.py:141 #: AKModel/views/manage.py:190
msgid "Plan published" msgid "Plan published"
msgstr "Plan veröffentlicht" msgstr "Plan veröffentlicht"
#: AKModel/views/manage.py:153 #: AKModel/views/manage.py:202
msgid "Unpublish the plan(s) of:" msgid "Unpublish the plan(s) of:"
msgstr "Den Plan/die Pläne verbergen von:" msgstr "Den Plan/die Pläne verbergen von:"
#: AKModel/views/manage.py:154 #: AKModel/views/manage.py:203
msgid "Plan unpublished" msgid "Plan unpublished"
msgstr "Plan verborgen" msgstr "Plan verborgen"
#: AKModel/views/manage.py:166 AKModel/views/status.py:135 #: AKModel/views/manage.py:215
msgid "Publish the poll(s) of:"
msgstr "Die Präferenzen-Abfrage(n) veröffentlichen von:"
#: AKModel/views/manage.py:216
msgid "Preference poll published"
msgstr "Präferenzen-Abfrage veröffentlicht"
#: AKModel/views/manage.py:228
msgid "Unpublish the preference poll(s) of:"
msgstr "Die Präferenzen-Abfrage(n) verbergen von:"
#: AKModel/views/manage.py:229
msgid "Preference poll unpublished"
msgstr "Präferenzen-Abfrage verborgen"
#: AKModel/views/manage.py:240 AKModel/views/status.py:134
msgid "Edit Default Slots" msgid "Edit Default Slots"
msgstr "Standardslots bearbeiten" msgstr "Standardslots bearbeiten"
#: AKModel/views/manage.py:204 #: AKModel/views/manage.py:278
#, python-brace-format #, python-brace-format
msgid "Could not update slot {id} since it does not belong to {event}" msgid "Could not update slot {id} since it does not belong to {event}"
msgstr "" msgstr ""
"Konnte Slot {id} nicht bearbeiten, da er nicht zum Event {event} gehört" "Konnte Slot {id} nicht bearbeiten, da er nicht zum Event {event} gehört"
#: AKModel/views/manage.py:235 #: AKModel/views/manage.py:309
#, python-brace-format #, python-brace-format
msgid "Updated {u} slot(s). created {c} new slot(s) and deleted {d} slot(s)" msgid "Updated {u} slot(s). created {c} new slot(s) and deleted {d} slot(s)"
msgstr "" msgstr ""
...@@ -1240,7 +1499,7 @@ msgstr "" ...@@ -1240,7 +1499,7 @@ msgstr ""
msgid "Created Room '%(room)s'" msgid "Created Room '%(room)s'"
msgstr "Raum '%(room)s' angelegt" msgstr "Raum '%(room)s' angelegt"
#: AKModel/views/room.py:51 AKModel/views/status.py:82 #: AKModel/views/room.py:51 AKModel/views/status.py:86
msgid "Import Rooms from CSV" msgid "Import Rooms from CSV"
msgstr "Räume aus CSV importieren" msgstr "Räume aus CSV importieren"
...@@ -1258,23 +1517,23 @@ msgstr "{count} Raum/Räume importiert" ...@@ -1258,23 +1517,23 @@ msgstr "{count} Raum/Räume importiert"
msgid "No rooms imported" msgid "No rooms imported"
msgstr "Keine Räume importiert" msgstr "Keine Räume importiert"
#: AKModel/views/status.py:17 #: AKModel/views/status.py:16
msgid "Overview" msgid "Overview"
msgstr "Überblick" msgstr "Überblick"
#: AKModel/views/status.py:33 #: AKModel/views/status.py:32
msgid "Categories" msgid "Categories"
msgstr "Kategorien" msgstr "Kategorien"
#: AKModel/views/status.py:37 #: AKModel/views/status.py:36
msgid "Add category" msgid "Add category"
msgstr "Kategorie hinzufügen" msgstr "Kategorie hinzufügen"
#: AKModel/views/status.py:64 #: AKModel/views/status.py:63
msgid "Add Room" msgid "Add Room"
msgstr "Raum hinzufügen" msgstr "Raum hinzufügen"
#: AKModel/views/status.py:122 #: AKModel/views/status.py:120
msgid "AKs requiring special attention" msgid "AKs requiring special attention"
msgstr "AKs, die besondere Aufmerksamkeit benötigen" msgstr "AKs, die besondere Aufmerksamkeit benötigen"
...@@ -1282,28 +1541,33 @@ msgstr "AKs, die besondere Aufmerksamkeit benötigen" ...@@ -1282,28 +1541,33 @@ msgstr "AKs, die besondere Aufmerksamkeit benötigen"
msgid "Enter Interest" msgid "Enter Interest"
msgstr "Interesse erfassen" msgstr "Interesse erfassen"
#: AKModel/views/status.py:139 #: AKModel/views/status.py:138
msgid "Manage ak tracks" msgid "Manage ak tracks"
msgstr "AK-Tracks verwalten" msgstr "AK-Tracks verwalten"
#: AKModel/views/status.py:143 #: AKModel/views/status.py:142
msgid "Export AKs as CSV" msgid "Export AKs as CSV"
msgstr "AKs als CSV exportieren" msgstr "AKs als CSV exportieren"
#: AKModel/views/status.py:147 #: AKModel/views/status.py:146
msgid "Export AKs for Wiki" msgid "Export AKs for Wiki"
msgstr "AKs im Wiki-Format exportieren" msgstr "AKs im Wiki-Format exportieren"
#: AKModel/views/status.py:180 #: AKModel/views/status.py:158
msgid "Export AKs as JSON"
msgstr "AKs als JSON exportieren"
#: AKModel/views/status.py:162
msgid "Import AK schedule from JSON"
msgstr "AK-Plan aus JSON importieren"
#: AKModel/views/status.py:190
msgid "Show AKs for requirements" msgid "Show AKs for requirements"
msgstr "Zu Anforderungen gehörige AKs anzeigen" msgstr "Zu Anforderungen gehörige AKs anzeigen"
#: AKModel/views/status.py:194 #: AKModel/views/status.py:204
msgid "Event Status" msgid "Event Status"
msgstr "Eventstatus" msgstr "Eventstatus"
#~ msgid "Messages" #~ msgid "Description of the AK"
#~ msgstr "Nachrichten" #~ msgstr "Beschreibung des AKs"
#~ msgid "Delete all messages"
#~ msgstr "Alle Nachrichten löschen"
# Generated by Django 4.2.11 on 2024-04-21 14:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0058_alter_ak_options'),
]
operations = [
migrations.AlterField(
model_name='event',
name='interest_start',
field=models.DateTimeField(blank=True, help_text='Opening time for expression of interest. When left blank, no interest indication will be possible.', null=True, verbose_name='Interest Window Start'),
),
]
# Generated by Django 4.2.11 on 2024-04-24 21:39
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0059_interest_default'),
]
operations = [
migrations.AddField(
model_name='akorgamessage',
name='resolved',
field=models.BooleanField(default=False, help_text='This message has been resolved (no further action needed)', verbose_name='Resolved'),
),
]
# 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'),
),
]