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
  • koma/feature/preference-polling-form
  • komasolver
  • main
  • renovate/django_csp-4.x
4 results

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
  • ak-import
  • feature/clear-schedule-button
  • feature/export-filtering
  • feature/json-export-via-rest-framework
  • feature/json-schedule-import-tests
  • feature/preference-polling-form
  • fix/add-room-import-only-once
  • fix/responsive-cols-in-polls
  • main
  • renovate/django-5.x
  • renovate/django-debug-toolbar-4.x
  • renovate/django-simple-history-3.x
  • renovate/mysqlclient-2.x
13 results
Show changes
Commits on Source (339)
239 additional commits have been omitted to prevent performance issues.
Hide whitespace changes
Inline Side-by-side
Showing
with 1222 additions and 366 deletions
.docker/extra_requirements.txt
View file @ d72e3357
uwsgi==2.0.23
uwsgi==2.0.30
.gitlab-ci.yml
View file @ d72e3357
image: python:3.9
image: python:3.11
services:
- mysql
......@@ -26,10 +26,9 @@ cache:
- pip install pylint-gitlab pylint-django
- mysql --version
check:
migrations:
extends: .before_script_template
script:
- ./Utils/check.sh --all
- source venv/bin/activate
- ./manage.py makemigrations --dry-run --check
......@@ -38,7 +37,7 @@ test:
script:
- source venv/bin/activate
- echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql
- pip install pytest-cov unittest-xml-reporting
- pip install pytest-cov
- coverage run --source='.' manage.py test --settings AKPlanning.settings_ci
after_script:
- source venv/bin/activate
......
AKDashboard/locale/de_DE/LC_MESSAGES/django.po
View file @ d72e3357
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-16 16:30+0200\n"
"POT-Creation-Date: 2025-01-01 17:28+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -61,17 +61,22 @@ msgstr "Veranstaltung"
msgid "Event this button belongs to"
msgstr "Veranstaltung, zu der dieser Button gehört"
#: AKDashboard/templates/AKDashboard/dashboard.html:17
#: AKDashboard/templates/AKDashboard/dashboard.html:18
#: AKDashboard/templates/AKDashboard/dashboard_event.html:29
#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:53
msgid "Write to organizers of this event for questions and comments"
msgstr ""
"Kontaktiere die Organisator*innen des Events bei Fragen oder Kommentaren"
#: AKDashboard/templates/AKDashboard/dashboard.html:24
msgid "Old events"
msgstr "Frühere Veranstaltungen"
#: AKDashboard/templates/AKDashboard/dashboard.html:34
msgid "Currently, there are no Events!"
msgstr "Aktuell gibt es keine Events!"
#: AKDashboard/templates/AKDashboard/dashboard.html:27
#: AKDashboard/templates/AKDashboard/dashboard.html:37
msgid "Please contact an administrator if you want to use AKPlanning."
msgstr ""
"Bitte kontaktiere eine*n Administrator*in, falls du AKPlanning verwenden "
......@@ -81,46 +86,53 @@ msgstr ""
msgid "Recent"
msgstr "Kürzlich"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:12
#: AKDashboard/templates/AKDashboard/dashboard_row.html:18
#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:20
msgid "AK List"
msgstr "AK-Liste"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:23
#: AKDashboard/templates/AKDashboard/dashboard_row.html:29
msgid "Current AKs"
msgstr "Aktuelle AKs"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:30
#: AKDashboard/templates/AKDashboard/dashboard_row.html:36
msgid "AK Wall"
msgstr "AK-Wall"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:38
#: AKDashboard/templates/AKDashboard/dashboard_row.html:44
#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:30
msgid "Schedule"
msgstr "AK-Plan"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:49
#: AKDashboard/templates/AKDashboard/dashboard_row.html:55
msgid "AK Submission"
msgstr "AK-Einreichung"
#: AKDashboard/templates/AKDashboard/dashboard_row.html:57
#: AKDashboard/templates/AKDashboard/dashboard_row.html:63
#: AKDashboard/templates/AKDashboard/dashboard_row_old_event.html:39
msgid "AK History"
msgstr "AK-Verlauf"
#: AKDashboard/views.py:59
#: AKDashboard/templates/AKDashboard/dashboard_row.html:71
msgid "AK Preferences"
msgstr "AK-Präferenzen"
#: AKDashboard/views.py:69
#, python-format
msgid "New AK: %(ak)s."
msgstr "Neuer AK: %(ak)s."
#: AKDashboard/views.py:62
#: AKDashboard/views.py:72
#, python-format
msgid "AK \"%(ak)s\" edited."
msgstr "AK \"%(ak)s\" bearbeitet."
#: AKDashboard/views.py:65
#: AKDashboard/views.py:75
#, python-format
msgid "AK \"%(ak)s\" deleted."
msgstr "AK \"%(ak)s\" gelöscht."
#: AKDashboard/views.py:80
#: AKDashboard/views.py:90
#, python-format
msgid "AK \"%(ak)s\" (re-)scheduled."
msgstr "AK \"%(ak)s\" (um-)geplant."
AKDashboard/static/AKDashboard/style.css
View file @ d72e3357
......@@ -2,6 +2,10 @@
margin-bottom: 5em;
}
.dashboard-row-small {
margin-bottom: 3em;
}
.dashboard-row > .row {
margin-left: 0;
padding-bottom: 1em;
......
AKDashboard/templates/AKDashboard/dashboard.html
View file @ d72e3357
......@@ -9,16 +9,27 @@
{% endblock %}
{% block content %}
{% for event in events %}
<div class="dashboard-row">
{% include "AKDashboard/dashboard_row.html" %}
{% if event.contact_email %}
<p>
<a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</p>
{% endif %}
</div>
{% empty %}
{% include "messages.html" %}
{% if total_event_count > 0 %}
{% for event in active_and_current_events %}
<div class="dashboard-row">
{% include "AKDashboard/dashboard_row.html" %}
{% if event.contact_email %}
<p>
<a href="mailto:{{ event.contact_email }}">{% fa6_icon "envelope" "fas" %} {% trans "Write to organizers of this event for questions and comments" %}</a>
</p>
{% endif %}
</div>
{% endfor %}
{% if old_event_count > 0 %}
<h2 class="mb-3">{% trans "Old events" %}</h2>
{% for event in old_events %}
<div class="dashboard-row-small">
{% include "AKDashboard/dashboard_row_old_event.html" %}
</div>
{% endfor %}
{% endif %}
{% else %}
<div class="jumbotron">
<h2 class="display-4">
{% trans 'Currently, there are no Events!' %}
......@@ -27,5 +38,5 @@
{% trans 'Please contact an administrator if you want to use AKPlanning.' %}
</p>
</div>
{% endfor %}
{% endif %}
{% endblock %}
AKDashboard/templates/AKDashboard/dashboard_event.html
View file @ d72e3357
......@@ -12,6 +12,7 @@
{% endblock %}
{% block content %}
{% include "messages.html" %}
<div class="dashboard-row">
{% include "AKDashboard/dashboard_row.html" %}
......
AKDashboard/templates/AKDashboard/dashboard_row.html
View file @ d72e3357
......@@ -3,6 +3,12 @@
{% load fontawesome_6 %}
<h2><a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event.name }}</a></h2>
<h4 class="text-muted">
{% if event.place %}
<b>{{ event.place }} &middot;</b>
{% endif %}
{{ event | event_month_year }}
</h4>
<div class="mt-2">
{% if 'AKSubmission'|check_app_installed %}
<a class="dashboard-box btn btn-primary"
......@@ -57,6 +63,17 @@
<span class='text'>{% trans 'AK History' %}</span>
</div>
</a>
{% if 'AKPreference'|check_app_installed and event.active %}
{% if not event.poll_hidden or user.is_staff %}
<a class="dashboard-box btn btn-primary"
href="{% url 'poll:poll' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-poll"></span>
<span class='text'>{% trans 'AK Preferences' %}</span>
</div>
</a>
{% endif %}
{% endif %}
{% for button in event.dashboardbutton_set.all %}
<a class="dashboard-box btn btn-{{ button.get_color_display }}"
href="{{ button.url }}">
......
AKDashboard/templates/AKDashboard/dashboard_row_old_event.html 0 → 100644
View file @ d72e3357
{% 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>
AKDashboard/tests.py
View file @ d72e3357
import zoneinfo
from django.apps import apps
from django.test import TestCase, override_settings
from django.test import override_settings, TestCase
from django.urls import reverse
from django.utils.timezone import now
from AKDashboard.models import DashboardButton
from AKModel.models import Event, AK, AKCategory
from AKModel.tests import BasicViewTests
from AKModel.models import AK, AKCategory, Event
from AKModel.tests.test_views import BasicViewTests
class DashboardTests(TestCase):
"""
Specific Dashboard Tests
"""
@classmethod
def setUpTestData(cls):
"""
......@@ -20,17 +22,18 @@ class DashboardTests(TestCase):
"""
super().setUpTestData()
cls.event = Event.objects.create(
name="Dashboard Test Event",
slug="dashboardtest",
timezone=zoneinfo.ZoneInfo("Europe/Berlin"),
start=now(),
end=now(),
active=True,
plan_hidden=False,
name="Dashboard Test Event",
slug="dashboardtest",
timezone=zoneinfo.ZoneInfo("Europe/Berlin"),
start=now(),
end=now(),
active=True,
plan_hidden=False,
poll_hidden=False,
)
cls.default_category = AKCategory.objects.create(
name="Test Category",
event=cls.event,
name="Test Category",
event=cls.event,
)
def test_dashboard_view(self):
......@@ -62,12 +65,12 @@ class DashboardTests(TestCase):
# History should be empty
response = self.client.get(url)
self.assertQuerysetEqual(response.context["recent_changes"], [])
self.assertQuerySetEqual(response.context["recent_changes"], [])
AK.objects.create(
name="Test AK",
category=self.default_category,
event=self.event,
name="Test AK",
category=self.default_category,
event=self.event,
)
# History should now contain one AK (Test AK)
......@@ -90,7 +93,8 @@ class DashboardTests(TestCase):
self.event.save()
response = self.client.get(url_dashboard_index)
self.assertEqual(response.status_code, 200)
self.assertFalse(self.event in response.context["events"])
self.assertFalse(self.event in response.context["active_and_current_events"])
self.assertFalse(self.event in response.context["old_events"])
response = self.client.get(url_event_dashboard)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context["event"], self.event)
......@@ -100,7 +104,7 @@ class DashboardTests(TestCase):
self.event.save()
response = self.client.get(url_dashboard_index)
self.assertEqual(response.status_code, 200)
self.assertTrue(self.event in response.context["events"])
self.assertTrue(self.event in response.context["active_and_current_events"])
def test_active(self):
"""
......@@ -143,6 +147,26 @@ class DashboardTests(TestCase):
self.assertContains(response, "Current AKs")
self.assertContains(response, "AK Wall")
def test_poll_hidden(self):
"""
Test visibility of poll buttons with regard to poll visibility status for a given event
"""
url_event_dashboard = reverse('dashboard:dashboard_event', kwargs={"slug": self.event.slug})
if apps.is_installed('AKPreference'):
# Poll hidden? No buttons should show up
self.event.poll_hidden = True
self.event.save()
response = self.client.get(url_event_dashboard)
self.assertNotContains(response, "AK Preferences")
# Poll not hidden?
# Buttons to preference poll should be on the page
self.event.poll_hidden = False
self.event.save()
response = self.client.get(url_event_dashboard)
self.assertContains(response, "AK Preferences")
def test_dashboard_buttons(self):
"""
Make sure manually added buttons are displayed correctly
......@@ -153,8 +177,8 @@ class DashboardTests(TestCase):
self.assertNotContains(response, "Dashboard Button Test")
DashboardButton.objects.create(
text="Dashboard Button Test",
event=self.event
text="Dashboard Button Test",
event=self.event
)
response = self.client.get(url_event_dashboard)
......
AKDashboard/views.py
View file @ d72e3357
......@@ -22,7 +22,18 @@ class DashboardView(TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['events'] = Event.objects.filter(public=True).prefetch_related('dashboardbutton_set')
# Load events and split between active and current/featured events and those that should show smaller below
context["active_and_current_events"] = []
context["old_events"] = []
events = Event.objects.filter(public=True).order_by("-active", "-pk").prefetch_related('dashboardbutton_set')
for event in events:
if event.active or len(context["active_and_current_events"]) < settings.DASHBOARD_MAX_FEATURED_EVENTS:
context["active_and_current_events"].append(event)
else:
context["old_events"].append(event)
context["active_event_count"] = len(context["active_and_current_events"])
context["old_event_count"] = len(context["old_events"])
context["total_event_count"] = context["active_event_count"] + context["old_event_count"]
return context
......
AKModel/admin.py
View file @ d72e3357
......@@ -2,6 +2,8 @@ from django import forms
from django.apps import apps
from django.contrib import admin, messages
from django.contrib.admin import SimpleListFilter, RelatedFieldListFilter, action, display
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User # pylint: disable=E5142
from django.db.models import Count, F
from django.http import HttpResponseRedirect
from django.shortcuts import render, redirect
......@@ -15,10 +17,10 @@ from simple_history.admin import SimpleHistoryAdmin
from AKModel.availability.models import Availability
from AKModel.forms import RoomFormWithAvailabilities
from AKModel.models import Event, AKOwner, AKCategory, AKTrack, AKRequirement, AK, AKSlot, Room, AKOrgaMessage, \
ConstraintViolation, DefaultSlot
ConstraintViolation, DefaultSlot, AKType
from AKModel.urls import get_admin_urls_event_wizard, get_admin_urls_event
from AKModel.views.ak import AKResetInterestView, AKResetInterestCounterView
from AKModel.views.manage import CVMarkResolvedView, CVSetLevelViolationView, CVSetLevelWarningView
from AKModel.views.manage import CVMarkResolvedView, CVSetLevelViolationView, CVSetLevelWarningView, ClearScheduleView
class EventRelatedFieldListFilter(RelatedFieldListFilter):
......@@ -49,12 +51,16 @@ class EventAdmin(admin.ModelAdmin):
wizard.
"""
model = Event
list_display = ['name', 'status_url', 'place', 'start', 'end', 'active', 'plan_hidden']
list_display = ['name', 'status_url', 'place', 'start', 'end', 'active', 'plan_hidden', 'poll_hidden']
list_filter = ['active']
list_editable = ['active']
ordering = ['-start']
readonly_fields = ['status_url', 'plan_hidden', 'plan_published_at', 'toggle_plan_visibility']
actions = ['publish', 'unpublish']
readonly_fields = [
'status_url',
'plan_hidden', 'plan_published_at', 'toggle_plan_visibility',
'poll_hidden', 'poll_published_at', 'toggle_poll_visibility',
]
actions = ['publish_plan', 'unpublish_plan', 'publish_poll', 'unpublish_poll']
def add_view(self, request, form_url='', extra_context=None):
# Override
......@@ -79,6 +85,10 @@ class EventAdmin(admin.ModelAdmin):
from AKScheduling.urls import get_admin_urls_scheduling # pylint: disable=import-outside-toplevel
urls.extend(get_admin_urls_scheduling(self.admin_site))
if apps.is_installed("AKSolverInterface"):
from AKSolverInterface.urls import get_admin_urls_solver_interface # pylint: disable=import-outside-toplevel
urls.extend(get_admin_urls_solver_interface(self.admin_site))
# Make sure built-in URLs are available as well
urls.extend(super().get_urls())
return urls
......@@ -113,13 +123,31 @@ class EventAdmin(admin.ModelAdmin):
text = _('Unpublish plan')
return format_html("<a href='{url}'>{text}</a>", url=url, text=text)
@display(description=_("Toggle poll visibility"))
def toggle_poll_visibility(self, obj):
"""
Define a read-only field to toggle the visibility of the preference poll of this event
This will choose from two different link targets/views depending on the current visibility status
:param obj: event to change the visibility of the poll for
:return: toggling link (HTML)
:rtype: str
"""
if obj.poll_hidden:
url = f"{reverse_lazy('admin:poll-publish')}?pks={obj.pk}"
text = _('Publish preference poll')
else:
url = f"{reverse_lazy('admin:poll-unpublish')}?pks={obj.pk}"
text = _('Unpublish preference poll')
return format_html("<a href='{url}'>{text}</a>", url=url, text=text)
def get_form(self, request, obj=None, change=False, **kwargs):
# Override (update) form rendering to make sure the timezone of the event is used
timezone.activate(obj.timezone)
return super().get_form(request, obj, change, **kwargs)
@action(description=_('Publish plan'))
def publish(self, request, queryset):
def publish_plan(self, request, queryset):
"""
Admin action to publish the plan
"""
......@@ -127,7 +155,7 @@ class EventAdmin(admin.ModelAdmin):
return HttpResponseRedirect(f"{reverse_lazy('admin:plan-publish')}?pks={','.join(str(pk) for pk in selected)}")
@action(description=_('Unpublish plan'))
def unpublish(self, request, queryset):
def unpublish_plan(self, request, queryset):
"""
Admin action to hide the plan
"""
......@@ -135,6 +163,23 @@ class EventAdmin(admin.ModelAdmin):
return HttpResponseRedirect(
f"{reverse_lazy('admin:plan-unpublish')}?pks={','.join(str(pk) for pk in selected)}")
@action(description=_('Publish preference poll'))
def publish_poll(self, request, queryset):
"""
Admin action to publish the preference poll
"""
selected = queryset.values_list('pk', flat=True)
return HttpResponseRedirect(f"{reverse_lazy('admin:poll-publish')}?pks={','.join(str(pk) for pk in selected)}")
@action(description=_('Unpublish preference poll'))
def unpublish_poll(self, request, queryset):
"""
Admin action to hide the preference poll
"""
selected = queryset.values_list('pk', flat=True)
return HttpResponseRedirect(
f"{reverse_lazy('admin:poll-unpublish')}?pks={','.join(str(pk) for pk in selected)}")
class PrepopulateWithNextActiveEventMixin:
"""
......@@ -159,10 +204,24 @@ class AKOwnerAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
Admin interface for AKOwner
"""
model = AKOwner
list_display = ['name', 'institution', 'event']
list_display = ['name', 'institution', 'event', 'aks_url']
list_filter = ['event', 'institution']
list_editable = []
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)
......@@ -201,6 +260,18 @@ class AKRequirementAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
ordering = ['name']
@admin.register(AKType)
class AKTypeAdmin(PrepopulateWithNextActiveEventMixin, admin.ModelAdmin):
"""
Admin interface for AKRequirements
"""
model = AKType
list_display = ['name', 'event']
list_filter = ['event']
list_editable = []
ordering = ['name']
class WishFilter(SimpleListFilter):
"""
Re-usable filter for wishes
......@@ -243,6 +314,7 @@ class AKAdminForm(forms.ModelForm):
self.fields["requirements"].queryset = AKRequirement.objects.filter(event=self.instance.event)
self.fields["conflicts"].queryset = AK.objects.filter(event=self.instance.event)
self.fields["prerequisites"].queryset = AK.objects.filter(event=self.instance.event)
self.fields["types"].queryset = AKType.objects.filter(event=self.instance.event)
@admin.register(AK)
......@@ -257,7 +329,8 @@ class AKAdmin(PrepopulateWithNextActiveEventMixin, SimpleHistoryAdmin):
list_filter = ['event',
WishFilter,
('category', EventRelatedFieldListFilter),
('requirements', EventRelatedFieldListFilter)
('requirements', EventRelatedFieldListFilter),
('types', EventRelatedFieldListFilter),
]
list_editable = ['short_name', 'track', 'interest_counter']
ordering = ['pk']
......@@ -407,10 +480,11 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
"""
model = AKSlot
list_display = ['id', 'ak', 'room', 'start', 'duration', 'event']
list_filter = ['event', ('room', EventRelatedFieldListFilter)]
list_filter = ['event', "fixed", ('room', EventRelatedFieldListFilter)]
ordering = ['start']
readonly_fields = ['ak_details_link', 'updated']
form = AKSlotAdminForm
actions = ["reset_scheduling"]
@display(description=_('AK Details'))
def ak_details_link(self, akslot):
......@@ -426,6 +500,36 @@ class AKSlotAdmin(EventTimezoneFormMixin, PrepopulateWithNextActiveEventMixin, a
return mark_safe(str(link))
return "-"
def get_urls(self):
"""
Add additional URLs/views
"""
urls = [
path('clear-schedule/', ClearScheduleView.as_view(), name="clear-schedule"),
]
urls.extend(super().get_urls())
return urls
@action(description=_("Clear start/rooms"))
def reset_scheduling(self, request, queryset):
"""
Action: Reset start and room field for the given AKs
Will use a typical admin confirmation view flow
"""
if queryset.filter(fixed=True).exists():
self.message_user(
request,
_(
"Cannot reset scheduling for fixed AKs. "
"Please make sure to filter out fixed AKs first."
),
messages.ERROR,
)
return redirect('admin:AKModel_akslot_changelist')
selected = queryset.values_list('pk', flat=True)
return HttpResponseRedirect(
f"{reverse_lazy('admin:clear-schedule')}?pks={','.join(str(pk) for pk in selected)}")
ak_details_link.short_description = _('AK Details')
......@@ -443,7 +547,7 @@ class AKOrgaMessageAdmin(admin.ModelAdmin):
"""
Admin interface for AKOrgaMessages
"""
list_display = ['timestamp', 'ak', 'text']
list_display = ['timestamp', 'ak', 'text', 'resolved']
list_filter = ['ak__event']
readonly_fields = ['timestamp', 'ak', 'text']
......@@ -541,3 +645,41 @@ class DefaultSlotAdmin(EventTimezoneFormMixin, admin.ModelAdmin):
list_display = ['start_simplified', 'end_simplified', 'event']
list_filter = ['event']
form = DefaultSlotAdminForm
# Define a new User admin
class UserAdmin(BaseUserAdmin):
"""
Admin interface for Users
Enhances the built-in UserAdmin with additional actions to activate and deactivate users and a custom selection
of displayed properties in overview list
"""
list_display = ["username", "email", "is_active", "is_staff", "is_superuser"]
actions = ['activate', 'deactivate']
@admin.action(description=_("Activate selected users"))
def activate(self, request, queryset):
"""
Bulk activate users
:param request: HTTP request
:param queryset: queryset containing all users that should be activated
"""
queryset.update(is_active=True)
self.message_user(request, _("The selected users have been activated."))
@admin.action(description=_("Deactivate selected users"))
def deactivate(self, request, queryset):
"""
Bulk deactivate users
:param request: HTTP request
:param queryset: queryset containing all users that should be deactivated
"""
queryset.update(is_active=False)
self.message_user(request, _("The selected users have been deactivated."))
# Re-register UserAdmin
admin.site.unregister(User)
admin.site.register(User, UserAdmin)
AKModel/availability/forms.py
View file @ d72e3357
......@@ -12,7 +12,7 @@ from django.utils.dateparse import parse_datetime
from django.utils.translation import gettext_lazy as _
from AKModel.availability.models import Availability
from AKModel.availability.serializers import AvailabilitySerializer
from AKModel.availability.serializers import AvailabilityFormSerializer
from AKModel.models import Event
......@@ -41,22 +41,11 @@ class AvailabilitiesFormMixin(forms.Form):
:rtype: str
"""
if instance:
availabilities = AvailabilitySerializer(
instance.availabilities.all(), many=True
).data
availabilities = instance.availabilities.all()
else:
availabilities = []
return json.dumps(
{
'availabilities': availabilities,
'event': {
# 'timezone': event.timezone,
'date_from': str(event.start),
'date_to': str(event.end),
},
}
)
return json.dumps(AvailabilityFormSerializer((availabilities, event)).data)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
......@@ -65,9 +54,10 @@ class AvailabilitiesFormMixin(forms.Form):
if isinstance(self.event, int):
self.event = Event.objects.get(pk=self.event)
initial = kwargs.pop('initial', {})
initial['availabilities'] = self._serialize(self.event, kwargs['instance'])
if 'availabilities' not in initial:
initial['availabilities'] = self._serialize(self.event, kwargs.get('instance'))
if not isinstance(self, forms.BaseModelForm):
kwargs.pop('instance')
kwargs.pop('instance', None)
kwargs['initial'] = initial
def _parse_availabilities_json(self, jsonavailabilities):
......@@ -183,7 +173,7 @@ class AvailabilitiesFormMixin(forms.Form):
for avail in availabilities:
setattr(avail, reference_name, instance.id)
def _replace_availabilities(self, instance, availabilities: [Availability]):
def _replace_availabilities(self, instance, availabilities: list[Availability]):
"""
Replace the existing list of availabilities belonging to an entity with a new, updated one
......
AKModel/availability/models.py
View file @ d72e3357
......@@ -11,6 +11,8 @@ from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _
from AKModel.models import Event, AKOwner, Room, AK, AKCategory
# TODO: Decouple from AKPreference app
from AKPreference.models import EventParticipant
zero_time = datetime.time(0, 0)
......@@ -24,6 +26,7 @@ zero_time = datetime.time(0, 0)
# enable availabilities for AKs and AKCategories
# add verbose names and help texts to model attributes
# adapt or extemd documentation
# add participants
class Availability(models.Model):
......@@ -79,20 +82,48 @@ class Availability(models.Model):
verbose_name=_('AK Category'),
help_text=_('AK Category whose availability this is'),
)
participant = models.ForeignKey(
to=EventParticipant,
related_name='availabilities',
on_delete=models.CASCADE,
null=True,
blank=True,
verbose_name=_('Participant'),
help_text=_('Participant whose availability this is'),
)
start = models.DateTimeField()
end = models.DateTimeField()
def __str__(self) -> str:
person = self.person.name if self.person else None
participant = str(self.participant) if self.participant else None
room = getattr(self.room, 'name', None)
event = getattr(getattr(self, 'event', None), 'name', None)
ak = getattr(self.ak, 'name', None)
ak_category = getattr(self.ak_category, 'name', None)
return f'Availability(event={event}, person={person}, room={room}, ak={ak}, ak category={ak_category})'
arg_list = [
f"event={event}",
f"person={person}",
f"room={room}",
f"ak={ak}",
f"ak category={ak_category}",
f"participant={participant}",
]
return f'Availability({", ".join(arg_list)})'
def __hash__(self):
return hash(
(getattr(self, 'event', None), self.person, self.room, self.ak, self.ak_category, self.start, self.end))
(
getattr(self, 'event', None),
self.person,
self.room,
self.ak,
self.ak_category,
self.participant,
self.start,
self.end,
)
)
def __eq__(self, other: 'Availability') -> bool:
"""Comparisons like ``availability1 == availability2``.
......@@ -103,7 +134,7 @@ class Availability(models.Model):
return all(
(
getattr(self, attribute, None) == getattr(other, attribute, None)
for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'start', 'end']
for attribute in ['event', 'person', 'room', 'ak', 'ak_category', 'participant', 'start', 'end']
)
)
......@@ -151,9 +182,12 @@ class Availability(models.Model):
if not other.overlaps(self, strict=False):
raise Exception('Only overlapping Availabilities can be merged.')
return Availability(
avail = Availability(
start=min(self.start, other.start), end=max(self.end, other.end)
)
if self.event == other.event:
avail.event = self.event
return avail
def __or__(self, other: 'Availability') -> 'Availability':
"""Performs the merge operation: ``availability1 | availability2``"""
......@@ -168,9 +202,12 @@ class Availability(models.Model):
if not other.overlaps(self, False):
raise Exception('Only overlapping Availabilities can be intersected.')
return Availability(
avail = Availability(
start=max(self.start, other.start), end=min(self.end, other.end)
)
if self.event == other.event:
avail.event = self.event
return avail
def __and__(self, other: 'Availability') -> 'Availability':
"""Performs the intersect operation: ``availability1 &
......@@ -247,7 +284,15 @@ class Availability(models.Model):
f'{self.end.astimezone(self.event.timezone).strftime("%a %H:%M")}')
@classmethod
def with_event_length(cls, event, person=None, room=None, ak=None, ak_category=None):
def with_event_length(
cls,
event: Event,
person: AKOwner | None = None,
room: Room | None = None,
ak: AK | None = None,
ak_category: AKCategory | None = None,
participant: EventParticipant | None = None,
) -> "Availability":
"""
Create an availability covering exactly the time between event start and event end.
Can e.g., be used to create default availabilities.
......@@ -265,7 +310,31 @@ class Availability(models.Model):
timeframe_end = event.end # adapt to our event model
timeframe_end = timeframe_end + datetime.timedelta(days=1)
return Availability(start=timeframe_start, end=timeframe_end, event=event, person=person,
room=room, ak=ak, ak_category=ak_category)
room=room, ak=ak, ak_category=ak_category, participant=participant)
def is_covered(self, availabilities: List['Availability']):
"""Check if list of availibilities cover this object.
:param availabilities: availabilities to check.
:return: whether the availabilities cover full event.
:rtype: bool
"""
avail_union = Availability.union(availabilities)
return any(avail.contains(self) for avail in avail_union)
@classmethod
def is_event_covered(cls, event: Event, availabilities: List['Availability']) -> bool:
"""Check if list of availibilities cover whole event.
:param event: event to check.
:param availabilities: availabilities to check.
:return: whether the availabilities cover full event.
:rtype: bool
"""
# NOTE: Cannot use `Availability.with_event_length` as its end is the
# event end + 1 day
full_event = Availability(event=event, start=event.start, end=event.end)
return full_event.is_covered(availabilities)
class Meta:
verbose_name = _('Availability')
......
AKModel/availability/serializers.py
View file @ d72e3357
......@@ -4,9 +4,10 @@
# Documentation was mainly added by us, other changes are marked in the code
from django.utils import timezone
from rest_framework.fields import SerializerMethodField
from rest_framework.serializers import ModelSerializer
from rest_framework.serializers import BaseSerializer, ModelSerializer
from AKModel.availability.models import Availability
from AKModel.models import Event
class AvailabilitySerializer(ModelSerializer):
......@@ -44,3 +45,28 @@ class AvailabilitySerializer(ModelSerializer):
class Meta:
model = Availability
fields = ('id', 'start', 'end', 'allDay')
class AvailabilityFormSerializer(BaseSerializer):
"""Serializer to configure an availability form."""
def create(self, validated_data):
raise ValueError("`AvailabilityFormSerializer` is read-only.")
def to_internal_value(self, data):
raise ValueError("`AvailabilityFormSerializer` is read-only.")
def update(self, instance, validated_data):
raise ValueError("`AvailabilityFormSerializer` is read-only.")
def to_representation(self, instance: tuple[Availability, Event], **kwargs):
availabilities, event = instance
return {
'availabilities': AvailabilitySerializer(availabilities, many=True).data,
'event': {
# 'timezone': event.timezone,
'date_from': str(event.start),
'date_to': str(event.end),
},
}
AKModel/fixtures/model.json
View file @ d72e3357
......@@ -93,7 +93,7 @@
"model": "AKModel.akcategory",
"pk": 1,
"fields": {
"name": "Spa▀",
"name": "Spaß",
"color": "275246",
"description": "",
"present_by_default": true,
......@@ -115,7 +115,7 @@
"model": "AKModel.akcategory",
"pk": 3,
"fields": {
"name": "Spa▀/Kultur",
"name": "Spaß/Kultur",
"color": "333333",
"description": "",
"present_by_default": true,
......@@ -193,6 +193,15 @@
"event": 2
}
},
{
"model": "AKModel.aktype",
"pk": 1,
"fields": {
"name": "Input",
"event": 2,
"slug": "input"
}
},
{
"model": "AKModel.historicalak",
"pk": 1,
......@@ -206,7 +215,6 @@
"reso": false,
"present": true,
"notes": "",
"interest": -1,
"category": 4,
"track": null,
"event": 2,
......@@ -229,7 +237,6 @@
"reso": false,
"present": true,
"notes": "",
"interest": -1,
"category": 4,
"track": null,
"event": 2,
......@@ -252,7 +259,6 @@
"reso": false,
"present": null,
"notes": "",
"interest": -1,
"category": 5,
"track": null,
"event": 2,
......@@ -275,7 +281,6 @@
"reso": false,
"present": null,
"notes": "",
"interest": -1,
"category": 5,
"track": null,
"event": 2,
......@@ -298,7 +303,6 @@
"reso": false,
"present": null,
"notes": "We need to find a volunteer first...",
"interest": -1,
"category": 3,
"track": null,
"event": 2,
......@@ -321,7 +325,6 @@
"reso": false,
"present": null,
"notes": "We need to find a volunteer first...",
"interest": -1,
"category": 3,
"track": null,
"event": 2,
......@@ -344,7 +347,6 @@
"reso": false,
"present": null,
"notes": "",
"interest": -1,
"category": 5,
"track": 1,
"event": 2,
......@@ -436,6 +438,62 @@
]
}
},
{
"model": "AKModel.ak",
"pk": 4,
"fields": {
"name": "Test AK fixed slots",
"short_name": "testfixed",
"description": "",
"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": "",
"link": "",
"protocol_link": "",
"category": 2,
"track": null,
"reso": false,
"present": true,
"notes": "",
"interest": -1,
"interest_counter": 0,
"include_in_export": false,
"event": 1,
"owners": [
3
],
"requirements": [
2
],
"conflicts": [],
"prerequisites": []
}
},
{
"model": "AKModel.room",
"pk": 1,
......@@ -460,6 +518,19 @@
"properties": []
}
},
{
"model": "AKModel.room",
"pk": 3,
"fields": {
"name": "BBB Session 1",
"location": "",
"capacity": -1,
"event": 1,
"properties": [
2
]
}
},
{
"model": "AKModel.akslot",
"pk": 1,
......@@ -525,6 +596,58 @@
"updated": "2022-12-02T12:23:11.856Z"
}
},
{
"model": "AKModel.akslot",
"pk": 6,
"fields": {
"ak": 4,
"room": null,
"start": "2020-11-08T18:30:00Z",
"duration": "2.00",
"fixed": true,
"event": 2,
"updated": "2022-12-02T12:23:11.856Z"
}
},
{
"model": "AKModel.akslot",
"pk": 7,
"fields": {
"ak": 4,
"room": 2,
"start": null,
"duration": "2.00",
"fixed": true,
"event": 2,
"updated": "2022-12-02T12:23:11.856Z"
}
},
{
"model": "AKModel.akslot",
"pk": 8,
"fields": {
"ak": 4,
"room": 2,
"start": "2020-11-07T16:00:00Z",
"duration": "2.00",
"fixed": true,
"event": 2,
"updated": "2022-12-02T12:23:11.856Z"
}
},
{
"model": "AKModel.akslot",
"pk": 9,
"fields": {
"ak": 5,
"room": null,
"start": null,
"duration": "2.00",
"fixed": false,
"event": 1,
"updated": "2022-12-02T12:23:11.856Z"
}
},
{
"model": "AKModel.constraintviolation",
"pk": 1,
......@@ -668,5 +791,71 @@
"start": "2020-11-07T18:30:00Z",
"end": "2020-11-07T21:30:00Z"
}
},
{
"model": "AKModel.availability",
"pk": 7,
"fields": {
"event": 1,
"person": null,
"room": null,
"ak": 5,
"ak_category": null,
"start": "2020-10-01T17:41:22Z",
"end": "2020-10-04T17:41:30Z"
}
},
{
"model": "AKModel.availability",
"pk": 8,
"fields": {
"event": 1,
"person": null,
"room": 3,
"ak": null,
"ak_category": null,
"start": "2020-10-01T17:41:22Z",
"end": "2020-10-04T17:41:30Z"
}
},
{
"model": "AKModel.defaultslot",
"pk": 1,
"fields": {
"event": 2,
"start": "2020-11-07T08:00:00Z",
"end": "2020-11-07T12:00:00Z",
"primary_categories": [5]
}
},
{
"model": "AKModel.defaultslot",
"pk": 2,
"fields": {
"event": 2,
"start": "2020-11-07T14:00:00Z",
"end": "2020-11-07T17:00:00Z",
"primary_categories": [4]
}
},
{
"model": "AKModel.defaultslot",
"pk": 3,
"fields": {
"event": 2,
"start": "2020-11-08T08:00:00Z",
"end": "2020-11-08T19:00:00Z",
"primary_categories": [4, 5]
}
},
{
"model": "AKModel.defaultslot",
"pk": 4,
"fields": {
"event": 2,
"start": "2020-11-09T17:00:00Z",
"end": "2020-11-10T01:00:00Z",
"primary_categories": [4, 5, 3]
}
}
]
AKModel/forms.py
View file @ d72e3357
......@@ -10,7 +10,7 @@ from django.forms.utils import ErrorList
from django.utils.translation import gettext_lazy as _
from AKModel.availability.forms import AvailabilitiesFormMixin
from AKModel.models import Event, AKCategory, AKRequirement, Room
from AKModel.models import Event, AKCategory, AKRequirement, Room, AKType
class DateTimeInput(forms.DateInput):
......@@ -34,9 +34,10 @@ class NewEventWizardStartForm(forms.ModelForm):
"""
class Meta:
model = Event
fields = ['name', 'slug', 'timezone', 'plan_hidden']
fields = ['name', 'slug', 'timezone', 'plan_hidden', 'poll_hidden']
widgets = {
'plan_hidden': forms.HiddenInput(),
'poll_hidden': forms.HiddenInput(),
}
# Special hidden field for wizard state handling
......@@ -53,7 +54,7 @@ class NewEventWizardSettingsForm(forms.ModelForm):
class Meta:
model = Event
fields = "__all__"
exclude = ['plan_published_at']
exclude = ['plan_published_at', 'poll_published_at']
widgets = {
'name': forms.HiddenInput(),
'slug': forms.HiddenInput(),
......@@ -65,6 +66,7 @@ class NewEventWizardSettingsForm(forms.ModelForm):
'interest_end': DateTimeInput(),
'reso_deadline': DateTimeInput(),
'plan_hidden': forms.HiddenInput(),
'poll_hidden': forms.HiddenInput(),
}
......@@ -101,6 +103,13 @@ class NewEventWizardImportForm(forms.Form):
required=False,
)
import_types = forms.ModelMultipleChoiceField(
queryset=AKType.objects.all(),
widget=forms.CheckboxSelectMultiple,
label=_("Copy types"),
required=False,
)
# pylint: disable=too-many-arguments
def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList,
label_suffix=None, empty_permitted=False, field_order=None, use_required_attribute=None,
......@@ -111,6 +120,8 @@ class NewEventWizardImportForm(forms.Form):
event=self.initial["import_event"])
self.fields["import_requirements"].queryset = self.fields["import_requirements"].queryset.filter(
event=self.initial["import_event"])
self.fields["import_types"].queryset = self.fields["import_types"].queryset.filter(
event=self.initial["import_event"])
# pylint: disable=import-outside-toplevel
# Local imports used to prevent cyclic imports and to only import when AKDashboard is available
......@@ -164,6 +175,18 @@ class SlideExportForm(AdminIntermediateForm):
initial=3,
label=_("# next AKs"),
help_text=_("How many next AKs should be shown on a slide?"))
types = forms.MultipleChoiceField(
label=_("AK Types"),
help_text=_("Which AK types should be included in the slides?"),
widget=forms.CheckboxSelectMultiple,
choices=[],
required=False)
types_all_selected_only = forms.BooleanField(
initial=False,
label=_("Only show AKs with all selected types?"),
help_text=_("If checked, only AKs that have all selected types will be shown in the slides. "
"If unchecked, AKs with at least one of the selected types will be shown."),
required=False)
presentation_mode = forms.TypedChoiceField(
initial=False,
label=_("Presentation only?"),
......
AKModel/locale/de_DE/LC_MESSAGES/django.po
View file @ d72e3357
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-21 16:43+0200\n"
"POT-Creation-Date: 2025-06-18 12:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\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:35
#: AKModel/templates/admin/AKModel/event_wizard/created_prepare_import.html:51
#: AKModel/templates/admin/AKModel/event_wizard/finish.html:21
......@@ -21,63 +21,110 @@ msgstr ""
msgid "Status"
msgstr "Status"
#: AKModel/admin.py:98
#: AKModel/admin.py:108
msgid "Toggle plan visibility"
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:163
msgid "Publish plan"
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:176
msgid "Unpublish plan"
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:189
msgid "Publish preference poll"
msgstr "Präferenzen-Abfrage veröffentlichen"
#: AKModel/admin.py:141 AKModel/admin.py:174 AKModel/views/manage.py:202
msgid "Unpublish preference poll"
msgstr "Präferenzen-Abfrage verbergen"
#: AKModel/admin.py:213 AKModel/models.py:788 AKModel/models.py:1239
#: AKModel/templates/admin/AKModel/aks_by_user.html:12
#: AKModel/templates/admin/AKModel/status/event_aks.html:10
#: AKModel/views/manage.py:97 AKModel/views/status.py:102
msgid "AKs"
msgstr "AKs"
#: AKModel/admin.py:279
msgid "Wish"
msgstr "AK-Wunsch"
#: AKModel/admin.py:214
#: AKModel/admin.py:285
msgid "Is wish"
msgstr "Ist ein Wunsch"
#: AKModel/admin.py:215
#: AKModel/admin.py:286
msgid "Is not a wish"
msgstr "Ist kein Wunsch"
#: AKModel/admin.py:274
#: AKModel/admin.py:347
msgid "Export to wiki syntax"
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."
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"
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"
msgstr "Interessenszähler der AKs zurücksetzen"
#: AKModel/admin.py:415 AKModel/admin.py:429
#: AKModel/admin.py:488 AKModel/admin.py:502
msgid "AK Details"
msgstr "AK-Details"
#: AKModel/admin.py:491 AKModel/views/manage.py:99
#: AKModel/admin.py:454
msgid "Clear start/rooms"
msgstr "Zugewiesenen Start/Räume zurücksetzen"
#: AKModel/admin.py:464
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:564 AKModel/views/manage.py:124
msgid "Mark Constraint Violations as manually resolved"
msgstr "Markiere Constraintverletzungen als manuell behoben"
#: AKModel/admin.py:500 AKModel/views/manage.py:112
#: AKModel/admin.py:573 AKModel/views/manage.py:137
msgid "Set Constraint Violations to level \"violation\""
msgstr "Constraintverletzungen auf Level \"Violation\" setzen"
#: AKModel/admin.py:509 AKModel/views/manage.py:125
#: AKModel/admin.py:582 AKModel/views/manage.py:150
msgid "Set Constraint Violations to level \"warning\""
msgstr "Constraintverletzungen auf Level \"Warning\" setzen"
#: AKModel/availability/forms.py:25 AKModel/availability/models.py:271
#: AKModel/admin.py:629
msgid "Activate selected users"
msgstr "Ausgewählte Benutzer*innen aktivieren"
#: AKModel/admin.py:638
msgid "The selected users have been activated."
msgstr "Benutzer*innen aktiviert"
#: AKModel/admin.py:640
msgid "Deactivate selected users"
msgstr "Ausgewählte Benutzer*innen deaktivieren"
#: AKModel/admin.py:649
msgid "The selected users have been deactivated."
msgstr "Benutzer*innen deaktiviert"
#: AKModel/availability/forms.py:25 AKModel/availability/models.py:340
msgid "Availability"
msgstr "Verfügbarkeit"
......@@ -90,121 +137,143 @@ msgstr ""
"Doppelt klicken um Einträge zu löschen. Oder Start- und End-Eingabe "
"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."
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."
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!"
msgstr "Bitte Verfügbarkeiten eintragen!"
#: AKModel/availability/models.py:43 AKModel/models.py:60 AKModel/models.py:174
#: AKModel/models.py:251 AKModel/models.py:270 AKModel/models.py:296
#: AKModel/models.py:350 AKModel/models.py:481 AKModel/models.py:520
#: AKModel/models.py:602 AKModel/models.py:657 AKModel/models.py:848
#: AKModel/availability/models.py:46 AKModel/models.py:182
#: AKModel/models.py:563 AKModel/models.py:640 AKModel/models.py:673
#: AKModel/models.py:701 AKModel/models.py:720 AKModel/models.py:778
#: AKModel/models.py:947 AKModel/models.py:1012 AKModel/models.py:1177
#: AKModel/models.py:1235 AKModel/models.py:1427
msgid "Event"
msgstr "Event"
#: AKModel/availability/models.py:44 AKModel/models.py:175
#: AKModel/models.py:252 AKModel/models.py:271 AKModel/models.py:297
#: AKModel/models.py:351 AKModel/models.py:482 AKModel/models.py:521
#: AKModel/models.py:603 AKModel/models.py:658 AKModel/models.py:849
#: AKModel/availability/models.py:47 AKModel/models.py:564
#: AKModel/models.py:641 AKModel/models.py:674 AKModel/models.py:702
#: AKModel/models.py:721 AKModel/models.py:779 AKModel/models.py:948
#: AKModel/models.py:1013 AKModel/models.py:1178 AKModel/models.py:1236
#: AKModel/models.py:1428
msgid "Associated event"
msgstr "Zugehöriges Event"
#: AKModel/availability/models.py:52
#: AKModel/availability/models.py:55
msgid "Person"
msgstr "Person"
#: AKModel/availability/models.py:53
#: AKModel/availability/models.py:56
msgid "Person whose availability this is"
msgstr "Person deren Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:61 AKModel/models.py:485
#: AKModel/models.py:510 AKModel/models.py:667
#: AKModel/availability/models.py:64 AKModel/models.py:951
#: AKModel/models.py:1002 AKModel/models.py:1245
msgid "Room"
msgstr "Raum"
#: AKModel/availability/models.py:62
#: AKModel/availability/models.py:65
msgid "Room whose availability this is"
msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
#: AKModel/availability/models.py:70 AKModel/models.py:359
#: AKModel/models.py:509 AKModel/models.py:597
#: AKModel/availability/models.py:73 AKModel/models.py:787
#: AKModel/models.py:1001 AKModel/models.py:1172
msgid "AK"
msgstr "AK"
#: AKModel/availability/models.py:71
#: AKModel/availability/models.py:74
msgid "AK whose availability this is"
msgstr "Verfügbarkeiten"
#: AKModel/availability/models.py:79 AKModel/models.py:255
#: AKModel/models.py:673
#: AKModel/availability/models.py:82 AKModel/models.py:644
#: AKModel/models.py:1251
msgid "AK Category"
msgstr "AK-Kategorie"
#: AKModel/availability/models.py:80
#: AKModel/availability/models.py:83
msgid "AK Category whose availability this is"
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"
msgstr "Verfügbarkeiten"
#: AKModel/forms.py:78
#: AKModel/forms.py:80
msgid "Copy ak requirements and ak categories of existing event"
msgstr "AK-Anforderungen und AK-Kategorien eines existierenden Events kopieren"
#: AKModel/forms.py:79
#: AKModel/forms.py:81
msgid "You can choose what to copy in the next step"
msgstr ""
"Im nächsten Schritt kann ausgewählt werden, was genau kopiert werden soll"
#: AKModel/forms.py:93
#: AKModel/forms.py:95
msgid "Copy ak categories"
msgstr "AK-Kategorien kopieren"
#: AKModel/forms.py:100
#: AKModel/forms.py:102
msgid "Copy ak requirements"
msgstr "AK-Anforderungen kopieren"
#: AKModel/forms.py:124
#: AKModel/forms.py:109
msgid "Copy types"
msgstr "Typen kopieren"
#: AKModel/forms.py:135
msgid "Copy dashboard buttons"
msgstr "Dashboard-Buttons kopieren"
#: AKModel/forms.py:165
#: AKModel/forms.py:176
msgid "# next AKs"
msgstr "# nächste AKs"
#: AKModel/forms.py:166
#: AKModel/forms.py:177
msgid "How many next AKs should be shown on a slide?"
msgstr "Wie viele nächste AKs sollen auf einer Folie angezeigt werden?"
#: AKModel/forms.py:169
#: AKModel/forms.py:179 AKModel/models.py:725
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 "Presentation only?"
msgstr "Nur Vorstellung?"
#: AKModel/forms.py:171 AKModel/forms.py:178
#: AKModel/forms.py:188 AKModel/forms.py:195
msgid "Yes"
msgstr "Ja"
#: AKModel/forms.py:171 AKModel/forms.py:178
#: AKModel/forms.py:188 AKModel/forms.py:195
msgid "No"
msgstr "Nein"
#: AKModel/forms.py:173
#: AKModel/forms.py:190
msgid "Restrict AKs to those that asked for chance to be presented?"
msgstr "AKs auf solche, die um eine Vorstellung gebeten haben, einschränken?"
#: AKModel/forms.py:176
#: AKModel/forms.py:193
msgid "Space for notes in wishes?"
msgstr "Platz für Notizen bei den Wünschen?"
#: AKModel/forms.py:180
#: AKModel/forms.py:197
msgid ""
"Create symbols indicating space to note down owners and timeslots for "
"wishes, e.g., to be filled out on a touch screen while presenting?"
......@@ -213,11 +282,11 @@ msgstr ""
"fürWünsche markieren, z.B. um während der Präsentation auf einem Touchscreen "
"ausgefüllt zu werden?"
#: AKModel/forms.py:189 AKModel/models.py:842
#: AKModel/forms.py:206 AKModel/models.py:1421
msgid "Default Slots"
msgstr "Standardslots"
#: AKModel/forms.py:191
#: AKModel/forms.py:208
msgid ""
"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."
......@@ -226,11 +295,11 @@ msgstr ""
"Einträge zu löschen. Oder Start- und End-Eingabe verwenden, um der "
"Kalenderansicht neue Einträge hinzuzufügen."
#: AKModel/forms.py:207
#: AKModel/forms.py:224
msgid "New rooms"
msgstr "Neue Räume"
#: AKModel/forms.py:208
#: AKModel/forms.py:225
msgid ""
"Enter room details in CSV format. Required colum is \"name\", optional "
"colums are \"location\", \"capacity\", and \"url\" for online/hybrid rooms. "
......@@ -240,19 +309,19 @@ msgstr ""
"Spalten sind \"location\", \"capacity\", und \"url\" for Online-/"
"HybridräumeTrennzeichen: Semikolon"
#: AKModel/forms.py:214
#: AKModel/forms.py:231
msgid "Default availabilities?"
msgstr "Standardverfügbarkeiten?"
#: AKModel/forms.py:215
#: AKModel/forms.py:232
msgid "Create default availabilities for all rooms?"
msgstr "Standardverfügbarkeiten für alle Räume anlegen?"
#: AKModel/forms.py:231
#: AKModel/forms.py:248
msgid "CSV must contain a name column"
msgstr "CSV muss eine name-Spalte enthalten"
#: AKModel/metaviews/admin.py:156 AKModel/models.py:29
#: AKModel/metaviews/admin.py:156 AKModel/models.py:138
msgid "Start"
msgstr "Start"
......@@ -277,138 +346,176 @@ msgstr "Aktivieren?"
msgid "Finish"
msgstr "Abschluss"
#: AKModel/models.py:20 AKModel/models.py:243 AKModel/models.py:267
#: AKModel/models.py:294 AKModel/models.py:312 AKModel/models.py:473
#: AKModel/models.py:24
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:129 AKModel/models.py:632 AKModel/models.py:670
#: AKModel/models.py:697 AKModel/models.py:718 AKModel/models.py:736
#: AKModel/models.py:939
msgid "Name"
msgstr "Name"
#: AKModel/models.py:21
#: AKModel/models.py:130
msgid "Name or iteration of the event"
msgstr "Name oder Iteration des Events"
#: AKModel/models.py:22
#: AKModel/models.py:131
msgid "Short Form"
msgstr "Kurzer Name"
#: AKModel/models.py:23
#: AKModel/models.py:132
msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs."
msgstr ""
"Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur "
"Nutzung in URLs"
#: AKModel/models.py:25
#: AKModel/models.py:134
msgid "Place"
msgstr "Ort"
#: AKModel/models.py:26
#: AKModel/models.py:135
msgid "City etc. the event takes place in"
msgstr "Stadt o.ä. in der das Event stattfindet"
#: AKModel/models.py:28
#: AKModel/models.py:137
msgid "Time Zone"
msgstr "Zeitzone"
#: AKModel/models.py:28
#: AKModel/models.py:137
msgid "Time Zone where this event takes place in"
msgstr "Zeitzone in der das Event stattfindet"
#: AKModel/models.py:29
#: AKModel/models.py:138
msgid "Time the event begins"
msgstr "Zeit zu der das Event beginnt"
#: AKModel/models.py:30
#: AKModel/models.py:139
msgid "End"
msgstr "Ende"
#: AKModel/models.py:30
#: AKModel/models.py:139
msgid "Time the event ends"
msgstr "Zeit zu der das Event endet"
#: AKModel/models.py:31
#: AKModel/models.py:140
msgid "Resolution Deadline"
msgstr "Resolutionsdeadline"
#: AKModel/models.py:32
#: AKModel/models.py:141
msgid "When should AKs with intention to submit a resolution be done?"
msgstr "Wann sollen AKs mit Resolutionsabsicht stattgefunden haben?"
#: AKModel/models.py:34
#: AKModel/models.py:143
msgid "Interest Window Start"
msgstr "Beginn Interessensbekundung"
#: AKModel/models.py:36
#: AKModel/models.py:145
msgid ""
"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."
"Ö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:38
#: AKModel/models.py:148
msgid "Interest Window End"
msgstr "Ende Interessensbekundung"
#: AKModel/models.py:39
#: AKModel/models.py:149
msgid "Closing time for expression of interest."
msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
#: AKModel/models.py:41
#: AKModel/models.py:151
msgid "Public event"
msgstr "Öffentliches Event"
#: AKModel/models.py:42
#: AKModel/models.py:152
msgid "Show this event on overview page."
msgstr "Zeige dieses Event auf der Übersichtseite an"
#: AKModel/models.py:44
#: AKModel/models.py:154
msgid "Active State"
msgstr "Aktiver Status"
#: AKModel/models.py:44
#: AKModel/models.py:154
msgid "Marks currently active events"
msgstr "Markiert aktuell aktive Events"
#: AKModel/models.py:45
#: AKModel/models.py:155
msgid "Plan Hidden"
msgstr "Plan verborgen"
#: AKModel/models.py:45
#: AKModel/models.py:155
msgid "Hides plan for non-staff users"
msgstr "Verbirgt den Plan für Nutzer*innen ohne erweiterte Rechte"
#: AKModel/models.py:47
#: AKModel/models.py:157
msgid "Plan published at"
msgstr "Plan veröffentlicht am/um"
#: AKModel/models.py:48
#: AKModel/models.py:158
msgid "Timestamp at which the plan was published"
msgstr "Zeitpunkt, zu dem der Plan veröffentlicht wurde"
#: AKModel/models.py:50
#: AKModel/models.py:160
msgid "Poll Hidden"
msgstr "Präferenzen-Abfrage verborgen"
#: AKModel/models.py:161
msgid "Hides preference poll for non-staff users"
msgstr ""
"Verbirgt die Präferenzen-Abfrage für Nutzer*innen ohne erweiterte Rechte"
#: AKModel/models.py:163
msgid "Poll published at"
msgstr "Präferenzen-Abfrage veröffentlicht am/um"
#: AKModel/models.py:164
msgid "Timestamp at which the preference poll was published"
msgstr "Zeitpunkt, zu dem die Präferenzen-Abfrage veröffentlicht wurde"
#: AKModel/models.py:166
msgid "Base URL"
msgstr "URL-Prefix"
#: AKModel/models.py:50
#: AKModel/models.py:166
msgid "Prefix for wiki link construction"
msgstr "Prefix für die automatische Generierung von Wiki-Links"
#: AKModel/models.py:51
#: AKModel/models.py:167
msgid "Wiki Export Template Name"
msgstr "Wiki-Export Templatename"
#: AKModel/models.py:52
#: AKModel/models.py:168
msgid "Default Slot Length"
msgstr "Standardslotlänge"
#: AKModel/models.py:53
#: AKModel/models.py:169
msgid "Default length in hours that is assumed for AKs in this event."
msgstr "Standardlänge von Slots (in Stunden) für dieses Event"
#: AKModel/models.py:55
#: AKModel/models.py:170
msgid "Export Slot Length"
msgstr "Export-Slotlänge"
#: AKModel/models.py:172
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"
msgstr "E-Mail Kontaktadresse"
#: AKModel/models.py:56
#: AKModel/models.py:178
msgid ""
"An email address that is displayed on every page and can be used for all "
"kinds of questions"
......@@ -416,75 +523,118 @@ msgstr ""
"Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von "
"Fragen genutzt werden kann"
#: AKModel/models.py:61
#: AKModel/models.py:183
msgid "Events"
msgstr "Events"
#: AKModel/models.py:169
#: AKModel/models.py:452
msgid "Cannot parse malformed JSON input."
msgstr "Kann fehlerhafte JSON-Eingabe nicht verarbeiten"
#: AKModel/models.py:459
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:476
#, 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:486
#, 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:500
#, 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:511
#, 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:556
msgid "Nickname"
msgstr "Spitzname"
#: AKModel/models.py:169
#: AKModel/models.py:558
msgid "Name to identify an AK owner by"
msgstr "Name, durch den eine AK-Leitung identifiziert wird"
#: AKModel/models.py:170
#: AKModel/models.py:559 AKModel/models.py:719
msgid "Slug"
msgstr "Slug"
#: AKModel/models.py:170
#: AKModel/models.py:559
msgid "Slug for URL generation"
msgstr "Slug für URL-Generierung"
#: AKModel/models.py:171
#: AKModel/models.py:560
msgid "Institution"
msgstr "Instutution"
msgstr "Institution"
#: AKModel/models.py:171
#: AKModel/models.py:560
msgid "Uni etc."
msgstr "Universität o.ä."
#: AKModel/models.py:172 AKModel/models.py:321
#: AKModel/models.py:561 AKModel/models.py:747
msgid "Web Link"
msgstr "Internet Link"
#: AKModel/models.py:172
#: AKModel/models.py:561
msgid "Link to Homepage"
msgstr "Link zu Homepage oder Webseite"
#: AKModel/models.py:178 AKModel/models.py:666
#: AKModel/models.py:567 AKModel/models.py:1244
msgid "AK Owner"
msgstr "AK-Leitung"
#: AKModel/models.py:179
#: AKModel/models.py:568
msgid "AK Owners"
msgstr "AK-Leitungen"
#: AKModel/models.py:243
#: AKModel/models.py:632
msgid "Name of the AK Category"
msgstr "Name der AK-Kategorie"
#: AKModel/models.py:244 AKModel/models.py:268
#: AKModel/models.py:633 AKModel/models.py:671
msgid "Color"
msgstr "Farbe"
#: AKModel/models.py:244 AKModel/models.py:268
#: AKModel/models.py:633 AKModel/models.py:671
msgid "Color for displaying"
msgstr "Farbe für die Anzeige"
#: AKModel/models.py:245 AKModel/models.py:315
#: AKModel/models.py:634 AKModel/models.py:741
msgid "Description"
msgstr "Beschreibung"
#: AKModel/models.py:246
#: AKModel/models.py:635
msgid "Short description of this AK Category"
msgstr "Beschreibung der AK-Kategorie"
#: AKModel/models.py:247
#: AKModel/models.py:636
msgid "Present by default"
msgstr "Defaultmäßig präsentieren"
#: AKModel/models.py:248
#: AKModel/models.py:637
msgid ""
"Present AKs of this category by default if AK owner did not specify whether "
"this AK should be presented?"
......@@ -492,132 +642,156 @@ msgstr ""
"AKs dieser Kategorie standardmäßig vorstellen, wenn die Leitungen das für "
"ihren AK nicht explizit spezifiziert haben?"
#: AKModel/models.py:256
#: AKModel/models.py:645
msgid "AK Categories"
msgstr "AK-Kategorien"
#: AKModel/models.py:267
#: AKModel/models.py:670
msgid "Name of the AK Track"
msgstr "Name des AK-Tracks"
#: AKModel/models.py:274
#: AKModel/models.py:677
msgid "AK Track"
msgstr "AK-Track"
#: AKModel/models.py:275
#: AKModel/models.py:678
msgid "AK Tracks"
msgstr "AK-Tracks"
#: AKModel/models.py:294
#: AKModel/models.py:697
msgid "Name of the Requirement"
msgstr "Name der Anforderung"
#: AKModel/models.py:300 AKModel/models.py:670
#: AKModel/models.py:698
msgid "Relevant for Participants?"
msgstr "Relevant für Teilnehmende?"
#: AKModel/models.py:699
msgid "Show this requirement when collecting participant preferences"
msgstr "Diese Voraussetzung anzeigen, wenn Präferenzen der Teilnehmenden abgefragt werden"
#: AKModel/models.py:705 AKModel/models.py:1248
msgid "AK Requirement"
msgstr "AK-Anforderung"
#: AKModel/models.py:301
#: AKModel/models.py:706
msgid "AK Requirements"
msgstr "AK-Anforderungen"
#: AKModel/models.py:312
#: AKModel/models.py:718
msgid "Name describing the type"
msgstr "Name, der den Typ beschreibt"
#: AKModel/models.py:724
msgid "AK Type"
msgstr "AK Typ"
#: AKModel/models.py:736
msgid "Name of the AK"
msgstr "Name des AKs"
#: AKModel/models.py:313
#: AKModel/models.py:738
msgid "Short Name"
msgstr "Kurzer Name"
#: AKModel/models.py:314
#: AKModel/models.py:740
msgid "Name displayed in the schedule"
msgstr "Name zur Anzeige im AK-Plan"
#: AKModel/models.py:315
#: AKModel/models.py:741
msgid "Description of the AK"
msgstr "Beschreibung des AKs"
#: AKModel/models.py:317
#: AKModel/models.py:743
msgid "Owners"
msgstr "Leitungen"
#: AKModel/models.py:318
#: AKModel/models.py:744
msgid "Those organizing the AK"
msgstr "Menschen, die den AK organisieren und halten"
#: AKModel/models.py:321
#: AKModel/models.py:747
msgid "Link to wiki page"
msgstr "Link zur Wiki Seite"
#: AKModel/models.py:322
#: AKModel/models.py:748
msgid "Protocol Link"
msgstr "Protokolllink"
#: AKModel/models.py:322
#: AKModel/models.py:748
msgid "Link to protocol"
msgstr "Link zum Protokoll"
#: AKModel/models.py:324
#: AKModel/models.py:750
msgid "Category"
msgstr "Kategorie"
#: AKModel/models.py:325
#: AKModel/models.py:751
msgid "Category of the AK"
msgstr "Kategorie des AKs"
#: AKModel/models.py:326
#: AKModel/models.py:752 AKModel/views/manage.py:67
msgid "Types"
msgstr "Typen"
#: AKModel/models.py:753
msgid "This AK is"
msgstr "Dieser AK ist"
#: AKModel/models.py:754
msgid "Track"
msgstr "Track"
#: AKModel/models.py:327
#: AKModel/models.py:755
msgid "Track the AK belongs to"
msgstr "Track zu dem der AK gehört"
#: AKModel/models.py:329
#: AKModel/models.py:757
msgid "Resolution Intention"
msgstr "Resolutionsabsicht"
#: AKModel/models.py:330
#: AKModel/models.py:758
msgid "Intends to submit a resolution"
msgstr "Beabsichtigt eine Resolution einzureichen"
#: AKModel/models.py:331
#: AKModel/models.py:759
msgid "Present this AK"
msgstr "AK präsentieren"
#: AKModel/models.py:332
#: AKModel/models.py:760
msgid "Present results of this AK"
msgstr "Die Ergebnisse dieses AKs vorstellen"
#: AKModel/models.py:334 AKModel/views/status.py:169
#: AKModel/models.py:762 AKModel/views/status.py:178
msgid "Requirements"
msgstr "Anforderungen"
#: AKModel/models.py:335
#: AKModel/models.py:763
msgid "AK's Requirements"
msgstr "Anforderungen des AKs"
#: AKModel/models.py:337
#: AKModel/models.py:765
msgid "Conflicting AKs"
msgstr "AK-Konflikte"
#: AKModel/models.py:338
#: AKModel/models.py:766
msgid "AKs that conflict and thus must not take place at the same time"
msgstr ""
"AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen"
#: AKModel/models.py:339
#: AKModel/models.py:767
msgid "Prerequisite AKs"
msgstr "Vorausgesetzte AKs"
#: AKModel/models.py:340
#: AKModel/models.py:768
msgid "AKs that should precede this AK in the schedule"
msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen"
#: AKModel/models.py:342
#: AKModel/models.py:770
msgid "Organizational Notes"
msgstr "Notizen zur Organisation"
#: AKModel/models.py:343
#: AKModel/models.py:771
msgid ""
"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/"
......@@ -627,287 +801,291 @@ msgstr ""
"Anmerkungen bitte den Button für Direktnachrichten verwenden (nach dem "
"Anlegen/Bearbeiten)."
#: AKModel/models.py:346
#: AKModel/models.py:774
msgid "Interest"
msgstr "Interesse"
#: AKModel/models.py:346
#: AKModel/models.py:774
msgid "Expected number of people"
msgstr "Erwartete Personenzahl"
#: AKModel/models.py:347
#: AKModel/models.py:775
msgid "Interest Counter"
msgstr "Interessenszähler"
#: AKModel/models.py:348
#: AKModel/models.py:776
msgid "People who have indicated interest online"
msgstr "Anzahl Personen, die online Interesse bekundet haben"
#: AKModel/models.py:353
#: AKModel/models.py:781
msgid "Export?"
msgstr "Export?"
#: AKModel/models.py:354
#: AKModel/models.py:782
msgid "Include AK in wiki export?"
msgstr "AK bei Wiki-Export berücksichtigen?"
#: AKModel/models.py:360 AKModel/models.py:661
#: 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:473
#: AKModel/models.py:939
msgid "Name or number of the room"
msgstr "Name oder Nummer des Raums"
#: AKModel/models.py:474
#: AKModel/models.py:940
msgid "Location"
msgstr "Ort"
#: AKModel/models.py:475
#: AKModel/models.py:941
msgid "Name or number of the location"
msgstr "Name oder Nummer des Ortes"
#: AKModel/models.py:476
#: AKModel/models.py:942
msgid "Capacity"
msgstr "Kapazität"
#: AKModel/models.py:477
#: AKModel/models.py:943
msgid "Maximum number of people (-1 for unlimited)."
msgstr "Maximale Personenzahl (-1 wenn unbeschränkt)."
#: AKModel/models.py:478
#: AKModel/models.py:944
msgid "Properties"
msgstr "Eigenschaften"
#: AKModel/models.py:479
#: AKModel/models.py:945
msgid "AK requirements fulfilled by the room"
msgstr "AK-Anforderungen, die dieser Raum erfüllt"
#: AKModel/models.py:486 AKModel/views/status.py:60
#: AKModel/models.py:952 AKModel/views/status.py:59
msgid "Rooms"
msgstr "Räume"
#: AKModel/models.py:509
#: AKModel/models.py:1001
msgid "AK being mapped"
msgstr "AK, der zugeordnet wird"
#: AKModel/models.py:511
#: AKModel/models.py:1003
msgid "Room the AK will take place in"
msgstr "Raum in dem der AK stattfindet"
#: AKModel/models.py:512 AKModel/models.py:845
#: AKModel/models.py:1004 AKModel/models.py:1424
msgid "Slot Begin"
msgstr "Beginn des Slots"
#: AKModel/models.py:512 AKModel/models.py:845
#: AKModel/models.py:1004 AKModel/models.py:1424
msgid "Time and date the slot begins"
msgstr "Zeit und Datum zu der der AK beginnt"
#: AKModel/models.py:514
#: AKModel/models.py:1006
msgid "Duration"
msgstr "Dauer"
#: AKModel/models.py:515
#: AKModel/models.py:1007
msgid "Length in hours"
msgstr "Länge in Stunden"
#: AKModel/models.py:517
#: AKModel/models.py:1009
msgid "Scheduling fixed"
msgstr "Planung fix"
#: AKModel/models.py:518
#: AKModel/models.py:1010
msgid "Length and time of this AK should not be changed"
msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden"
#: AKModel/models.py:523
#: AKModel/models.py:1015
msgid "Last update"
msgstr "Letzte Aktualisierung"
#: AKModel/models.py:526
#: AKModel/models.py:1018
msgid "AK Slot"
msgstr "AK-Slot"
#: AKModel/models.py:527 AKModel/models.py:663
#: AKModel/models.py:1019 AKModel/models.py:1241
msgid "AK Slots"
msgstr "AK-Slot"
#: AKModel/models.py:549 AKModel/models.py:558
#: AKModel/models.py:1041 AKModel/models.py:1050
msgid "Not scheduled yet"
msgstr "Noch nicht geplant"
#: AKModel/models.py:598
#: AKModel/models.py:1173
msgid "AK this message belongs to"
msgstr "AK zu dem die Nachricht gehört"
#: AKModel/models.py:599
#: AKModel/models.py:1174
msgid "Message text"
msgstr "Nachrichtentext"
#: AKModel/models.py:600
#: AKModel/models.py:1175
msgid "Message to the organizers. This is not publicly visible."
msgstr ""
"Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
#: AKModel/models.py:606
#: AKModel/models.py:1179
msgid "Resolved"
msgstr "Erledigt"
#: AKModel/models.py:1180
msgid "This message has been resolved (no further action needed)"
msgstr ""
"Diese Nachricht wurde vollständig bearbeitet (keine weiteren Aktionen "
"notwendig)"
#: AKModel/models.py:1183
msgid "AK Orga Message"
msgstr "AK-Organachricht"
#: AKModel/models.py:607
#: AKModel/models.py:1184
msgid "AK Orga Messages"
msgstr "AK-Organachrichten"
#: AKModel/models.py:624
#: AKModel/models.py:1202
msgid "Constraint Violation"
msgstr "Constraintverletzung"
#: AKModel/models.py:625 AKModel/views/status.py:117
#: AKModel/models.py:1203
msgid "Constraint Violations"
msgstr "Constraintverletzungen"
#: AKModel/models.py:632
#: AKModel/models.py:1210
msgid "Owner has two parallel slots"
msgstr "Leitung hat zwei Slots parallel"
#: AKModel/models.py:633
#: AKModel/models.py:1211
msgid "AK Slot was scheduled outside the AK's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert"
#: AKModel/models.py:634
#: AKModel/models.py:1212
msgid "Room has two AK slots scheduled at the same time"
msgstr "Raum hat zwei AK Slots gleichzeitig"
#: AKModel/models.py:635
#: AKModel/models.py:1213
msgid "Room does not satisfy the requirement of the scheduled AK"
msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
#: AKModel/models.py:636
#: AKModel/models.py:1214
msgid "AK Slot is scheduled at the same time as an AK listed as a conflict"
msgstr ""
"AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert"
#: AKModel/models.py:637
#: AKModel/models.py:1215
msgid "AK Slot is scheduled before an AK listed as a prerequisite"
msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert"
#: AKModel/models.py:639
#: AKModel/models.py:1217
msgid ""
"AK Slot for AK with intention to submit a resolution is scheduled after "
"resolution deadline"
msgstr ""
"AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert"
#: AKModel/models.py:640
#: AKModel/models.py:1218
msgid "AK Slot in a category is outside that categories availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie"
#: AKModel/models.py:641
#: AKModel/models.py:1219
msgid "Two AK Slots for the same AK scheduled at the same time"
msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert"
#: AKModel/models.py:642
#: AKModel/models.py:1220
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"
#: AKModel/models.py:643
#: AKModel/models.py:1221
msgid "AK Slot is scheduled outside the event's availabilities"
msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert"
#: AKModel/models.py:649
#: AKModel/models.py:1227
msgid "Warning"
msgstr "Warnung"
#: AKModel/models.py:650
#: AKModel/models.py:1228
msgid "Violation"
msgstr "Verletzung"
#: AKModel/models.py:652
#: AKModel/models.py:1230
msgid "Type"
msgstr "Art"
#: AKModel/models.py:653
#: AKModel/models.py:1231
msgid "Type of violation, i.e. what kind of constraint was violated"
msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde"
#: AKModel/models.py:654
#: AKModel/models.py:1232
msgid "Level"
msgstr "Level"
#: AKModel/models.py:655
#: AKModel/models.py:1233
msgid "Severity level of the violation"
msgstr "Schweregrad der Verletzung"
#: AKModel/models.py:662
#: AKModel/models.py:1240
msgid "AK(s) belonging to this constraint"
msgstr "AK(s), die zu diesem Constraint gehören"
#: AKModel/models.py:664
#: AKModel/models.py:1242
msgid "AK Slot(s) belonging to this constraint"
msgstr "AK Slot(s), die zu diesem Constraint gehören"
#: AKModel/models.py:666
#: AKModel/models.py:1244
msgid "AK Owner belonging to this constraint"
msgstr "AK Leitung(en), die zu diesem Constraint gehören"
#: AKModel/models.py:668
#: AKModel/models.py:1246
msgid "Room belonging to this constraint"
msgstr "Raum, der zu diesem Constraint gehört"
#: AKModel/models.py:671
#: AKModel/models.py:1249
msgid "AK Requirement belonging to this constraint"
msgstr "AK Anforderung, die zu diesem Constraint gehört"
#: AKModel/models.py:673
#: AKModel/models.py:1251
msgid "AK Category belonging to this constraint"
msgstr "AK Kategorie, di zu diesem Constraint gehört"
#: AKModel/models.py:675
#: AKModel/models.py:1253
msgid "Comment"
msgstr "Kommentar"
#: AKModel/models.py:675
#: AKModel/models.py:1253
msgid "Comment or further details for this violation"
msgstr "Kommentar oder weitere Details zu dieser Vereletzung"
#: AKModel/models.py:678
#: AKModel/models.py:1256
msgid "Timestamp"
msgstr "Timestamp"
#: AKModel/models.py:678
#: AKModel/models.py:1256
msgid "Time of creation"
msgstr "Zeitpunkt der ERstellung"
#: AKModel/models.py:679
#: AKModel/models.py:1257
msgid "Manually Resolved"
msgstr "Manuell behoben"
#: AKModel/models.py:680
#: AKModel/models.py:1258
msgid "Mark this violation manually as resolved"
msgstr "Markiere diese Verletzung manuell als behoben"
#: AKModel/models.py:707
#: AKModel/models.py:1285 AKModel/templates/admin/AKModel/aks_by_user.html:22
#: AKModel/templates/admin/AKModel/requirements_overview.html:27
msgid "Details"
msgstr "Details"
#: AKModel/models.py:841
#: AKModel/models.py:1420
msgid "Default Slot"
msgstr "Standardslot"
#: AKModel/models.py:846
#: AKModel/models.py:1425
msgid "Slot End"
msgstr "Ende des Slots"
#: AKModel/models.py:846
#: AKModel/models.py:1425
msgid "Time and date the slot ends"
msgstr "Zeit und Datum zu der der Slot endet"
#: AKModel/models.py:851
#: AKModel/models.py:1430
msgid "Primary categories"
msgstr "Primäre Kategorien"
#: AKModel/models.py:852
#: AKModel/models.py:1432
msgid "Categories that should be assigned to this slot primarily"
msgstr "Kategorieren, die diesem Slot primär zugewiesen werden sollen"
......@@ -944,6 +1122,19 @@ msgstr "Bestätigen"
msgid "Cancel"
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/created_prepare_import.html:9
#: AKModel/templates/admin/AKModel/event_wizard/finish.html:9
......@@ -1010,16 +1201,12 @@ msgstr ""
msgid "Requirements Overview"
msgstr "Übersicht Anforderungen"
#: AKModel/templates/admin/AKModel/requirements_overview.html:31
msgid "Edit"
msgstr "Bearbeiten"
#: AKModel/templates/admin/AKModel/requirements_overview.html:38
msgid "No AKs with this requirement"
msgstr "Kein AK mit dieser Anforderung"
#: AKModel/templates/admin/AKModel/requirements_overview.html:45
#: AKModel/views/status.py:185
#: AKModel/views/status.py:194
msgid "Add Requirement"
msgstr "Anforderung hinzufügen"
......@@ -1072,7 +1259,7 @@ msgstr "Bisher keine Räume"
msgid "Active 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"
msgstr "Scheduling"
......@@ -1117,7 +1304,7 @@ msgstr "AK-CSV-Export"
msgid "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"
msgstr "Wünsche"
......@@ -1155,85 +1342,113 @@ msgstr "'%(obj)s' kopiert"
msgid "Could not copy '%(obj)s' (%(error)s)"
msgstr "'%(obj)s' konnte nicht kopiert werden (%(error)s)"
#: AKModel/views/manage.py:35 AKModel/views/status.py:152
#: AKModel/views/manage.py:36 AKModel/views/status.py:150
msgid "Export AK Slides"
msgstr "AK-Folien exportieren"
#: AKModel/views/manage.py:48
#: AKModel/views/manage.py:61
msgid "Symbols"
msgstr "Symbole"
#: AKModel/views/manage.py:49
#: AKModel/views/manage.py:62
msgid "Who?"
msgstr "Wer?"
#: AKModel/views/manage.py:50
#: AKModel/views/manage.py:63
msgid "Duration(s)"
msgstr "Dauer(n)"
#: AKModel/views/manage.py:51
#: AKModel/views/manage.py:64
msgid "Reso intention?"
msgstr "Resolutionsabsicht?"
#: AKModel/views/manage.py:52
#: AKModel/views/manage.py:65
msgid "Category (for Wishes)"
msgstr "Kategorie (für Wünsche)"
#: AKModel/views/manage.py:101
#: AKModel/views/manage.py:126
msgid "The following Constraint Violations will be marked as manually resolved"
msgstr ""
"Die folgenden Constraintverletzungen werden als manuell behoben markiert."
#: AKModel/views/manage.py:102
#: AKModel/views/manage.py:127
msgid "Constraint Violations marked as resolved"
msgstr "Constraintverletzungen als manuell behoben markiert"
#: AKModel/views/manage.py:114
#: AKModel/views/manage.py:139
msgid "The following Constraint Violations will be set to level 'violation'"
msgstr ""
"Die folgenden Constraintverletzungen werden auf das Level \"Violation\" "
"gesetzt."
#: AKModel/views/manage.py:115
#: AKModel/views/manage.py:140
msgid "Constraint Violations set to level 'violation'"
msgstr "Constraintverletzungen auf Level \"Violation\" gesetzt"
#: AKModel/views/manage.py:127
#: AKModel/views/manage.py:152
msgid "The following Constraint Violations will be set to level 'warning'"
msgstr ""
"Die folgenden Constraintverletzungen werden auf das Level 'warning' gesetzt."
#: AKModel/views/manage.py:128
#: AKModel/views/manage.py:153
msgid "Constraint Violations set to level 'warning'"
msgstr "Constraintverletzungen auf Level \"Warning\" gesetzt"
#: AKModel/views/manage.py:140
#: AKModel/views/manage.py:144
msgid "Clear schedule"
msgstr "Planung zurücksetzen"
#: AKModel/views/manage.py:146
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:147
msgid "Schedule cleared"
msgstr "Planung zurückgesetzt"
#: AKModel/views/manage.py:180
msgid "Publish the plan(s) of:"
msgstr "Den Plan/die Pläne veröffentlichen von:"
#: AKModel/views/manage.py:141
#: AKModel/views/manage.py:166
msgid "Plan published"
msgstr "Plan veröffentlicht"
#: AKModel/views/manage.py:153
#: AKModel/views/manage.py:178
msgid "Unpublish the plan(s) of:"
msgstr "Den Plan/die Pläne verbergen von:"
#: AKModel/views/manage.py:154
#: AKModel/views/manage.py:179
msgid "Plan unpublished"
msgstr "Plan verborgen"
#: AKModel/views/manage.py:166 AKModel/views/status.py:136
#: AKModel/views/manage.py:191
msgid "Publish the poll(s) of:"
msgstr "Die Präferenzen-Abfrage(n) veröffentlichen von:"
#: AKModel/views/manage.py:192
msgid "Preference poll published"
msgstr "Präferenzen-Abfrage veröffentlicht"
#: AKModel/views/manage.py:204
msgid "Unpublish the preference poll(s) of:"
msgstr "Die Präferenzen-Abfrage(n) verbergen von:"
#: AKModel/views/manage.py:205
msgid "Preference poll unpublished"
msgstr "Präferenzen-Abfrage verborgen"
#: AKModel/views/manage.py:216 AKModel/views/status.py:134
msgid "Edit Default Slots"
msgstr "Standardslots bearbeiten"
#: AKModel/views/manage.py:204
#: AKModel/views/manage.py:254
#, python-brace-format
msgid "Could not update slot {id} since it does not belong to {event}"
msgstr ""
"Konnte Slot {id} nicht bearbeiten, da er nicht zum Event {event} gehört"
#: AKModel/views/manage.py:235
#: AKModel/views/manage.py:285
#, python-brace-format
msgid "Updated {u} slot(s). created {c} new slot(s) and deleted {d} slot(s)"
msgstr ""
......@@ -1244,7 +1459,7 @@ msgstr ""
msgid "Created Room '%(room)s'"
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"
msgstr "Räume aus CSV importieren"
......@@ -1262,55 +1477,54 @@ msgstr "{count} Raum/Räume importiert"
msgid "No rooms imported"
msgstr "Keine Räume importiert"
#: AKModel/views/status.py:17
#: AKModel/views/status.py:16
msgid "Overview"
msgstr "Überblick"
#: AKModel/views/status.py:33
#: AKModel/views/status.py:32
msgid "Categories"
msgstr "Kategorien"
#: AKModel/views/status.py:37
#: AKModel/views/status.py:36
msgid "Add category"
msgstr "Kategorie hinzufügen"
#: AKModel/views/status.py:64
#: AKModel/views/status.py:63
msgid "Add Room"
msgstr "Raum hinzufügen"
#: AKModel/views/status.py:122
#: AKModel/views/status.py:120
msgid "AKs requiring special attention"
msgstr "AKs, die besondere Aufmerksamkeit benötigen"
#: AKModel/views/status.py:128
#: AKModel/views/status.py:126
msgid "Enter Interest"
msgstr "Interesse erfassen"
#: AKModel/views/status.py:140
#: AKModel/views/status.py:138
msgid "Manage ak tracks"
msgstr "AK-Tracks verwalten"
#: AKModel/views/status.py:144
#: AKModel/views/status.py:142
msgid "Export AKs as CSV"
msgstr "AKs als CSV exportieren"
#: AKModel/views/status.py:148
#: AKModel/views/status.py:146
msgid "Export AKs for Wiki"
msgstr "AKs im Wiki-Format exportieren"
#: AKModel/views/status.py:181
#: 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"
msgstr "Zu Anforderungen gehörige AKs anzeigen"
#: AKModel/views/status.py:195
#: AKModel/views/status.py:204
msgid "Event Status"
msgstr "Eventstatus"
#~ msgid "Opening time for expression of interest."
#~ msgstr "Öffnungszeitpunkt für die Angabe von Interesse an AKs."
#~ msgid "Messages"
#~ msgstr "Nachrichten"
#~ msgid "Delete all messages"
#~ msgstr "Alle Nachrichten löschen"
AKModel/migrations/0060_orga_message_resolved.py 0 → 100644
View file @ d72e3357
# 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'),
),
]
AKModel/migrations/0061_types.py 0 → 100644
View file @ d72e3357
# Generated by Django 4.2.13 on 2025-02-25 20:58
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0060_orga_message_resolved'),
]
operations = [
migrations.CreateModel(
name='AKType',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(help_text='Name describing the type', max_length=128, verbose_name='Name')),
('event', models.ForeignKey(help_text='Associated event', on_delete=django.db.models.deletion.CASCADE, to='AKModel.event', verbose_name='Event')),
],
options={
'verbose_name': 'AK Type',
'verbose_name_plural': 'AK Types',
'ordering': ['name'],
'unique_together': {('event', 'name')},
},
),
migrations.AddField(
model_name='ak',
name='types',
field=models.ManyToManyField(blank=True, help_text='This AK is', to='AKModel.aktype', verbose_name='Types'),
),
]
AKModel/migrations/0062_interest_no_history.py 0 → 100644
View file @ d72e3357
# Generated by Django 4.2.13 on 2025-02-26 22:35
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('AKModel', '0061_types'),
]
operations = [
migrations.RemoveField(
model_name='historicalak',
name='interest',
),
]