Compare revisions

Benjamin Hättasch · Benjamin Hättasch · Benjamin Hättasch · Benjamin Hättasch · Benjamin Hättasch · Benjamin Hättasch
--- a/AKDashboard/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKDashboard/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-29 13:36+0000\n"
+"POT-Creation-Date: 2022-12-27 01:09+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"
@@ -101,6 +101,10 @@ msgstr "AK-Plan"
 msgid "AK Submission"
 msgstr "AK-Einreichung"

+#: AKDashboard/templates/AKDashboard/dashboard_row.html:57
+msgid "AK History"
+msgstr "AK-Verlauf"
+
 #: AKDashboard/views.py:42
 #, python-format
 msgid "New AK: %(ak)s."

--- a/AKDashboard/templates/AKDashboard/dashboard_event.html
+++ b/AKDashboard/templates/AKDashboard/dashboard_event.html
@@ -24,7 +24,7 @@
        {% include "AKDashboard/dashboard_row.html" %}

        {% if recent_changes|length > 0 %}
-            <h3 class="mt-1">{% trans "Recent" %}:</h3>
+            <h3 class="mt-1" id="history">{% trans "Recent" %}:</h3>
            <ul id="recent-changes-list">
                {% for recent in recent_changes %}
                    <li><a href="{{ recent.link }}">{% fa5_icon recent.icon.0 recent.icon.1 %} {{ recent.text }}</a> <span style="color: #999999;">{{ recent.timestamp | timezone:event.timezone | date:"d.m. H:i" }}</span></li>

--- a/AKDashboard/templates/AKDashboard/dashboard_row.html
+++ b/AKDashboard/templates/AKDashboard/dashboard_row.html
@@ -50,6 +50,13 @@
            </div>
        </a>
    {% endif %}
+    <a class="dashboard-box 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="dashboard-box btn btn-{{ button.get_color_display }}"
           href="{{ button.url }}">

--- a/AKModel/admin.py
+++ b/AKModel/admin.py
@@ -412,6 +412,12 @@ class DefaultSlotAdminForm(forms.ModelForm):

 @admin.register(DefaultSlot)
 class DefaultSlotAdmin(admin.ModelAdmin):
-    list_display = ['start', 'end', 'event']
+    list_display = ['start_simplified', 'end_simplified', 'event']
    list_filter = ['event']
    form = DefaultSlotAdminForm
+
+    def get_form(self, request, obj=None, change=False, **kwargs):
+        # Use timezone of event
+        if obj is not None:
+            timezone.activate(obj.event.timezone)
+        return super().get_form(request, obj, change, **kwargs)
--- a/AKModel/availability/forms.py
+++ b/AKModel/availability/forms.py
@@ -20,7 +20,8 @@ class AvailabilitiesFormMixin(forms.Form):
    availabilities = forms.CharField(
        label=_('Availability'),
        help_text=_(
-            'Click and drag to mark the availability during the event, double-click to delete.'  # Adapted help text
+            'Click and drag to mark the availability during the event, double-click to delete. '
+            'Or use the start and end inputs to add entries to the calendar view.'  # Adapted help text
        ),
        widget=forms.TextInput(attrs={'class': 'availabilities-editor-data'}),
        required=False,

--- a/AKModel/fixtures/model.json
+++ b/AKModel/fixtures/model.json
@@ -377,6 +377,7 @@
        "notes": "",
        "interest": -1,
        "interest_counter": 0,
+        "include_in_export": false,
        "event": 2,
        "owners": [
            1

--- a/AKModel/forms.py
+++ b/AKModel/forms.py
@@ -112,7 +112,8 @@ class DefaultSlotEditorForm(AdminIntermediateForm):
    availabilities = forms.CharField(
        label=_('Default Slots'),
        help_text=_(
-            'Click and drag to mark the availability during the event, double-click to delete.'  # Adapted help text
+            '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.'
        ),
        widget=forms.TextInput(attrs={'class': 'availabilities-editor-data'}),
        required=True,

--- a/AKModel/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po
--- a/AKModel/migrations/0055_ak_export.py
+++ b/AKModel/migrations/0055_ak_export.py
+# Generated by Django 3.2.16 on 2022-12-26 22:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('AKModel', '0054_default_slots'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ak',
+            name='include_in_export',
+            field=models.BooleanField(default=True, help_text='Include AK in wiki export?', verbose_name='Export?'),
+        ),
+    ]
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -92,10 +92,10 @@ class Event(models.Model):
            for category in categories:
                ak_list = []
                for ak in category.ak_set.all():
-                    if ak.wish:
-                        ak_wishes.append(ak)
-                    else:
-                        if filter(ak):
+                    if filter(ak):
+                        if ak.wish:
+                            ak_wishes.append(ak)
+                        else:
                            ak_list.append(ak)
                if not hide_empty_categories or len(ak_list) > 0:
                    categories_with_aks.append((category, ak_list))
@@ -288,7 +288,10 @@ class AK(models.Model):
    event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
                              help_text=_('Associated event'))

-    history = HistoricalRecords(excluded_fields=['interest_counter'])
+    include_in_export = models.BooleanField(default=True, verbose_name=_('Export?'),
+                                            help_text=_("Include AK in wiki export?"))
+
+    history = HistoricalRecords(excluded_fields=['interest_counter', 'include_in_export'])

    class Meta:
        verbose_name = _('AK')

--- a/AKModel/templates/admin/AKModel/default_slot_editor.html
+++ b/AKModel/templates/admin/AKModel/default_slot_editor.html
@@ -18,7 +18,8 @@
                '{{ event.timezone }}',
                '{{ LANGUAGE_CODE }}',
                '{{ event.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
-                '{{ event.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}'
+                '{{ event.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
+                '00:15:00'
            );
        });
    </script>

--- a/AKModel/tests.py
+++ b/AKModel/tests.py
+import traceback
 from typing import List

 from django.contrib.auth.models import User
@@ -59,8 +60,11 @@ class BasicViewTests:
    def test_views_for_200(self):
        for view_name in self.VIEWS:
            view_name_with_prefix, url = self._name_and_url(view_name)
-            response = self.client.get(url)
-            self.assertEqual(response.status_code, 200, msg=f"{view_name_with_prefix} ({url}) broken")
+            try:
+                response = self.client.get(url)
+                self.assertEqual(response.status_code, 200, msg=f"{view_name_with_prefix} ({url}) broken")
+            except Exception as e:
+                self.fail(f"An error occurred during rendering of {view_name_with_prefix} ({url}):\n\n{traceback.format_exc()}")

    def test_access_control_staff_only(self):
        self.client.logout()
@@ -94,9 +98,12 @@ class ModelViewTests(BasicViewTests, TestCase):
        (DefaultSlot, 'defaultslot')
    ]

+    VIEWS_STAFF_ONLY = [
+        ('admin:index', {})
+    ]
+
    def test_admin(self):
        self.client.force_login(self.admin_user)
-
        for model in self.ADMIN_MODELS:
            if model[1] == "event":
                continue
@@ -110,3 +117,20 @@ class ModelViewTests(BasicViewTests, TestCase):
                view_name_with_prefix, url = self._name_and_url((f'admin:AKModel_{model[1]}_change', {'object_id': m.pk}))
                response = self.client.get(url)
                self.assertEqual(response.status_code, 200, msg=f"Edit form for model {model[1]} ({url}) broken")
+
+    def test_wiki_export(self):
+        self.client.force_login(self.admin_user)
+
+        export_url = reverse_lazy(f"admin:ak_wiki_export", kwargs={'slug': 'kif42'})
+        response = self.client.get(export_url)
+        self.assertEqual(response.status_code, 200, "Export not working at all")
+
+        export_count = 0
+        for category, aks in response.context["categories_with_aks"]:
+            for ak in aks:
+                self.assertEqual(ak.include_in_export, True, f"AK with export flag set to False (pk={ak.pk}) included in export")
+                self.assertNotEqual(ak.pk, 1, "AK known to be excluded from export (PK 1) included in export")
+                export_count += 1
+
+        self.assertEqual(export_count, AK.objects.filter(event_id=2, include_in_export=True).count(),
+                         "Wiki export contained the wrong number of AKs")
--- a/AKModel/views.py
+++ b/AKModel/views.py
@@ -197,7 +197,10 @@ class AKWikiExportView(AdminViewMixin, DetailView):
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

-        categories_with_aks, ak_wishes = context["event"].get_categories_with_aks(wishes_seperately=True)
+        categories_with_aks, ak_wishes = context["event"].get_categories_with_aks(
+            wishes_seperately=True,
+            filter=lambda ak: ak.include_in_export
+        )

        context["categories_with_aks"] = [(category.name, ak_list) for category, ak_list in categories_with_aks]
        context["categories_with_aks"].append((_("Wishes"), ak_wishes))

--- a/AKPlan/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKPlan/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-22 08:02+0000\n"
+"POT-Creation-Date: 2022-12-27 00:42+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"
@@ -38,7 +38,7 @@ msgstr "Veranstaltung"
 #: AKPlan/templates/AKPlan/plan_index.html:55
 #: AKPlan/templates/AKPlan/plan_room.html:13
 #: AKPlan/templates/AKPlan/plan_room.html:59
-#: AKPlan/templates/AKPlan/plan_wall.html:52
+#: AKPlan/templates/AKPlan/plan_wall.html:54
 msgid "Room"
 msgstr "Raum"

@@ -63,12 +63,12 @@ msgid "AK Wall"
 msgstr "AK-Wall"

 #: AKPlan/templates/AKPlan/plan_index.html:126
-#: AKPlan/templates/AKPlan/plan_wall.html:116
+#: AKPlan/templates/AKPlan/plan_wall.html:119
 msgid "Current AKs"
 msgstr "Aktuelle AKs"

 #: AKPlan/templates/AKPlan/plan_index.html:133
-#: AKPlan/templates/AKPlan/plan_wall.html:121
+#: AKPlan/templates/AKPlan/plan_wall.html:124
 msgid "Next AKs"
 msgstr "Nächste AKs"

@@ -99,7 +99,7 @@ msgstr "Eigenschaften"
 msgid "Track"
 msgstr "Track"

-#: AKPlan/templates/AKPlan/plan_wall.html:131
+#: AKPlan/templates/AKPlan/plan_wall.html:134
 msgid "Reload page automatically?"
 msgstr "Seite automatisch neu laden?"


--- a/AKPlan/tests.py
+++ b/AKPlan/tests.py
@@ -26,3 +26,11 @@ class PlanViewTests(BasicViewTests, TestCase):
        response = self.client.get(url)
        self.assertNotContains(response, "Plan is not visible (yet).",
                               msg_prefix="Plan is not visible for staff user")
+
+    def test_wall_redirect(self):
+        view_name_with_prefix, url_wall = self._name_and_url(('plan_wall', {'event_slug': 'kif23'}))
+        view_name_with_prefix, url_plan = self._name_and_url(('plan_overview', {'event_slug': 'kif23'}))
+
+        response = self.client.get(url_wall)
+        self.assertRedirects(response, url_plan,
+                             msg_prefix=f"Redirect away from wall not working ({url_wall} -> {url_plan})")
--- a/AKPlanning/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKPlanning/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-29 13:36+0000\n"
+"POT-Creation-Date: 2022-12-27 00:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: AKPlanning/settings.py:144
+#: AKPlanning/settings.py:146
 msgid "German"
 msgstr "Deutsch"

-#: AKPlanning/settings.py:145
+#: AKPlanning/settings.py:147
 msgid "English"
 msgstr "Englisch"
--- a/AKScheduling/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKScheduling/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-29 00:13+0100\n"
+"POT-Creation-Date: 2022-12-27 00:42+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"
@@ -41,13 +41,13 @@ msgstr ""

 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:44
 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:100
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:214
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:293
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:222
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:360
 msgid "No violations"
 msgstr "Keine Verletzungen"

 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:77
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:264
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:331
 msgid "Violation(s)"
 msgstr "Verletzung(en)"

@@ -60,12 +60,12 @@ msgid "Reload now"
 msgstr "Jetzt neu laden"

 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:90
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:200
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:211
 msgid "Violation"
 msgstr "Verletzung"

 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:91
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:287
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:354
 msgid "Problem"
 msgstr "Problem"

@@ -79,7 +79,7 @@ msgstr "Seit"

 #: AKScheduling/templates/admin/AKScheduling/constraint_violations.html:106
 #: AKScheduling/templates/admin/AKScheduling/manage_tracks.html:243
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:250
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:317
 #: AKScheduling/templates/admin/AKScheduling/special_attention.html:48
 #: AKScheduling/templates/admin/AKScheduling/unscheduled.html:34
 msgid "Event Status"
@@ -95,7 +95,7 @@ msgstr "Abschicken"

 #: AKScheduling/templates/admin/AKScheduling/manage_tracks.html:11
 #: AKScheduling/templates/admin/AKScheduling/scheduling.html:19
-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:247
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:314
 msgid "Scheduling for"
 msgstr "Scheduling für"

@@ -147,15 +147,35 @@ msgstr "Event (horizontal)"
 msgid "Event (Vertical)"
 msgstr "Event (vertikal)"

-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:147
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:157
 msgid "Room"
 msgstr "Raum"

-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:261
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:253
+msgid "Please choose AK"
+msgstr "Bitte AK auswählen"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:273
+msgid "Could not create slot"
+msgstr "Konnte Slot nicht anlegen"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:289
+msgid "Add slot"
+msgstr "Slot hinzufügen"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:300
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:301
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:328
 msgid "Unscheduled"
 msgstr "Nicht gescheduled"

-#: AKScheduling/templates/admin/AKScheduling/scheduling.html:286
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:353
 msgid "Level"
 msgstr "Level"

@@ -191,19 +211,19 @@ msgstr "Noch nicht geschedulte AK-Slots"
 msgid "Count"
 msgstr "Anzahl"

-#: AKScheduling/views.py:109
+#: AKScheduling/views.py:112
 msgid "Interest updated"
 msgstr "Interesse aktualisiert"

-#: AKScheduling/views.py:154
+#: AKScheduling/views.py:157
 msgid "Wishes"
 msgstr "Wünsche"

-#: AKScheduling/views.py:162
+#: AKScheduling/views.py:165
 msgid "Cleanup: Delete unscheduled slots for wishes"
 msgstr "Aufräumen: Noch nicht geplante Slots für Wünsche löschen"

-#: AKScheduling/views.py:169
+#: AKScheduling/views.py:172
 #, python-brace-format
 msgid ""
 "The following {count} unscheduled slots of wishes will be deleted:\n"
@@ -215,15 +235,15 @@ msgstr ""
 "\n"
 " {slots}"

-#: AKScheduling/views.py:176
+#: AKScheduling/views.py:179
 msgid "Unscheduled slots for wishes successfully deleted"
 msgstr "Noch nicht geplante Slots für Wünsche erfolgreich gelöscht"

-#: AKScheduling/views.py:181
+#: AKScheduling/views.py:184
 msgid "Create default availabilities for AKs"
 msgstr "Standardverfügbarkeiten für AKs anlegen"

-#: AKScheduling/views.py:188
+#: AKScheduling/views.py:191
 #, python-brace-format
 msgid ""
 "The following {count} AKs don't have any availability information. Create "
@@ -236,15 +256,18 @@ msgstr ""
 "\n"
 " {aks}"

-#: AKScheduling/views.py:206
+#: AKScheduling/views.py:209
 #, python-brace-format
 msgid "Could not create default availabilities for AK: {ak}"
 msgstr "Konnte keine Verfügbarkeit anlegen für AK: {ak}"

-#: AKScheduling/views.py:211
+#: AKScheduling/views.py:214
 #, python-brace-format
 msgid "Created default availabilities for {count} AKs"
 msgstr "Standardverfügbarkeiten für {count} AKs angelegt"

+#~ msgid "Bitte AK auswählen"
+#~ msgstr "Please sel"
+
 #~ msgid "Cannot load current violations from server"
 #~ msgstr "Kann die aktuellen Verletzungen nicht vom Server laden"
--- a/AKScheduling/templates/admin/AKScheduling/scheduling.html
+++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html
@@ -250,7 +250,7 @@
            function addSlot() {
                let ak = $('#id_ak').val();
                if(ak === "") {
-                    alert("{% trans "Bitte AK auswählen" %}");
+                    alert("{% trans "Please choose AK" %}");
                }
                else {
                    $.ajax({

--- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
+++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-26 23:16+0100\n"
+"POT-Creation-Date: 2023-01-01 16:07+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"
@@ -38,6 +38,33 @@ msgstr ""
 "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere "
 "Slots haben soll, mehrere Zeilen verwenden"

+#: AKSubmission/forms.py:192
+#: AKSubmission/templates/AKSubmission/ak_detail.html:315
+msgid "Start"
+msgstr "Start"
+
+#: AKSubmission/forms.py:193
+#: AKSubmission/templates/AKSubmission/ak_detail.html:316
+msgid "End"
+msgstr "Ende"
+
+#: AKSubmission/forms.py:194
+#: AKSubmission/templates/AKSubmission/ak_detail.html:245
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:35
+msgid "Duration"
+msgstr "Dauer"
+
+#: AKSubmission/forms.py:195
+#: AKSubmission/templates/AKSubmission/ak_detail.html:247
+msgid "Room"
+msgstr "Raum"
+
+#: AKSubmission/forms.py:199
+#: AKSubmission/templates/AKSubmission/ak_history.html:11
+#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
+msgid "AK"
+msgstr "AK"
+
 #: AKSubmission/templates/AKSubmission/ak_detail.html:22
 #: AKSubmission/templates/AKSubmission/ak_edit.html:13
 #: AKSubmission/templates/AKSubmission/ak_history.html:16
@@ -197,15 +224,6 @@ msgstr "Notizen"
 msgid "When?"
 msgstr "Wann?"

-#: AKSubmission/templates/AKSubmission/ak_detail.html:245
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:35
-msgid "Duration"
-msgstr "Dauer"
-
-#: AKSubmission/templates/AKSubmission/ak_detail.html:247
-msgid "Room"
-msgstr "Raum"
-
 #: AKSubmission/templates/AKSubmission/ak_detail.html:278
 msgid "Delete"
 msgstr "Löschen"
@@ -222,14 +240,6 @@ msgstr "Einen neuen AK-Slot hinzufügen"
 msgid "Possible Times"
 msgstr "Mögliche Zeiten"

-#: AKSubmission/templates/AKSubmission/ak_detail.html:315
-msgid "Start"
-msgstr "Start"
-
-#: AKSubmission/templates/AKSubmission/ak_detail.html:316
-msgid "End"
-msgstr "Ende"
-
 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
 #: AKSubmission/templates/AKSubmission/ak_history.html:11
 #: AKSubmission/templates/AKSubmission/ak_overview.html:8
@@ -248,14 +258,16 @@ msgid "AKs"
 msgstr "AKs"

 #: AKSubmission/templates/AKSubmission/ak_edit.html:8
-#: AKSubmission/templates/AKSubmission/ak_edit.html:21
+#: AKSubmission/templates/AKSubmission/ak_edit.html:32
 msgid "Edit AK"
 msgstr "AK bearbeiten"

-#: AKSubmission/templates/AKSubmission/ak_history.html:11
-#: AKSubmission/templates/AKSubmission/akslot_delete.html:31
-msgid "AK"
-msgstr "AK"
+#: AKSubmission/templates/AKSubmission/ak_edit.html:24
+msgid ""
+"Add person not in the list yet. Unsaved changes in this form will be lost."
+msgstr ""
+"Person hinzufügen, die noch nicht in der Liste ist. Ungespeicherte "
+"Änderungen in diesem Formular gehen verloren."

 #: AKSubmission/templates/AKSubmission/ak_history.html:27
 msgid "Back"
@@ -311,7 +323,7 @@ msgstr "Senden"
 #: AKSubmission/templates/AKSubmission/akmessage_add.html:32
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:27
 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:30
-#: AKSubmission/templates/AKSubmission/submit_new.html:54
+#: AKSubmission/templates/AKSubmission/submit_new.html:56
 msgid "Reset Form"
 msgstr "Formular leeren"

@@ -319,7 +331,7 @@ msgstr "Formular leeren"
 #: AKSubmission/templates/AKSubmission/akowner_create_update.html:31
 #: AKSubmission/templates/AKSubmission/akslot_add_update.html:34
 #: AKSubmission/templates/AKSubmission/akslot_delete.html:46
-#: AKSubmission/templates/AKSubmission/submit_new.html:58
+#: AKSubmission/templates/AKSubmission/submit_new.html:60
 msgid "Cancel"
 msgstr "Abbrechen"

@@ -402,7 +414,7 @@ msgstr ""
 "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet "
 "werden"

-#: AKSubmission/templates/AKSubmission/submit_new.html:50
+#: AKSubmission/templates/AKSubmission/submit_new.html:52
 msgid "Submit"
 msgstr "Eintragen"

@@ -432,35 +444,40 @@ msgstr "AK erfolgreich angelegt"
 msgid "AK successfully updated"
 msgstr "AK erfolgreich aktualisiert"

-#: AKSubmission/views.py:344
+#: AKSubmission/views.py:310
+#, python-brace-format
+msgid "Added '{owner}' as new owner of '{ak.name}'"
+msgstr "'{owner}' als neue Leitung von '{ak.name}' hinzugefügt"
+
+#: AKSubmission/views.py:351
 msgid "Person Info successfully updated"
 msgstr "Personen-Info erfolgreich aktualisiert"

-#: AKSubmission/views.py:364
+#: AKSubmission/views.py:371
 msgid "No user selected"
 msgstr "Keine Person ausgewählt"

-#: AKSubmission/views.py:391
+#: AKSubmission/views.py:398
 msgid "AK Slot successfully added"
 msgstr "AK-Slot erfolgreich angelegt"

-#: AKSubmission/views.py:405
+#: AKSubmission/views.py:412
 msgid "You cannot edit a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden"

-#: AKSubmission/views.py:415
+#: AKSubmission/views.py:422
 msgid "AK Slot successfully updated"
 msgstr "AK-Slot erfolgreich aktualisiert"

-#: AKSubmission/views.py:428
+#: AKSubmission/views.py:435
 msgid "You cannot delete a slot that has already been scheduled"
 msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden"

-#: AKSubmission/views.py:438
+#: AKSubmission/views.py:445
 msgid "AK Slot successfully deleted"
 msgstr "AK-Slot erfolgreich angelegt"

-#: AKSubmission/views.py:460
+#: AKSubmission/views.py:467
 msgid "Message to organizers successfully saved"
 msgstr "Nachricht an die Organisator*innen erfolgreich gespeichert"


--- a/AKSubmission/templates/AKSubmission/ak_edit.html
+++ b/AKSubmission/templates/AKSubmission/ak_edit.html
@@ -16,6 +16,17 @@
    <li class="breadcrumb-item active">{% trans "Edit" %}</li>
 {% endblock %}

+{% block form_contents %}
+    {% bootstrap_field form.name %}
+    <div class="form-group">
+        {% bootstrap_field form.owners form_group_class="" %}
+        <a href="{% url 'submit:akowner_create' event_slug=event.slug %}?add_to_existing_ak={{ ak.pk }}">
+            {% fa5_icon "plus" "fas" %} {% trans "Add person not in the list yet. Unsaved changes in this form will be lost." %}
+        </a>
+    </div>
+    {% bootstrap_form form exclude='name,owners' %}
+{% endblock %}
+

 {% block headline %}
    <h2>{% trans 'Edit AK' %}</h2>
No results found