From 284f0b2420050f4b45e1dfb7f07823033e8d7ae4 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 24 Nov 2024 20:09:34 +0100
Subject: [PATCH 01/56] members: make email field in emergency contact optional

---
 .../0026_alter_emergencycontact_email.py       | 18 ++++++++++++++++++
 jdav_web/members/models.py                     |  1 +
 .../members/crisis_intervention_list.tex       |  3 +--
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 jdav_web/members/migrations/0026_alter_emergencycontact_email.py

diff --git a/jdav_web/members/migrations/0026_alter_emergencycontact_email.py b/jdav_web/members/migrations/0026_alter_emergencycontact_email.py
new file mode 100644
index 0000000..3adfa23
--- /dev/null
+++ b/jdav_web/members/migrations/0026_alter_emergencycontact_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.1 on 2024-11-24 19:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0025_alter_member_options'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emergencycontact',
+            name='email',
+            field=models.EmailField(blank=True, default='', max_length=100),
+        ),
+    ]
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 92cf9fb..f85cb3a 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -681,6 +681,7 @@ class EmergencyContact(ContactWithPhoneNumber):
     Emergency contact of a member
     """
     member = models.ForeignKey(Member, verbose_name=_('Member'), on_delete=models.CASCADE)
+    email = models.EmailField(max_length=100, default='', blank=True)
 
     def __str__(self):
         return str(self.member)
diff --git a/jdav_web/members/templates/members/crisis_intervention_list.tex b/jdav_web/members/templates/members/crisis_intervention_list.tex
index 2481209..5dfd6d9 100644
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@@ -89,8 +89,7 @@
     {{ m.member.contact_phone_number|esc_all }} &
     {% for c in m.member.emergencycontact_set.all %}
         {{ c.name }} \newline
-        Tel.: {{ c.phone_number }} \newline
-        Email: \href{mailto:{{ c.email }}}{ {{c.email}}}
+        Tel.: {{ c.phone_number }}
     {% endfor %} \\
 {% endfor %}
 \bottomrule

From 1f75d627e08f3c9e80240f4049535c30b83f44f3 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 24 Nov 2024 20:14:32 +0100
Subject: [PATCH 02/56] members: skip empty email addresses when requesting
 confirmation

---
 jdav_web/members/models.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index f85cb3a..4775e38 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -130,6 +130,8 @@ class Contact(CommonModel):
         for email_fd, confirmed_email_fd, confirm_mail_key_fd in self.email_fields:
             if getattr(self, confirmed_email_fd) and not rerequest:
                 continue
+            if not getattr(self, email_fd):
+                continue
             requested_confirmation = True
             setattr(self, confirmed_email_fd, False)
             confirm_mail_key = uuid.uuid4().hex

From 90f4ac88fc2f8da38758cd3a1707da29cd296cee Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 24 Nov 2024 20:45:06 +0100
Subject: [PATCH 03/56] members: make email field not required for emergency
 contacts in forms

---
 jdav_web/members/templates/members/member_form.html | 4 +++-
 jdav_web/members/views.py                           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdav_web/members/templates/members/member_form.html b/jdav_web/members/templates/members/member_form.html
index f0664d3..6969e50 100644
--- a/jdav_web/members/templates/members/member_form.html
+++ b/jdav_web/members/templates/members/member_form.html
@@ -47,7 +47,9 @@
   function addRequired(element) {
     var inputs = element.getElementsByTagName('input');
     for (var i = 0; i < inputs.length; i++) {
-      inputs[i].setAttribute('required', 'required');
+      if (inputs[i].getAttribute('type') != 'email') {
+          inputs[i].setAttribute('required', 'required');
+      }
     }
   }
   function removeRequired(element) {
diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index b96e130..0bb9cdc 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -72,7 +72,7 @@ class EmergencyContactForm(ModelForm):
     class Meta:
         model = EmergencyContact
         fields = ['prename', 'lastname', 'email', 'phone_number']
-        required = ['prename', 'lastname', 'email', 'phone_number']
+        required = ['prename', 'lastname', 'phone_number']
 
 
 class BaseEmergencyContactsFormSet(BaseInlineFormSet):

From 3087b8f8ee45b8564f876c6915ef0101134d3fda Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 24 Nov 2024 22:26:48 +0100
Subject: [PATCH 04/56] members/admin: add help texts to excursion

---
 jdav_web/locale/de/LC_MESSAGES/django.po      |  44 ++-
 jdav_web/members/admin.py                     |  10 +
 .../members/locale/de/LC_MESSAGES/django.po   | 344 ++++++++++--------
 .../templates/admin/edit_inline/stacked.html  |   1 +
 .../templates/admin/edit_inline/tabular.html  |  78 ++++
 .../nesting/admin/inlines/stacked.html        |  95 +++++
 6 files changed, 413 insertions(+), 159 deletions(-)
 create mode 100644 jdav_web/templates/admin/edit_inline/stacked.html
 create mode 100644 jdav_web/templates/admin/edit_inline/tabular.html
 create mode 100644 jdav_web/templates/nesting/admin/inlines/stacked.html

diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index 27b06a5..0517c44 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-24 18:18+0100\n"
+"POT-Creation-Date: 2024-11-24 22:24+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"
@@ -142,9 +142,9 @@ msgid ""
 "related objects, but your account doesn't have permission to delete the "
 "following types of objects:"
 msgstr ""
-"Löschen von %(object_name)s '%(escaped_object)s' würde zur Löschung der folgenden "
-"verknüpften Objekte führen, aber du hast nicht die Berechtigung die folgenden Typen "
-"von Objekten zu löschen:"
+"Löschen von %(object_name)s '%(escaped_object)s' würde zur Löschung der "
+"folgenden verknüpften Objekte führen, aber du hast nicht die Berechtigung "
+"die folgenden Typen von Objekten zu löschen:"
 
 #: templates/admin/delete_confirmation.html:12
 #, python-format
@@ -152,16 +152,16 @@ msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
-"Löschen von %(object_name)s '%(escaped_object)s' würde zur Löschung der folgenden "
-"geschützten verknüpften Objekte führen:"
+"Löschen von %(object_name)s '%(escaped_object)s' würde zur Löschung der "
+"folgenden geschützten verknüpften Objekte führen:"
 
 #: templates/admin/delete_confirmation.html:17
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"?"
 msgstr ""
-"Bist du sicher, dass du %(object_name)s \"%(escaped_object)s\" und alle davon abhängigen "
-"Objekte löschen möchtest? "
+"Bist du sicher, dass du %(object_name)s \"%(escaped_object)s\" und alle "
+"davon abhängigen Objekte löschen möchtest? "
 
 #: templates/admin/delete_confirmation.html:29
 #: templates/admin/delete_selected_confirmation.html:34
@@ -181,8 +181,8 @@ msgid ""
 "types of objects:"
 msgstr ""
 "Löschen der ausgewählten %(objects_name)s würde zur Löschung der folgenden "
-"verknüpften Objekte führen, aber du hast nicht die Berechtigung die folgenden Typen "
-"von Objekten zu löschen:"
+"verknüpften Objekte führen, aber du hast nicht die Berechtigung die "
+"folgenden Typen von Objekten zu löschen:"
 
 #: templates/admin/delete_selected_confirmation.html:9
 #, python-format
@@ -210,6 +210,25 @@ msgstr "Zusammenfassung"
 msgid "Objects"
 msgstr "Objekte"
 
+#: templates/admin/edit_inline/tabular.html:33
+msgid "Delete?"
+msgstr "Löschen?"
+
+#: templates/admin/edit_inline/tabular.html:47
+#: templates/nesting/admin/inlines/stacked.html:42
+msgid "Change"
+msgstr "Ändern"
+
+#: templates/admin/edit_inline/tabular.html:47
+#: templates/nesting/admin/inlines/stacked.html:42
+msgid "View"
+msgstr "Anzeigen"
+
+#: templates/admin/edit_inline/tabular.html:49
+#: templates/nesting/admin/inlines/stacked.html:44
+msgid "View on site"
+msgstr "Auf der Website anzeigen"
+
 #: templates/admin/finance/statementconfirmed/change_form_object_tools.html:8
 msgid "Unconfirm"
 msgstr "Bestätigung zurücknehmen"
@@ -255,6 +274,11 @@ msgstr "Als Kompassbenutzer:in einladen"
 msgid "Invite to group"
 msgstr "Zu Gruppe einladen"
 
+#: templates/nesting/admin/inlines/stacked.html:87
+#, python-format
+msgid "Add another %(verbose_name)s"
+msgstr "Weiteren %(verbose_name)s hinzufügen"
+
 #: utils.py:14
 msgid "Please keep filesize under {} MiB. Current filesize: {:10.2f} MiB."
 msgstr "Maximale Dateigröße {} MiB. Aktuelle Dateigröße: {:10.2f} MiB."
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index eacf19f..9da53d4 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -681,6 +681,7 @@ class BillOnExcursionInline(CommonAdminInlineMixin, admin.TabularInline):
 class StatementOnListInline(CommonAdminInlineMixin, nested_admin.NestedStackedInline):
     model = Statement
     extra = 1
+    description = _('Please list here all expenses in relation with this excursion and upload relevant bills. These have to be permanently stored for the application of LJP contributions. The short descriptions are used in the seminar report cost overview (possible descriptions are e.g. food, material, etc.).')
     sortable_options = []
     fields = ['night_cost']
     inlines = [BillOnExcursionInline]
@@ -698,6 +699,7 @@ class InterventionOnLJPInline(CommonAdminInlineMixin, admin.TabularInline):
 class LJPOnListInline(CommonAdminInlineMixin, nested_admin.NestedStackedInline):
     model = LJPProposal
     extra = 1
+    description = _('Here you can work on a seminar report for applying for financial contributions from Landesjugendplan (LJP). More information on creating a seminar report can be found in the wiki. The seminar report or only a participant list and cost overview can be consequently downloaded.')
     sortable_options = []
     inlines = [InterventionOnLJPInline]
 
@@ -705,6 +707,7 @@ class LJPOnListInline(CommonAdminInlineMixin, nested_admin.NestedStackedInline):
 class MemberOnListInline(CommonAdminInlineMixin, GenericTabularInline):
     model = NewMemberOnList
     extra = 0
+    description = _('Please list all participants (also youth leaders) of this excursion. Here you can still make changes just before departure and hence generate the latest participant list for crisis intervention at all times.')
     formfield_overrides = {
         TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
     }
@@ -776,6 +779,13 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
     search_fields = ('name',)
     ordering = ('-date',)
     view_on_site = False
+    fieldsets = (
+        (None, {
+            'fields': ('name', 'place', 'destination', 'date', 'end', 'description', 'groups', 'jugendleiter',
+                       'tour_type', 'tour_approach', 'kilometers_traveled', 'activity', 'difficulty'),
+            'description': _('General information on your excursion. These are partly relevant for the amount of financial compensation (means of transport, travel distance, etc.).')
+        }),
+    )
     #formfield_overrides = {
     #    ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
     #    ForeignKey: {'widget': apply_select2(forms.Select)}
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 5e81b32..eb91978 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-24 02:47+0100\n"
+"POT-Creation-Date: 2024-11-24 22:24+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: members/admin.py:126 members/models.py:371
+#: members/admin.py:126 members/models.py:373
 msgid "Registration complete"
 msgstr "Anmeldung vollständig"
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:373 members/models.py:53 members/models.py:1379
+#: members/admin.py:373 members/models.py:53 members/models.py:1390
 msgid "Name"
 msgstr "Name"
 
@@ -155,8 +155,8 @@ msgstr "%(name)s zurück auf die Warteliste gesetzt."
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:496 members/models.py:378 members/models.py:718
-#: members/models.py:1124
+#: members/admin.py:496 members/models.py:380 members/models.py:729
+#: members/models.py:1135
 msgid "Group"
 msgstr "Gruppe"
 
@@ -189,73 +189,119 @@ msgstr "Wähle Gruppe für Einladung aus"
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:651
+#: members/admin.py:652
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:654
+#: members/admin.py:655
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:657 members/models.py:934
+#: members/admin.py:658 members/models.py:945
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:752
+#: members/admin.py:684
+msgid ""
+"Please list here all expenses in relation with this excursion and upload "
+"relevant bills. These have to be permanently stored for the application of "
+"LJP contributions. The short descriptions are used in the seminar report "
+"cost overview (possible descriptions are e.g. food, material, etc.)."
+msgstr ""
+"Gib hier bitte alle deine Ausgaben in Zusammenhang mit der Ausfahrt an und "
+"lade entsprechende Belege/Quittungen hoch. Diese müssen für die Beantragung "
+"von LJP-Zuschüssen langfristig aufbewahrt werden. Die Kurzbeschreibung der "
+"einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
+"wären z.B. Anreise, Verpflegung, Material etc.)."
+
+#: members/admin.py:702
+msgid ""
+"Here you can work on a seminar report for applying for financial "
+"contributions from Landesjugendplan (LJP). More information on creating a "
+"seminar report can be found in the wiki. The seminar report or only a "
+"participant list and cost overview can be consequently downloaded."
+msgstr ""
+"Hier kannst du an einem Seminarbericht für die Beantragung von Zuschüssen "
+"des Landesjugendplans (LJP) arbeiten. Weitere Informationen zur Gestaltung "
+"von Seminarberichten findest du im JL-Wiki. Den Seminarbericht oder "
+"wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
+"herunterladen."
+
+#: members/admin.py:710
+msgid ""
+"Please list all participants (also youth leaders) of this excursion. Here "
+"you can still make changes just before departure and hence generate the "
+"latest participant list for crisis intervention at all times."
+msgstr ""
+"Gib hier bitte alle Personen an, die bei der Ausfahrt dabei sind (auch JL). "
+"Hier kannst du auch spontan kurz vor Abfahrt noch Änderungen machen und so "
+"jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
+"generieren."
+
+#: members/admin.py:756
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:762
+#: members/admin.py:766
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:766
+#: members/admin.py:770
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:767
+#: members/admin.py:771
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:768
+#: members/admin.py:772
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:805
+#: members/admin.py:786
+msgid ""
+"General information on your excursion. These are partly relevant for the "
+"amount of financial compensation (means of transport, travel distance, etc.)."
+msgstr ""
+"Hier kannst du allgemein Angaben zu deiner Ausfahrt machen. Diese sind "
+"teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
+"Fahrstrecke in km)."
+
+#: members/admin.py:816
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:813
+#: members/admin.py:824
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:821
+#: members/admin.py:832
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:825 members/admin.py:848
+#: members/admin.py:836 members/admin.py:859
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: members/admin.py:838
+#: members/admin.py:849
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:842
+#: members/admin.py:853
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:860
+#: members/admin.py:871
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
@@ -291,11 +337,11 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:54 members/models.py:920
+#: members/models.py:54 members/models.py:931
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:60 members/models.py:912
+#: members/models.py:60 members/models.py:923
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
@@ -328,7 +374,7 @@ msgstr "Bis Jahrgang"
 msgid "youth leaders"
 msgstr "Jugendleiter"
 
-#: members/models.py:77 members/models.py:1206
+#: members/models.py:77 members/models.py:1217
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
@@ -336,7 +382,7 @@ msgstr "Zeitpunkt"
 msgid "Ending time"
 msgstr "Endzeitpunkt"
 
-#: members/models.py:85 members/models.py:247
+#: members/models.py:85 members/models.py:249
 msgid "group"
 msgstr "Gruppe"
 
@@ -356,478 +402,478 @@ msgstr "Nachname"
 msgid "Email confirmed"
 msgstr "Emailadresse bestätigt"
 
-#: members/models.py:137
+#: members/models.py:139
 msgid "Email confirmation needed"
 msgstr "Email Bestätigung erforderlich"
 
-#: members/models.py:177 members/models.py:221
+#: members/models.py:179 members/models.py:223
 msgid "phone number"
 msgstr "Telefonnummer (mobil)"
 
-#: members/models.py:187
+#: members/models.py:189
 msgid "birth date"
 msgstr "Geburtsdatum"
 
-#: members/models.py:193
+#: members/models.py:195
 msgid "Gender"
 msgstr "Gender"
 
-#: members/models.py:194
+#: members/models.py:196
 msgid "comments"
 msgstr "Kommentare"
 
-#: members/models.py:218
+#: members/models.py:220
 msgid "Alternative email confirmed"
 msgstr "Alternative E-Mail Adresse bestätigt"
 
-#: members/models.py:222
+#: members/models.py:224
 msgid "street and house number"
 msgstr "Straße und Hausnummer"
 
-#: members/models.py:223
+#: members/models.py:225
 msgid "Postcode"
 msgstr "PLZ"
 
-#: members/models.py:225
+#: members/models.py:227
 msgid "town"
 msgstr "Stadt"
 
-#: members/models.py:226
+#: members/models.py:228
 msgid "Address extra"
 msgstr "Adress-Zusatz"
 
-#: members/models.py:227
+#: members/models.py:229
 msgid "Country"
 msgstr "Land"
 
-#: members/models.py:229
+#: members/models.py:231
 msgid "Good conduct certificate presented on"
 msgstr "Führungszeugnis vorgelegt am"
 
-#: members/models.py:230
+#: members/models.py:232
 msgid "Joined on"
 msgstr "Eintritt"
 
-#: members/models.py:231
+#: members/models.py:233
 msgid "Left on"
 msgstr "Austritt"
 
-#: members/models.py:232
+#: members/models.py:234
 msgid "Has key"
 msgstr "Hat Jugendraumschlüssel"
 
-#: members/models.py:233
+#: members/models.py:235
 msgid "Has a free ticket for the climbing gym"
 msgstr "Hat Freikarte für Kletterhalle"
 
-#: members/models.py:234
+#: members/models.py:236
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py:235
+#: members/models.py:237
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
 
-#: members/models.py:236
+#: members/models.py:238
 msgid "Climbing badge"
 msgstr "Kletterschein"
 
-#: members/models.py:237
+#: members/models.py:239
 msgid "Alpine experience"
 msgstr "Alpine Erfahrung"
 
-#: members/models.py:238
+#: members/models.py:240
 msgid "Allergies"
 msgstr "Allergieen"
 
-#: members/models.py:239
+#: members/models.py:241
 msgid "Medication"
 msgstr "Medikamente"
 
-#: members/models.py:240
+#: members/models.py:242
 msgid "Tetanus vaccination"
 msgstr "Tetanusimpfung"
 
-#: members/models.py:241
+#: members/models.py:243
 msgid "Photos may be taken"
 msgstr "Fotoerlaubnis"
 
-#: members/models.py:242
+#: members/models.py:244
 msgid "Legal guardians"
 msgstr "Erziehungsberechtigte"
 
-#: members/models.py:244
+#: members/models.py:246
 msgid "May cancel a group appointment independently"
 msgstr "Darf sich allein von der Gruppenstunde abmelden"
 
-#: members/models.py:251
+#: members/models.py:253
 msgid "receives newsletter"
 msgstr "Erhält den Newsletter"
 
-#: members/models.py:255
+#: members/models.py:257
 msgid "created"
 msgstr "erstellt"
 
-#: members/models.py:256
+#: members/models.py:258
 msgid "Active"
 msgstr "Aktiv"
 
-#: members/models.py:257
+#: members/models.py:259
 msgid "registration form"
 msgstr "Anmeldeformular"
 
-#: members/models.py:265
+#: members/models.py:267
 msgid "image"
 msgstr "Bild"
 
-#: members/models.py:274
+#: members/models.py:276
 msgid "Echoed"
 msgstr "Rückgemeldet"
 
-#: members/models.py:275
+#: members/models.py:277
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: members/models.py:277
+#: members/models.py:279
 msgid "Login data"
 msgstr "Zugangsdaten"
 
-#: members/models.py:307
+#: members/models.py:309
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py:381
+#: members/models.py:383
 msgid "member"
 msgstr "Teilnehmer"
 
-#: members/models.py:382
+#: members/models.py:384
 msgid "members"
 msgstr "Teilnehmer"
 
-#: members/models.py:455
+#: members/models.py:457
 #, python-format
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:666
+#: members/models.py:668
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:675 members/models.py:868 members/models.py:879
-#: members/models.py:1155 members/models.py:1162
+#: members/models.py:685 members/models.py:879 members/models.py:890
+#: members/models.py:1166 members/models.py:1173
 msgid "Member"
 msgstr "Teilnehmer"
 
-#: members/models.py:681
+#: members/models.py:692
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:682
+#: members/models.py:693
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:702
+#: members/models.py:713
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:703
+#: members/models.py:714
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:717 members/models.py:762
+#: members/models.py:728 members/models.py:773
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:719
+#: members/models.py:730
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:720 members/templates/members/reject_success.html:6
+#: members/models.py:731 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:724
+#: members/models.py:735
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:725
+#: members/models.py:736
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:732
+#: members/models.py:743
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:734
+#: members/models.py:745
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:736
+#: members/models.py:747
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:737
+#: members/models.py:748
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:748
+#: members/models.py:759
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:749
+#: members/models.py:760
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:751
+#: members/models.py:762
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:755
+#: members/models.py:766
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:756
+#: members/models.py:767
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:763
+#: members/models.py:774
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:787
+#: members/models.py:798
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:794
+#: members/models.py:805
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:847
+#: members/models.py:858
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:859
+#: members/models.py:870
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:873
+#: members/models.py:884
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:880 members/models.py:1163
+#: members/models.py:891 members/models.py:1174
 msgid "Members"
 msgstr "Teilnehmer"
 
-#: members/models.py:914
+#: members/models.py:925
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:915
+#: members/models.py:926
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:917
+#: members/models.py:928
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:918
+#: members/models.py:929
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:919
+#: members/models.py:930
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:922
+#: members/models.py:933
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:935
+#: members/models.py:946
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:938
+#: members/models.py:949
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:939
+#: members/models.py:950
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:939
+#: members/models.py:950
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:939
+#: members/models.py:950
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:949 members/models.py:1186
+#: members/models.py:960 members/models.py:1197
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:950
+#: members/models.py:961
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1101 members/models.py:1177 members/models.py:1393
+#: members/models.py:1112 members/models.py:1188 members/models.py:1404
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1102 members/models.py:1120 members/models.py:1394
+#: members/models.py:1113 members/models.py:1131 members/models.py:1405
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1121
+#: members/models.py:1132
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1122
+#: members/models.py:1133
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1146
+#: members/models.py:1157
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1149
+#: members/models.py:1160
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1150
+#: members/models.py:1161
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1168
+#: members/models.py:1179
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1171
+#: members/models.py:1182
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1172
+#: members/models.py:1183
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1179
+#: members/models.py:1190
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1180
+#: members/models.py:1191
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1181
+#: members/models.py:1192
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1182
+#: members/models.py:1193
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1183
+#: members/models.py:1194
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1192 members/models.py:1213
+#: members/models.py:1203 members/models.py:1224
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1193
+#: members/models.py:1204
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1207
+#: members/models.py:1218
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1210
+#: members/models.py:1221
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1218
+#: members/models.py:1229
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1219
+#: members/models.py:1230
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1321 members/models.py:1351
+#: members/models.py:1332 members/models.py:1362
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer:innen listen"
 
-#: members/models.py:1323 members/models.py:1353
+#: members/models.py:1334 members/models.py:1364
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer:innen anzeigen"
 
-#: members/models.py:1325 members/models.py:1355
+#: members/models.py:1336 members/models.py:1366
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer:innen ändern"
 
-#: members/models.py:1327 members/models.py:1357
+#: members/models.py:1338 members/models.py:1368
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer:innen löschen"
 
-#: members/models.py:1331 members/models.py:1361
+#: members/models.py:1342 members/models.py:1372
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
 
-#: members/models.py:1333 members/models.py:1363
+#: members/models.py:1344 members/models.py:1374
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
 
-#: members/models.py:1335 members/models.py:1365
+#: members/models.py:1346 members/models.py:1376
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
 
-#: members/models.py:1337 members/models.py:1367
+#: members/models.py:1348 members/models.py:1378
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
 
-#: members/models.py:1340 members/models.py:1341 members/models.py:1344
+#: members/models.py:1351 members/models.py:1352 members/models.py:1355
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1370 members/models.py:1371 members/models.py:1374
+#: members/models.py:1381 members/models.py:1382 members/models.py:1385
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1380
+#: members/models.py:1391
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1383
+#: members/models.py:1394
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1384
+#: members/models.py:1395
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1395
+#: members/models.py:1406
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1396
+#: members/models.py:1407
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1397
+#: members/models.py:1408
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1398
+#: members/models.py:1409
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1401
+#: members/models.py:1412
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1402
+#: members/models.py:1413
 msgid "Trainings"
 msgstr "Fortbildungen"
 
@@ -844,8 +890,8 @@ msgid ""
 "Here you can generate a seminar report suitable for the LJP. A report\n"
 "always contains a head page with the basic information on the seminar."
 msgstr ""
-"Hier kannst du einen Seminarbericht für den Landesjugendplan erstellen. "
-"Ein Bericht enthält immer einen Kopf mit den Stammdaten des Seminars."
+"Hier kannst du einen Seminarbericht für den Landesjugendplan erstellen. Ein "
+"Bericht enthält immer einen Kopf mit den Stammdaten des Seminars."
 
 #: members/templates/admin/generate_seminar_report.html:32
 msgid ""
@@ -853,9 +899,9 @@ msgid ""
 "schedule. This requires\n"
 "the seminar report section to be filled out."
 msgstr ""
-"Vollständiger Bericht: Stelle Lernziele und einen detaillierte, "
-"tabellierten Zeitplan dar. Dies benötigt, dass der Seminarbericht "
-"in der Ausfahrt ausgefüllt ist."
+"Vollständiger Bericht: Stelle Lernziele und einen detaillierte, tabellierten "
+"Zeitplan dar. Dies benötigt, dass der Seminarbericht in der Ausfahrt "
+"ausgefüllt ist."
 
 #: members/templates/admin/generate_seminar_report.html:36
 msgid ""
@@ -1122,7 +1168,7 @@ msgstr ""
 "Ich bin einverstanden, dass meine Daten auf dem Server der JDAV %(sektion)s "
 "gespeichert und verarbeitet werden."
 
-#: members/templates/members/member_form.html:101
+#: members/templates/members/member_form.html:103
 msgid "This file is bigger than the maximal allowed file size of 5 MiB."
 msgstr "Diese Datei ist größer als die maximal erlaubte Dateigröße von 5 MiB."
 
diff --git a/jdav_web/templates/admin/edit_inline/stacked.html b/jdav_web/templates/admin/edit_inline/stacked.html
new file mode 100644
index 0000000..f797e82
--- /dev/null
+++ b/jdav_web/templates/admin/edit_inline/stacked.html
@@ -0,0 +1 @@
+{% load i18n admin_urls %}
diff --git a/jdav_web/templates/admin/edit_inline/tabular.html b/jdav_web/templates/admin/edit_inline/tabular.html
new file mode 100644
index 0000000..42bb07f
--- /dev/null
+++ b/jdav_web/templates/admin/edit_inline/tabular.html
@@ -0,0 +1,78 @@
+{% load i18n admin_urls static admin_modify %}
+<div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group"
+     data-inline-type="tabular"
+     data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
+  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
+{{ inline_admin_formset.formset.management_form }}
+<fieldset class="module {{ inline_admin_formset.classes }}" aria-labelledby="{{ inline_admin_formset.formset.prefix }}-heading">
+  {% if inline_admin_formset.is_collapsible %}<details><summary>{% endif %}
+  <h2 id="{{ inline_admin_formset.formset.prefix }}-heading" class="inline-heading">
+  {% if inline_admin_formset.formset.max_num == 1 %}
+    {{ inline_admin_formset.opts.verbose_name|capfirst }}
+  {% else %}
+    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}
+  {% endif %}
+  </h2>
+  {% if inline_admin_formset.is_collapsible %}</summary>{% endif %}
+   {{ inline_admin_formset.formset.non_form_errors }}
+   {% if inline_admin_formset.opts.description %}
+   <div class="description">
+       <p>
+   {{ inline_admin_formset.opts.description }}
+       </p>
+   </div>
+   {% endif %}
+   <table>
+     <thead><tr>
+       <th class="original"></th>
+     {% for field in inline_admin_formset.fields %}
+       <th class="column-{{ field.name }}{% if field.required %} required{% endif %}{% if field.widget.is_hidden %} hidden{% endif %}">{{ field.label|capfirst }}
+       {% if field.help_text %}<img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}">{% endif %}
+       </th>
+     {% endfor %}
+     {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}<th>{% translate "Delete?" %}</th>{% endif %}
+     </tr></thead>
+
+     <tbody>
+     {% for inline_admin_form in inline_admin_formset %}
+        {% if inline_admin_form.form.non_field_errors %}
+        <tr class="row-form-errors"><td colspan="{{ inline_admin_form|cell_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
+        {% endif %}
+        <tr class="form-row {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form{% endif %}"
+             id="{{ inline_admin_formset.formset.prefix }}-{% if forloop.last and inline_admin_formset.has_add_permission %}empty{% else %}{{ forloop.counter0 }}{% endif %}">
+        <td class="original">
+          {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
+          {% if inline_admin_form.original %}
+          {{ inline_admin_form.original }}
+          {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}<a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{{ inline_admin_formset.has_change_permission|yesno:'inlinechangelink,inlineviewlink' }}">{% if inline_admin_formset.has_change_permission %}{% translate "Change" %}{% else %}{% translate "View" %}{% endif %}</a>{% endif %}
+          {% endif %}
+          {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>{% endif %}
+            </p>{% endif %}
+          {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+          {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}
+        </td>
+        {% for fieldset in inline_admin_form %}
+          {% for line in fieldset %}
+            {% for field in line %}
+              <td class="{% if field.field.name %}field-{{ field.field.name }}{% endif %}{% if field.field.is_hidden %} hidden{% endif %}">
+              {% if field.is_readonly %}
+                  <p>{{ field.contents }}</p>
+              {% else %}
+                  {{ field.field.errors.as_ul }}
+                  {{ field.field }}
+              {% endif %}
+              </td>
+            {% endfor %}
+          {% endfor %}
+        {% endfor %}
+        {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
+          <td class="delete">{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}</td>
+        {% endif %}
+        </tr>
+     {% endfor %}
+     </tbody>
+   </table>
+  {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
+</fieldset>
+  </div>
+</div>
diff --git a/jdav_web/templates/nesting/admin/inlines/stacked.html b/jdav_web/templates/nesting/admin/inlines/stacked.html
new file mode 100644
index 0000000..58fac04
--- /dev/null
+++ b/jdav_web/templates/nesting/admin/inlines/stacked.html
@@ -0,0 +1,95 @@
+{% load i18n nested_admin admin_urls %}
+{% with inline_admin_formset.formset.is_nested as is_nested %}
+
+{% with inline_admin_formset.opts as inline_opts %}
+<div class="inline-group group djn-group djn-stacked{% if is_nested %} djn-group-nested{% else %} djn-group-root{% endif %}"
+    id="{{ inline_admin_formset.formset.prefix }}-group"
+    data-inline-type="stacked"
+    data-inline-formset="{{ inline_admin_formset.inline_formset_data }}"
+    data-inline-model="{{ inline_admin_formset.inline_model_id }}">
+
+    {% ifinlineclasses %}<fieldset class="djn-fieldset module {{ inline_admin_formset.classes }}" aria-labelledby="{{ inline_admin_formset.formset.prefix }}-heading">{% endifinlineclasses %}
+    {% if inline_admin_formset.is_collapsible %}<details><summary>{% endif %}
+    <h2 id="{{ inline_admin_formset.formset.prefix }}-heading" class="inline-heading">
+    {% if inline_admin_formset.opts.title %}{{ inline_admin_formset.opts.title }}{% else %}{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}{% endif %}
+    </h2>
+    {% if inline_admin_formset.is_collapsible %}</summary>{% endif %}
+
+    {{ inline_admin_formset.formset.management_form }}
+    {{ inline_admin_formset.formset.non_form_errors }}
+    {% if inline_admin_formset.opts.description %}
+    <div class="description">
+        <p>
+        {{ inline_admin_formset.opts.description }}
+        </p>
+    </div>
+    {% endif %}
+    <div class="items djn-items">
+
+        {% with inline_admin_formset.opts.sortable_field_name|default:"" as sortable_field_name %}
+        {% for inline_admin_form in inline_admin_formset|formsetsort:sortable_field_name %}
+            {% if forloop.first %}
+            <div class="djn-item djn-no-drag"><div></div></div>
+            {% endif %}
+            <div class="{% if not forloop.last or not inline_admin_formset.has_add_permission %}djn-item{% endif %} djn-module djn-inline-form{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} djn-empty-form empty-form last-related{% endif %} inline-related"
+                 data-inline-model="{{ inline_admin_form.model_admin.opts.app_label }}-{{ inline_admin_form.model_admin.opts.model_name }}"
+                 {% if inline_admin_form.pk_field.field %}
+                 data-is-initial="{% if inline_admin_form.pk_field.field.value %}true{% else %}false{% endif %}"
+                 {% endif %}
+                 id="{{ inline_admin_formset.formset.prefix }}-{% if forloop.last and inline_admin_formset.has_add_permission %}empty{% else %}{{ inline_admin_form.form|form_index }}{% endif %}">
+                 
+                <h3 class="{% if not inline_opts.sortable_options or not inline_opts.sortable_options.disabled %} djn-drag-handler{% endif %}">
+                    <b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %}">{% if inline_admin_formset.has_change_permission %}{% trans "Change" %}{% else %}{% trans "View" %}{% endif %}</a>{% endif %}
+                    {% else %}#{{ forloop.counter }}{% endif %}</span>
+                          {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %}
+                        {% if inline_admin_formset.formset.can_delete  %}
+                        {% if inline_admin_form.original %}
+                            <span class="delete djn-delete-handler {{ inline_admin_formset.handler_classes|join:" " }}">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>
+                        {% else %}
+                            <span><a class="inline-deletelink djn-remove-handler {{ inline_admin_formset.handler_classes|join:" " }}" href="javascript:void(0)">Remove</a></span>
+                        {% endif %}
+                        {% endif %}
+                </h3>
+
+                {% if inline_admin_form.form.non_field_errors %}
+                    <ul class="errorlist">
+                        <li>{{ inline_admin_form.form.non_field_errors }}</li>
+                    </ul>
+                {% endif %}
+
+                {% if "5.1"|django_version_gte %}
+                {% with parent_counter=forloop.counter0 %}
+                    {% for fieldset in inline_admin_form %}
+                        {% include inline_admin_formset.opts.fieldset_template with heading_level=4 id_prefix=parent_counter id_suffix=forloop.counter0 %}
+                    {% endfor %}
+                {% endwith %}
+                {% else %}
+                {% for fieldset in inline_admin_form %}
+                    {% include inline_admin_formset.opts.fieldset_template %}
+                {% endfor %}
+                {% endif %}
+                {% if inline_admin_form.has_auto_field or inline_admin_form.needs_explicit_pk_field %}
+                    {{ inline_admin_form.pk_field.field }}
+                {% endif %}
+                {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}
+                {% if inline_admin_form.form.inlines %}
+                    {% for nested in inline_admin_form.form.inlines %}
+                        {% include nested.opts.template with inline_admin_formset=nested %}
+                    {% endfor %}
+                {% endif %}
+
+            </div>
+        {% endfor %}
+        {% endwith %}
+    </div>
+    <div class="djn-module djn-add-item add-item add-row">
+        <a href="javascript://" class="add-handler djn-add-handler {{ inline_admin_formset.handler_classes|join:" " }}">
+            {% blocktrans with inline_admin_formset.opts.verbose_name|strip_parent_name:inline_opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}
+        </a>
+    </div>
+    {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
+    {% ifinlineclasses %}</fieldset>{% endifinlineclasses %}
+</div>
+{% endwith %}{# ends with inline_admin_formset.opts as inline_opts #}
+
+{% endwith %}{# ends {% with inline_admin_formset.formset.is_nested as is_nested %} #}

From 67e019073a68a01755c2d3fddd569f386f3a3839 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 24 Nov 2024 22:38:44 +0100
Subject: [PATCH 05/56] finance: fix allowance per day and rounding

---
 jdav_web/finance/models.py          | 2 +-
 jdav_web/jdav_web/settings/local.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py
index 91f0a6c..1cfc2a4 100644
--- a/jdav_web/finance/models.py
+++ b/jdav_web/finance/models.py
@@ -283,7 +283,7 @@ class Statement(CommonModel):
         if self.excursion is None:
             return 0
 
-        return self.total_staff / self.excursion.staff_count
+        return cvt_to_decimal(self.total_staff / self.excursion.staff_count)
 
     @property
     def total_staff(self):
diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index 2e68dfd..4e3d49e 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -22,7 +22,7 @@ MAX_AGE_GOOD_CONDUCT_CERTIFICATE_MONTHS = 24
 
 # finance
 
-ALLOWANCE_PER_DAY = 10
+ALLOWANCE_PER_DAY = 22
 MAX_NIGHT_COST = 11
 
 CLOUD_LINK = 'https://nc.cloud-jdav-hd.de'

From 520dc1d3d2b9c5eee9e92a14b43f8cfc405f1dc4 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Wed, 27 Nov 2024 22:22:28 +0100
Subject: [PATCH 06/56] members/admin: fix inlines

---
 .../templates/admin/edit_inline/stacked.html  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/jdav_web/templates/admin/edit_inline/stacked.html b/jdav_web/templates/admin/edit_inline/stacked.html
index f797e82..a6939f4 100644
--- a/jdav_web/templates/admin/edit_inline/stacked.html
+++ b/jdav_web/templates/admin/edit_inline/stacked.html
@@ -1 +1,38 @@
 {% load i18n admin_urls %}
+<div class="js-inline-admin-formset inline-group"
+     id="{{ inline_admin_formset.formset.prefix }}-group"
+     data-inline-type="stacked"
+     data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
+<fieldset class="module {{ inline_admin_formset.classes }}" aria-labelledby="{{ inline_admin_formset.formset.prefix }}-heading">
+  {% if inline_admin_formset.is_collapsible %}<details><summary>{% endif %}
+  <h2 id="{{ inline_admin_formset.formset.prefix }}-heading" class="inline-heading">
+  {% if inline_admin_formset.formset.max_num == 1 %}
+    {{ inline_admin_formset.opts.verbose_name|capfirst }}
+  {% else %}
+    {{ inline_admin_formset.opts.verbose_name_plural|capfirst }}
+  {% endif %}
+  </h2>
+  {% if inline_admin_formset.is_collapsible %}</summary>{% endif %}
+{{ inline_admin_formset.formset.management_form }}
+{{ inline_admin_formset.formset.non_form_errors }}
+
+{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if forloop.last and inline_admin_formset.has_add_permission %}empty{% else %}{{ forloop.counter0 }}{% endif %}">
+  <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b> <span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{{ inline_admin_formset.has_change_permission|yesno:'inlinechangelink,inlineviewlink' }}">{% if inline_admin_formset.has_change_permission %}{% translate "Change" %}{% else %}{% translate "View" %}{% endif %}</a>{% endif %}
+{% else %}#{{ forloop.counter }}{% endif %}</span>
+      {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>{% endif %}
+    {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
+  </h3>
+  {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
+
+  {% with parent_counter=forloop.counter0 %}
+    {% for fieldset in inline_admin_form %}
+      {% include "admin/includes/fieldset.html" with heading_level=4 prefix=fieldset.formset.prefix id_prefix=parent_counter id_suffix=forloop.counter0 %}
+    {% endfor %}
+  {% endwith %}
+
+  {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+  {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}
+</div>{% endfor %}
+  {% if inline_admin_formset.is_collapsible %}</details>{% endif %}
+</fieldset>
+</div>

From 8dafe01de05006040eeb59fcdedc7cb905d2735d Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Wed, 27 Nov 2024 22:26:24 +0100
Subject: [PATCH 07/56] templates: purge more ludwigsburg email addresses

---
 jdav_web/logindata/templates/logindata/register_failed.html     | 2 +-
 jdav_web/members/templates/members/echo_failed.html             | 2 +-
 .../members/templates/members/invited_registration_failed.html  | 2 +-
 jdav_web/members/templates/members/register_failed.html         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdav_web/logindata/templates/logindata/register_failed.html b/jdav_web/logindata/templates/logindata/register_failed.html
index 433815a..b04b8f9 100644
--- a/jdav_web/logindata/templates/logindata/register_failed.html
+++ b/jdav_web/logindata/templates/logindata/register_failed.html
@@ -12,6 +12,6 @@
 
 <p>{% trans "Something went wrong. The registration key is invalid or has expired." %}</p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-ludwigsburg.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/echo_failed.html b/jdav_web/members/templates/members/echo_failed.html
index 8e7ee67..f65550f 100644
--- a/jdav_web/members/templates/members/echo_failed.html
+++ b/jdav_web/members/templates/members/echo_failed.html
@@ -12,6 +12,6 @@
 
 <p><b>{% trans "Something went wrong. The key you supplied is" %} {{ reason }}.</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-ludwigsburg.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/invited_registration_failed.html b/jdav_web/members/templates/members/invited_registration_failed.html
index 619f534..a68a610 100644
--- a/jdav_web/members/templates/members/invited_registration_failed.html
+++ b/jdav_web/members/templates/members/invited_registration_failed.html
@@ -12,6 +12,6 @@
 
 <p><b>{% trans "Something went wrong. The key you supplied is" %} {{ reason }}.</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-ludwigsburg.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/register_failed.html b/jdav_web/members/templates/members/register_failed.html
index 49af016..92b4319 100644
--- a/jdav_web/members/templates/members/register_failed.html
+++ b/jdav_web/members/templates/members/register_failed.html
@@ -12,6 +12,6 @@
 
 <p><b>{% trans "Something went wrong while processing your registration." %}</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-ludwigsburg.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
 
 {% endblock %}

From 5205caa6a6a195f4e248ae648c6204ac979f6db1 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Wed, 27 Nov 2024 23:11:10 +0100
Subject: [PATCH 08/56] chore: add read_settings templatetag

---
 jdav_web/contrib/templatetags/common.py                  | 9 +++++++++
 .../logindata/templates/logindata/register_failed.html   | 5 ++---
 jdav_web/members/templates/members/echo_failed.html      | 6 +++---
 .../templates/members/invited_registration_failed.html   | 5 ++---
 jdav_web/members/templates/members/register_failed.html  | 6 +++---
 jdav_web/templates/admin/index.html                      | 8 ++++----
 6 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 jdav_web/contrib/templatetags/common.py

diff --git a/jdav_web/contrib/templatetags/common.py b/jdav_web/contrib/templatetags/common.py
new file mode 100644
index 0000000..4e2b350
--- /dev/null
+++ b/jdav_web/contrib/templatetags/common.py
@@ -0,0 +1,9 @@
+from django import template
+from django.conf import settings
+
+register = template.Library()
+
+# settings value
+@register.simple_tag
+def settings_value(name):
+    return getattr(settings, name, "")
diff --git a/jdav_web/logindata/templates/logindata/register_failed.html b/jdav_web/logindata/templates/logindata/register_failed.html
index b04b8f9..5484579 100644
--- a/jdav_web/logindata/templates/logindata/register_failed.html
+++ b/jdav_web/logindata/templates/logindata/register_failed.html
@@ -1,6 +1,5 @@
 {% extends "members/base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static common %}
 
 {% block title %}
 {% trans "Registration" %}
@@ -12,6 +11,6 @@
 
 <p>{% trans "Something went wrong. The registration key is invalid or has expired." %}</p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:{% settings_value 'RESPONSIBLE_MAIL' %}">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/echo_failed.html b/jdav_web/members/templates/members/echo_failed.html
index f65550f..be66343 100644
--- a/jdav_web/members/templates/members/echo_failed.html
+++ b/jdav_web/members/templates/members/echo_failed.html
@@ -1,6 +1,5 @@
 {% extends "members/base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static common %}
 
 {% block title %}
 {% trans "Echo failed" %}
@@ -12,6 +11,7 @@
 
 <p><b>{% trans "Something went wrong. The key you supplied is" %} {{ reason }}.</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %}
+<a href="mailto:{% settings_value 'RESPONSIBLE_MAIL' %}">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/invited_registration_failed.html b/jdav_web/members/templates/members/invited_registration_failed.html
index a68a610..393307f 100644
--- a/jdav_web/members/templates/members/invited_registration_failed.html
+++ b/jdav_web/members/templates/members/invited_registration_failed.html
@@ -1,6 +1,5 @@
 {% extends "members/base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static common %}
 
 {% block title %}
 {% trans "Registration failed" %}
@@ -12,6 +11,6 @@
 
 <p><b>{% trans "Something went wrong. The key you supplied is" %} {{ reason }}.</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:{% settings_value 'RESPONSIBLE_MAIL' %}">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/members/templates/members/register_failed.html b/jdav_web/members/templates/members/register_failed.html
index 92b4319..c1371c8 100644
--- a/jdav_web/members/templates/members/register_failed.html
+++ b/jdav_web/members/templates/members/register_failed.html
@@ -1,6 +1,5 @@
 {% extends "members/base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static common %}
 
 {% block title %}
 {% trans "Registration failed" %}
@@ -12,6 +11,7 @@
 
 <p><b>{% trans "Something went wrong while processing your registration." %}</b></p>
 
-<p>{% trans "If you think this is a mistake, please" %} <a href="mailto:jugendreferent@jdav-hd.de">{% trans "contact us." %}</a></p>
+<p>{% trans "If you think this is a mistake, please" %}
+<a href="mailto:{% settings_value 'RESPONSIBLE_MAIL' %}">{% trans "contact us." %}</a></p>
 
 {% endblock %}
diff --git a/jdav_web/templates/admin/index.html b/jdav_web/templates/admin/index.html
index e498037..5ee62a8 100644
--- a/jdav_web/templates/admin/index.html
+++ b/jdav_web/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/index.html" %}
-{% load i18n static %}
+{% load i18n static common %}
 
 {% block content %}
 
@@ -67,7 +67,7 @@ Hier siehst du alle von dir geleiteten Ausfahrten.
 <table>
     <tr>
         <td>
-            <a href="https://nc.cloud-jdav-hd.de/">Nextcloud</a>
+            <a href="{% settings_value 'CLOUD_LINK' %}">Nextcloud</a>
         </td>
         <td>
             Hier liegen Vorlagen für Formulare und nützliche Handbücher.
@@ -75,7 +75,7 @@ Hier siehst du alle von dir geleiteten Ausfahrten.
     </tr>
     <tr>
         <td>
-            <a href="https://dav360.de">DAV 360</a>
+            <a href="{% settings_value 'DAV_360_LINK' %}">DAV 360</a>
         </td>
         <td>
             Zugriff zu Online Office, Teams und deinem DAV Mailaccount.
@@ -83,7 +83,7 @@ Hier siehst du alle von dir geleiteten Ausfahrten.
     </tr>
     <tr>
         <td>
-            <a href="https://davbgs.sharepoint.com/sites/S-114-O-JDAV-Jugendreferat">Julei-Wiki</a>
+            <a href="{% settings_value 'WIKI_LINK' %}">Julei-Wiki</a>
         </td>
         <td>
             Informationen zum Jugendleiter:in-sein.

From 7ef55738a5998e715238d158f6b4f58425fb4ec0 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:00:50 +0100
Subject: [PATCH 09/56] members: provide contact info in waitinglist invitation

---
 .../jdav_web/settings/components/texts.py     |  11 +-
 jdav_web/mailer/mailutils.py                  |   8 +-
 jdav_web/members/admin.py                     |  13 +-
 .../members/locale/de/LC_MESSAGES/django.po   | 138 +++++++++---------
 .../migrations/0027_alter_group_weekday.py    |  18 +++
 .../migrations/0028_group_contact_email.py    |  20 +++
 jdav_web/members/models.py                    |  39 +++--
 7 files changed, 161 insertions(+), 86 deletions(-)
 create mode 100644 jdav_web/members/migrations/0027_alter_group_weekday.py
 create mode 100644 jdav_web/members/migrations/0028_group_contact_email.py

diff --git a/jdav_web/jdav_web/settings/components/texts.py b/jdav_web/jdav_web/settings/components/texts.py
index 6371e57..0bb3ad3 100644
--- a/jdav_web/jdav_web/settings/components/texts.py
+++ b/jdav_web/jdav_web/settings/components/texts.py
@@ -22,12 +22,19 @@ der Registrierung kommst du hier:
 Viele Grüße
 Dein KOMPASS"""
 
+GROUP_TIME_AVAILABLE_TEXT = """Die Gruppenstunde findet jeden {weekday} von {start_time} bis {end_time} Uhr statt."""
+
+GROUP_TIME_UNAVAILABLE_TEXT = """Bitte erfrage die Gruppenzeiten bei der Gruppenleitung ({contact_email})."""
+
 INVITE_TEXT = """Hallo {name},
 
 wir haben gute Neuigkeiten für dich. Es ist ein Platz in der Jugendgruppe {group_name} {group_link}freigeworden.
-Wir treffen uns jeden {weekday} von {start_time} bis {end_time} Uhr.
+{group_time}
+
+Bitte kontaktiere die Gruppenleitung ({contact_email}) für alle weiteren Absprachen.
 
-Wir brauchen jetzt noch ein paar Informationen von dir und deine Anmeldebestätigung. Die lädst du herunter
+Wenn du nach der Schnupperstunde beschließt der Gruppe beizutreten, benötigen wir noch ein paar
+Informationen und deine Anmeldebestätigung von dir. Die lädst du herunter
 (siehe %(REGISTRATION_FORM_DOWNLOAD_LINK)s), lässt sie von deinen Eltern ausfüllen, unterschreiben
 und lädst ein Foto davon in unserem Anmeldeformular hoch. Das kannst du alles über folgenden Link erledigen:
 
diff --git a/jdav_web/mailer/mailutils.py b/jdav_web/mailer/mailutils.py
index 701de61..c9478de 100644
--- a/jdav_web/mailer/mailutils.py
+++ b/jdav_web/mailer/mailutils.py
@@ -7,10 +7,14 @@ import os
 NOT_SENT, SENT, PARTLY_SENT = 0, 1, 2
 
 def send(subject, content, sender, recipients, message_id=None, reply_to=None,
-         attachments=None):
+         attachments=None, cc=None):
     failed, succeeded = False, False
     if type(recipients) != list:
         recipients = [recipients]
+    if not cc:
+        cc = []
+    elif type(cc) != list:
+        cc = [cc]
     if reply_to is not None:
         kwargs = {"reply_to": reply_to}
     else:
@@ -23,7 +27,7 @@ def send(subject, content, sender, recipients, message_id=None, reply_to=None,
     # construct mails
     mails = []
     for recipient in set(recipients):
-        email = EmailMessage(subject, content, sender, [recipient],
+        email = EmailMessage(subject, content, sender, [recipient], cc=cc,
                              headers=headers, **kwargs)
         if attachments is not None:
             for attach in attachments:
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 9da53d4..de8128f 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -170,6 +170,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
                 ('email', 'alternative_email'),
                 'phone_number',
                 'birth_date',
+                'gender',
                 'group', 'registration_form', 'image',
                 ('join_date', 'leave_date'),
                 'comments',
@@ -382,6 +383,7 @@ class MemberUnconfirmedAdmin(admin.ModelAdmin):
                 ('email', 'alternative_email'),
                 'phone_number',
                 'birth_date',
+                'gender',
                 'group', 'registration_form', 'image',
                 ('join_date', 'leave_date'),
                 'comments',
@@ -539,6 +541,10 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
                 messages.error(request,
                                _("An error occurred while trying to invite said members. Please try again."))
                 return HttpResponseRedirect(request.get_full_path())
+            if not group.contact_email:
+                messages.error(request,
+                               _('The selected group does not have a contact email. Please first set a contact email and then try again.'))
+                return HttpResponseRedirect(request.get_full_path())
 
             for waiter in queryset:
                 waiter.invited_for_group = group
@@ -596,6 +602,11 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
                                _("An error occurred while trying to invite said members. Please try again."))
                 return HttpResponseRedirect(request.get_full_path())
 
+            if not group.contact_email:
+                messages.error(request,
+                               _('The selected group does not have a contact email. Please first set a contact email and then try again.'))
+                return HttpResponseRedirect(request.get_full_path())
+
             waiter.invited_for_group = group
             waiter.save()
             waiter.invite_to_group(group)
@@ -634,7 +645,7 @@ class GroupAdminForm(forms.ModelForm):
 
 
 class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
-    fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'show_website',
+    fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'contact_email', 'show_website',
         'weekday', ('start_time', 'end_time')]
     form = GroupAdminForm
     list_display = ('name', 'year_from', 'year_to')
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index eb91978..57f0cbd 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-24 22:24+0100\n"
+"POT-Creation-Date: 2024-11-27 23:16+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"
@@ -34,174 +34,174 @@ msgstr "Nein"
 msgid "All"
 msgstr "Alle"
 
-#: members/admin.py:183 members/admin.py:395
+#: members/admin.py:184 members/admin.py:397
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: members/admin.py:188 members/admin.py:400
+#: members/admin.py:189 members/admin.py:402
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: members/admin.py:193 members/admin.py:405
+#: members/admin.py:194 members/admin.py:407
 msgid "Others"
 msgstr "Sonstiges"
 
-#: members/admin.py:199 members/admin.py:410
+#: members/admin.py:200 members/admin.py:412
 msgid "Organizational"
 msgstr "Organisatorisches"
 
-#: members/admin.py:280
+#: members/admin.py:281
 msgid "Compose new mail to selected members"
 msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
 
-#: members/admin.py:286
+#: members/admin.py:287
 msgid "Echo required"
 msgstr "Rückmeldung erforderlich"
 
-#: members/admin.py:288
+#: members/admin.py:289
 msgid "Successfully requested echo from selected members."
 msgstr ""
 "Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt."
 
-#: members/admin.py:289
+#: members/admin.py:290
 msgid "Request echo from selected members"
 msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken"
 
-#: members/admin.py:295
+#: members/admin.py:296
 #, python-format
 msgid "Successfully invited %(name)s as user."
 msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:297
+#: members/admin.py:298
 msgid "Successfully invited selected members to join as users."
 msgstr ""
 "Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:304 members/admin.py:321
+#: members/admin.py:305 members/admin.py:322
 msgid "Permission denied."
 msgstr "Fehlende Berechtigungen."
 
-#: members/admin.py:311 members/admin.py:340
+#: members/admin.py:312 members/admin.py:341
 #: members/templates/admin/invite_as_user.html:21
 msgid "Invite as user"
 msgstr "Kompass Zugangsdaten wählen lassen"
 
-#: members/admin.py:316
+#: members/admin.py:317
 msgid "Invite selected members to join Kompass as users."
 msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen."
 
-#: members/admin.py:327
+#: members/admin.py:328
 msgid "Member not found."
 msgstr "Teilnehmer:in nicht gefunden."
 
-#: members/admin.py:331
+#: members/admin.py:332
 #, python-format
 msgid "%(name)s already has login data."
 msgstr "%(name)s hat schon Zugangsdaten."
 
-#: members/admin.py:345
+#: members/admin.py:346
 #, python-format
 msgid "%(name)s already has a pending invitation as user."
 msgstr ""
 "%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen."
 
-#: members/admin.py:363
+#: members/admin.py:364
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:373 members/models.py:53 members/models.py:1390
+#: members/admin.py:374 members/models.py:53 members/models.py:1390
 msgid "Name"
 msgstr "Name"
 
-#: members/admin.py:444
+#: members/admin.py:446
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
-#: members/admin.py:445
+#: members/admin.py:447
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py:452 members/admin.py:486
+#: members/admin.py:454 members/admin.py:488
 #, python-format
 msgid "Successfully confirmed %(name)s."
 msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 
-#: members/admin.py:456 members/admin.py:489
+#: members/admin.py:458 members/admin.py:491
 #, python-format
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py:461
+#: members/admin.py:463
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py:463
+#: members/admin.py:465
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
 "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
 "sind."
 
-#: members/admin.py:464
+#: members/admin.py:466
 msgid "Confirm selected registrations"
 msgstr "Ausgewählte Registrierungen bestätigen"
 
-#: members/admin.py:480
+#: members/admin.py:482
 #, python-format
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py:481
+#: members/admin.py:483
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:496 members/models.py:380 members/models.py:729
+#: members/admin.py:498 members/models.py:380 members/models.py:729
 #: members/models.py:1135
 msgid "Group"
 msgstr "Gruppe"
 
-#: members/admin.py:530
+#: members/admin.py:532
 #, python-format
 msgid "Successfully asked %(name)s to confirm their waiting status."
 msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 
-#: members/admin.py:531
+#: members/admin.py:533
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:540 members/admin.py:596
+#: members/admin.py:542 members/admin.py:598
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:548 members/admin.py:603
+#: members/admin.py:550 members/admin.py:605
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:552 members/admin.py:609
+#: members/admin.py:554 members/admin.py:611
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:559
+#: members/admin.py:561
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:652
+#: members/admin.py:654
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:655
+#: members/admin.py:657
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:658 members/models.py:945
+#: members/admin.py:660 members/models.py:945
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:684
+#: members/admin.py:686
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -214,7 +214,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:702
+#: members/admin.py:704
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -227,7 +227,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:710
+#: members/admin.py:712
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -238,30 +238,30 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:756
+#: members/admin.py:758
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:766
+#: members/admin.py:768
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:770
+#: members/admin.py:772
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:771
+#: members/admin.py:773
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:772
+#: members/admin.py:774
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:786
+#: members/admin.py:788
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -270,38 +270,38 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:816
+#: members/admin.py:818
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:824
+#: members/admin.py:826
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:832
+#: members/admin.py:834
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:836 members/admin.py:859
+#: members/admin.py:838 members/admin.py:861
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: members/admin.py:849
+#: members/admin.py:851
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:853
+#: members/admin.py:855
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:871
+#: members/admin.py:873
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
@@ -374,6 +374,10 @@ msgstr "Bis Jahrgang"
 msgid "youth leaders"
 msgstr "Jugendleiter"
 
+#: members/models.py:76
+msgid "week day"
+msgstr "Wochentag"
+
 #: members/models.py:77 members/models.py:1217
 msgid "Starting time"
 msgstr "Zeitpunkt"
@@ -1022,7 +1026,7 @@ msgid "Save and confirm registration"
 msgstr "Speichern und Registrierung bestätigen"
 
 #: members/templates/members/echo.html:6 members/templates/members/echo.html:13
-#: members/templates/members/echo_failed.html:11
+#: members/templates/members/echo_failed.html:10
 #: members/templates/members/echo_password.html:6
 #: members/templates/members/echo_password.html:11
 #: members/templates/members/echo_success.html:10
@@ -1037,23 +1041,23 @@ msgstr ""
 "Vielen Dank, dass du dich rückmeldest. Hier siehst du deine aktuellen Daten. "
 "Falls sich etwas geändert hat, trage das bitte hier ein."
 
-#: members/templates/members/echo_failed.html:6
+#: members/templates/members/echo_failed.html:5
 msgid "Echo failed"
 msgstr "Rückmeldung fehlgeschlagen"
 
-#: members/templates/members/echo_failed.html:13
-#: members/templates/members/invited_registration_failed.html:13
+#: members/templates/members/echo_failed.html:12
+#: members/templates/members/invited_registration_failed.html:12
 msgid "Something went wrong. The key you supplied is"
 msgstr "Etwas ist schief gegangen. Der verwendete Code ist"
 
-#: members/templates/members/echo_failed.html:15
-#: members/templates/members/invited_registration_failed.html:15
-#: members/templates/members/register_failed.html:15
+#: members/templates/members/echo_failed.html:14
+#: members/templates/members/invited_registration_failed.html:14
+#: members/templates/members/register_failed.html:14
 msgid "If you think this is a mistake, please"
 msgstr "Wenn du denkst, dass das ein Fehler ist, "
 
 #: members/templates/members/echo_failed.html:15
-#: members/templates/members/invited_registration_failed.html:15
+#: members/templates/members/invited_registration_failed.html:14
 #: members/templates/members/register_failed.html:15
 msgid "contact us."
 msgstr "kontaktiere uns."
@@ -1091,14 +1095,14 @@ msgstr ""
 "Du hast zu oft ein falsches Passwort eingegeben. Bitte frage deinen "
 "Jugendleiter nach einem korrekten Passwort."
 
-#: members/templates/members/invited_registration_failed.html:6
-#: members/templates/members/register_failed.html:6
+#: members/templates/members/invited_registration_failed.html:5
+#: members/templates/members/register_failed.html:5
 msgid "Registration failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: members/templates/members/invited_registration_failed.html:11
+#: members/templates/members/invited_registration_failed.html:10
 #: members/templates/members/register.html:6
-#: members/templates/members/register_failed.html:11
+#: members/templates/members/register_failed.html:10
 #: members/templates/members/register_password.html:6
 #: members/templates/members/register_success.html:6
 #: members/templates/members/register_wrong_password.html:6
@@ -1183,7 +1187,7 @@ msgstr "Registrieren"
 msgid "Here you can register for group"
 msgstr "Hier kannst du dich registrieren für die Gruppe"
 
-#: members/templates/members/register_failed.html:13
+#: members/templates/members/register_failed.html:12
 msgid "Something went wrong while processing your registration."
 msgstr "Etwas ist schief gelaufen, bei der Verarbeitung deiner Registrierung."
 
diff --git a/jdav_web/members/migrations/0027_alter_group_weekday.py b/jdav_web/members/migrations/0027_alter_group_weekday.py
new file mode 100644
index 0000000..1713448
--- /dev/null
+++ b/jdav_web/members/migrations/0027_alter_group_weekday.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.1 on 2024-11-27 22:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0026_alter_emergencycontact_email'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='weekday',
+            field=models.IntegerField(blank=True, choices=[(0, 'Monday'), (1, 'Tuesday'), (2, 'Wednesday'), (3, 'Thursday'), (4, 'Friday'), (5, 'Saturday'), (6, 'Sunday')], null=True, verbose_name='week day'),
+        ),
+    ]
diff --git a/jdav_web/members/migrations/0028_group_contact_email.py b/jdav_web/members/migrations/0028_group_contact_email.py
new file mode 100644
index 0000000..3f8d948
--- /dev/null
+++ b/jdav_web/members/migrations/0028_group_contact_email.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.0.1 on 2024-11-27 22:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailer', '0005_alter_emailaddress_name'),
+        ('members', '0027_alter_group_weekday'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='contact_email',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mailer.emailaddress', verbose_name='Contact email'),
+        ),
+    ]
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 4775e38..ebe3f47 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -73,9 +73,14 @@ class Group(models.Model):
     year_to = models.IntegerField(verbose_name=_('highest year'), default=2011)
     leiters = models.ManyToManyField('members.Member', verbose_name=_('youth leaders'),
                                      related_name='leited_groups', blank=True)
-    weekday = models.IntegerField(choices=WEEKDAYS, null=True, blank=True)
+    weekday = models.IntegerField(verbose_name=_('week day'), choices=WEEKDAYS, null=True, blank=True)
     start_time = models.TimeField(verbose_name=_('Starting time'), null=True, blank=True)
     end_time = models.TimeField(verbose_name=_('Ending time'), null=True, blank=True)
+    contact_email = models.ForeignKey('mailer.EmailAddress',
+                                      verbose_name=_('Contact email'),
+                                      null=True,
+                                      blank=True,
+                                      on_delete=models.SET_NULL)
 
     def __str__(self):
         """String representation"""
@@ -85,6 +90,10 @@ class Group(models.Model):
         verbose_name = _('group')
         verbose_name_plural = _('groups')
 
+    def has_time_info(self):
+        # return if the group has all relevant time slot information filled
+        return self.weekday and self.start_time and self.end_time
+
 
 class MemberManager(models.Manager):
     def get_queryset(self):
@@ -154,9 +163,9 @@ class Contact(CommonModel):
                 return getattr(self, email_fd)
         return None
 
-    def send_mail(self, subject, content):
+    def send_mail(self, subject, content, cc=None):
         send_mail(subject, content, settings.DEFAULT_SENDING_MAIL,
-            [getattr(self, email_fd) for email_fd, _, _ in self.email_fields])
+            [getattr(self, email_fd) for email_fd, _, _ in self.email_fields], cc=cc)
 
 
 def confirm_mail_by_key(key):
@@ -849,21 +858,23 @@ class MemberWaitingList(Person):
             group_link = '({url}) '.format(url=prepend_base_url(reverse('startpage:gruppe_detail', args=[group.name])))
         else:
             group_link = ''
-        # TODO: inform the user that the group has no configured weekday, start_time or end_time
-        weekday = WEEKDAYS[group.weekday][1] if group.weekday != None else WEEKDAYS[0][1]
-        start_time = group.start_time.strftime('%H:%M') if group.start_time != None else "14:00"
-        end_time = group.end_time.strftime('%H:%M') if group.end_time != None else "16:00"
+        if group.has_time_info():
+            group_time = settings.GROUP_TIME_AVAILABLE_TEXT.format(weekday=WEEKDAYS[group.weekday][1],
+                                                          start_time=group.start_time.strftime('%H:%M'),
+                                                          end_time=group.end_time.strftime('%H:%M'))
+        else:
+            group_time = settings.GROUP_TIME_UNAVAILABLE_TEXT.format(contact_email=group.contact_email)
         invitation = InvitationToGroup(group=group, waiter=self)
         invitation.save()
         self.send_mail(_("Invitation to trial group meeting"),
             settings.INVITE_TEXT.format(name=self.prename,
-            weekday=weekday,
-            start_time=start_time,
-            end_time=end_time,
-            group_name=group.name,
-            group_link=group_link,
-            link=get_registration_link(invitation.key),
-            invitation_reject_link=get_invitation_reject_link(invitation.key)))
+                group_time=group_time,
+                group_name=group.name,
+                group_link=group_link,
+                contact_email=group.contact_email,
+                link=get_registration_link(invitation.key),
+                invitation_reject_link=get_invitation_reject_link(invitation.key)),
+            cc=group.contact_email.email)
 
     def unregister(self):
         """Delete the waiter and inform them about the deletion via email."""

From b22a891157ecaec7cb9043c800cc8b39f0f564df Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:01:48 +0100
Subject: [PATCH 10/56] chore: update translations

---
 jdav_web/locale/de/LC_MESSAGES/django.po | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index 0517c44..d83aa2c 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-24 22:24+0100\n"
+"POT-Creation-Date: 2024-11-27 23:16+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"
@@ -67,28 +67,28 @@ msgstr "Aktives Registrierungspasswort"
 msgid "Active registration passwords"
 msgstr "Aktive Registrierungspasswörter"
 
-#: logindata/templates/logindata/register_failed.html:6
+#: logindata/templates/logindata/register_failed.html:5
 msgid "Registration"
 msgstr "Registrierung"
 
-#: logindata/templates/logindata/register_failed.html:11
+#: logindata/templates/logindata/register_failed.html:10
 #: logindata/templates/logindata/register_form.html:13
 #: logindata/templates/logindata/register_password.html:11
 #: logindata/templates/logindata/register_success.html:10
 msgid "Set login data"
 msgstr "Zugangsdaten wählen"
 
-#: logindata/templates/logindata/register_failed.html:13
+#: logindata/templates/logindata/register_failed.html:12
 msgid "Something went wrong. The registration key is invalid or has expired."
 msgstr ""
 "Etwas ist schief gegangen. Der Registrierungscode ist ungültig oder ist "
 "abgelaufen."
 
-#: logindata/templates/logindata/register_failed.html:15
+#: logindata/templates/logindata/register_failed.html:14
 msgid "If you think this is a mistake, please"
 msgstr "Falls du denkst, dass das ein Fehler ist, bitte"
 
-#: logindata/templates/logindata/register_failed.html:15
+#: logindata/templates/logindata/register_failed.html:14
 msgid "contact us."
 msgstr "kontaktiere uns."
 
@@ -210,25 +210,28 @@ msgstr "Zusammenfassung"
 msgid "Objects"
 msgstr "Objekte"
 
-#: templates/admin/edit_inline/tabular.html:33
-msgid "Delete?"
-msgstr "Löschen?"
-
+#: templates/admin/edit_inline/stacked.html:20
 #: templates/admin/edit_inline/tabular.html:47
 #: templates/nesting/admin/inlines/stacked.html:42
 msgid "Change"
 msgstr "Ändern"
 
+#: templates/admin/edit_inline/stacked.html:20
 #: templates/admin/edit_inline/tabular.html:47
 #: templates/nesting/admin/inlines/stacked.html:42
 msgid "View"
 msgstr "Anzeigen"
 
+#: templates/admin/edit_inline/stacked.html:22
 #: templates/admin/edit_inline/tabular.html:49
 #: templates/nesting/admin/inlines/stacked.html:44
 msgid "View on site"
 msgstr "Auf der Website anzeigen"
 
+#: templates/admin/edit_inline/tabular.html:33
+msgid "Delete?"
+msgstr "Löschen?"
+
 #: templates/admin/finance/statementconfirmed/change_form_object_tools.html:8
 msgid "Unconfirm"
 msgstr "Bestätigung zurücknehmen"

From ed445a9bc679ff3ed1d61d4ed2c5eb3c6717f20c Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:09:09 +0100
Subject: [PATCH 11/56] members: update translations

---
 .../members/locale/de/LC_MESSAGES/django.po   | 324 +++++++++---------
 1 file changed, 169 insertions(+), 155 deletions(-)

diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 57f0cbd..6e0fabd 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-27 23:16+0100\n"
+"POT-Creation-Date: 2024-11-28 00:04+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: members/admin.py:126 members/models.py:373
+#: members/admin.py:126 members/models.py:382
 msgid "Registration complete"
 msgstr "Anmeldung vollständig"
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:374 members/models.py:53 members/models.py:1390
+#: members/admin.py:374 members/models.py:53 members/models.py:1401
 msgid "Name"
 msgstr "Name"
 
@@ -155,8 +155,8 @@ msgstr "%(name)s zurück auf die Warteliste gesetzt."
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:498 members/models.py:380 members/models.py:729
-#: members/models.py:1135
+#: members/admin.py:498 members/models.py:389 members/models.py:738
+#: members/models.py:1146
 msgid "Group"
 msgstr "Gruppe"
 
@@ -169,39 +169,47 @@ msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:542 members/admin.py:598
+#: members/admin.py:542 members/admin.py:602
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:550 members/admin.py:605
+#: members/admin.py:546 members/admin.py:607
+msgid ""
+"The selected group does not have a contact email. Please first set a contact "
+"email and then try again."
+msgstr ""
+"Die ausgewählte Gruppe hat keine Kontakt E-Mail Adresse. Bitte stelle eine "
+"Kontakt E-Mail Adresse ein und versuche es erneut."
+
+#: members/admin.py:554 members/admin.py:614
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:554 members/admin.py:611
+#: members/admin.py:558 members/admin.py:620
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:561
+#: members/admin.py:565
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:654
+#: members/admin.py:663
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:657
+#: members/admin.py:666
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:660 members/models.py:945
+#: members/admin.py:669 members/models.py:956
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:686
+#: members/admin.py:695
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -214,7 +222,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:704
+#: members/admin.py:713
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -227,7 +235,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:712
+#: members/admin.py:721
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -238,30 +246,30 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:758
+#: members/admin.py:767
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:768
+#: members/admin.py:777
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:772
+#: members/admin.py:781
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:773
+#: members/admin.py:782
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:774
+#: members/admin.py:783
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:788
+#: members/admin.py:797
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -270,38 +278,38 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:818
+#: members/admin.py:827
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:826
+#: members/admin.py:835
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:834
+#: members/admin.py:843
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:838 members/admin.py:861
+#: members/admin.py:847 members/admin.py:870
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: members/admin.py:851
+#: members/admin.py:860
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:855
+#: members/admin.py:864
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:873
+#: members/admin.py:882
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
@@ -337,11 +345,11 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:54 members/models.py:931
+#: members/models.py:54 members/models.py:942
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:60 members/models.py:923
+#: members/models.py:60 members/models.py:934
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
@@ -378,7 +386,7 @@ msgstr "Jugendleiter"
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:77 members/models.py:1217
+#: members/models.py:77 members/models.py:1228
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
@@ -386,498 +394,504 @@ msgstr "Zeitpunkt"
 msgid "Ending time"
 msgstr "Endzeitpunkt"
 
-#: members/models.py:85 members/models.py:249
+#: members/models.py:80
+#, fuzzy
+#| msgid "Contact information"
+msgid "Contact email"
+msgstr "Kontaktinformationen"
+
+#: members/models.py:90 members/models.py:258
 msgid "group"
 msgstr "Gruppe"
 
-#: members/models.py:86
+#: members/models.py:91
 msgid "groups"
 msgstr "Gruppen"
 
-#: members/models.py:98
+#: members/models.py:107
 msgid "prename"
 msgstr "Vorname"
 
-#: members/models.py:99
+#: members/models.py:108
 msgid "last name"
 msgstr "Nachname"
 
-#: members/models.py:102
+#: members/models.py:111
 msgid "Email confirmed"
 msgstr "Emailadresse bestätigt"
 
-#: members/models.py:139
+#: members/models.py:148
 msgid "Email confirmation needed"
 msgstr "Email Bestätigung erforderlich"
 
-#: members/models.py:179 members/models.py:223
+#: members/models.py:188 members/models.py:232
 msgid "phone number"
 msgstr "Telefonnummer (mobil)"
 
-#: members/models.py:189
+#: members/models.py:198
 msgid "birth date"
 msgstr "Geburtsdatum"
 
-#: members/models.py:195
+#: members/models.py:204
 msgid "Gender"
 msgstr "Gender"
 
-#: members/models.py:196
+#: members/models.py:205
 msgid "comments"
 msgstr "Kommentare"
 
-#: members/models.py:220
+#: members/models.py:229
 msgid "Alternative email confirmed"
 msgstr "Alternative E-Mail Adresse bestätigt"
 
-#: members/models.py:224
+#: members/models.py:233
 msgid "street and house number"
 msgstr "Straße und Hausnummer"
 
-#: members/models.py:225
+#: members/models.py:234
 msgid "Postcode"
 msgstr "PLZ"
 
-#: members/models.py:227
+#: members/models.py:236
 msgid "town"
 msgstr "Stadt"
 
-#: members/models.py:228
+#: members/models.py:237
 msgid "Address extra"
 msgstr "Adress-Zusatz"
 
-#: members/models.py:229
+#: members/models.py:238
 msgid "Country"
 msgstr "Land"
 
-#: members/models.py:231
+#: members/models.py:240
 msgid "Good conduct certificate presented on"
 msgstr "Führungszeugnis vorgelegt am"
 
-#: members/models.py:232
+#: members/models.py:241
 msgid "Joined on"
 msgstr "Eintritt"
 
-#: members/models.py:233
+#: members/models.py:242
 msgid "Left on"
 msgstr "Austritt"
 
-#: members/models.py:234
+#: members/models.py:243
 msgid "Has key"
 msgstr "Hat Jugendraumschlüssel"
 
-#: members/models.py:235
+#: members/models.py:244
 msgid "Has a free ticket for the climbing gym"
 msgstr "Hat Freikarte für Kletterhalle"
 
-#: members/models.py:236
+#: members/models.py:245
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py:237
+#: members/models.py:246
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
 
-#: members/models.py:238
+#: members/models.py:247
 msgid "Climbing badge"
 msgstr "Kletterschein"
 
-#: members/models.py:239
+#: members/models.py:248
 msgid "Alpine experience"
 msgstr "Alpine Erfahrung"
 
-#: members/models.py:240
+#: members/models.py:249
 msgid "Allergies"
 msgstr "Allergieen"
 
-#: members/models.py:241
+#: members/models.py:250
 msgid "Medication"
 msgstr "Medikamente"
 
-#: members/models.py:242
+#: members/models.py:251
 msgid "Tetanus vaccination"
 msgstr "Tetanusimpfung"
 
-#: members/models.py:243
+#: members/models.py:252
 msgid "Photos may be taken"
 msgstr "Fotoerlaubnis"
 
-#: members/models.py:244
+#: members/models.py:253
 msgid "Legal guardians"
 msgstr "Erziehungsberechtigte"
 
-#: members/models.py:246
+#: members/models.py:255
 msgid "May cancel a group appointment independently"
 msgstr "Darf sich allein von der Gruppenstunde abmelden"
 
-#: members/models.py:253
+#: members/models.py:262
 msgid "receives newsletter"
 msgstr "Erhält den Newsletter"
 
-#: members/models.py:257
+#: members/models.py:266
 msgid "created"
 msgstr "erstellt"
 
-#: members/models.py:258
+#: members/models.py:267
 msgid "Active"
 msgstr "Aktiv"
 
-#: members/models.py:259
+#: members/models.py:268
 msgid "registration form"
 msgstr "Anmeldeformular"
 
-#: members/models.py:267
+#: members/models.py:276
 msgid "image"
 msgstr "Bild"
 
-#: members/models.py:276
+#: members/models.py:285
 msgid "Echoed"
 msgstr "Rückgemeldet"
 
-#: members/models.py:277
+#: members/models.py:286
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: members/models.py:279
+#: members/models.py:288
 msgid "Login data"
 msgstr "Zugangsdaten"
 
-#: members/models.py:309
+#: members/models.py:318
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py:383
+#: members/models.py:392
 msgid "member"
 msgstr "Teilnehmer"
 
-#: members/models.py:384
+#: members/models.py:393
 msgid "members"
 msgstr "Teilnehmer"
 
-#: members/models.py:457
+#: members/models.py:466
 #, python-format
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:668
+#: members/models.py:677
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:685 members/models.py:879 members/models.py:890
-#: members/models.py:1166 members/models.py:1173
+#: members/models.py:694 members/models.py:890 members/models.py:901
+#: members/models.py:1177 members/models.py:1184
 msgid "Member"
 msgstr "Teilnehmer"
 
-#: members/models.py:692
+#: members/models.py:701
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:693
+#: members/models.py:702
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:713
+#: members/models.py:722
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:714
+#: members/models.py:723
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:728 members/models.py:773
+#: members/models.py:737 members/models.py:782
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:730
+#: members/models.py:739
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:731 members/templates/members/reject_success.html:6
+#: members/models.py:740 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:735
+#: members/models.py:744
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:736
+#: members/models.py:745
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:743
+#: members/models.py:752
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:745
+#: members/models.py:754
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:747
+#: members/models.py:756
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:748
+#: members/models.py:757
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:759
+#: members/models.py:768
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:760
+#: members/models.py:769
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:762
+#: members/models.py:771
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:766
+#: members/models.py:775
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:767
+#: members/models.py:776
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:774
+#: members/models.py:783
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:798
+#: members/models.py:807
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:805
+#: members/models.py:814
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:858
+#: members/models.py:869
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:870
+#: members/models.py:881
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:884
+#: members/models.py:895
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:891 members/models.py:1174
+#: members/models.py:902 members/models.py:1185
 msgid "Members"
 msgstr "Teilnehmer"
 
-#: members/models.py:925
+#: members/models.py:936
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:926
+#: members/models.py:937
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:928
+#: members/models.py:939
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:929
+#: members/models.py:940
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:930
+#: members/models.py:941
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:933
+#: members/models.py:944
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:946
+#: members/models.py:957
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:949
+#: members/models.py:960
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:950
+#: members/models.py:961
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:950
+#: members/models.py:961
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:950
+#: members/models.py:961
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:960 members/models.py:1197
+#: members/models.py:971 members/models.py:1208
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:961
+#: members/models.py:972
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1112 members/models.py:1188 members/models.py:1404
+#: members/models.py:1123 members/models.py:1199 members/models.py:1415
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1113 members/models.py:1131 members/models.py:1405
+#: members/models.py:1124 members/models.py:1142 members/models.py:1416
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1132
+#: members/models.py:1143
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1133
+#: members/models.py:1144
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1157
+#: members/models.py:1168
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1160
+#: members/models.py:1171
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1161
+#: members/models.py:1172
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1179
+#: members/models.py:1190
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1182
+#: members/models.py:1193
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1183
+#: members/models.py:1194
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1190
+#: members/models.py:1201
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1191
+#: members/models.py:1202
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1192
+#: members/models.py:1203
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1193
+#: members/models.py:1204
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1194
+#: members/models.py:1205
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1203 members/models.py:1224
+#: members/models.py:1214 members/models.py:1235
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1204
+#: members/models.py:1215
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1218
+#: members/models.py:1229
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1221
+#: members/models.py:1232
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1229
+#: members/models.py:1240
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1230
+#: members/models.py:1241
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1332 members/models.py:1362
+#: members/models.py:1343 members/models.py:1373
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer:innen listen"
 
-#: members/models.py:1334 members/models.py:1364
+#: members/models.py:1345 members/models.py:1375
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer:innen anzeigen"
 
-#: members/models.py:1336 members/models.py:1366
+#: members/models.py:1347 members/models.py:1377
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer:innen ändern"
 
-#: members/models.py:1338 members/models.py:1368
+#: members/models.py:1349 members/models.py:1379
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer:innen löschen"
 
-#: members/models.py:1342 members/models.py:1372
+#: members/models.py:1353 members/models.py:1383
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
 
-#: members/models.py:1344 members/models.py:1374
+#: members/models.py:1355 members/models.py:1385
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
 
-#: members/models.py:1346 members/models.py:1376
+#: members/models.py:1357 members/models.py:1387
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
 
-#: members/models.py:1348 members/models.py:1378
+#: members/models.py:1359 members/models.py:1389
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
 
-#: members/models.py:1351 members/models.py:1352 members/models.py:1355
+#: members/models.py:1362 members/models.py:1363 members/models.py:1366
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1381 members/models.py:1382 members/models.py:1385
+#: members/models.py:1392 members/models.py:1393 members/models.py:1396
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1391
+#: members/models.py:1402
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1394
+#: members/models.py:1405
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1395
+#: members/models.py:1406
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1406
+#: members/models.py:1417
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1407
+#: members/models.py:1418
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1408
+#: members/models.py:1419
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1409
+#: members/models.py:1420
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1412
+#: members/models.py:1423
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1413
+#: members/models.py:1424
 msgid "Trainings"
 msgstr "Fortbildungen"
 

From 02db0669cd77eb1b2d83193c4d1d1b575912081c Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:12:21 +0100
Subject: [PATCH 12/56] members: don't request mail confirmation of emergency
 contacts

---
 jdav_web/members/admin.py  | 3 +--
 jdav_web/members/models.py | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index de8128f..31de6a6 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -112,8 +112,7 @@ class EmergencyContactInline(CommonAdminInlineMixin, admin.TabularInline):
     formfield_overrides = {
         TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
     }
-    fields = ['prename', 'lastname', 'email', 'phone_number', 'confirmed_mail']
-    readonly_fields = ['confirmed_mail']
+    fields = ['prename', 'lastname', 'email', 'phone_number']
     extra = 0
 
 
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index ebe3f47..d15664f 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -445,11 +445,6 @@ class Member(Person):
         return not self.confirmed and self.confirmed_alternative_mail and self.confirmed_mail and\
             all([emc.confirmed_mail for emc in self.emergencycontact_set.all()])
 
-    def request_mail_confirmation(self, rerequest=False):
-        ret = super().request_mail_confirmation(rerequest)
-        rets = [emc.request_mail_confirmation(rerequest) for emc in self.emergencycontact_set.all()]
-        return ret or any(rets)
-
     def confirm_mail(self, key):
         ret = super().confirm_mail(key)
         if self.registration_ready():

From bb91d77cfc168d3915ebfcb08947afd6b8140edf Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:23:00 +0100
Subject: [PATCH 13/56] members/views: fix prefilling of date inputs

---
 jdav_web/members/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index 0bb9cdc..f737976 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -29,7 +29,7 @@ class MemberRegistrationForm(ModelForm):
                   'phone_number', 'birth_date', 'gender', 'email', 'alternative_email',
                   'registration_form']
         widgets = {
-            'birth_date': DateInput(format='%d.%m.%Y', attrs={'type': 'date'}),
+            'birth_date': DateInput(format='%Y-%m-%d', attrs={'type': 'date'}),
             'registration_form': FileInput(attrs={'accept': 'application/pdf,image/jpeg,image/png'}),
         }
         help_texts = {
@@ -53,7 +53,7 @@ class MemberRegistrationWaitingListForm(ModelForm):
         model = MemberWaitingList
         fields = ['prename', 'lastname', 'birth_date', 'gender', 'email', 'application_text']
         widgets = {
-            'birth_date': DateInput(format='%d.%m.%Y', attrs={'type': 'date'})
+            'birth_date': DateInput(format='%Y-%m-%d', attrs={'type': 'date'})
         }
         help_texts = {
             'prename': _('Prename of the member.'),

From 18d5f5e9899eff38bce3e37d5d70826e62c02c01 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 00:53:57 +0100
Subject: [PATCH 14/56] dashboard: add mailer section

---
 jdav_web/jdav_web/settings/local.py           |  1 +
 jdav_web/mailer/admin.py                      |  1 +
 jdav_web/templates/admin/index.html           | 60 +++++++++++++++----
 .../templates/admin/mailer/app_index.html     | 55 +++++++++++++++++
 4 files changed, 105 insertions(+), 12 deletions(-)
 create mode 100644 jdav_web/templates/admin/mailer/app_index.html

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index 4e3d49e..d873429 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -10,6 +10,7 @@ SEKTION_BOARD_MAIL = "vorstand@alpenverein-heidelberg.de"
 SEKTION_CRISIS_INTERVENTION_MAIL = "krisenmanagement@alpenverein-heidelberg.de"
 
 RESPONSIBLE_MAIL = "jugendreferat@jdav-hd.de"
+DIGITAL_MAIL = "digitales@jdav-hd.de"
 
 # echo
 
diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index 6fc2a3f..780302f 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -36,6 +36,7 @@ class MessageAdmin(FilteredMemberFieldMixin, CommonAdminMixin, ObjectPermissions
     exclude = ('created_by',)
     list_display = ('subject', 'get_recipients', 'sent')
     search_fields = ('subject',)
+    list_filter = ('sent',)
     change_form_template = "mailer/change_form.html"
     readonly_fields = ('sent',)
     #formfield_overrides = {
diff --git a/jdav_web/templates/admin/index.html b/jdav_web/templates/admin/index.html
index 5ee62a8..aee2fbf 100644
--- a/jdav_web/templates/admin/index.html
+++ b/jdav_web/templates/admin/index.html
@@ -19,45 +19,81 @@ auf deine
 
 {% if user.member %}
 
-<div>
-<p>
+<div class="module">
 <h3>Deine Jugendgruppen</h3>
+<p>
 Hier siehst du alle von dir geleiteten Jugendgruppen.
 </p>
 <p>
 <table>
     {% for group in user.member.led_groups %}
     <tr>
-        <td>
-        <a href='{% url 'admin:members_member_changelist' %}?group__id__exact={{group.pk}}'>{{ group.name }}</a>
-        </td>
+        <th scope="row">
+            <a href='{% url 'admin:members_member_changelist' %}?group__id__exact={{group.pk}}'>{{ group.name }}</a>
+        </th>
+        <td></td>
+        <td></td>
     </tr>
     {% endfor %}
 </table>
 </p>
 </div>
 
-<div>
-<p>
+<div class="module">
 <h3>Deine letzten Ausfahrten</h3>
+<p>
 Hier siehst du alle von dir geleiteten Ausfahrten.
 </p>
 <p>
 <table>
     {% for freizeit in user.member.led_freizeiten %}
     <tr>
-        <td>
+        <th scope="row">
             <a href='{% url 'admin:members_freizeit_change' freizeit.pk %}'>{{freizeit.name}}</a>
-        </td>
+        </th>
+        <td></td>
+        <td></td>
     </tr>
     {% endfor %}
 </table>
 </p>
 </div>
-</div>
 
 {% endif %}
 
+<div class="module current-app">
+
+<h3>E-Mail Verteiler</h3>
+<p>
+Hier kannst du E-Mails an deine Gruppe oder an andere Menschen in der JDAV Heidelberg schicken.
+</p>
+<table>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_add' %}'>Verfassen</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_changelist' %}?sent__exact=1'>Gesendet</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_changelist' %}?sent__exact=0'>Entwürfe</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+</table>
+
+</div>
+</div>
+
 {% endblock %}
 
 {% block sidebar %}
@@ -103,7 +139,7 @@ weiterweißt oder sonst der Schuh drückt, schreibe eine E-Mail an eine der folg
             Jugendreferat
         </td>
         <td>
-             <a href="mailto:jugendreferat@jdav-hd.de">jugendreferat@jdav-hd.de</a>
+            <a href="mailto:{% settings_value 'RESPONSIBLE_MAIL' %}">jugendreferat@jdav-hd.de</a>
         </td>
     </tr>
     <tr>
@@ -111,7 +147,7 @@ weiterweißt oder sonst der Schuh drückt, schreibe eine E-Mail an eine der folg
             Fragen zum Kompass
         </td>
         <td>
-             <a href="mailto:digitales@jdav-hd.de">digitales@jdav-hd.de</a>
+             <a href="mailto:{% settings_value 'DIGITAL_MAIL' %}">digitales@jdav-hd.de</a>
         </td>
     </tr>
 </table>
diff --git a/jdav_web/templates/admin/mailer/app_index.html b/jdav_web/templates/admin/mailer/app_index.html
new file mode 100644
index 0000000..a764c6b
--- /dev/null
+++ b/jdav_web/templates/admin/mailer/app_index.html
@@ -0,0 +1,55 @@
+{% extends "admin/app_index.html" %}
+
+{% block content %}
+<div id="content-main">
+<div class="app-mailer module current-app">
+<h2>E-Mail Verteiler</h2>
+<p>
+Hier kannst du E-Mails an deine Gruppe oder an andere Menschen in der JDAV Heidelberg schicken.
+</p>
+<table>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_add' %}'>Verfassen</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_changelist' %}?sent__exact=1'>Gesendet</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_message_changelist' %}?sent__exact=0'>Entwürfe</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+</table>
+
+{% if perms.mailer.change_emailaddress %}
+<br>
+<div class="app-mailer module current-app">
+<h2>Weiterleitungen</h2>
+<p>
+Hier kannst du E-Mail Adressen, also Weiterleitungen, konfigurieren.
+</p>
+<table>
+    <tr>
+        <th scope="row">
+            <a href='{% url 'admin:mailer_emailaddress_changelist' %}'>E-Mail Adressen</a>
+        </th>
+        <td></td>
+        <td></td>
+    </tr>
+</table>
+
+</div>
+</div>
+{% endif %}
+
+{% endblock %}

From fcfd1b0a9dd44a200f6bafda402668b663a33980 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 01:15:47 +0100
Subject: [PATCH 15/56] members: remove default from gender field

---
 ...r_gender_alter_memberwaitinglist_gender.py | 23 +++++++++++++++++++
 jdav_web/members/models.py                    |  1 -
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 jdav_web/members/migrations/0029_alter_member_gender_alter_memberwaitinglist_gender.py

diff --git a/jdav_web/members/migrations/0029_alter_member_gender_alter_memberwaitinglist_gender.py b/jdav_web/members/migrations/0029_alter_member_gender_alter_memberwaitinglist_gender.py
new file mode 100644
index 0000000..3cee52d
--- /dev/null
+++ b/jdav_web/members/migrations/0029_alter_member_gender_alter_memberwaitinglist_gender.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.0.1 on 2024-11-28 00:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0028_group_contact_email'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='member',
+            name='gender',
+            field=models.IntegerField(choices=[(0, 'Männlich'), (1, 'Weiblich'), (2, 'Divers')], verbose_name='Gender'),
+        ),
+        migrations.AlterField(
+            model_name='memberwaitinglist',
+            name='gender',
+            field=models.IntegerField(choices=[(0, 'Männlich'), (1, 'Weiblich'), (2, 'Divers')], verbose_name='Gender'),
+        ),
+    ]
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index d15664f..6e302c7 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -200,7 +200,6 @@ class Person(Contact):
                       (FEMALE, 'Weiblich'),
                       (DIVERSE, 'Divers'))
     gender = models.IntegerField(choices=gender_choices,
-                                 default=DIVERSE,
                                  verbose_name=_('Gender'))
     comments = models.TextField(_('comments'), default='', blank=True)
 

From 7b5c16f6b754cb39a5bd69dd40fa3ddd5ca76cea Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 28 Nov 2024 01:16:46 +0100
Subject: [PATCH 16/56] mailer: remove send to note list field

---
 jdav_web/mailer/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index 780302f..e59a3b5 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -33,7 +33,7 @@ class EmailAddressAdmin(FilteredMemberFieldMixin, admin.ModelAdmin):
 
 class MessageAdmin(FilteredMemberFieldMixin, CommonAdminMixin, ObjectPermissionsModelAdmin):
     """Message creation view"""
-    exclude = ('created_by',)
+    exclude = ('created_by', 'to_notelist')
     list_display = ('subject', 'get_recipients', 'sent')
     search_fields = ('subject',)
     list_filter = ('sent',)

From d1db0b833f9acc2c03094252e39c448445ccbecc Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Fri, 29 Nov 2024 23:13:46 +0100
Subject: [PATCH 17/56] startpage: sort recent posts and reports

---
 jdav_web/startpage/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdav_web/startpage/views.py b/jdav_web/startpage/views.py
index dd84dc7..d7f6eba 100644
--- a/jdav_web/startpage/views.py
+++ b/jdav_web/startpage/views.py
@@ -22,8 +22,8 @@ def render(request, template_path, context={}):
 
 def index(request):
     context = {
-        'recent_posts': Post.objects.filter(section__urlname=settings.RECENT_SECTION),
-        'reports': Post.objects.filter(section__urlname=settings.REPORTS_SECTION),
+        'recent_posts': Post.objects.filter(section__urlname=settings.RECENT_SECTION).order_by('-date'),
+        'reports': Post.objects.filter(section__urlname=settings.REPORTS_SECTION).order_by('-date'),
     }
     return render(request, 'startpage/index.html', context)
 

From d19da71fef0235d02413cda5c107c3bb3bd9ee60 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 01:25:28 +0100
Subject: [PATCH 18/56] members: add demote to waiter button and confirmation

---
 jdav_web/locale/de/LC_MESSAGES/django.po      |   6 +-
 jdav_web/members/admin.py                     |  56 ++-
 .../members/locale/de/LC_MESSAGES/django.po   | 409 +++++++++---------
 .../templates/admin/demote_to_waiter.html     |  48 ++
 .../change_form_object_tools.html             |  13 +
 5 files changed, 330 insertions(+), 202 deletions(-)
 create mode 100644 jdav_web/members/templates/admin/demote_to_waiter.html
 create mode 100644 jdav_web/templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html

diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index d83aa2c..49905e1 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-27 23:16+0100\n"
+"POT-Creation-Date: 2024-11-30 01:22+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"
@@ -272,6 +272,10 @@ msgstr "Abrechnung einreichen"
 msgid "Invite as user"
 msgstr "Als Kompassbenutzer:in einladen"
 
+#: templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html:8
+msgid "Demote to waiter"
+msgstr "Zurück auf die Warteliste setzen"
+
 #: templates/admin/members/memberwaitinglist/change_form_object_tools.html:8
 #: templates/admin/members/memberwaitinglist/submit_line.html:9
 msgid "Invite to group"
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 31de6a6..ed28f4d 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -374,7 +374,11 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
     name_text_or_link.admin_order_field = 'lastname'
 
 
-class MemberUnconfirmedAdmin(admin.ModelAdmin):
+class DemoteToWaiterForm(forms.Form):
+    _selected_action = forms.CharField(widget=forms.MultipleHiddenInput)
+
+
+class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
     fieldsets = [
         (None,
          {
@@ -422,7 +426,7 @@ class MemberUnconfirmedAdmin(admin.ModelAdmin):
     list_filter = ('group', 'confirmed_mail', 'confirmed_alternative_mail')
     readonly_fields = ['confirmed_mail', 'confirmed_alternative_mail',
                        'good_conduct_certificate_valid']
-    actions = ['request_mail_confirmation', 'confirm', 'demote_to_waiter']
+    actions = ['request_mail_confirmation', 'confirm', 'demote_to_waiter_action']
     inlines = [EmergencyContactInline]
     change_form_template = "members/change_member_unconfirmed.html"
 
@@ -464,22 +468,62 @@ class MemberUnconfirmedAdmin(admin.ModelAdmin):
             messages.error(request, _("Failed to confirm some registrations because of unconfirmed email addresses."))
     confirm.short_description = _('Confirm selected registrations')
 
+    def get_urls(self):
+        urls = super().get_urls()
+
+        def wrap(view):
+            def wrapper(*args, **kwargs):
+                return self.admin_site.admin_view(view)(*args, **kwargs)
+
+            wrapper.model_admin = self
+            return update_wrapper(wrapper, view)
+
+        custom_urls = [
+            path(
+                "<path:object_id>/demote/",
+                wrap(self.demote_to_waiter_view),
+                name="%s_%s_demote" % (self.opts.app_label, self.opts.model_name),
+            ),
+        ]
+        return custom_urls + urls
+
+    def demote_to_waiter_action(self, request, queryset):
+        return self.demote_to_waiter_view(request, queryset)
+    demote_to_waiter_action.short_description = _('Demote selected registrations to waiters.')
+
+    def demote_to_waiter_view(self, request, object_id):
+        if type(object_id) == str:
+            member = MemberUnconfirmedProxy.objects.get(pk=object_id)
+            queryset = [member]
+            form = None
+        else:
+            queryset = object_id
+            form = DemoteToWaiterForm(initial={'_selected_action': queryset.values_list('id', flat=True)})
+
+        if "apply" in request.POST:
+            self.demote_to_waiter(request, queryset)
+            return HttpResponseRedirect(reverse('admin:members_memberunconfirmedproxy_changelist'))
+
+        context = dict(self.admin_site.each_context(request),
+                       title=_('Demote member to waiter'),
+                       opts=self.opts,
+                       queryset=queryset,
+                       form=form)
+        return render(request, 'admin/demote_to_waiter.html', context=context)
+
     def demote_to_waiter(self, request, queryset):
         for member in queryset:
-            #mem_as_dict = member.__dict__
-            #del mem_as_dict['_state']
-            #del mem_as_dict['id']
             waiter = MemberWaitingList(prename=member.prename,
                                        lastname=member.lastname,
                                        email=member.email,
                                        birth_date=member.birth_date,
+                                       gender=member.gender,
                                        comments=member.comments,
                                        confirmed_mail=member.confirmed_mail,
                                        confirm_mail_key=member.confirm_mail_key)
             waiter.save()
             member.delete()
             messages.success(request, _("Successfully demoted %(name)s to waiter.") % {'name': waiter.name})
-    demote_to_waiter.short_description = _('Demote selected registrations to waiters.')
 
     def response_change(self, request, member):
         if "_confirm" in request.POST:
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 6e0fabd..04677ac 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-28 00:04+0100\n"
+"POT-Creation-Date: 2024-11-30 01:22+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"
@@ -18,165 +18,169 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: members/admin.py:126 members/models.py:382
+#: members/admin.py:125 members/models.py:381
 msgid "Registration complete"
 msgstr "Anmeldung vollständig"
 
-#: members/admin.py:132
+#: members/admin.py:131
 msgid "True"
 msgstr "Ja"
 
-#: members/admin.py:133
+#: members/admin.py:132
 msgid "False"
 msgstr "Nein"
 
-#: members/admin.py:134
+#: members/admin.py:133
 msgid "All"
 msgstr "Alle"
 
-#: members/admin.py:184 members/admin.py:397
+#: members/admin.py:183 members/admin.py:400
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: members/admin.py:189 members/admin.py:402
+#: members/admin.py:188 members/admin.py:405
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: members/admin.py:194 members/admin.py:407
+#: members/admin.py:193 members/admin.py:410
 msgid "Others"
 msgstr "Sonstiges"
 
-#: members/admin.py:200 members/admin.py:412
+#: members/admin.py:199 members/admin.py:415
 msgid "Organizational"
 msgstr "Organisatorisches"
 
-#: members/admin.py:281
+#: members/admin.py:280
 msgid "Compose new mail to selected members"
 msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
 
-#: members/admin.py:287
+#: members/admin.py:286
 msgid "Echo required"
 msgstr "Rückmeldung erforderlich"
 
-#: members/admin.py:289
+#: members/admin.py:288
 msgid "Successfully requested echo from selected members."
 msgstr ""
 "Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt."
 
-#: members/admin.py:290
+#: members/admin.py:289
 msgid "Request echo from selected members"
 msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken"
 
-#: members/admin.py:296
+#: members/admin.py:295
 #, python-format
 msgid "Successfully invited %(name)s as user."
 msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:298
+#: members/admin.py:297
 msgid "Successfully invited selected members to join as users."
 msgstr ""
 "Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:305 members/admin.py:322
+#: members/admin.py:304 members/admin.py:321
 msgid "Permission denied."
 msgstr "Fehlende Berechtigungen."
 
-#: members/admin.py:312 members/admin.py:341
+#: members/admin.py:311 members/admin.py:340
 #: members/templates/admin/invite_as_user.html:21
 msgid "Invite as user"
 msgstr "Kompass Zugangsdaten wählen lassen"
 
-#: members/admin.py:317
+#: members/admin.py:316
 msgid "Invite selected members to join Kompass as users."
 msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen."
 
-#: members/admin.py:328
+#: members/admin.py:327
 msgid "Member not found."
 msgstr "Teilnehmer:in nicht gefunden."
 
-#: members/admin.py:332
+#: members/admin.py:331
 #, python-format
 msgid "%(name)s already has login data."
 msgstr "%(name)s hat schon Zugangsdaten."
 
-#: members/admin.py:346
+#: members/admin.py:345
 #, python-format
 msgid "%(name)s already has a pending invitation as user."
 msgstr ""
 "%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen."
 
-#: members/admin.py:364
+#: members/admin.py:363
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:374 members/models.py:53 members/models.py:1401
+#: members/admin.py:373 members/models.py:53 members/models.py:1395
 msgid "Name"
 msgstr "Name"
 
-#: members/admin.py:446
+#: members/admin.py:449
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
-#: members/admin.py:447
+#: members/admin.py:450
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py:454 members/admin.py:488
+#: members/admin.py:457 members/admin.py:531
 #, python-format
 msgid "Successfully confirmed %(name)s."
 msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 
-#: members/admin.py:458 members/admin.py:491
+#: members/admin.py:461 members/admin.py:534
 #, python-format
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py:463
+#: members/admin.py:466
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py:465
+#: members/admin.py:468
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
 "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
 "sind."
 
-#: members/admin.py:466
+#: members/admin.py:469
 msgid "Confirm selected registrations"
 msgstr "Ausgewählte Registrierungen bestätigen"
 
-#: members/admin.py:482
+#: members/admin.py:492
+msgid "Demote selected registrations to waiters."
+msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
+
+#: members/admin.py:508
+msgid "Demote member to waiter"
+msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
+
+#: members/admin.py:526
 #, python-format
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py:483
-msgid "Demote selected registrations to waiters."
-msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
-
-#: members/admin.py:498 members/models.py:389 members/models.py:738
-#: members/models.py:1146
+#: members/admin.py:541 members/models.py:388 members/models.py:732
+#: members/models.py:1140
 msgid "Group"
 msgstr "Gruppe"
 
-#: members/admin.py:532
+#: members/admin.py:575
 #, python-format
 msgid "Successfully asked %(name)s to confirm their waiting status."
 msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 
-#: members/admin.py:533
+#: members/admin.py:576
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:542 members/admin.py:602
+#: members/admin.py:585 members/admin.py:645
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:546 members/admin.py:607
+#: members/admin.py:589 members/admin.py:650
 msgid ""
 "The selected group does not have a contact email. Please first set a contact "
 "email and then try again."
@@ -184,32 +188,32 @@ msgstr ""
 "Die ausgewählte Gruppe hat keine Kontakt E-Mail Adresse. Bitte stelle eine "
 "Kontakt E-Mail Adresse ein und versuche es erneut."
 
-#: members/admin.py:554 members/admin.py:614
+#: members/admin.py:597 members/admin.py:657
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:558 members/admin.py:620
+#: members/admin.py:601 members/admin.py:663
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:565
+#: members/admin.py:608
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:663
+#: members/admin.py:706
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:666
+#: members/admin.py:709
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:669 members/models.py:956
+#: members/admin.py:712 members/models.py:950
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:695
+#: members/admin.py:738
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -222,7 +226,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:713
+#: members/admin.py:756
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -235,7 +239,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:721
+#: members/admin.py:764
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -246,30 +250,30 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:767
+#: members/admin.py:810
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:777
+#: members/admin.py:820
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:781
+#: members/admin.py:824
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:782
+#: members/admin.py:825
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:783
+#: members/admin.py:826
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:797
+#: members/admin.py:840
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -278,38 +282,38 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:827
+#: members/admin.py:870
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:835
+#: members/admin.py:878
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:843
+#: members/admin.py:886
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:847 members/admin.py:870
+#: members/admin.py:890 members/admin.py:913
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: members/admin.py:860
+#: members/admin.py:903
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:864
+#: members/admin.py:907
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:882
+#: members/admin.py:925
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
@@ -345,11 +349,11 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:54 members/models.py:942
+#: members/models.py:54 members/models.py:936
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:60 members/models.py:934
+#: members/models.py:60 members/models.py:928
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
@@ -386,7 +390,7 @@ msgstr "Jugendleiter"
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:77 members/models.py:1228
+#: members/models.py:77 members/models.py:1222
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
@@ -395,12 +399,10 @@ msgid "Ending time"
 msgstr "Endzeitpunkt"
 
 #: members/models.py:80
-#, fuzzy
-#| msgid "Contact information"
 msgid "Contact email"
-msgstr "Kontaktinformationen"
+msgstr "Kontakt Email"
 
-#: members/models.py:90 members/models.py:258
+#: members/models.py:90 members/models.py:257
 msgid "group"
 msgstr "Gruppe"
 
@@ -424,7 +426,7 @@ msgstr "Emailadresse bestätigt"
 msgid "Email confirmation needed"
 msgstr "Email Bestätigung erforderlich"
 
-#: members/models.py:188 members/models.py:232
+#: members/models.py:188 members/models.py:231
 msgid "phone number"
 msgstr "Telefonnummer (mobil)"
 
@@ -432,469 +434,470 @@ msgstr "Telefonnummer (mobil)"
 msgid "birth date"
 msgstr "Geburtsdatum"
 
-#: members/models.py:204
+#: members/models.py:203
 msgid "Gender"
 msgstr "Gender"
 
-#: members/models.py:205
+#: members/models.py:204
 msgid "comments"
 msgstr "Kommentare"
 
-#: members/models.py:229
+#: members/models.py:228
 msgid "Alternative email confirmed"
 msgstr "Alternative E-Mail Adresse bestätigt"
 
-#: members/models.py:233
+#: members/models.py:232
 msgid "street and house number"
 msgstr "Straße und Hausnummer"
 
-#: members/models.py:234
+#: members/models.py:233
 msgid "Postcode"
 msgstr "PLZ"
 
-#: members/models.py:236
+#: members/models.py:235
 msgid "town"
 msgstr "Stadt"
 
-#: members/models.py:237
+#: members/models.py:236
 msgid "Address extra"
 msgstr "Adress-Zusatz"
 
-#: members/models.py:238
+#: members/models.py:237
 msgid "Country"
 msgstr "Land"
 
-#: members/models.py:240
+#: members/models.py:239
 msgid "Good conduct certificate presented on"
 msgstr "Führungszeugnis vorgelegt am"
 
-#: members/models.py:241
+#: members/models.py:240
 msgid "Joined on"
 msgstr "Eintritt"
 
-#: members/models.py:242
+#: members/models.py:241
 msgid "Left on"
 msgstr "Austritt"
 
-#: members/models.py:243
+#: members/models.py:242
 msgid "Has key"
 msgstr "Hat Jugendraumschlüssel"
 
-#: members/models.py:244
+#: members/models.py:243
 msgid "Has a free ticket for the climbing gym"
 msgstr "Hat Freikarte für Kletterhalle"
 
-#: members/models.py:245
+#: members/models.py:244
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py:246
+#: members/models.py:245
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
 
-#: members/models.py:247
+#: members/models.py:246
 msgid "Climbing badge"
 msgstr "Kletterschein"
 
-#: members/models.py:248
+#: members/models.py:247
 msgid "Alpine experience"
 msgstr "Alpine Erfahrung"
 
-#: members/models.py:249
+#: members/models.py:248
 msgid "Allergies"
 msgstr "Allergieen"
 
-#: members/models.py:250
+#: members/models.py:249
 msgid "Medication"
 msgstr "Medikamente"
 
-#: members/models.py:251
+#: members/models.py:250
 msgid "Tetanus vaccination"
 msgstr "Tetanusimpfung"
 
-#: members/models.py:252
+#: members/models.py:251
 msgid "Photos may be taken"
 msgstr "Fotoerlaubnis"
 
-#: members/models.py:253
+#: members/models.py:252
 msgid "Legal guardians"
 msgstr "Erziehungsberechtigte"
 
-#: members/models.py:255
+#: members/models.py:254
 msgid "May cancel a group appointment independently"
 msgstr "Darf sich allein von der Gruppenstunde abmelden"
 
-#: members/models.py:262
+#: members/models.py:261
 msgid "receives newsletter"
 msgstr "Erhält den Newsletter"
 
-#: members/models.py:266
+#: members/models.py:265
 msgid "created"
 msgstr "erstellt"
 
-#: members/models.py:267
+#: members/models.py:266
 msgid "Active"
 msgstr "Aktiv"
 
-#: members/models.py:268
+#: members/models.py:267
 msgid "registration form"
 msgstr "Anmeldeformular"
 
-#: members/models.py:276
+#: members/models.py:275
 msgid "image"
 msgstr "Bild"
 
-#: members/models.py:285
+#: members/models.py:284
 msgid "Echoed"
 msgstr "Rückgemeldet"
 
-#: members/models.py:286
+#: members/models.py:285
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: members/models.py:288
+#: members/models.py:287
 msgid "Login data"
 msgstr "Zugangsdaten"
 
-#: members/models.py:318
+#: members/models.py:317
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py:392
+#: members/models.py:391
 msgid "member"
 msgstr "Teilnehmer"
 
-#: members/models.py:393
+#: members/models.py:392
 msgid "members"
 msgstr "Teilnehmer"
 
-#: members/models.py:466
+#: members/models.py:460
 #, python-format
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:677
+#: members/models.py:671
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:694 members/models.py:890 members/models.py:901
-#: members/models.py:1177 members/models.py:1184
+#: members/models.py:688 members/models.py:884 members/models.py:895
+#: members/models.py:1171 members/models.py:1178
 msgid "Member"
 msgstr "Teilnehmer"
 
-#: members/models.py:701
+#: members/models.py:695
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:702
+#: members/models.py:696
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:722
+#: members/models.py:716
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:723
+#: members/models.py:717
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:737 members/models.py:782
+#: members/models.py:731 members/models.py:776
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:739
+#: members/models.py:733
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:740 members/templates/members/reject_success.html:6
+#: members/models.py:734 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:744
+#: members/models.py:738
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:745
+#: members/models.py:739
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:752
+#: members/models.py:746
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:754
+#: members/models.py:748
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:756
+#: members/models.py:750
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:757
+#: members/models.py:751
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:768
+#: members/models.py:762
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:769
+#: members/models.py:763
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:771
+#: members/models.py:765
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:775
+#: members/models.py:769
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:776
+#: members/models.py:770
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:783
+#: members/models.py:777
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:807
+#: members/models.py:801
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:814
+#: members/models.py:808
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:869
+#: members/models.py:863
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:881
+#: members/models.py:875
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:895
+#: members/models.py:889
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:902 members/models.py:1185
+#: members/models.py:896 members/models.py:1179
 msgid "Members"
 msgstr "Teilnehmer"
 
-#: members/models.py:936
+#: members/models.py:930
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:937
+#: members/models.py:931
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:939
+#: members/models.py:933
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:940
+#: members/models.py:934
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:941
+#: members/models.py:935
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:944
+#: members/models.py:938
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:957
+#: members/models.py:951
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:960
+#: members/models.py:954
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:961
+#: members/models.py:955
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:961
+#: members/models.py:955
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:961
+#: members/models.py:955
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:971 members/models.py:1208
+#: members/models.py:965 members/models.py:1202
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:972
+#: members/models.py:966
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1123 members/models.py:1199 members/models.py:1415
+#: members/models.py:1117 members/models.py:1193 members/models.py:1409
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1124 members/models.py:1142 members/models.py:1416
+#: members/models.py:1118 members/models.py:1136 members/models.py:1410
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1143
+#: members/models.py:1137
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1144
+#: members/models.py:1138
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1168
+#: members/models.py:1162
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1171
+#: members/models.py:1165
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1172
+#: members/models.py:1166
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1190
+#: members/models.py:1184
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1193
+#: members/models.py:1187
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1194
+#: members/models.py:1188
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1201
+#: members/models.py:1195
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1202
+#: members/models.py:1196
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1203
+#: members/models.py:1197
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1204
+#: members/models.py:1198
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1205
+#: members/models.py:1199
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1214 members/models.py:1235
+#: members/models.py:1208 members/models.py:1229
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1215
+#: members/models.py:1209
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1229
+#: members/models.py:1223
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1232
+#: members/models.py:1226
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1240
+#: members/models.py:1234
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1241
+#: members/models.py:1235
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1343 members/models.py:1373
+#: members/models.py:1337 members/models.py:1367
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer:innen listen"
 
-#: members/models.py:1345 members/models.py:1375
+#: members/models.py:1339 members/models.py:1369
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer:innen anzeigen"
 
-#: members/models.py:1347 members/models.py:1377
+#: members/models.py:1341 members/models.py:1371
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer:innen ändern"
 
-#: members/models.py:1349 members/models.py:1379
+#: members/models.py:1343 members/models.py:1373
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer:innen löschen"
 
-#: members/models.py:1353 members/models.py:1383
+#: members/models.py:1347 members/models.py:1377
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
 
-#: members/models.py:1355 members/models.py:1385
+#: members/models.py:1349 members/models.py:1379
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
 
-#: members/models.py:1357 members/models.py:1387
+#: members/models.py:1351 members/models.py:1381
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
 
-#: members/models.py:1359 members/models.py:1389
+#: members/models.py:1353 members/models.py:1383
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
 
-#: members/models.py:1362 members/models.py:1363 members/models.py:1366
+#: members/models.py:1356 members/models.py:1357 members/models.py:1360
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1392 members/models.py:1393 members/models.py:1396
+#: members/models.py:1386 members/models.py:1387 members/models.py:1390
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1402
+#: members/models.py:1396
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1405
+#: members/models.py:1399
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1406
+#: members/models.py:1400
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1417
+#: members/models.py:1411
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1418
+#: members/models.py:1412
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1419
+#: members/models.py:1413
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1420
+#: members/models.py:1414
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1423
+#: members/models.py:1417
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1424
+#: members/models.py:1418
 msgid "Trainings"
 msgstr "Fortbildungen"
 
+#: members/templates/admin/demote_to_waiter.html:17
 #: members/templates/admin/generate_seminar_report.html:17
 #: members/templates/admin/invite_as_user.html:17
 #: members/templates/admin/invite_for_group.html:17
@@ -903,6 +906,30 @@ msgstr "Fortbildungen"
 msgid "Home"
 msgstr "Start"
 
+#: members/templates/admin/demote_to_waiter.html:20
+#: members/templates/admin/demote_to_waiter.html:25
+msgid "Demote to waiter"
+msgstr "Zurück auf die Warteliste setzen"
+
+#: members/templates/admin/demote_to_waiter.html:27
+msgid ""
+"Do you want to demote the following unconfirmed registrations to waiters?"
+msgstr ""
+"Möchtest du die folgenden Personen zurück auf die Warteliste setzen?"
+
+#: members/templates/admin/demote_to_waiter.html:45
+msgid "Demote"
+msgstr "Zurück auf die Warteliste setzen"
+
+#: members/templates/admin/demote_to_waiter.html:46
+#: members/templates/admin/generate_seminar_report.html:54
+#: members/templates/admin/invite_as_user.html:37
+#: members/templates/admin/invite_for_group.html:52
+#: members/templates/admin/invite_selected_as_user.html:49
+#: members/templates/admin/invite_selected_for_group.html:53
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: members/templates/admin/generate_seminar_report.html:27
 msgid ""
 "Here you can generate a seminar report suitable for the LJP. A report\n"
@@ -939,14 +966,6 @@ msgstr "Bitte wähle einen der obigen Modi."
 msgid "Generate"
 msgstr "Erstellen"
 
-#: members/templates/admin/generate_seminar_report.html:54
-#: members/templates/admin/invite_as_user.html:37
-#: members/templates/admin/invite_for_group.html:52
-#: members/templates/admin/invite_selected_as_user.html:49
-#: members/templates/admin/invite_selected_for_group.html:53
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: members/templates/admin/invite_as_user.html:27
 #, python-format
 msgid ""
diff --git a/jdav_web/members/templates/admin/demote_to_waiter.html b/jdav_web/members/templates/admin/demote_to_waiter.html
new file mode 100644
index 0000000..661ddef
--- /dev/null
+++ b/jdav_web/members/templates/admin/demote_to_waiter.html
@@ -0,0 +1,48 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+    {{ media }}
+    <script src="{% static 'admin/js/cancel.js' %}" async></script>
+    <script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
+    <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
+{% endblock %}
+
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; {% translate 'Demote to waiter' %}
+</div>
+{% endblock %}
+
+{% block content %}
+<h2>{% translate "Demote to waiter" %}</h2>
+<p>
+{% trans "Do you want to demote the following unconfirmed registrations to waiters?" %}
+</p>
+<p>
+<ul>
+    {% for member in queryset %}
+    <li>
+    <a href="{% url 'admin:members_memberunconfirmedproxy_change' 3 %}">{{ member }}</a>
+    </li>
+    {% endfor %}
+</ul>
+</p>
+
+<form action="" method="post">
+    {% csrf_token %}
+    {% if form %}
+    {{form}}
+    {% endif %}
+    <input type="hidden" name="action" value="demote_to_waiter_action">
+    <input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Demote' %}">
+    <a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
+</form>
+{% endblock %}
diff --git a/jdav_web/templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html b/jdav_web/templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html
new file mode 100644
index 0000000..c3fbe46
--- /dev/null
+++ b/jdav_web/templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html
@@ -0,0 +1,13 @@
+{% extends "admin/change_form_object_tools.html" %}
+{% load i18n admin_urls %}
+
+{% block object-tools-items %}
+
+<li>
+    {% url opts|admin_urlname:'demote' original.pk|admin_urlquote as demote_url %}
+    <a class="historylink" href="{% add_preserved_filters demote_url %}">{% trans 'Demote to waiter' %}</a>
+</li>
+
+{{block.super}}
+
+{% endblock %}

From 5734d41a239e19e7d1397f00a29e1f3e7989ff52 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 01:49:15 +0100
Subject: [PATCH 19/56] startpage: update impressum

---
 .../templates/startpage/impressum.html        | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/jdav_web/startpage/templates/startpage/impressum.html b/jdav_web/startpage/templates/startpage/impressum.html
index eb31dc1..78371b6 100644
--- a/jdav_web/startpage/templates/startpage/impressum.html
+++ b/jdav_web/startpage/templates/startpage/impressum.html
@@ -38,7 +38,7 @@ Der Deutsche Alpenverein Sektion Heidelberg 1869 e.V. ist im Vereinsregister des
 <h3>Jugendreferat</h3>
 
 <p>
-Leitung: Eva Engelmann und Robert Scheffler (kommissarisch)<br>
+Leitung: Eva Engelmann und Robert Scheffler<br>
 E-Mail: jugend@alpenverein-heidelberg.de<br>
 URL: <a href="https://www.jdav-hd.de">www.jdav-hd.de</a> ; <a href="https://www.jdav-heidelberg.de">www.jdav-heidelberg.de</a>
 </p>
@@ -59,12 +59,13 @@ Diese Datenschutz-Information gilt für die Datenverarbeitung durch:
 <p>
 Verantwortlicher: Deutscher Alpenverein Sektion Heidelberg 1869 e.V.<br>
 Harbigweg 20, 69124 Heidelberg<br>
-Email: <a href="mailto:alpenverein-heidelberg@t-online.de">alpenverein-heidelberg@t-online.de</a><br>
+Email: <a href="mailto:geschaeftsstelle@alpenverein-heidelberg.de">geschaeftsstelle@alpenverein-heidelberg.de</a><br>
 Telefon: +49 6221 484076
 </p>
 
 <p>
-Zur Auftragsverarbeitung für die jdav Heidelberg ist die Firma reeweb AG Wettsteinplatz 74058 Basel Schweiz beauftragt. Die Datenverarbeitung erfolgt in Rechenzentren in der Schweiz oder Staaten des Europäischen Wirtschaftsraums (EWR).
+Zur Auftragsverarbeitung für die jdav Heidelberg ist die Firma Contabo GmbH Aschauer Str. 32a 81549 München beauftragt.
+Die Datenverarbeitung erfolgt in Rechenzentren in der Schweiz oder Staaten des Europäischen Wirtschaftsraums (EWR).
 </p>
 
 <h3>
@@ -72,7 +73,7 @@ Zur Auftragsverarbeitung für die jdav Heidelberg ist die Firma reeweb AG Wettst
 </h3>
 
 <p>
-Beim Aufrufen unserer Website <a href="https://jdav-hd.merten.dev">jdav-hd.merten.dev</a> werden durch den auf Ihrem Endgerät zum Einsatz kommenden Browser automatisch Informationen an den Server unserer Website gesendet. Diese Informationen werden temporär in einem sog. Logfile gespeichert. Folgende Informationen werden dabei ohne Ihr Zutun erfasst und bis zur automatischen Löschung gespeichert:
+Beim Aufrufen unserer Website <a href="https://jdav-hd.de">jdav-hd.de</a> werden durch den auf Ihrem Endgerät zum Einsatz kommenden Browser automatisch Informationen an den Server unserer Website gesendet. Diese Informationen werden temporär in einem sog. Logfile gespeichert. Folgende Informationen werden dabei ohne Ihr Zutun erfasst und bis zur automatischen Löschung gespeichert:
 </p>
 
 <p>
@@ -131,7 +132,8 @@ Zur Weitergabe der Daten im Rahmen einer Mitgliedschaft im Alpenverein Heidelber
 </p>
 
 <p>
-Die jdav Heidelberg hat die Firma reeweb AG Wettsteinplatz 74058 Basel Schweiz beauftragt die Daten ihrer Mitglieder zu verwalten. Diese Datenverarbeitung erfolgt in Rechenzentren in der Schweiz oder Staaten des Europäischen Wirtschaftsraums (EWR).
+Die jdav Heidelberg hat die Firma Contabo GmbH Aschauer Str. 32a 81549 München beauftragt die Daten ihrer Mitglieder zu
+verwalten. Diese Datenverarbeitung erfolgt in Rechenzentren in der Schweiz oder Staaten des Europäischen Wirtschaftsraums (EWR).
 </p>
 
 <p>
@@ -191,7 +193,10 @@ Die meisten Browser akzeptieren Cookies automatisch. Sie können Ihren Browser j
 </p>
 
 <p>
-Auf unserer Internetseite sind Kontaktformulare vorhanden, welche für die elektronische Kontaktaufnahme genutzt werden können. Nimmt ein Nutzer diese Möglichkeit wahr, so werden die in der Eingabemaske eingegeben Daten an uns übermittelt und gespeichert. Diese Daten sind:
+Auf unserer Internetseite sind Kontaktformulare vorhanden, welche für die elektronische Kontaktaufnahme genutzt werden können.
+Nimmt ein Nutzer diese Möglichkeit wahr, so werden die in der Eingabemaske eingegeben Daten an uns übermittelt und gespeichert.
+Für diese Datenverarbeitung ist die Firma Contabo GmbH Aschauer Str. 32a 81549 München beauftragt.
+Diese Daten sind:
 </p>
 
 <p>
@@ -258,7 +263,7 @@ Die während des Absendevorgangs zusätzlich erhobenen personenbezogenen Daten w
 <h3>6. Das geschieht, wenn Sie Online-Anmeldeformulare nutzen:</h3>
 
 <p>
-Auf unserer Internetseite sind Anmeldeformulare vorhanden, welches für die elektronische Anmeldung zu Jugendgruppen, Kursen und Veranstaltungen unseres Vereins genutzt werden kann. Nimmt ein Nutzer diese Möglichkeit wahr, so werden die in der Eingabemaske eingegeben Daten an uns übermittelt und gespeichert. Für diese Datenverarbeitung ist die Firma reeweb AG Wettsteinplatz 74058 Basel Schweiz beauftragt. Diese Daten sind:
+Auf unserer Internetseite sind Anmeldeformulare vorhanden, welches für die elektronische Anmeldung zu Jugendgruppen, Kursen und Veranstaltungen unseres Vereins genutzt werden kann. Nimmt ein Nutzer diese Möglichkeit wahr, so werden die in der Eingabemaske eingegeben Daten an uns übermittelt und gespeichert.
 </p>
 
 <p>
@@ -346,7 +351,7 @@ Sofern Ihre personenbezogenen Daten auf Grundlage von berechtigten Interessen ge
 <p>
 Möchten Sie von Ihrem Widerrufs- oder Widerspruchsrecht Gebrauch machen, genügt eine Email an
 <a href="mailto:jugend@alpenverein-heidelberg.de">jugend@alpenverein-heidelberg.de</a> oder
-<a href="mailto:alpenverein-heidelberg@t-online.de">alpenverein-heidelberg@t-online.de</a>.
+<a href="mailto:geschaeftsstelle@alpenverein-heidelberg.de">geschaeftsstelle@alpenverein-heidelberg.de</a>.
 </p>
 
 <h3>10. Die Sicherheit Ihrer Daten:</h3>
@@ -358,7 +363,7 @@ Wir bedienen uns geeigneter technischer und organisatorischer Sicherheitsmaßnah
 <h3>11. Aktualität und Änderung dieser Datenschutzerklärung</h3>
 
 <p>
-Diese Datenschutzerklärung ist aktuell gültig und hat den Stand April 2020.
+Diese Datenschutzerklärung ist aktuell gültig und hat den Stand November 2024.
 </p>
 
 <p>

From 79b538910795fa76c91bd420c1c9f4492067d484 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 03:56:23 +0100
Subject: [PATCH 20/56] members/excursion: add finance overview

---
 jdav_web/finance/admin.py                     |  26 +-
 .../finance/locale/de/LC_MESSAGES/django.po   | 126 ++--
 jdav_web/finance/models.py                    |  31 +-
 jdav_web/locale/de/LC_MESSAGES/django.po      |  19 +-
 jdav_web/members/admin.py                     |  22 +
 .../members/locale/de/LC_MESSAGES/django.po   | 611 ++++++++++++------
 jdav_web/members/models.py                    |  14 +
 .../admin/freizeit_finance_overview.html      | 166 +++++
 .../freizeit/change_form_object_tools.html    |   7 +-
 jdav_web/utils.py                             |  12 +
 10 files changed, 726 insertions(+), 308 deletions(-)
 create mode 100644 jdav_web/members/templates/admin/freizeit_finance_overview.html

diff --git a/jdav_web/finance/admin.py b/jdav_web/finance/admin.py
index 442b0cc..a1c8e82 100644
--- a/jdav_web/finance/admin.py
+++ b/jdav_web/finance/admin.py
@@ -9,6 +9,7 @@ from django.shortcuts import render
 from django.conf import settings
 
 from contrib.admin import CommonAdminInlineMixin, CommonAdminMixin
+from utils import get_member
 
 from rules.contrib.admin import ObjectPermissionsModelAdmin
 
@@ -218,23 +219,7 @@ class StatementSubmittedAdmin(admin.ModelAdmin):
                        opts=self.opts,
                        statement=statement,
                        transaction_issues=statement.transaction_issues,
-                       total_bills=statement.total_bills,
-                       total=statement.total)
-        if statement.excursion is not None:
-            context = dict(context,
-                           nights=statement.excursion.night_count,
-                           price_per_night=statement.real_night_cost,
-                           duration=statement.excursion.duration,
-                           staff_count=statement.real_staff_count,
-                           kilometers_traveled=statement.excursion.kilometers_traveled,
-                           means_of_transport=statement.excursion.get_tour_approach(),
-                           euro_per_km=statement.euro_per_km,
-                           allowance_per_day=settings.ALLOWANCE_PER_DAY,
-                           nights_per_yl=statement.nights_per_yl,
-                           allowance_per_yl=statement.allowance_per_yl,
-                           transportation_per_yl=statement.transportation_per_yl,
-                           total_per_yl=statement.total_per_yl,
-                           total_staff=statement.total_staff)
+                       **statement.template_context())
 
         return render(request, 'admin/overview_submitted_statement.html', context=context)
 
@@ -325,10 +310,3 @@ class BillAdmin(admin.ModelAdmin):
     list_display = ['__str__', 'statement', 'short_description', 'pretty_amount', 'paid_by', 'refunded']
     list_filter = ('statement', 'paid_by', 'refunded')
     search_fields = ('reference', 'statement')
-
-
-def get_member(request):
-    if not hasattr(request.user, 'member'):
-        return None
-    else:
-        return request.user.member
diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index cbb5e02..1d0f727 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/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: 2024-11-24 01:34+0100\n"
+"POT-Creation-Date: 2024-11-30 03:54+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"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: finance/admin.py:75
+#: finance/admin.py:76
 #, python-format
 msgid "%(name)s is already submitted."
 msgstr "%(name)s ist bereits eingereicht."
 
-#: finance/admin.py:81
+#: finance/admin.py:82
 #, python-format
 msgid ""
 "Successfully submited %(name)s. The finance department will notify the "
@@ -32,23 +32,23 @@ msgstr ""
 "Rechnung %(name)s erfolgreich eingereicht. Das Finanzreferat wird auf dich "
 "sobald wie möglich zukommen."
 
-#: finance/admin.py:84
+#: finance/admin.py:85
 msgid "Submit statement"
 msgstr "Rechnung einreichen"
 
-#: finance/admin.py:161
+#: finance/admin.py:162
 #, python-format
 msgid "%(name)s is not yet submitted."
 msgstr "%(name)s ist noch nicht eingereicht."
 
-#: finance/admin.py:168
+#: finance/admin.py:169
 #, python-format
 msgid "An error occured while trying to confirm %(name)s. Please try again."
 msgstr ""
 "Beim Abwickeln von %(name)s ist ein Fehler aufgetreten. Bitte versuche es "
 "erneut."
 
-#: finance/admin.py:172
+#: finance/admin.py:173
 #, python-format
 msgid ""
 "Successfully confirmed %(name)s. I hope you executed the associated "
@@ -57,11 +57,11 @@ msgstr ""
 "Erfolgreich %(name)s abgewickelt. Ich hoffe du hast die zugehörigen "
 "Überweisungen ausgeführt, ich werde dich nicht nochmal erinnern."
 
-#: finance/admin.py:179
+#: finance/admin.py:180
 msgid "Statement confirmed"
 msgstr "Abrechnung abgewickelt"
 
-#: finance/admin.py:185
+#: finance/admin.py:186
 msgid ""
 "Transactions do not match the covered expenses. Please correct the mistakes "
 "listed below."
@@ -69,19 +69,19 @@ msgstr ""
 "Überweisungen stimmen nicht mit den übernommenen Kosten überein. Bitte "
 "korrigiere die unten aufgeführten Fehler."
 
-#: finance/admin.py:190
+#: finance/admin.py:191
 msgid "Some transactions have no ledger configured. Please fill in the gaps."
 msgstr ""
 "Manche Überweisungen haben kein Geldtopf eingestellt. Bitte trage das nach."
 
-#: finance/admin.py:199
+#: finance/admin.py:200
 #, python-format
 msgid "Successfully rejected %(name)s. The requestor can reapply, when needed."
 msgstr ""
 "Die Rechnung %(name)s wurde abgelehnt. Die Person kann die Rechnung erneut "
 "einstellen, wenn es benötigt wird."
 
-#: finance/admin.py:206
+#: finance/admin.py:207
 #, python-format
 msgid ""
 "%(name)s already has transactions. Please delete them first, if you want to "
@@ -90,12 +90,12 @@ msgstr ""
 "%(name)s hat bereits Überweisungen. Bitte lösche diese zunächst, bevor du "
 "neue generierst."
 
-#: finance/admin.py:211
+#: finance/admin.py:212
 #, python-format
 msgid "Successfully generated transactions for %(name)s"
 msgstr "Automatisch Überweisungsträger für %(name)s generiert."
 
-#: finance/admin.py:214
+#: finance/admin.py:215
 #, python-format
 msgid ""
 "Error while generating transactions for %(name)s. Do all bills have a payer?"
@@ -103,28 +103,28 @@ msgstr ""
 "Fehler beim Erzeugen der Überweisungsträger für %(name)s. Sind für alle "
 "Quittungen eine bezahlende Person eingestellt? "
 
-#: finance/admin.py:217
+#: finance/admin.py:218
 msgid "View submitted statement"
 msgstr "Eingereichte Abrechnung einsehen"
 
-#: finance/admin.py:245
+#: finance/admin.py:230
 #, python-format
 msgid "Successfully reduced transactions for %(name)s."
 msgstr "Überweisungsträger für %(name)s minimiert."
 
-#: finance/admin.py:289
+#: finance/admin.py:274
 #, python-format
 msgid "%(name)s is not yet confirmed."
 msgstr "%(name)s ist noch nicht bestätigt."
 
-#: finance/admin.py:298
+#: finance/admin.py:283
 #, python-format
 msgid "Successfully unconfirmed %(name)s. I hope you know what you are doing."
 msgstr ""
 "Erfolgreich die Bestätigung von %(name)s zurückgenommen. Ich hoffe du weißt "
 "was du machst."
 
-#: finance/admin.py:303 finance/templates/admin/unconfirm_statement.html:26
+#: finance/admin.py:288 finance/templates/admin/unconfirm_statement.html:26
 msgid "Unconfirm statement"
 msgstr "Bestätigung zurücknehmen"
 
@@ -132,165 +132,165 @@ msgstr "Bestätigung zurücknehmen"
 msgid "Finance"
 msgstr "Finanzen"
 
-#: finance/models.py:19
+#: finance/models.py:20
 msgid "Name"
 msgstr "Name"
 
-#: finance/models.py:25 finance/models.py:441 finance/models.py:465
+#: finance/models.py:26 finance/models.py:466 finance/models.py:490
 #: finance/templates/admin/confirmed_statement.html:38
 #: finance/templates/admin/overview_submitted_statement.html:100
 msgid "Ledger"
 msgstr "Geldtopf"
 
-#: finance/models.py:26
+#: finance/models.py:27
 msgid "Ledgers"
 msgstr "Geldtöpfe"
 
-#: finance/models.py:46 finance/models.py:384 finance/models.py:464
+#: finance/models.py:47 finance/models.py:409 finance/models.py:489
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: finance/models.py:49 finance/models.py:385
+#: finance/models.py:50 finance/models.py:410
 msgid "Explanation"
 msgstr "Erklärung"
 
-#: finance/models.py:51
+#: finance/models.py:52
 msgid "Associated excursion"
 msgstr "Zugehörige Ausfahrt"
 
-#: finance/models.py:56
+#: finance/models.py:57
 msgid "Price per night"
 msgstr "Preis pro Nacht"
 
-#: finance/models.py:58
+#: finance/models.py:59
 msgid "Submitted"
 msgstr "Eingericht"
 
-#: finance/models.py:59
+#: finance/models.py:60
 msgid "Submitted on"
 msgstr "Eingereicht am"
 
-#: finance/models.py:60
+#: finance/models.py:61
 msgid "Confirmed"
 msgstr "Abgewickelt"
 
-#: finance/models.py:61 finance/models.py:448
+#: finance/models.py:62 finance/models.py:473
 msgid "Paid on"
 msgstr "Bezahlt am"
 
-#: finance/models.py:63
+#: finance/models.py:64
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: finance/models.py:68
+#: finance/models.py:69
 msgid "Submitted by"
 msgstr "Eingereicht bei"
 
-#: finance/models.py:73 finance/models.py:449
+#: finance/models.py:74 finance/models.py:474
 msgid "Authorized by"
 msgstr "Autorisiert von"
 
-#: finance/models.py:80 finance/models.py:383 finance/models.py:444
+#: finance/models.py:81 finance/models.py:408 finance/models.py:469
 msgid "Statement"
 msgstr "Abrechnung"
 
-#: finance/models.py:81
+#: finance/models.py:82
 msgid "Statements"
 msgstr "Abrechnungen"
 
-#: finance/models.py:96
+#: finance/models.py:97
 #, python-format
 msgid "Statement: %(excursion)s"
 msgstr "Abrechnung: %(excursion)s"
 
-#: finance/models.py:148
+#: finance/models.py:149
 msgid "Ready to confirm"
 msgstr "Bereit zur Abwicklung"
 
-#: finance/models.py:192
+#: finance/models.py:193
 #, python-format
 msgid "Compensation for %(excu)s"
 msgstr "Entschädigung für %(excu)s"
 
-#: finance/models.py:325
+#: finance/models.py:326
 #: finance/templates/admin/overview_submitted_statement.html:78
 msgid "Total"
 msgstr "Gesamtbetrag"
 
-#: finance/models.py:338
+#: finance/models.py:363
 msgid "Statement in preparation"
 msgstr "Abrechnung in Vorbereitung"
 
-#: finance/models.py:339
+#: finance/models.py:364
 msgid "Statements in preparation"
 msgstr "Abrechnungen in Vorbereitung"
 
-#: finance/models.py:358
+#: finance/models.py:383
 msgid "Submitted statement"
 msgstr "Eingereichte Abrechnung"
 
-#: finance/models.py:359
+#: finance/models.py:384
 msgid "Submitted statements"
 msgstr "Eingereichte Abrechnungen"
 
-#: finance/models.py:375
+#: finance/models.py:400
 msgid "Paid statement"
 msgstr "Bezahlte Abrechnung"
 
-#: finance/models.py:376
+#: finance/models.py:401
 msgid "Paid statements"
 msgstr "Bezahlte Abrechnungen"
 
-#: finance/models.py:388
+#: finance/models.py:412 finance/models.py:426 finance/models.py:463
+#: finance/templates/admin/confirmed_statement.html:36
+#: finance/templates/admin/overview_submitted_statement.html:31
+#: finance/templates/admin/overview_submitted_statement.html:98
+msgid "Amount"
+msgstr "Betrag"
+
+#: finance/models.py:413
 msgid "Paid by"
 msgstr "Bezahlt von"
 
-#: finance/models.py:390
+#: finance/models.py:415
 msgid "Covered"
 msgstr "Übernommen"
 
-#: finance/models.py:391
+#: finance/models.py:416
 msgid "Refunded"
 msgstr "Ausgezahlt"
 
-#: finance/models.py:393
+#: finance/models.py:418
 msgid "Proof"
 msgstr "Beleg"
 
-#: finance/models.py:401 finance/models.py:438
-#: finance/templates/admin/confirmed_statement.html:36
-#: finance/templates/admin/overview_submitted_statement.html:31
-#: finance/templates/admin/overview_submitted_statement.html:98
-msgid "Amount"
-msgstr "Betrag"
-
-#: finance/models.py:404 finance/models.py:411 finance/models.py:424
+#: finance/models.py:429 finance/models.py:436 finance/models.py:449
 msgid "Bill"
 msgstr "Quittung"
 
-#: finance/models.py:405 finance/models.py:412 finance/models.py:425
+#: finance/models.py:430 finance/models.py:437 finance/models.py:450
 #: finance/templates/admin/overview_submitted_statement.html:26
 msgid "Bills"
 msgstr "Quittungen"
 
-#: finance/models.py:437 finance/templates/admin/confirmed_statement.html:37
+#: finance/models.py:462 finance/templates/admin/confirmed_statement.html:37
 #: finance/templates/admin/overview_submitted_statement.html:99
 msgid "Reference"
 msgstr "Verwendungszweck"
 
-#: finance/models.py:439
+#: finance/models.py:464
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: finance/models.py:447
+#: finance/models.py:472
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: finance/models.py:459
+#: finance/models.py:484
 msgid "Transaction"
 msgstr "Überweisung"
 
-#: finance/models.py:460
+#: finance/models.py:485
 #: finance/templates/admin/overview_submitted_statement.html:84
 msgid "Transactions"
 msgstr "Überweisungen"
diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py
index 1cfc2a4..5704f01 100644
--- a/jdav_web/finance/models.py
+++ b/jdav_web/finance/models.py
@@ -12,6 +12,7 @@ from django.conf import settings
 import rules
 from contrib.models import CommonModel
 from contrib.rules import has_global_perm
+from utils import cvt_to_decimal
 
 # Create your models here.
 
@@ -324,6 +325,30 @@ class Statement(CommonModel):
         return "{}€".format(self.total)
     total_pretty.short_description = _('Total')
 
+    def template_context(self):
+        context = {
+            'total_bills': self.total_bills,
+            'total_bills_theoretic': self.total_bills_theoretic,
+            'total': self.total,
+        }
+        if self.excursion:
+            excursion_context = {
+                'nights': self.excursion.night_count,
+                'price_per_night': self.real_night_cost,
+                'duration': self.excursion.duration,
+                'staff_count': self.real_staff_count,
+                'kilometers_traveled': self.excursion.kilometers_traveled,
+                'means_of_transport': self.excursion.get_tour_approach(),
+                'euro_per_km': self.euro_per_km,
+                'allowance_per_day': settings.ALLOWANCE_PER_DAY,
+                'nights_per_yl': self.nights_per_yl,
+                'allowance_per_yl': self.allowance_per_yl,
+                'transportation_per_yl': self.transportation_per_yl,
+                'total_per_yl': self.total_per_yl,
+                'total_staff': self.total_staff,
+            }
+        return dict(context, **excursion_context)
+
 
 class StatementUnSubmittedManager(models.Manager):
     def get_queryset(self):
@@ -384,7 +409,7 @@ class Bill(CommonModel):
     short_description = models.CharField(verbose_name=_('Short description'), max_length=30)
     explanation = models.TextField(verbose_name=_('Explanation'), blank=True)
 
-    amount = models.DecimalField(max_digits=6, decimal_places=2, default=0)
+    amount = models.DecimalField(verbose_name=_('Amount'), max_digits=6, decimal_places=2, default=0)
     paid_by = models.ForeignKey(Member, verbose_name=_('Paid by'), null=True,
                                 on_delete=models.SET_NULL)
     costs_covered = models.BooleanField(verbose_name=_('Covered'), default=False)
@@ -466,7 +491,3 @@ class Receipt(models.Model):
                                on_delete=models.CASCADE)
     amount = models.DecimalField(max_digits=6, decimal_places=2)
     comments = models.TextField()
-
-
-def cvt_to_decimal(f):
-    return Decimal(f).quantize(Decimal('.01'), rounding=ROUND_HALF_DOWN)
diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index 49905e1..7ed7671 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-30 01:22+0100\n"
+"POT-Creation-Date: 2024-11-30 03:54+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"
@@ -264,9 +264,11 @@ msgstr "Übersicht erstellen"
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: templates/admin/members/freizeit/change_form_object_tools.html:36
-msgid "Submit statement"
-msgstr "Abrechnung einreichen"
+#: templates/admin/members/freizeit/change_form_object_tools.html:38
+#, fuzzy
+#| msgid "Generate overview"
+msgid "Finance overview"
+msgstr "Übersicht erstellen"
 
 #: templates/admin/members/member/change_form_object_tools.html:8
 msgid "Invite as user"
@@ -286,14 +288,17 @@ msgstr "Zu Gruppe einladen"
 msgid "Add another %(verbose_name)s"
 msgstr "Weiteren %(verbose_name)s hinzufügen"
 
-#: utils.py:14
+#: utils.py:15
 msgid "Please keep filesize under {} MiB. Current filesize: {:10.2f} MiB."
 msgstr "Maximale Dateigröße {} MiB. Aktuelle Dateigröße: {:10.2f} MiB."
 
-#: utils.py:42
+#: utils.py:43
 msgid "Filetype not supported."
 msgstr "Dateityp nicht unterstützt."
 
-#: utils.py:44
+#: utils.py:45
 msgid "Please keep filesize under {}. Current filesize: {}"
 msgstr "Maximale Dateigröße {}. Aktuelle Dateigröße: {}."
+
+#~ msgid "Submit statement"
+#~ msgstr "Abrechnung einreichen"
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index ed28f4d..0d24940 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -41,6 +41,7 @@ from .models import (Member, Group, Freizeit, MemberNoteList, NewMemberOnList, K
 from finance.models import Statement, BillOnExcursionProxy
 from mailer.mailutils import send as send_mail, get_echo_link
 from django.conf import settings
+from utils import get_member
 #from easy_select2 import apply_select2
 
 
@@ -924,6 +925,25 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
         return fill_pdf_form(title + "_SJR_Antrag", 'members/sjr_template.pdf', context, attachments)
     sjr_application.short_description = _('Generate SJR application')
 
+    def finance_overview(self, request, memberlist):
+        if not memberlist.statement:
+            messages.error(request, _("No statement found. Please add a statement and then retry."))
+        if "apply" in request.POST:
+            memberlist.statement.submit(get_member(request))
+            messages.success(request,
+                             _("Successfully submited statement. The finance department will notify you as soon as possible."))
+            return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(memberlist.pk,)))
+        context = dict(self.admin_site.each_context(request),
+                       title=_('Finance overview'),
+                       opts=self.opts,
+                       memberlist=memberlist,
+                       object=memberlist,
+                       participant_count=memberlist.participant_count,
+                       ljp_contributions=memberlist.potential_ljp_contributions,
+                       total_relative_costs=memberlist.total_relative_costs,
+                       **memberlist.statement.template_context())
+        return render(request, 'admin/freizeit_finance_overview.html', context=context)
+
     def get_urls(self):
         urls = super().get_urls()
 
@@ -952,6 +972,8 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
             return self.notes_list(request, Freizeit.objects.get(pk=object_id))
         if "crisis_intervention_list" in request.POST:
             return self.crisis_intervention_list(request, Freizeit.objects.get(pk=object_id))
+        if "finance_overview" in request.POST:
+            return self.finance_overview(request, Freizeit.objects.get(pk=object_id))
         return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name),
                                             args=(object_id,)))
 
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 04677ac..200a4bc 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-30 01:22+0100\n"
+"POT-Creation-Date: 2024-11-30 03:54+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"
@@ -18,169 +18,169 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: members/admin.py:125 members/models.py:381
+#: members/admin.py:126 members/models.py:382
 msgid "Registration complete"
 msgstr "Anmeldung vollständig"
 
-#: members/admin.py:131
+#: members/admin.py:132
 msgid "True"
 msgstr "Ja"
 
-#: members/admin.py:132
+#: members/admin.py:133
 msgid "False"
 msgstr "Nein"
 
-#: members/admin.py:133
+#: members/admin.py:134
 msgid "All"
 msgstr "Alle"
 
-#: members/admin.py:183 members/admin.py:400
+#: members/admin.py:184 members/admin.py:401
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: members/admin.py:188 members/admin.py:405
+#: members/admin.py:189 members/admin.py:406
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: members/admin.py:193 members/admin.py:410
+#: members/admin.py:194 members/admin.py:411
 msgid "Others"
 msgstr "Sonstiges"
 
-#: members/admin.py:199 members/admin.py:415
+#: members/admin.py:200 members/admin.py:416
 msgid "Organizational"
 msgstr "Organisatorisches"
 
-#: members/admin.py:280
+#: members/admin.py:281
 msgid "Compose new mail to selected members"
 msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
 
-#: members/admin.py:286
+#: members/admin.py:287
 msgid "Echo required"
 msgstr "Rückmeldung erforderlich"
 
-#: members/admin.py:288
+#: members/admin.py:289
 msgid "Successfully requested echo from selected members."
 msgstr ""
 "Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt."
 
-#: members/admin.py:289
+#: members/admin.py:290
 msgid "Request echo from selected members"
 msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken"
 
-#: members/admin.py:295
+#: members/admin.py:296
 #, python-format
 msgid "Successfully invited %(name)s as user."
 msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:297
+#: members/admin.py:298
 msgid "Successfully invited selected members to join as users."
 msgstr ""
 "Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:304 members/admin.py:321
+#: members/admin.py:305 members/admin.py:322
 msgid "Permission denied."
 msgstr "Fehlende Berechtigungen."
 
-#: members/admin.py:311 members/admin.py:340
+#: members/admin.py:312 members/admin.py:341
 #: members/templates/admin/invite_as_user.html:21
 msgid "Invite as user"
 msgstr "Kompass Zugangsdaten wählen lassen"
 
-#: members/admin.py:316
+#: members/admin.py:317
 msgid "Invite selected members to join Kompass as users."
 msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen."
 
-#: members/admin.py:327
+#: members/admin.py:328
 msgid "Member not found."
 msgstr "Teilnehmer:in nicht gefunden."
 
-#: members/admin.py:331
+#: members/admin.py:332
 #, python-format
 msgid "%(name)s already has login data."
 msgstr "%(name)s hat schon Zugangsdaten."
 
-#: members/admin.py:345
+#: members/admin.py:346
 #, python-format
 msgid "%(name)s already has a pending invitation as user."
 msgstr ""
 "%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen."
 
-#: members/admin.py:363
+#: members/admin.py:364
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:373 members/models.py:53 members/models.py:1395
+#: members/admin.py:374 members/models.py:54 members/models.py:1409
 msgid "Name"
 msgstr "Name"
 
-#: members/admin.py:449
+#: members/admin.py:450
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
-#: members/admin.py:450
+#: members/admin.py:451
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py:457 members/admin.py:531
+#: members/admin.py:458 members/admin.py:532
 #, python-format
 msgid "Successfully confirmed %(name)s."
 msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 
-#: members/admin.py:461 members/admin.py:534
+#: members/admin.py:462 members/admin.py:535
 #, python-format
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py:466
+#: members/admin.py:467
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py:468
+#: members/admin.py:469
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
 "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
 "sind."
 
-#: members/admin.py:469
+#: members/admin.py:470
 msgid "Confirm selected registrations"
 msgstr "Ausgewählte Registrierungen bestätigen"
 
-#: members/admin.py:492
+#: members/admin.py:493
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:508
+#: members/admin.py:509
 msgid "Demote member to waiter"
 msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
 
-#: members/admin.py:526
+#: members/admin.py:527
 #, python-format
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py:541 members/models.py:388 members/models.py:732
-#: members/models.py:1140
+#: members/admin.py:542 members/models.py:389 members/models.py:733
+#: members/models.py:1154
 msgid "Group"
 msgstr "Gruppe"
 
-#: members/admin.py:575
+#: members/admin.py:576
 #, python-format
 msgid "Successfully asked %(name)s to confirm their waiting status."
 msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 
-#: members/admin.py:576
+#: members/admin.py:577
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:585 members/admin.py:645
+#: members/admin.py:586 members/admin.py:646
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:589 members/admin.py:650
+#: members/admin.py:590 members/admin.py:651
 msgid ""
 "The selected group does not have a contact email. Please first set a contact "
 "email and then try again."
@@ -188,32 +188,32 @@ msgstr ""
 "Die ausgewählte Gruppe hat keine Kontakt E-Mail Adresse. Bitte stelle eine "
 "Kontakt E-Mail Adresse ein und versuche es erneut."
 
-#: members/admin.py:597 members/admin.py:657
+#: members/admin.py:598 members/admin.py:658
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:601 members/admin.py:663
+#: members/admin.py:602 members/admin.py:664
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:608
+#: members/admin.py:609
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:706
+#: members/admin.py:707
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:709
+#: members/admin.py:710
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:712 members/models.py:950
+#: members/admin.py:713 members/models.py:951
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:738
+#: members/admin.py:739
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -226,7 +226,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:756
+#: members/admin.py:757
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -239,7 +239,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:764
+#: members/admin.py:765
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -250,30 +250,30 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:810
+#: members/admin.py:811
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:820
+#: members/admin.py:821
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:824
+#: members/admin.py:825
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:825
+#: members/admin.py:826
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:826
+#: members/admin.py:827
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:840
+#: members/admin.py:841
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -282,622 +282,643 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:870
+#: members/admin.py:871
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:878
+#: members/admin.py:879
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:886
+#: members/admin.py:887
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:890 members/admin.py:913
+#: members/admin.py:891 members/admin.py:914
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Seminarbericht erstellen"
 
-#: members/admin.py:903
+#: members/admin.py:904
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:907
+#: members/admin.py:908
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:925
+#: members/admin.py:926
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
+#: members/admin.py:930
+msgid "No statement found. Please add a statement and then retry."
+msgstr ""
+"Keine Abrechnung angelegt. Bitte lege eine Abrechnung and und versuche es "
+"erneut."
+
+#: members/admin.py:934
+msgid ""
+"Successfully submited statement. The finance department will notify you as "
+"soon as possible."
+msgstr ""
+"Abrechnung erfolgreich eingericht. Die Finanzabteilung wird sich bei dir so "
+"schnell wie möglich melden."
+
+#: members/admin.py:937
+#: members/templates/admin/freizeit_finance_overview.html:21
+msgid "Finance overview"
+msgstr "Kostenübersicht"
+
 #: members/apps.py:7
 msgid "member administration"
 msgstr "Meine Jugendgruppe"
 
-#: members/models.py:39
+#: members/models.py:40
 msgid "Monday"
 msgstr "Montag"
 
-#: members/models.py:40
+#: members/models.py:41
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: members/models.py:41
+#: members/models.py:42
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: members/models.py:42
+#: members/models.py:43
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: members/models.py:43
+#: members/models.py:44
 msgid "Friday"
 msgstr "Freitag"
 
-#: members/models.py:44
+#: members/models.py:45
 msgid "Saturday"
 msgstr "Samstag"
 
-#: members/models.py:45
+#: members/models.py:46
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:54 members/models.py:936
+#: members/models.py:55 members/models.py:937
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:60 members/models.py:928
+#: members/models.py:61 members/models.py:929
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
 
-#: members/models.py:61
+#: members/models.py:62
 msgid "Activities"
 msgstr "Aktivitäten"
 
-#: members/models.py:69
+#: members/models.py:70
 msgid "name"
 msgstr "Name"
 
-#: members/models.py:70
+#: members/models.py:71
 msgid "description"
 msgstr "Beschreibung"
 
-#: members/models.py:71
+#: members/models.py:72
 msgid "show on website"
 msgstr "Auf der Webseite anzeigen"
 
-#: members/models.py:72
+#: members/models.py:73
 msgid "lowest year"
 msgstr "Ab Jahrgang"
 
-#: members/models.py:73
+#: members/models.py:74
 msgid "highest year"
 msgstr "Bis Jahrgang"
 
-#: members/models.py:74
+#: members/models.py:75
 msgid "youth leaders"
 msgstr "Jugendleiter"
 
-#: members/models.py:76
+#: members/models.py:77
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:77 members/models.py:1222
+#: members/models.py:78 members/models.py:1236
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
-#: members/models.py:78
+#: members/models.py:79
 msgid "Ending time"
 msgstr "Endzeitpunkt"
 
-#: members/models.py:80
+#: members/models.py:81
 msgid "Contact email"
 msgstr "Kontakt Email"
 
-#: members/models.py:90 members/models.py:257
+#: members/models.py:91 members/models.py:258
 msgid "group"
 msgstr "Gruppe"
 
-#: members/models.py:91
+#: members/models.py:92
 msgid "groups"
 msgstr "Gruppen"
 
-#: members/models.py:107
+#: members/models.py:108
 msgid "prename"
 msgstr "Vorname"
 
-#: members/models.py:108
+#: members/models.py:109
 msgid "last name"
 msgstr "Nachname"
 
-#: members/models.py:111
+#: members/models.py:112
 msgid "Email confirmed"
 msgstr "Emailadresse bestätigt"
 
-#: members/models.py:148
+#: members/models.py:149
 msgid "Email confirmation needed"
 msgstr "Email Bestätigung erforderlich"
 
-#: members/models.py:188 members/models.py:231
+#: members/models.py:189 members/models.py:232
 msgid "phone number"
 msgstr "Telefonnummer (mobil)"
 
-#: members/models.py:198
+#: members/models.py:199
 msgid "birth date"
 msgstr "Geburtsdatum"
 
-#: members/models.py:203
+#: members/models.py:204
 msgid "Gender"
 msgstr "Gender"
 
-#: members/models.py:204
+#: members/models.py:205
 msgid "comments"
 msgstr "Kommentare"
 
-#: members/models.py:228
+#: members/models.py:229
 msgid "Alternative email confirmed"
 msgstr "Alternative E-Mail Adresse bestätigt"
 
-#: members/models.py:232
+#: members/models.py:233
 msgid "street and house number"
 msgstr "Straße und Hausnummer"
 
-#: members/models.py:233
+#: members/models.py:234
 msgid "Postcode"
 msgstr "PLZ"
 
-#: members/models.py:235
+#: members/models.py:236
 msgid "town"
 msgstr "Stadt"
 
-#: members/models.py:236
+#: members/models.py:237
 msgid "Address extra"
 msgstr "Adress-Zusatz"
 
-#: members/models.py:237
+#: members/models.py:238
 msgid "Country"
 msgstr "Land"
 
-#: members/models.py:239
+#: members/models.py:240
 msgid "Good conduct certificate presented on"
 msgstr "Führungszeugnis vorgelegt am"
 
-#: members/models.py:240
+#: members/models.py:241
 msgid "Joined on"
 msgstr "Eintritt"
 
-#: members/models.py:241
+#: members/models.py:242
 msgid "Left on"
 msgstr "Austritt"
 
-#: members/models.py:242
+#: members/models.py:243
 msgid "Has key"
 msgstr "Hat Jugendraumschlüssel"
 
-#: members/models.py:243
+#: members/models.py:244
 msgid "Has a free ticket for the climbing gym"
 msgstr "Hat Freikarte für Kletterhalle"
 
-#: members/models.py:244
+#: members/models.py:245
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py:245
+#: members/models.py:246
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
 
-#: members/models.py:246
+#: members/models.py:247
 msgid "Climbing badge"
 msgstr "Kletterschein"
 
-#: members/models.py:247
+#: members/models.py:248
 msgid "Alpine experience"
 msgstr "Alpine Erfahrung"
 
-#: members/models.py:248
+#: members/models.py:249
 msgid "Allergies"
 msgstr "Allergieen"
 
-#: members/models.py:249
+#: members/models.py:250
 msgid "Medication"
 msgstr "Medikamente"
 
-#: members/models.py:250
+#: members/models.py:251
 msgid "Tetanus vaccination"
 msgstr "Tetanusimpfung"
 
-#: members/models.py:251
+#: members/models.py:252
 msgid "Photos may be taken"
 msgstr "Fotoerlaubnis"
 
-#: members/models.py:252
+#: members/models.py:253
 msgid "Legal guardians"
 msgstr "Erziehungsberechtigte"
 
-#: members/models.py:254
+#: members/models.py:255
 msgid "May cancel a group appointment independently"
 msgstr "Darf sich allein von der Gruppenstunde abmelden"
 
-#: members/models.py:261
+#: members/models.py:262
 msgid "receives newsletter"
 msgstr "Erhält den Newsletter"
 
-#: members/models.py:265
+#: members/models.py:266
 msgid "created"
 msgstr "erstellt"
 
-#: members/models.py:266
+#: members/models.py:267
 msgid "Active"
 msgstr "Aktiv"
 
-#: members/models.py:267
+#: members/models.py:268
 msgid "registration form"
 msgstr "Anmeldeformular"
 
-#: members/models.py:275
+#: members/models.py:276
 msgid "image"
 msgstr "Bild"
 
-#: members/models.py:284
+#: members/models.py:285
 msgid "Echoed"
 msgstr "Rückgemeldet"
 
-#: members/models.py:285
+#: members/models.py:286
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: members/models.py:287
+#: members/models.py:288
 msgid "Login data"
 msgstr "Zugangsdaten"
 
-#: members/models.py:317
+#: members/models.py:318
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py:391
+#: members/models.py:392
 msgid "member"
 msgstr "Teilnehmer"
 
-#: members/models.py:392
+#: members/models.py:393
 msgid "members"
 msgstr "Teilnehmer"
 
-#: members/models.py:460
+#: members/models.py:461
 #, python-format
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:671
+#: members/models.py:672
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:688 members/models.py:884 members/models.py:895
-#: members/models.py:1171 members/models.py:1178
+#: members/models.py:689 members/models.py:885 members/models.py:896
+#: members/models.py:1185 members/models.py:1192
 msgid "Member"
 msgstr "Teilnehmer"
 
-#: members/models.py:695
+#: members/models.py:696
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:696
+#: members/models.py:697
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:716
+#: members/models.py:717
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:717
+#: members/models.py:718
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:731 members/models.py:776
+#: members/models.py:732 members/models.py:777
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:733
+#: members/models.py:734
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:734 members/templates/members/reject_success.html:6
+#: members/models.py:735 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:738
+#: members/models.py:739
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:739
+#: members/models.py:740
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:746
+#: members/models.py:747
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:748
+#: members/models.py:749
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:750
+#: members/models.py:751
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:751
+#: members/models.py:752
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:762
+#: members/models.py:763
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:763
+#: members/models.py:764
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:765
+#: members/models.py:766
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:769
+#: members/models.py:770
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:770
+#: members/models.py:771
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:777
+#: members/models.py:778
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:801
+#: members/models.py:802
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:808
+#: members/models.py:809
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:863
+#: members/models.py:864
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:875
+#: members/models.py:876
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:889
+#: members/models.py:890
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:896 members/models.py:1179
+#: members/models.py:897 members/models.py:1193
 msgid "Members"
 msgstr "Teilnehmer"
 
-#: members/models.py:930
+#: members/models.py:931
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:931
+#: members/models.py:932
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:933
+#: members/models.py:934
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:934
+#: members/models.py:935
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:935
+#: members/models.py:936
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:938
+#: members/models.py:939
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:951
+#: members/models.py:952
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:954
+#: members/models.py:955
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:955
+#: members/models.py:956
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:955
+#: members/models.py:956
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:955
+#: members/models.py:956
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:965 members/models.py:1202
+#: members/models.py:966 members/models.py:1216
+#: members/templates/admin/freizeit_finance_overview.html:26
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:966
+#: members/models.py:967
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1117 members/models.py:1193 members/models.py:1409
+#: members/models.py:1131 members/models.py:1207 members/models.py:1423
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1118 members/models.py:1136 members/models.py:1410
+#: members/models.py:1132 members/models.py:1150 members/models.py:1424
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1137
+#: members/models.py:1151
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1138
+#: members/models.py:1152
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1162
+#: members/models.py:1176
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1165
+#: members/models.py:1179
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1166
+#: members/models.py:1180
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1184
+#: members/models.py:1198
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1187
+#: members/models.py:1201
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1188
+#: members/models.py:1202
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1195
+#: members/models.py:1209
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1196
+#: members/models.py:1210
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1197
+#: members/models.py:1211
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1198
+#: members/models.py:1212
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1199
+#: members/models.py:1213
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1208 members/models.py:1229
+#: members/models.py:1222 members/models.py:1243
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1209
+#: members/models.py:1223
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1223
+#: members/models.py:1237
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1226
+#: members/models.py:1240
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1234
+#: members/models.py:1248
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1235
+#: members/models.py:1249
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1337 members/models.py:1367
+#: members/models.py:1351 members/models.py:1381
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer:innen listen"
 
-#: members/models.py:1339 members/models.py:1369
+#: members/models.py:1353 members/models.py:1383
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer:innen anzeigen"
 
-#: members/models.py:1341 members/models.py:1371
+#: members/models.py:1355 members/models.py:1385
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer:innen ändern"
 
-#: members/models.py:1343 members/models.py:1373
+#: members/models.py:1357 members/models.py:1387
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer:innen löschen"
 
-#: members/models.py:1347 members/models.py:1377
+#: members/models.py:1361 members/models.py:1391
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
 
-#: members/models.py:1349 members/models.py:1379
+#: members/models.py:1363 members/models.py:1393
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
 
-#: members/models.py:1351 members/models.py:1381
+#: members/models.py:1365 members/models.py:1395
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
 
-#: members/models.py:1353 members/models.py:1383
+#: members/models.py:1367 members/models.py:1397
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
 
-#: members/models.py:1356 members/models.py:1357 members/models.py:1360
+#: members/models.py:1370 members/models.py:1371 members/models.py:1374
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1386 members/models.py:1387 members/models.py:1390
+#: members/models.py:1400 members/models.py:1401 members/models.py:1404
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1396
+#: members/models.py:1410
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1399
+#: members/models.py:1413
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1400
+#: members/models.py:1414
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1411
+#: members/models.py:1425
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1412
+#: members/models.py:1426
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1413
+#: members/models.py:1427
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1414
+#: members/models.py:1428
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1417
+#: members/models.py:1431
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1418
+#: members/models.py:1432
 msgid "Trainings"
 msgstr "Fortbildungen"
 
 #: members/templates/admin/demote_to_waiter.html:17
+#: members/templates/admin/freizeit_finance_overview.html:17
 #: members/templates/admin/generate_seminar_report.html:17
 #: members/templates/admin/invite_as_user.html:17
 #: members/templates/admin/invite_for_group.html:17
@@ -914,14 +935,14 @@ msgstr "Zurück auf die Warteliste setzen"
 #: members/templates/admin/demote_to_waiter.html:27
 msgid ""
 "Do you want to demote the following unconfirmed registrations to waiters?"
-msgstr ""
-"Möchtest du die folgenden Personen zurück auf die Warteliste setzen?"
+msgstr "Möchtest du die folgenden Personen zurück auf die Warteliste setzen?"
 
 #: members/templates/admin/demote_to_waiter.html:45
 msgid "Demote"
 msgstr "Zurück auf die Warteliste setzen"
 
 #: members/templates/admin/demote_to_waiter.html:46
+#: members/templates/admin/freizeit_finance_overview.html:153
 #: members/templates/admin/generate_seminar_report.html:54
 #: members/templates/admin/invite_as_user.html:37
 #: members/templates/admin/invite_for_group.html:52
@@ -930,6 +951,182 @@ msgstr "Zurück auf die Warteliste setzen"
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#: members/templates/admin/freizeit_finance_overview.html:29
+msgid ""
+"\n"
+"Here you see an estimate on the expected costs and contributions by the "
+"association. This is not a guaranteed\n"
+"cost plan!\n"
+msgstr ""
+"\n"
+"Hier siehst du eine Schätzung der erwarteten Kosten und Zuschüsse. Dies ist "
+"kein garantierter Kostenplan.\n"
+
+#: members/templates/admin/freizeit_finance_overview.html:34
+#: members/templates/admin/freizeit_finance_overview.html:99
+msgid "Expenses"
+msgstr "Ausgaben"
+
+#: members/templates/admin/freizeit_finance_overview.html:35
+msgid "You listed the following expenses:"
+msgstr "Du hast die folgenden Ausgaben angegeben:"
+
+#: members/templates/admin/freizeit_finance_overview.html:39
+msgid "Amount"
+msgstr "Betrag"
+
+#: members/templates/admin/freizeit_finance_overview.html:57
+#, python-format
+msgid "The total expected expenses are %(total_bills_theoretic)s €."
+msgstr ""
+"Insgesamt belaufen sich die geschätzten Ausgaben auf "
+"%(total_bills_theoretic)s €."
+
+#: members/templates/admin/freizeit_finance_overview.html:59
+#: members/templates/admin/freizeit_finance_overview.html:107
+msgid "Contributions by the association"
+msgstr "Sektionszuschüsse"
+
+#: members/templates/admin/freizeit_finance_overview.html:62
+#, python-format
+msgid ""
+"According to the contribution guidelines,\n"
+"%(staff_count)s youth leader(s) receive contributions. Each of them receives"
+msgstr ""
+"Gemäß den Zuschussrichtlinien erhalten %(staff_count)s Jugendleiter:innen "
+"Zuschüsse. Jeweils sind das"
+
+#: members/templates/admin/freizeit_finance_overview.html:68
+#, python-format
+msgid ""
+"%(nights)s nights for %(price_per_night)s€ per night making a total of "
+"%(nights_per_yl)s€."
+msgstr ""
+"%(nights)s Nächte zum Preis von %(price_per_night)s€ pro Nacht. Das ergibt "
+"eine Gesamtsumme von %(nights_per_yl)s€."
+
+#: members/templates/admin/freizeit_finance_overview.html:71
+#, python-format
+msgid ""
+"%(duration)s days for %(allowance_per_day)s€ per day making a total of "
+"%(allowance_per_yl)s€."
+msgstr ""
+"%(duration)s Tage für %(allowance_per_day)s€ pro Tag. Das ergibt eine "
+"Gesamtsumme von %(allowance_per_yl)s€."
+
+#: members/templates/admin/freizeit_finance_overview.html:74
+#, python-format
+msgid ""
+"%(kilometers_traveled)s km by %(means_of_transport)s (%(euro_per_km)s € / "
+"km) making a total of %(transportation_per_yl)s€."
+msgstr ""
+"%(kilometers_traveled)s km mit %(means_of_transport)s (%(euro_per_km)s€ / "
+"km). Das ergibt eine Gesamtsumme von %(transportation_per_yl)s€."
+
+#: members/templates/admin/freizeit_finance_overview.html:79
+#, python-format
+msgid ""
+"In total these are contributions of %(total_per_yl)s€ times %(staff_count)s, "
+"giving %(total_staff)s€."
+msgstr ""
+"Insgesamt sind das Kosten von %(total_per_yl)s€ mal %(staff_count)s, "
+"insgesamt also %(total_staff)s€."
+
+#: members/templates/admin/freizeit_finance_overview.html:82
+msgid "LJP contributions"
+msgstr "LJP Zuschüsse"
+
+#: members/templates/admin/freizeit_finance_overview.html:85
+#, python-format
+msgid ""
+"By submitting a seminar report, you may apply for LJP contributions. In this "
+"case,\n"
+"you may obtain up to 25€ times %(duration)s days for %(participant_count)s "
+"participants but only up to\n"
+"90%% of the total costs. This results in a total of %(ljp_contributions)s€."
+msgstr ""
+"Indem du einen Seminarbericht anfertigst, kannst du Landesjugendplan (LJP) "
+"Zuschüsse beantragen. In diesem Fall kannst du bis zu 25€ mal %(duration)s "
+"Tage für %(participant_count)s Teilnehmende, aber nicht mehr als 90%% der "
+"Gesamtausgaben erhalten. Das resultiert in einem Gesamtzuschuss von "
+"%(ljp_contributions)s€."
+
+#: members/templates/admin/freizeit_finance_overview.html:90
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: members/templates/admin/freizeit_finance_overview.html:93
+msgid "This is the estimated cost and contribution summary:"
+msgstr "Das ist die geschätzte Kosten- und Zuschussübersicht."
+
+#: members/templates/admin/freizeit_finance_overview.html:115
+msgid "Potential LJP contributions"
+msgstr "Mögliche LJP Zuschüsse"
+
+#: members/templates/admin/freizeit_finance_overview.html:123
+msgid "Remaining costs"
+msgstr "Verbleibende Kosten"
+
+#: members/templates/admin/freizeit_finance_overview.html:132
+msgid ""
+"Positive remaining costs indicate that the estimated costs exceed the "
+"estimated contributions, while negative\n"
+"remaining costs indicate that the estimated contributions exceed the "
+"estimated costs."
+msgstr ""
+"Positive verbleibende Kosten bedeuten, dass die geschätzten Kosten die "
+"geschätzten Zuschüsse übersteigen, während negative Kosten\n"
+" bedeuten, dass die geschätzten Zuschüsse die geschätzten Kosten übersteigen."
+
+#: members/templates/admin/freizeit_finance_overview.html:136
+msgid ""
+"Note that this cost calculation expects you to apply for LJP contributions. "
+"On the\n"
+"excursions main page, you can generate a template for a seminar report."
+msgstr ""
+"Beachte dass diese Kostenkalkulation davon ausgeht, dass du LJP Zuschüsse "
+"beantragst. Auf der Hauptseite dieser Ausfahrt kannst du dir eine Vorlage "
+"und alle Formblätter für einen solchen Antrag erstellen lassen."
+
+#: members/templates/admin/freizeit_finance_overview.html:141
+msgid "Submit statement"
+msgstr "Abrechnung einreichen"
+
+#: members/templates/admin/freizeit_finance_overview.html:143
+msgid ""
+"Did you already complete this excursion? If yes, please check if all listed "
+"expenses are correct\n"
+"and then submit the statement for processing by the finance department. If "
+"you proceed,\n"
+"no further changes to the statement are possible."
+msgstr ""
+"Hat die Ausfahrt bereits stattgefunden? Wenn ja, prüfe bitte ob alle "
+"aufgelisteten Kosten korrekt sind und reiche deine Abrechnung dann beim "
+"Finanzreferat ein. Wenn du fortschreitest sind keine weiteren Änderungen an "
+"der Abrechnung mehr möglich."
+
+#: members/templates/admin/freizeit_finance_overview.html:152
+msgid "Submit"
+msgstr "Einreichen"
+
+#: members/templates/admin/freizeit_finance_overview.html:157
+msgid "Statement submitted"
+msgstr "Abrechnung eingereicht"
+
+#: members/templates/admin/freizeit_finance_overview.html:159
+msgid ""
+"The statement for this excursion was already submitted. The finance "
+"department is currently processing your\n"
+"data and you will receive a response shortly."
+msgstr ""
+"Die Abrechnung für diese Ausfahrt wurde bereits eingereicht. Das "
+"Finanzreferat bearbeitet deine Abrechnung zur Zeit und kommt "
+"schnellstmöglich auf dich zurück."
+
+#: members/templates/admin/freizeit_finance_overview.html:162
+msgid "Back"
+msgstr "Zurück"
+
 #: members/templates/admin/generate_seminar_report.html:27
 msgid ""
 "Here you can generate a seminar report suitable for the LJP. A report\n"
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 6e302c7..3b6739e 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -24,6 +24,7 @@ from .rules import may_view, may_change, may_delete, is_own_training, is_oneself
 import rules
 from contrib.models import CommonModel
 from contrib.rules import memberize_user, has_global_perm
+from utils import cvt_to_decimal
 
 from dateutil.relativedelta import relativedelta
 
@@ -1023,6 +1024,19 @@ class Freizeit(CommonModel):
         jls = set(self.jugendleiter.distinct())
         return len(ps - jls)
 
+    @property
+    def potential_ljp_contributions(self):
+        return cvt_to_decimal(min(25 * self.participant_count * self.duration,
+                                  0.9 * float(self.statement.total_bills_theoretic) + float(self.statement.total_staff)))
+
+    @property
+    def total_relative_costs(self):
+        if not self.statement:
+            return 0
+        total_costs = self.statement.total_bills_theoretic
+        total_contributions = self.statement.total_staff + self.potential_ljp_contributions
+        return total_costs - total_contributions
+
     @property
     def time_period_str(self):
         time_period = self.date.strftime('%d.%m.%Y')
diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html
new file mode 100644
index 0000000..9026873
--- /dev/null
+++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html
@@ -0,0 +1,166 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static %}
+
+{% block extrahead %}
+    {{ block.super }}
+    {{ media }}
+    <script src="{% static 'admin/js/cancel.js' %}" async></script>
+    <script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
+    <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
+{% endblock %}
+
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
+&rsaquo; {% translate 'Finance overview' %}
+</div>
+{% endblock %}
+
+{% block content %}
+<h2>{% trans 'Excursion' %}: {{ memberlist.name }}</h2>
+
+<p>
+{% blocktrans %}
+Here you see an estimate on the expected costs and contributions by the association. This is not a guaranteed
+cost plan!
+{% endblocktrans %}
+</p>
+<h3>{% translate "Expenses" %}</h3>
+{% blocktrans %}You listed the following expenses:{% endblocktrans %}
+<p>
+<table>
+    <th>
+        <td>{% trans "Amount" %}</td>
+    </th>
+    {% for bill in memberlist.statement.bill_set.all %}
+        <tr>
+            <td>
+            {{bill.short_description}}
+            </td>
+            <td>
+            {{bill.explanation}}
+            </td>
+            <td>
+            {{ bill.amount }}€.
+            </td>
+        </tr>
+    {% endfor %}
+</table>
+</p>
+
+<p>{% blocktrans %}The total expected expenses are {{ total_bills_theoretic }} €.{% endblocktrans %}</p>
+
+<h3>{% trans "Contributions by the association" %}</h3>
+
+<p>
+{% blocktrans %}According to the contribution guidelines,
+{{ staff_count }} youth leader(s) receive contributions. Each of them receives{% endblocktrans %}
+</p>
+<p>
+<ul>
+    <li>
+        {% blocktrans %}{{ nights }} nights for {{ price_per_night }}€ per night making a total of {{ nights_per_yl }}€.{% endblocktrans %}
+    </li>
+    <li>
+        {% blocktrans %}{{ duration }} days for {{ allowance_per_day }}€ per day making a total of {{ allowance_per_yl }}€.{% endblocktrans %}
+    </li>
+    <li>
+        {% blocktrans %}{{ kilometers_traveled }} km by {{ means_of_transport }} ({{euro_per_km}} € / km) making a total of {{ transportation_per_yl }}€.{% endblocktrans %}
+    </li>
+</ul>
+</p>
+<p>
+{% blocktrans %}In total these are contributions of {{ total_per_yl }}€ times {{ staff_count }}, giving {{ total_staff }}€.{% endblocktrans %}
+</p>
+
+<h3>{% trans "LJP contributions" %}</h3>
+
+<p>
+{% blocktrans %}By submitting a seminar report, you may apply for LJP contributions. In this case,
+you may obtain up to 25€ times {{ duration }} days for {{ participant_count }} participants but only up to
+90% of the total costs. This results in a total of {{ ljp_contributions }}€.{% endblocktrans %}
+</p>
+
+<h3>{% trans "Summary" %}</h3>
+
+<p>
+{% blocktrans %}This is the estimated cost and contribution summary:{% endblocktrans %}
+</p>
+
+<table>
+    <tr>
+        <td>
+            {% trans "Expenses" %}
+        </td>
+        <td>
+            {{ total_bills_theoretic }}€
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {% trans "Contributions by the association" %}
+        </td>
+        <td>
+            -{{ total_staff }}€
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {% trans "Potential LJP contributions" %}
+        </td>
+        <td>
+            -{{ ljp_contributions }}€
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {% trans "Remaining costs" %}
+        </td>
+        <td>
+            {{ total_relative_costs }}€
+        </td>
+    </tr>
+</table>
+<br>
+<p>
+{% blocktrans %}Positive remaining costs indicate that the estimated costs exceed the estimated contributions, while negative
+remaining costs indicate that the estimated contributions exceed the estimated costs.{% endblocktrans %}
+</p>
+<p>
+{% blocktrans %}Note that this cost calculation expects you to apply for LJP contributions. On the
+excursions main page, you can generate a template for a seminar report.{% endblocktrans %}
+</p>
+
+{% if not memberlist.statement.submitted %}
+<h3>{% trans "Submit statement" %}</h3>
+<p>
+{% blocktrans %}Did you already complete this excursion? If yes, please check if all listed expenses are correct
+and then submit the statement for processing by the finance department. If you proceed,
+no further changes to the statement are possible.{% endblocktrans %}
+</p>
+
+<form action="" method="post">
+    {% csrf_token %}
+    <input type="hidden" name="action" value="finance_overview">
+    <input type="hidden" name="finance_overview">
+    <input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Submit' %}">
+    <a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
+</form>
+{% else %}
+<br>
+<h3>{% trans "Statement submitted" %}</h3>
+<p>
+{% blocktrans %}The statement for this excursion was already submitted. The finance department is currently processing your
+data and you will receive a response shortly.{% endblocktrans %}
+</p>
+<a href="#" class="button cancel-link">{% translate "Back" %}</a>
+
+{% endif %}
+
+{% endblock %}
diff --git a/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html b/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
index 99af802..7facebe 100644
--- a/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
+++ b/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
@@ -31,9 +31,12 @@
     </form>
 </li>
 
-{% if original.statement and not original.statement.submitted %}
+{% if original.statement %}
 <li>
-<a class="historylink" href="{% url 'admin:finance_statementunsubmitted_submit' original.statement.pk %}">{% trans 'Submit statement' %}</a>
+<form method="post" action="{% url 'admin:members_freizeit_action' original.pk %}">
+    {% csrf_token %}
+    <input type="submit" name="finance_overview" value="{% trans 'Finance overview' %}">
+</form>
 </li>
 {% endif %}
 {{block.super}}
diff --git a/jdav_web/utils.py b/jdav_web/utils.py
index 9060743..b6131bc 100644
--- a/jdav_web/utils.py
+++ b/jdav_web/utils.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
+from decimal import Decimal, ROUND_HALF_DOWN
 
 
 def file_size_validator(max_upload_size):
@@ -48,3 +49,14 @@ class RestrictedFileField(models.FileField):
         except AttributeError as e:
             print(e)
         return data
+
+
+def cvt_to_decimal(f):
+    return Decimal(f).quantize(Decimal('.01'), rounding=ROUND_HALF_DOWN)
+
+
+def get_member(request):
+    if not hasattr(request.user, 'member'):
+        return None
+    else:
+        return request.user.member

From 302565d5f5c65afb31d9a08b7e6e9a0f9a21a51d Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 04:00:50 +0100
Subject: [PATCH 21/56] finance/bill: rename

---
 jdav_web/finance/admin.py                        | 2 +-
 jdav_web/finance/locale/de/LC_MESSAGES/django.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdav_web/finance/admin.py b/jdav_web/finance/admin.py
index a1c8e82..41468a0 100644
--- a/jdav_web/finance/admin.py
+++ b/jdav_web/finance/admin.py
@@ -307,6 +307,6 @@ class TransactionAdmin(admin.ModelAdmin):
 
 @admin.register(Bill)
 class BillAdmin(admin.ModelAdmin):
-    list_display = ['__str__', 'statement', 'short_description', 'pretty_amount', 'paid_by', 'refunded']
+    list_display = ['__str__', 'statement', 'explanation', 'pretty_amount', 'paid_by', 'refunded']
     list_filter = ('statement', 'paid_by', 'refunded')
     search_fields = ('reference', 'statement')
diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index 1d0f727..8e561f5 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
@@ -266,12 +266,12 @@ msgstr "Beleg"
 
 #: finance/models.py:429 finance/models.py:436 finance/models.py:449
 msgid "Bill"
-msgstr "Quittung"
+msgstr "Ausgabe"
 
 #: finance/models.py:430 finance/models.py:437 finance/models.py:450
 #: finance/templates/admin/overview_submitted_statement.html:26
 msgid "Bills"
-msgstr "Quittungen"
+msgstr "Ausgaben"
 
 #: finance/models.py:462 finance/templates/admin/confirmed_statement.html:37
 #: finance/templates/admin/overview_submitted_statement.html:99

From eaccc5a5ef93ac88d9136cc840b7c6b61def5b4d Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 04:22:48 +0100
Subject: [PATCH 22/56] members/excursion: group bills in seminar report

---
 jdav_web/finance/models.py                    |  6 ++
 .../members/locale/de/LC_MESSAGES/django.po   | 75 +++++++++++--------
 .../admin/freizeit_finance_overview.html      |  3 +-
 .../admin/generate_seminar_report.html        |  4 +
 .../templates/members/seminar_report.tex      |  2 +-
 5 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py
index 5704f01..b2bc714 100644
--- a/jdav_web/finance/models.py
+++ b/jdav_web/finance/models.py
@@ -6,6 +6,7 @@ from .rules import is_creator, not_submitted, leads_excursion
 from members.rules import is_leader, statement_not_submitted
 
 from django.db import models
+from django.db.models import Sum
 from django.utils.translation import gettext_lazy as _
 from members.models import Member, Freizeit, OEFFENTLICHE_ANREISE, MUSKELKRAFT_ANREISE
 from django.conf import settings
@@ -349,6 +350,11 @@ class Statement(CommonModel):
             }
         return dict(context, **excursion_context)
 
+    def grouped_bills(self):
+        return self.bill_set.values('short_description')\
+                            .order_by('short_description')\
+                            .annotate(amount=Sum('amount'))
+
 
 class StatementUnSubmittedManager(models.Manager):
     def get_queryset(self):
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 200a4bc..08b248d 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-30 03:54+0100\n"
+"POT-Creation-Date: 2024-11-30 04:20+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"
@@ -942,8 +942,8 @@ msgid "Demote"
 msgstr "Zurück auf die Warteliste setzen"
 
 #: members/templates/admin/demote_to_waiter.html:46
-#: members/templates/admin/freizeit_finance_overview.html:153
-#: members/templates/admin/generate_seminar_report.html:54
+#: members/templates/admin/freizeit_finance_overview.html:154
+#: members/templates/admin/generate_seminar_report.html:58
 #: members/templates/admin/invite_as_user.html:37
 #: members/templates/admin/invite_for_group.html:52
 #: members/templates/admin/invite_selected_as_user.html:49
@@ -963,7 +963,7 @@ msgstr ""
 "kein garantierter Kostenplan.\n"
 
 #: members/templates/admin/freizeit_finance_overview.html:34
-#: members/templates/admin/freizeit_finance_overview.html:99
+#: members/templates/admin/freizeit_finance_overview.html:100
 msgid "Expenses"
 msgstr "Ausgaben"
 
@@ -972,22 +972,28 @@ msgid "You listed the following expenses:"
 msgstr "Du hast die folgenden Ausgaben angegeben:"
 
 #: members/templates/admin/freizeit_finance_overview.html:39
+#, fuzzy
+#| msgid "Evaluation"
+msgid "Explanation"
+msgstr "Wertung"
+
+#: members/templates/admin/freizeit_finance_overview.html:40
 msgid "Amount"
 msgstr "Betrag"
 
-#: members/templates/admin/freizeit_finance_overview.html:57
+#: members/templates/admin/freizeit_finance_overview.html:58
 #, python-format
 msgid "The total expected expenses are %(total_bills_theoretic)s €."
 msgstr ""
 "Insgesamt belaufen sich die geschätzten Ausgaben auf "
 "%(total_bills_theoretic)s €."
 
-#: members/templates/admin/freizeit_finance_overview.html:59
-#: members/templates/admin/freizeit_finance_overview.html:107
+#: members/templates/admin/freizeit_finance_overview.html:60
+#: members/templates/admin/freizeit_finance_overview.html:108
 msgid "Contributions by the association"
 msgstr "Sektionszuschüsse"
 
-#: members/templates/admin/freizeit_finance_overview.html:62
+#: members/templates/admin/freizeit_finance_overview.html:63
 #, python-format
 msgid ""
 "According to the contribution guidelines,\n"
@@ -996,7 +1002,7 @@ msgstr ""
 "Gemäß den Zuschussrichtlinien erhalten %(staff_count)s Jugendleiter:innen "
 "Zuschüsse. Jeweils sind das"
 
-#: members/templates/admin/freizeit_finance_overview.html:68
+#: members/templates/admin/freizeit_finance_overview.html:69
 #, python-format
 msgid ""
 "%(nights)s nights for %(price_per_night)s€ per night making a total of "
@@ -1005,7 +1011,7 @@ msgstr ""
 "%(nights)s Nächte zum Preis von %(price_per_night)s€ pro Nacht. Das ergibt "
 "eine Gesamtsumme von %(nights_per_yl)s€."
 
-#: members/templates/admin/freizeit_finance_overview.html:71
+#: members/templates/admin/freizeit_finance_overview.html:72
 #, python-format
 msgid ""
 "%(duration)s days for %(allowance_per_day)s€ per day making a total of "
@@ -1014,7 +1020,7 @@ msgstr ""
 "%(duration)s Tage für %(allowance_per_day)s€ pro Tag. Das ergibt eine "
 "Gesamtsumme von %(allowance_per_yl)s€."
 
-#: members/templates/admin/freizeit_finance_overview.html:74
+#: members/templates/admin/freizeit_finance_overview.html:75
 #, python-format
 msgid ""
 "%(kilometers_traveled)s km by %(means_of_transport)s (%(euro_per_km)s € / "
@@ -1023,7 +1029,7 @@ msgstr ""
 "%(kilometers_traveled)s km mit %(means_of_transport)s (%(euro_per_km)s€ / "
 "km). Das ergibt eine Gesamtsumme von %(transportation_per_yl)s€."
 
-#: members/templates/admin/freizeit_finance_overview.html:79
+#: members/templates/admin/freizeit_finance_overview.html:80
 #, python-format
 msgid ""
 "In total these are contributions of %(total_per_yl)s€ times %(staff_count)s, "
@@ -1032,11 +1038,11 @@ msgstr ""
 "Insgesamt sind das Kosten von %(total_per_yl)s€ mal %(staff_count)s, "
 "insgesamt also %(total_staff)s€."
 
-#: members/templates/admin/freizeit_finance_overview.html:82
+#: members/templates/admin/freizeit_finance_overview.html:83
 msgid "LJP contributions"
 msgstr "LJP Zuschüsse"
 
-#: members/templates/admin/freizeit_finance_overview.html:85
+#: members/templates/admin/freizeit_finance_overview.html:86
 #, python-format
 msgid ""
 "By submitting a seminar report, you may apply for LJP contributions. In this "
@@ -1051,23 +1057,23 @@ msgstr ""
 "Gesamtausgaben erhalten. Das resultiert in einem Gesamtzuschuss von "
 "%(ljp_contributions)s€."
 
-#: members/templates/admin/freizeit_finance_overview.html:90
+#: members/templates/admin/freizeit_finance_overview.html:91
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: members/templates/admin/freizeit_finance_overview.html:93
+#: members/templates/admin/freizeit_finance_overview.html:94
 msgid "This is the estimated cost and contribution summary:"
 msgstr "Das ist die geschätzte Kosten- und Zuschussübersicht."
 
-#: members/templates/admin/freizeit_finance_overview.html:115
+#: members/templates/admin/freizeit_finance_overview.html:116
 msgid "Potential LJP contributions"
 msgstr "Mögliche LJP Zuschüsse"
 
-#: members/templates/admin/freizeit_finance_overview.html:123
+#: members/templates/admin/freizeit_finance_overview.html:124
 msgid "Remaining costs"
 msgstr "Verbleibende Kosten"
 
-#: members/templates/admin/freizeit_finance_overview.html:132
+#: members/templates/admin/freizeit_finance_overview.html:133
 msgid ""
 "Positive remaining costs indicate that the estimated costs exceed the "
 "estimated contributions, while negative\n"
@@ -1078,7 +1084,7 @@ msgstr ""
 "geschätzten Zuschüsse übersteigen, während negative Kosten\n"
 " bedeuten, dass die geschätzten Zuschüsse die geschätzten Kosten übersteigen."
 
-#: members/templates/admin/freizeit_finance_overview.html:136
+#: members/templates/admin/freizeit_finance_overview.html:137
 msgid ""
 "Note that this cost calculation expects you to apply for LJP contributions. "
 "On the\n"
@@ -1088,11 +1094,11 @@ msgstr ""
 "beantragst. Auf der Hauptseite dieser Ausfahrt kannst du dir eine Vorlage "
 "und alle Formblätter für einen solchen Antrag erstellen lassen."
 
-#: members/templates/admin/freizeit_finance_overview.html:141
+#: members/templates/admin/freizeit_finance_overview.html:142
 msgid "Submit statement"
 msgstr "Abrechnung einreichen"
 
-#: members/templates/admin/freizeit_finance_overview.html:143
+#: members/templates/admin/freizeit_finance_overview.html:144
 msgid ""
 "Did you already complete this excursion? If yes, please check if all listed "
 "expenses are correct\n"
@@ -1105,15 +1111,15 @@ msgstr ""
 "Finanzreferat ein. Wenn du fortschreitest sind keine weiteren Änderungen an "
 "der Abrechnung mehr möglich."
 
-#: members/templates/admin/freizeit_finance_overview.html:152
+#: members/templates/admin/freizeit_finance_overview.html:153
 msgid "Submit"
 msgstr "Einreichen"
 
-#: members/templates/admin/freizeit_finance_overview.html:157
+#: members/templates/admin/freizeit_finance_overview.html:158
 msgid "Statement submitted"
 msgstr "Abrechnung eingereicht"
 
-#: members/templates/admin/freizeit_finance_overview.html:159
+#: members/templates/admin/freizeit_finance_overview.html:160
 msgid ""
 "The statement for this excursion was already submitted. The finance "
 "department is currently processing your\n"
@@ -1123,7 +1129,7 @@ msgstr ""
 "Finanzreferat bearbeitet deine Abrechnung zur Zeit und kommt "
 "schnellstmöglich auf dich zurück."
 
-#: members/templates/admin/freizeit_finance_overview.html:162
+#: members/templates/admin/freizeit_finance_overview.html:163
 msgid "Back"
 msgstr "Zurück"
 
@@ -1135,7 +1141,16 @@ msgstr ""
 "Hier kannst du einen Seminarbericht für den Landesjugendplan erstellen. Ein "
 "Bericht enthält immer einen Kopf mit den Stammdaten des Seminars."
 
-#: members/templates/admin/generate_seminar_report.html:32
+#: members/templates/admin/generate_seminar_report.html:31
+msgid ""
+"Expenses with same short description are automatically summed up and shown "
+"as one expense in the\n"
+"expense overview."
+msgstr ""
+"Ausgaben mit der gleichen Kurzbeschreibung werden automatisch aufsummiert "
+"und zu einer Ausgabe zusammengefasst."
+
+#: members/templates/admin/generate_seminar_report.html:36
 msgid ""
 "Full report: Include learning goals and a detailed, tabularized time "
 "schedule. This requires\n"
@@ -1145,7 +1160,7 @@ msgstr ""
 "Zeitplan dar. Dies benötigt, dass der Seminarbericht in der Ausfahrt "
 "ausgefüllt ist."
 
-#: members/templates/admin/generate_seminar_report.html:36
+#: members/templates/admin/generate_seminar_report.html:40
 msgid ""
 "Costs and participants only: Only show a list of participants and costs. In "
 "this case you\n"
@@ -1155,11 +1170,11 @@ msgstr ""
 "Kosten an. In diesem Fall musst du Lernziele und einen Zeitplan manuell "
 "hinzufügen."
 
-#: members/templates/admin/generate_seminar_report.html:42
+#: members/templates/admin/generate_seminar_report.html:46
 msgid "Please choose one of the listed modes."
 msgstr "Bitte wähle einen der obigen Modi."
 
-#: members/templates/admin/generate_seminar_report.html:53
+#: members/templates/admin/generate_seminar_report.html:57
 msgid "Generate"
 msgstr "Erstellen"
 
diff --git a/jdav_web/members/templates/admin/freizeit_finance_overview.html b/jdav_web/members/templates/admin/freizeit_finance_overview.html
index 9026873..ffba21f 100644
--- a/jdav_web/members/templates/admin/freizeit_finance_overview.html
+++ b/jdav_web/members/templates/admin/freizeit_finance_overview.html
@@ -36,6 +36,7 @@ cost plan!
 <p>
 <table>
     <th>
+        <td>{% trans "Explanation" %}</td>
         <td>{% trans "Amount" %}</td>
     </th>
     {% for bill in memberlist.statement.bill_set.all %}
@@ -47,7 +48,7 @@ cost plan!
             {{bill.explanation}}
             </td>
             <td>
-            {{ bill.amount }}€.
+            {{ bill.amount }}€
             </td>
         </tr>
     {% endfor %}
diff --git a/jdav_web/members/templates/admin/generate_seminar_report.html b/jdav_web/members/templates/admin/generate_seminar_report.html
index 8b4cfa0..6a3e8e8 100644
--- a/jdav_web/members/templates/admin/generate_seminar_report.html
+++ b/jdav_web/members/templates/admin/generate_seminar_report.html
@@ -27,6 +27,10 @@
 {% blocktrans %}Here you can generate a seminar report suitable for the LJP. A report
 always contains a head page with the basic information on the seminar.{% endblocktrans %}
 </p>
+<p>
+{% blocktrans %}Expenses with same short description are automatically summed up and shown as one expense in the
+expense overview.{% endblocktrans %}
+</p>
 <ul>
     <li>
 {% blocktrans %}Full report: Include learning goals and a detailed, tabularized time schedule. This requires
diff --git a/jdav_web/members/templates/members/seminar_report.tex b/jdav_web/members/templates/members/seminar_report.tex
index ea0160b..30ff1f6 100644
--- a/jdav_web/members/templates/members/seminar_report.tex
+++ b/jdav_web/members/templates/members/seminar_report.tex
@@ -148,7 +148,7 @@
     Aufwandsentschädigung & {{ memberlist.statement.total_allowance }} € \\
     Fahrtkosten & {{ memberlist.statement.total_transportation }} € \\
     Übernachtungskosten & {{ memberlist.statement.total_nights }} € \\
-    {% for bill in memberlist.statement.bill_set.all %}
+    {% for bill in memberlist.statement.grouped_bills %}
         {{ bill.short_description|esc_all }} & {{ bill.amount }} € \\
     {% endfor %}
     \bottomrule

From 7d93a4be0abd99c824b7e8029f4b83b2438b01fa Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 16:08:55 +0100
Subject: [PATCH 23/56] members/excursion: add V32 and improve texts

---
 .../finance/locale/de/LC_MESSAGES/django.po   |  78 ++++-----
 .../jdav_web/settings/components/texts.py     |   5 +
 jdav_web/jdav_web/settings/local.py           |  13 ++
 jdav_web/locale/de/LC_MESSAGES/django.po      |  10 +-
 jdav_web/members/admin.py                     |  20 ++-
 .../members/locale/de/LC_MESSAGES/django.po   | 156 ++++++++++--------
 jdav_web/members/models.py                    |  68 +++++++-
 jdav_web/members/pdf.py                       |  48 ++++--
 .../admin/generate_seminar_report.html        |   6 +-
 ...1_Themenorientierte_Bildungsmassnahmen.pdf | Bin 0 -> 128108 bytes
 .../members/crisis_intervention_list.tex      |   2 +-
 .../members/templates/members/notes_list.tex  |   2 +-
 .../templates/members/seminar_report.tex      |   2 +-
 .../freizeit/change_form_object_tools.html    |   4 +-
 14 files changed, 271 insertions(+), 143 deletions(-)
 create mode 100644 jdav_web/members/templates/members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf

diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index 8e561f5..d0f37a9 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/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: 2024-11-30 03:54+0100\n"
+"POT-Creation-Date: 2024-11-30 15:59+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"
@@ -132,165 +132,165 @@ msgstr "Bestätigung zurücknehmen"
 msgid "Finance"
 msgstr "Finanzen"
 
-#: finance/models.py:20
+#: finance/models.py:21
 msgid "Name"
 msgstr "Name"
 
-#: finance/models.py:26 finance/models.py:466 finance/models.py:490
+#: finance/models.py:27 finance/models.py:472 finance/models.py:496
 #: finance/templates/admin/confirmed_statement.html:38
 #: finance/templates/admin/overview_submitted_statement.html:100
 msgid "Ledger"
 msgstr "Geldtopf"
 
-#: finance/models.py:27
+#: finance/models.py:28
 msgid "Ledgers"
 msgstr "Geldtöpfe"
 
-#: finance/models.py:47 finance/models.py:409 finance/models.py:489
+#: finance/models.py:48 finance/models.py:415 finance/models.py:495
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: finance/models.py:50 finance/models.py:410
+#: finance/models.py:51 finance/models.py:416
 msgid "Explanation"
 msgstr "Erklärung"
 
-#: finance/models.py:52
+#: finance/models.py:53
 msgid "Associated excursion"
 msgstr "Zugehörige Ausfahrt"
 
-#: finance/models.py:57
+#: finance/models.py:58
 msgid "Price per night"
 msgstr "Preis pro Nacht"
 
-#: finance/models.py:59
+#: finance/models.py:60
 msgid "Submitted"
 msgstr "Eingericht"
 
-#: finance/models.py:60
+#: finance/models.py:61
 msgid "Submitted on"
 msgstr "Eingereicht am"
 
-#: finance/models.py:61
+#: finance/models.py:62
 msgid "Confirmed"
 msgstr "Abgewickelt"
 
-#: finance/models.py:62 finance/models.py:473
+#: finance/models.py:63 finance/models.py:479
 msgid "Paid on"
 msgstr "Bezahlt am"
 
-#: finance/models.py:64
+#: finance/models.py:65
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: finance/models.py:69
+#: finance/models.py:70
 msgid "Submitted by"
 msgstr "Eingereicht bei"
 
-#: finance/models.py:74 finance/models.py:474
+#: finance/models.py:75 finance/models.py:480
 msgid "Authorized by"
 msgstr "Autorisiert von"
 
-#: finance/models.py:81 finance/models.py:408 finance/models.py:469
+#: finance/models.py:82 finance/models.py:414 finance/models.py:475
 msgid "Statement"
 msgstr "Abrechnung"
 
-#: finance/models.py:82
+#: finance/models.py:83
 msgid "Statements"
 msgstr "Abrechnungen"
 
-#: finance/models.py:97
+#: finance/models.py:98
 #, python-format
 msgid "Statement: %(excursion)s"
 msgstr "Abrechnung: %(excursion)s"
 
-#: finance/models.py:149
+#: finance/models.py:150
 msgid "Ready to confirm"
 msgstr "Bereit zur Abwicklung"
 
-#: finance/models.py:193
+#: finance/models.py:194
 #, python-format
 msgid "Compensation for %(excu)s"
 msgstr "Entschädigung für %(excu)s"
 
-#: finance/models.py:326
+#: finance/models.py:327
 #: finance/templates/admin/overview_submitted_statement.html:78
 msgid "Total"
 msgstr "Gesamtbetrag"
 
-#: finance/models.py:363
+#: finance/models.py:369
 msgid "Statement in preparation"
 msgstr "Abrechnung in Vorbereitung"
 
-#: finance/models.py:364
+#: finance/models.py:370
 msgid "Statements in preparation"
 msgstr "Abrechnungen in Vorbereitung"
 
-#: finance/models.py:383
+#: finance/models.py:389
 msgid "Submitted statement"
 msgstr "Eingereichte Abrechnung"
 
-#: finance/models.py:384
+#: finance/models.py:390
 msgid "Submitted statements"
 msgstr "Eingereichte Abrechnungen"
 
-#: finance/models.py:400
+#: finance/models.py:406
 msgid "Paid statement"
 msgstr "Bezahlte Abrechnung"
 
-#: finance/models.py:401
+#: finance/models.py:407
 msgid "Paid statements"
 msgstr "Bezahlte Abrechnungen"
 
-#: finance/models.py:412 finance/models.py:426 finance/models.py:463
+#: finance/models.py:418 finance/models.py:432 finance/models.py:469
 #: finance/templates/admin/confirmed_statement.html:36
 #: finance/templates/admin/overview_submitted_statement.html:31
 #: finance/templates/admin/overview_submitted_statement.html:98
 msgid "Amount"
 msgstr "Betrag"
 
-#: finance/models.py:413
+#: finance/models.py:419
 msgid "Paid by"
 msgstr "Bezahlt von"
 
-#: finance/models.py:415
+#: finance/models.py:421
 msgid "Covered"
 msgstr "Übernommen"
 
-#: finance/models.py:416
+#: finance/models.py:422
 msgid "Refunded"
 msgstr "Ausgezahlt"
 
-#: finance/models.py:418
+#: finance/models.py:424
 msgid "Proof"
 msgstr "Beleg"
 
-#: finance/models.py:429 finance/models.py:436 finance/models.py:449
+#: finance/models.py:435 finance/models.py:442 finance/models.py:455
 msgid "Bill"
 msgstr "Ausgabe"
 
-#: finance/models.py:430 finance/models.py:437 finance/models.py:450
+#: finance/models.py:436 finance/models.py:443 finance/models.py:456
 #: finance/templates/admin/overview_submitted_statement.html:26
 msgid "Bills"
 msgstr "Ausgaben"
 
-#: finance/models.py:462 finance/templates/admin/confirmed_statement.html:37
+#: finance/models.py:468 finance/templates/admin/confirmed_statement.html:37
 #: finance/templates/admin/overview_submitted_statement.html:99
 msgid "Reference"
 msgstr "Verwendungszweck"
 
-#: finance/models.py:464
+#: finance/models.py:470
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: finance/models.py:472
+#: finance/models.py:478
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: finance/models.py:484
+#: finance/models.py:490
 msgid "Transaction"
 msgstr "Überweisung"
 
-#: finance/models.py:485
+#: finance/models.py:491
 #: finance/templates/admin/overview_submitted_statement.html:84
 msgid "Transactions"
 msgstr "Überweisungen"
diff --git a/jdav_web/jdav_web/settings/components/texts.py b/jdav_web/jdav_web/settings/components/texts.py
index 0bb3ad3..577e348 100644
--- a/jdav_web/jdav_web/settings/components/texts.py
+++ b/jdav_web/jdav_web/settings/components/texts.py
@@ -162,3 +162,8 @@ Bei Fragen, wende dich gerne an %(RESPONSIBLE_MAIL)s.
 
 Viele Grüße
 Deine JDAV %(SEKTION)s""" % { 'SEKTION': SEKTION, 'RESPONSIBLE_MAIL': RESPONSIBLE_MAIL }
+
+
+ADDRESS = """JDAV %(SEKTION)s
+%(STREET)s
+%(PLACE)s""" % { 'SEKTION': SEKTION, 'STREET': SEKTION_STREET, 'PLACE': SEKTION_TOWN }
diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index d873429..a92da5e 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -8,10 +8,23 @@ SEKTION_TELEFAX = "06221 437338"
 SEKTION_CONTACT_MAIL = "geschaeftsstelle@alpenverein-heidelberg.de"
 SEKTION_BOARD_MAIL = "vorstand@alpenverein-heidelberg.de"
 SEKTION_CRISIS_INTERVENTION_MAIL = "krisenmanagement@alpenverein-heidelberg.de"
+SEKTION_IBAN = "DE22 6729 0000 0000 1019 40"
+SEKTION_ACCOUNT_HOLDER = "Deutscher Alpenverein Sektion Heidelberg 1869"
 
 RESPONSIBLE_MAIL = "jugendreferat@jdav-hd.de"
 DIGITAL_MAIL = "digitales@jdav-hd.de"
 
+# LJP
+
+V32_HEAD_ORGANISATION = """JDAV Baden-Württemberg
+Rotebühlstraße 59A
+70178 Stuttgart
+
+info@jdav-bw.de
+0711 - 49 09 46 00"""
+
+LJP_CONTRIBUTION_PER_DAY = 25
+
 # echo
 
 ECHO_PASSWORD_BIRTHDATE_FORMAT = '%d.%m.%Y'
diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index 7ed7671..bb7020a 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-30 03:54+0100\n"
+"POT-Creation-Date: 2024-11-30 15:59+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"
@@ -258,17 +258,15 @@ msgstr "SJR Antrag erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:23
 msgid "Generate overview"
-msgstr "Übersicht erstellen"
+msgstr "Hinweise für Jugendleiter:innen erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:30
 msgid "Generate seminar report"
-msgstr "Seminarbericht erstellen"
+msgstr "Landesjugendplan Antrag erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:38
-#, fuzzy
-#| msgid "Generate overview"
 msgid "Finance overview"
-msgstr "Übersicht erstellen"
+msgstr "Kostenübersicht"
 
 #: templates/admin/members/member/change_form_object_tools.html:8
 msgid "Invite as user"
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 0d24940..154d1cd 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -23,10 +23,10 @@ from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django.db.models import TextField, ManyToManyField, ForeignKey, Count,\
     Sum, Case, Q, F, When, Value, IntegerField, Subquery, OuterRef
-from django.forms import Textarea, RadioSelect, TypedChoiceField
+from django.forms import Textarea, RadioSelect, TypedChoiceField, CheckboxInput
 from django.shortcuts import render
 from django.core.exceptions import PermissionDenied
-from .pdf import render_tex, fill_pdf_form
+from .pdf import render_tex, fill_pdf_form, merge_pdfs, serve_pdf
 
 from contrib.admin import CommonAdminInlineMixin, CommonAdminMixin
 
@@ -825,6 +825,9 @@ class GenerateSeminarReportForm(forms.Form):
     modes = (('full', _('Full report')),
              ('basic', _('Costs and participants only')))
     mode = forms.ChoiceField(choices=modes, label=_('Mode'))
+    prepend_v32 = forms.BooleanField(label=_('Prepend V32'), initial=True,
+                                     widget=CheckboxInput(attrs={'style': 'display: inherit'}),
+                                     required=False)
 
 
 class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
@@ -904,12 +907,21 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
                 messages.error(request, _('Please select a mode.'))
                 return self.render_seminar_report_options(request, memberlist, form)
             mode = form.cleaned_data['mode']
+            prepend_v32 = form.cleaned_data['prepend_v32']
             if mode == 'full' and not hasattr(memberlist, 'ljpproposal'):
                 messages.error(request, _('Full mode is only available, if the seminar report section is filled out.'))
                 return self.render_seminar_report_options(request, memberlist, form)
-            context = dict(memberlist=memberlist, settings=settings, mode=mode)
             title = memberlist.ljpproposal.title if hasattr(memberlist, 'ljpproposal') else memberlist.name
-            return render_tex(title + '_Seminarbericht', 'members/seminar_report.tex', context)
+            context = dict(memberlist=memberlist, settings=settings, mode=mode)
+            fp = render_tex(title + '_Seminarbericht', 'members/seminar_report.tex', context, save_only=True)
+            if prepend_v32:
+                context = memberlist.v32_fields()
+                v32_fp = fill_pdf_form(title + "_LJP_V32",
+                                       'members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf',
+                                       context,
+                                       save_only=True)
+                return merge_pdfs(title + 'LJP_Antrag', [v32_fp, fp])
+            return serve_pdf(fp)
         return self.render_seminar_report_options(request, memberlist, GenerateSeminarReportForm())
     seminar_report.short_description = _('Generate seminar report')
 
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 08b248d..8871d4e 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-30 04:20+0100\n"
+"POT-Creation-Date: 2024-11-30 15:59+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"
@@ -109,7 +109,7 @@ msgstr ""
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:374 members/models.py:54 members/models.py:1409
+#: members/admin.py:374 members/models.py:54 members/models.py:1475
 msgid "Name"
 msgstr "Name"
 
@@ -160,7 +160,7 @@ msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
 #: members/admin.py:542 members/models.py:389 members/models.py:733
-#: members/models.py:1154
+#: members/models.py:1220
 msgid "Group"
 msgstr "Gruppe"
 
@@ -273,7 +273,11 @@ msgstr "Nur Kosten und Teilnehmende"
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:841
+#: members/admin.py:828
+msgid "Prepend V32"
+msgstr "V32 Formblatt einfügen"
+
+#: members/admin.py:844
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -282,48 +286,48 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:871
+#: members/admin.py:874
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:879
+#: members/admin.py:882
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:887
+#: members/admin.py:890
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:891 members/admin.py:914
+#: members/admin.py:894 members/admin.py:926
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
-msgstr "Seminarbericht erstellen"
+msgstr "Landesjugendplan Antrag erstellen"
 
-#: members/admin.py:904
+#: members/admin.py:907
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:908
+#: members/admin.py:912
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:926
+#: members/admin.py:938
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
-#: members/admin.py:930
+#: members/admin.py:942
 msgid "No statement found. Please add a statement and then retry."
 msgstr ""
 "Keine Abrechnung angelegt. Bitte lege eine Abrechnung and und versuche es "
 "erneut."
 
-#: members/admin.py:934
+#: members/admin.py:946
 msgid ""
 "Successfully submited statement. The finance department will notify you as "
 "soon as possible."
@@ -331,7 +335,7 @@ msgstr ""
 "Abrechnung erfolgreich eingericht. Die Finanzabteilung wird sich bei dir so "
 "schnell wie möglich melden."
 
-#: members/admin.py:937
+#: members/admin.py:949
 #: members/templates/admin/freizeit_finance_overview.html:21
 msgid "Finance overview"
 msgstr "Kostenübersicht"
@@ -409,7 +413,7 @@ msgstr "Jugendleiter"
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:78 members/models.py:1236
+#: members/models.py:78 members/models.py:1302
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
@@ -599,7 +603,7 @@ msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
 #: members/models.py:689 members/models.py:885 members/models.py:896
-#: members/models.py:1185 members/models.py:1192
+#: members/models.py:1251 members/models.py:1258
 msgid "Member"
 msgstr "Teilnehmer"
 
@@ -700,7 +704,7 @@ msgstr "Von der Warteliste abgemeldet"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:897 members/models.py:1193
+#: members/models.py:897 members/models.py:1259
 msgid "Members"
 msgstr "Teilnehmer"
 
@@ -748,7 +752,7 @@ msgstr "mittel"
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:966 members/models.py:1216
+#: members/models.py:966 members/models.py:1282
 #: members/templates/admin/freizeit_finance_overview.html:26
 msgid "Excursion"
 msgstr "Ausfahrt"
@@ -757,163 +761,163 @@ msgstr "Ausfahrt"
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1131 members/models.py:1207 members/models.py:1423
+#: members/models.py:1197 members/models.py:1273 members/models.py:1489
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1132 members/models.py:1150 members/models.py:1424
+#: members/models.py:1198 members/models.py:1216 members/models.py:1490
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1151
+#: members/models.py:1217
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1152
+#: members/models.py:1218
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1176
+#: members/models.py:1242
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1179
+#: members/models.py:1245
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1180
+#: members/models.py:1246
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1198
+#: members/models.py:1264
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1201
+#: members/models.py:1267
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1202
+#: members/models.py:1268
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1209
+#: members/models.py:1275
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1210
+#: members/models.py:1276
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1211
+#: members/models.py:1277
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1212
+#: members/models.py:1278
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1213
+#: members/models.py:1279
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1222 members/models.py:1243
+#: members/models.py:1288 members/models.py:1309
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1223
+#: members/models.py:1289
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1237
+#: members/models.py:1303
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1240
+#: members/models.py:1306
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1248
+#: members/models.py:1314
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1249
+#: members/models.py:1315
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1351 members/models.py:1381
+#: members/models.py:1417 members/models.py:1447
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer:innen listen"
 
-#: members/models.py:1353 members/models.py:1383
+#: members/models.py:1419 members/models.py:1449
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer:innen anzeigen"
 
-#: members/models.py:1355 members/models.py:1385
+#: members/models.py:1421 members/models.py:1451
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer:innen ändern"
 
-#: members/models.py:1357 members/models.py:1387
+#: members/models.py:1423 members/models.py:1453
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer:innen löschen"
 
-#: members/models.py:1361 members/models.py:1391
+#: members/models.py:1427 members/models.py:1457
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
 
-#: members/models.py:1363 members/models.py:1393
+#: members/models.py:1429 members/models.py:1459
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
 
-#: members/models.py:1365 members/models.py:1395
+#: members/models.py:1431 members/models.py:1461
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
 
-#: members/models.py:1367 members/models.py:1397
+#: members/models.py:1433 members/models.py:1463
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
 
-#: members/models.py:1370 members/models.py:1371 members/models.py:1374
+#: members/models.py:1436 members/models.py:1437 members/models.py:1440
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1400 members/models.py:1401 members/models.py:1404
+#: members/models.py:1466 members/models.py:1467 members/models.py:1470
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1410
+#: members/models.py:1476
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1413
+#: members/models.py:1479
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1414
+#: members/models.py:1480
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1425
+#: members/models.py:1491
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1426
+#: members/models.py:1492
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1427
+#: members/models.py:1493
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1428
+#: members/models.py:1494
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1431
+#: members/models.py:1497
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1432
+#: members/models.py:1498
 msgid "Trainings"
 msgstr "Fortbildungen"
 
@@ -943,7 +947,7 @@ msgstr "Zurück auf die Warteliste setzen"
 
 #: members/templates/admin/demote_to_waiter.html:46
 #: members/templates/admin/freizeit_finance_overview.html:154
-#: members/templates/admin/generate_seminar_report.html:58
+#: members/templates/admin/generate_seminar_report.html:60
 #: members/templates/admin/invite_as_user.html:37
 #: members/templates/admin/invite_for_group.html:52
 #: members/templates/admin/invite_selected_as_user.html:49
@@ -972,10 +976,8 @@ msgid "You listed the following expenses:"
 msgstr "Du hast die folgenden Ausgaben angegeben:"
 
 #: members/templates/admin/freizeit_finance_overview.html:39
-#, fuzzy
-#| msgid "Evaluation"
 msgid "Explanation"
-msgstr "Wertung"
+msgstr "Erklärung"
 
 #: members/templates/admin/freizeit_finance_overview.html:40
 msgid "Amount"
@@ -1138,8 +1140,12 @@ msgid ""
 "Here you can generate a seminar report suitable for the LJP. A report\n"
 "always contains a head page with the basic information on the seminar."
 msgstr ""
-"Hier kannst du einen Seminarbericht für den Landesjugendplan erstellen. Ein "
-"Bericht enthält immer einen Kopf mit den Stammdaten des Seminars."
+"Hier kannst du einen Zuschussantrag für den Landesjugendplan (LJP) "
+"erstellen. Ein solcher Antrag besteht immer aus zwei Teilen: Einem Formblatt "
+"und einem Seminarbericht. Ein Bericht enthält immer einen Kopf mit den "
+"Stammdaten des Seminars. Darüber hinaus muss der Seminarbericht eine "
+"Teilnehemendenliste, eine Kostenübersicht und eine detaillierte didaktische "
+"Planung enthalten. "
 
 #: members/templates/admin/generate_seminar_report.html:31
 msgid ""
@@ -1147,8 +1153,8 @@ msgid ""
 "as one expense in the\n"
 "expense overview."
 msgstr ""
-"Ausgaben mit der gleichen Kurzbeschreibung werden automatisch aufsummiert "
-"und zu einer Ausgabe zusammengefasst."
+"In der Kostenübersicht werden Ausgaben mit der gleichen Kurzbeschreibung "
+"automatisch aufsummiert und zu einer Ausgabe zusammengefasst."
 
 #: members/templates/admin/generate_seminar_report.html:36
 msgid ""
@@ -1156,7 +1162,7 @@ msgid ""
 "schedule. This requires\n"
 "the seminar report section to be filled out."
 msgstr ""
-"Vollständiger Bericht: Stelle Lernziele und einen detaillierte, tabellierten "
+"Vollständiger Bericht: Stelle Lernziele und einen detaillierten, tabellierten "
 "Zeitplan dar. Dies benötigt, dass der Seminarbericht in der Ausfahrt "
 "ausgefüllt ist."
 
@@ -1171,10 +1177,15 @@ msgstr ""
 "hinzufügen."
 
 #: members/templates/admin/generate_seminar_report.html:46
-msgid "Please choose one of the listed modes."
-msgstr "Bitte wähle einen der obigen Modi."
+msgid "You may also choose to include the V32 attachment."
+msgstr ""
+"Ein LJP Antrag benötigt immer ein Formblatt (in unserem Fall V32-1 "
+"Themenorientierte Bildungsmaßnahmen). Dieses kannst du automatisch "
+"vorausfüllen lassen und dem Antrag hinzufügen. "
+"Bitte fülle die verbleibenden Felder im Formblatt selbst aus und "
+"unterschreibe das PDF."
 
-#: members/templates/admin/generate_seminar_report.html:57
+#: members/templates/admin/generate_seminar_report.html:59
 msgid "Generate"
 msgstr "Erstellen"
 
@@ -1636,6 +1647,9 @@ msgstr "abgelaufen"
 msgid "Invalid emergency contacts"
 msgstr "Ungültige Notfallkontakte"
 
+#~ msgid "Please choose one of the listed modes."
+#~ msgstr "Bitte wähle einen der obigen Modi."
+
 #~ msgid "Good conduct certificate presentation needed"
 #~ msgstr "Vorlage Führungszeugnis notwendig"
 
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 3b6739e..54d9f51 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -1024,9 +1024,21 @@ class Freizeit(CommonModel):
         jls = set(self.jugendleiter.distinct())
         return len(ps - jls)
 
+    @property
+    def ljp_participant_count(self):
+        ps = set(map(lambda x: x.member, self.membersonlist.distinct()))
+        jls = set(self.jugendleiter.distinct())
+        count = len(ps.union(jls))
+        return count
+        #return count if count >= 5 else 0
+
+    @property
+    def maximal_ljp_contributions(self):
+        return cvt_to_decimal(settings.LJP_CONTRIBUTION_PER_DAY * self.ljp_participant_count * self.duration)
+
     @property
     def potential_ljp_contributions(self):
-        return cvt_to_decimal(min(25 * self.participant_count * self.duration,
+        return cvt_to_decimal(min(self.maximal_ljp_contributions,
                                   0.9 * float(self.statement.total_bills_theoretic) + float(self.statement.total_staff)))
 
     @property
@@ -1113,6 +1125,60 @@ class Freizeit(CommonModel):
             base['Status' + suffix] = str(2)
         return base
 
+    def v32_fields(self):
+        title = self.ljpproposal.title if hasattr(self, 'ljpproposal') else self.name
+        base = {
+            # AntragstellerIn
+            'Textfeld 2':  settings.ADDRESS,
+            # Dachorganisation
+            'Textfeld 3':  settings.V32_HEAD_ORGANISATION,
+            # Datum der Maßnahme am/vom
+            'Textfeld 20': self.date.strftime('%d.%m.%Y'),
+            # bis
+            'Textfeld 28': self.end.strftime('%d.%m.%Y'),
+            # Thema der Maßnahme
+            'Textfeld 22': title,
+            # IBAN
+            'Textfeld 36': settings.SEKTION_IBAN,
+            # Kontoinhaber
+            'Textfeld 37': settings.SEKTION_ACCOUNT_HOLDER,
+            # Zahl der zuwendungsfähigen Teilnehemr
+            'Textfeld 43': str(self.ljp_participant_count),
+            # Teilnahmetage
+            'Textfeld 46': str(round(self.duration * self.ljp_participant_count, 1)).replace('.', ','),
+            # Euro Tagessatz
+            'Textfeld 48': str(settings.LJP_CONTRIBUTION_PER_DAY),
+            # Erbetener Zuschuss
+            'Textfeld 50': str(self.maximal_ljp_contributions).replace('.', ','),
+            # Stunden Bildungsprogramm
+            'Textfeld 52': '??',
+            # Tage
+            'Textfeld 53': str(round(self.duration, 1)).replace('.', ','),
+            # Haushaltsjahr
+            'Textfeld 54': str(datetime.now().year),
+            # nicht anrechenbare Teilnahmetage
+            'Textfeld 55': '0',
+            # Gesamt-Teilnahmetage
+            'Textfeld 56': str(round(self.duration * self.ljp_participant_count, 1)).replace('.', ','),
+            # Ort, Datum
+            'DatumOrt 2': 'Heidelberg, ' + datetime.now().strftime('%d.%m.%Y')
+        }
+        if self.statement:
+            possible_contributions = self.maximal_ljp_contributions
+            total_contributions = min(self.statement.total_theoretic, possible_contributions)
+            self_participation = max(cvt_to_decimal(0), self.statement.total_theoretic - possible_contributions)
+            # Gesamtkosten von
+            base['Textfeld 62'] = str(self.statement.total_theoretic).replace('.', ',')
+            # Eigenmittel und Teilnahmebeiträge
+            base['Textfeld 59'] = str(self_participation).replace('.', ',')
+            # Drittmittel
+            base['Textfeld 60'] = '0,00'
+            # Erbetener Zuschuss
+            base['Textfeld 61'] = str(total_contributions).replace('.', ',')
+            # Ergibt wieder
+            base['Textfeld 58'] = base['Textfeld 62']
+        return base
+
     @staticmethod
     def filter_queryset_by_permissions(member, queryset=None):
         if queryset is None:
diff --git a/jdav_web/members/pdf.py b/jdav_web/members/pdf.py
index 00a9978..a273b95 100644
--- a/jdav_web/members/pdf.py
+++ b/jdav_web/members/pdf.py
@@ -31,7 +31,17 @@ def media_dir():
     return os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists")
 
 
-def render_tex(name, template_path, context):
+def serve_pdf(filename_pdf):
+    # provide the user with the resulting pdf file
+    with open(media_path(filename_pdf), 'rb') as pdf:
+        response = HttpResponse(FileWrapper(pdf))#, content='application/pdf')
+        response['Content-Type'] = 'application/pdf'
+        response['Content-Disposition'] = 'attachment; filename='+filename_pdf
+
+    return response
+
+
+def render_tex(name, template_path, context, save_only=False):
     filename = name + "_" + datetime.today().strftime("%d_%m_%Y")
     filename = filename.replace(' ', '_').replace('&', '').replace('/', '_')
     # drop umlauts, accents etc.
@@ -64,16 +74,12 @@ def render_tex(name, template_path, context):
 
     os.chdir(oldwd)
 
-    # provide the user with the resulting pdf file
-    with open(media_path(filename_pdf), 'rb') as pdf:
-        response = HttpResponse(FileWrapper(pdf))#, content='application/pdf')
-        response['Content-Type'] = 'application/pdf'
-        response['Content-Disposition'] = 'attachment; filename='+filename_pdf
-
-    return response
+    if save_only:
+        return filename_pdf
+    return serve_pdf(filename_pdf)
 
 
-def fill_pdf_form(name, template_path, fields, attachments=[]):
+def fill_pdf_form(name, template_path, fields, attachments=[], save_only=False):
     filename = name + "_" + datetime.today().strftime("%d_%m_%Y")
     filename = filename.replace(' ', '_').replace('&', '').replace('/', '_')
     # drop umlauts, accents etc.
@@ -104,10 +110,22 @@ def fill_pdf_form(name, template_path, fields, attachments=[]):
     with open(media_path(filename_pdf), 'wb') as output_stream:
         writer.write(output_stream)
 
-    # provide the user with the resulting pdf file
-    with open(media_path(filename_pdf), 'rb') as pdf:
-        response = HttpResponse(FileWrapper(pdf))#, content='application/pdf')
-        response['Content-Type'] = 'application/pdf'
-        response['Content-Disposition'] = 'attachment; filename='+filename_pdf
+    if save_only:
+        return filename_pdf
+    return serve_pdf(filename_pdf)
 
-    return response
+
+def merge_pdfs(name, filenames, save_only=False):
+    merger = PdfWriter()
+
+    for pdf in filenames:
+        merger.append(media_path(pdf))
+
+    filename = name + "_" + datetime.today().strftime("%d_%m_%Y")
+    filename_pdf = filename + ".pdf"
+    merger.write(media_path(filename_pdf))
+    merger.close()
+
+    if save_only:
+        return filename_pdf
+    return serve_pdf(filename_pdf)
diff --git a/jdav_web/members/templates/admin/generate_seminar_report.html b/jdav_web/members/templates/admin/generate_seminar_report.html
index 6a3e8e8..6a52699 100644
--- a/jdav_web/members/templates/admin/generate_seminar_report.html
+++ b/jdav_web/members/templates/admin/generate_seminar_report.html
@@ -43,12 +43,14 @@ have to add learning goals and a time schedule manually.{% endblocktrans %}
 </ul>
 
 <br>
-<p>{% blocktrans %}Please choose one of the listed modes.{% endblocktrans %}</p>
+<p>{% blocktrans %}You may also choose to include the V32 attachment.{% endblocktrans %}</p>
 
 <form action="" method="post">
     {% csrf_token %}
     <p>
-    {{form}}
+    <table>
+    {{ form }}
+    </table>
     </p>
     <br>
     <input type="hidden" name="action" value="seminar_report">
diff --git a/jdav_web/members/templates/members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf b/jdav_web/members/templates/members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..46a427aa0e550561f0d3e2cd6afa0168ff8eee5e
GIT binary patch
literal 128108
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

literal 0
HcmV?d00001

diff --git a/jdav_web/members/templates/members/crisis_intervention_list.tex b/jdav_web/members/templates/members/crisis_intervention_list.tex
index 5dfd6d9..3828b24 100644
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@@ -1,6 +1,6 @@
 {% load tex_extras %}
 
-\documentclass{article}
+\documentclass[a4paper]{article}
 
 \usepackage[utf8]{inputenc}
 \usepackage{booktabs}
diff --git a/jdav_web/members/templates/members/notes_list.tex b/jdav_web/members/templates/members/notes_list.tex
index f07cb48..2f7e134 100644
--- a/jdav_web/members/templates/members/notes_list.tex
+++ b/jdav_web/members/templates/members/notes_list.tex
@@ -1,6 +1,6 @@
 {% load tex_extras %}
 
-\documentclass{article}
+\documentclass[a4paper]{article}
 
 \usepackage[utf8]{inputenc}
 \usepackage{booktabs}
diff --git a/jdav_web/members/templates/members/seminar_report.tex b/jdav_web/members/templates/members/seminar_report.tex
index 30ff1f6..15deb3f 100644
--- a/jdav_web/members/templates/members/seminar_report.tex
+++ b/jdav_web/members/templates/members/seminar_report.tex
@@ -1,6 +1,6 @@
 {% load tex_extras %}
 
-\documentclass{article}
+\documentclass[a4paper]{article}
 
 \usepackage[utf8]{inputenc}
 \usepackage{booktabs}
diff --git a/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html b/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
index 7facebe..f27115c 100644
--- a/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
+++ b/jdav_web/templates/admin/members/freizeit/change_form_object_tools.html
@@ -20,14 +20,14 @@
 <li>
     <form method="post" action="{% url 'admin:members_freizeit_action' original.pk %}">
         {% csrf_token %}
-        <input type="submit" name="notes_list" value="{% trans 'Generate overview' %}">
+        <input type="submit" name="seminar_report" value="{% trans 'Generate seminar report' %}">
     </form>
 </li>
 
 <li>
     <form method="post" action="{% url 'admin:members_freizeit_action' original.pk %}">
         {% csrf_token %}
-        <input type="submit" name="seminar_report" value="{% trans 'Generate seminar report' %}">
+        <input type="submit" name="notes_list" value="{% trans 'Generate overview' %}">
     </form>
 </li>
 

From 81eced382e070076ee4edde2f056e0dcad3a9a76 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 20:55:47 +0100
Subject: [PATCH 24/56] import: waitinglist default fields

---
 jdav_web/members/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 54d9f51..08c8b2b 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -1612,7 +1612,7 @@ def parse_date(value):
 def parse_datetime(value):
     tz = pytz.timezone('Europe/Berlin')
     if value == '':
-        return None
+        return timezone.now()
     return tz.localize(datetime.strptime(value, '%d.%m.%Y %H:%M:%S'))
 
 
@@ -1713,7 +1713,7 @@ def import_from_csv_waitinglist(path):
         kwargs = dict([ transform_field(k, v) for k, v in row.items() if k in CLUBDESK_TO_KOMPASS ])
         kwargs_filtered = { k : v for k, v in kwargs.items() if k in ['prename', 'lastname', 'email', 'birth_date', 'application_text', 'application_date'] }
 
-        mem = MemberWaitingList(**kwargs_filtered)
+        mem = MemberWaitingList(gender=DIVERSE, **kwargs_filtered)
         mem.save()
 
         if kwargs['contacted_by']:

From 368017a20a139ceaf61483f90795792f080e0fea Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sat, 30 Nov 2024 21:15:34 +0100
Subject: [PATCH 25/56] settings: read domain from env variable

---
 jdav_web/jdav_web/settings/local.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index a92da5e..d0d9948 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -60,7 +60,7 @@ TEST_MAIL = "post@flavigny.de"
 
 REGISTRATION_FORM_DOWNLOAD_LINK = 'https://nc.cloud-jdav-hd.de'
 
-DOMAIN = 'jdav-hd.merten.dev'
+DOMAIN = os.environ.get('DOMAIN', 'example.com')
 
 STARTPAGE_REDIRECT_URL = 'https://jdav-hd.de'
 ROOT_SECTION = 'jdav_heidelberg'

From c5316fa0dc9d836f65fe845c4a783d6b4afde758 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 11:48:47 +0100
Subject: [PATCH 26/56] startpage: add favicon, rename root section

---
 jdav_web/jdav_web/settings/local.py              |   2 +-
 jdav_web/startpage/templates/startpage/base.html |   1 +
 .../templates/startpage/navigation.html          |   2 +-
 jdav_web/static/startpage/img/favicon.png        | Bin 0 -> 3807 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 jdav_web/static/startpage/img/favicon.png

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index d0d9948..7fdaca4 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -63,6 +63,6 @@ REGISTRATION_FORM_DOWNLOAD_LINK = 'https://nc.cloud-jdav-hd.de'
 DOMAIN = os.environ.get('DOMAIN', 'example.com')
 
 STARTPAGE_REDIRECT_URL = 'https://jdav-hd.de'
-ROOT_SECTION = 'jdav_heidelberg'
+ROOT_SECTION = os.environ.get('ROOT_SECTION', 'wir')
 RECENT_SECTION = 'aktuelles'
 REPORTS_SECTION = 'berichte'
diff --git a/jdav_web/startpage/templates/startpage/base.html b/jdav_web/startpage/templates/startpage/base.html
index 05414ba..ae69f54 100644
--- a/jdav_web/startpage/templates/startpage/base.html
+++ b/jdav_web/startpage/templates/startpage/base.html
@@ -7,6 +7,7 @@
         <link rel="stylesheet" href="{% static 'startpage/css/base.css' %}">
         <link rel="stylesheet" href="{% static 'startpage/css/fonts.css' %}">
         <link rel="stylesheet" href="{% static 'startpage/css/people_grid.css' %}">
+        <link rel="shortcut icon" type="image/png" href="{% static 'startpage/img/favicon.png' %}"/>
     </head>
 
     <body>
diff --git a/jdav_web/startpage/templates/startpage/navigation.html b/jdav_web/startpage/templates/startpage/navigation.html
index 1d15166..74dc605 100644
--- a/jdav_web/startpage/templates/startpage/navigation.html
+++ b/jdav_web/startpage/templates/startpage/navigation.html
@@ -51,7 +51,7 @@ window.onclick = function(event) {
             <div class="menu-level-1">
                 <ul>
                     <li>
-                        <a href="{% url 'startpage:index' %}">jdav Heidelberg</a>
+                        <a href="{% url 'startpage:index' %}">{{ root_section.title }}</a>
                       <div class="menu-level-2">
                       <ul>
                           <li>
diff --git a/jdav_web/static/startpage/img/favicon.png b/jdav_web/static/startpage/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2a0608ace5225c267782542b9d5ace654f2ce28
GIT binary patch
literal 3807
zcmbVP2UJsM8;(as1QFB%0*(+00wH9QkjRh(1k^wn6;x1ek{gJS+?WIiRLXKdS+Zm(
zY8jSaB%lmMv{pc<lu>aYI8kIMA|QeS%75eFxBs#Id;XkrbHDL?&-=XNd(XM?EEh*L
z6<rks0-@&YWbY2Y^%ak@68!JgTL;0fc@lR=IzryIY7m|*@V8^yArNO$RA+#N@O-hz
zX`2Lr&@xm!^PJtk9YG)#PVqgxrQXafG!7&%2e=R$G?xiPFdBidvXzMdP9P{nvO#~o
z&>Ho!_A&~|=USt@ESNZ^hye!hox;VSN4Se8Cp?ft<)UnDkXAApOdtTI08%Ch5=v+?
zYt#o`8a!4kV^PQt5NV(_%1&Vr>CI#z8ITx6T9}hD96ZSaNuiqK$wU&BYKA1>@RnGd
zB^FP_;K?)+jz%CLKmAa!H8Gb*bGP64$re1bMg>TvA{rJO8X9UIN;HSW{#ZPfO2y&`
zSONh9BQTOMp%jo|gc5_#4ECUeBj$^wd`O5?Fam5SSZa-em40+VAey5UN<M`N4j5Jj
zh_HBboWi9KKrUwvCkhq^eK5}DV8I|z01BlN7>l37iUJ@hBng22f_iTIPX^%7GMRHW
zzN$qam@^@fI)uP(d<w`{(Gt%v5r}mMB~Y-K13HAjG7S{oh-eHk2uLBZCj<q3P8932
zWF&*3NDLKe?8O&yp-_p*7iU0wKnhx;6#Ez)1%sz}!ighNXgCrYN1)+wAE8W$%jboC
z4N9WWNEUyB!d1fsq`?0Kb2&5~Bo+X$&wK&k4`M|^e-v^qk~9Vs1c_n8usY(G>&^@Y
zOAPV&LGXs+1|gjt7-T$^OvVt*@gL+enKWmiL<$HwptHR-3XYFCpU<UnNFdh|$75qa
z9)*YD5lL(e+mb}Z;5lp(34r(TmfX+h?IBLEq6!q}KVAqf#DO{fBacJm0-z<8jRANh
z4u%VoEHIXM5)s4Wa40-B1y7~0DWBO~#eDcq0zqH0DpYY{Ml#O=PbT02j3q!OVTb?;
zzyMqv0YkMU;4G*_swI(#Q&j$kVxl?mC2*R<KHVh`aL=bv5Fh!WerNzkaWAY<97REZ
zus<J{`Cp00KeGJkd}sg&lm1PWd^970c+yZn4BGj_vHK^5i2W=55+LO7)&H|>ew6h!
z^?xed|5N>^;BW!}p+5+>S}aQ84_48XKBfly-&y;x_eBHy42Qd-VmQ~1;mKS>2Zb=T
z7;e{k#ji6E2xXzOy`87G<0UUumS?}_`-!V#-Vaiq8Y-)-%s|@j^}K4NPp4~m<k1YP
z%D&mbp>cAz8@Z%!Zy_z^r=5vUHgHDYY$%Qw6lAYFSd2gEl%b3|5fyV5Res*A>^=yb
z>!11l+_1_*Lf&AL&;99_?_OF@u7CKpZCh7~zv>Ik)@hBWdMVdVWR&>fLhJpW*+u!|
zVlJWls*;=@zK0HNo^@5(?-Rd1ma?pGb&~esi~Fhis()BWRS8{{)vodU`=F>nS$+Sy
zYFn{JU>XJBG%ig{%)w91a`OYr=a=*cZK!-0wC9*c#*c-Eq)WC>HPoyK8GLz{-HZ$h
z(YvXlUg&W8(AHJiJy}uuftTO3gag&W$z4B3LGe{k`YHYbyh@TIf_~AUNOMtTu6MR$
zDa$SD+#=zxn+IdHvo6P~sSBFQgQMKRO!-k=4<-GA&8Nu;=g*+i7=$=|!|{6GkwV0#
zHPb6yznxjR&;-kRz0WT@JICBeEyhDX3yt%`KfciOW973A8$GqyGb^qO2O19-)h^S{
zHoLukYR4Z?jjDPPrO4iB<sfmAl`C}LUsVu#-Xm`NaGHE^EbE#z4%cx|Xj<PEO-@X`
zt^56{LTL4)-8niVh`PPjqa!UA9j2_J^>))VzoJF=air9(QyOb6)qiKdDo0J2wA}c?
zaY3U=Z->A9?ZZ6-I=2BkuGZGJsd>5M+HN~*=SP;Hue#o-*1zeXN3Dq5r_*o%z5C@+
zhmz?1&r@b9)x34n(R&@tJ)FD{n9%1VF0JGX6RL00N0|fJo#ADVt1=gj2Hcyx8pd$7
z*hzi0%Duk-Nhf!!>Hh7fAEw}!j~;Fx)9BSqV5%l88_+R|AmYUni_%Y6toYgB&fT@M
z0o~}lRAq+t<9AiJyfZzG*EINDI(lJL-&CHNni-m4ap%Pw-##1K#1@@j-(OhXW8&i*
z6VFg9Qf5uF)?mgD;qzTK(klUhSgYE0Z<MiWYBlZGum{^~wEVl#Z)>>hpJbHTKzmk~
zi_-1Ru#T3&YJ=iIt0WO~$u|VU3^NqANJXb`UMWv0)2rCH2EV-h)&t#}>Bua5+n$p=
zy@gXxTQ?;pr^cDw+G(nmS+Z_8_kuk&FoIo(UVZ+~TWYfJJM`}1qxmY=uQ)zUa@u5j
z*^FpfGHAt7f0bjG8<$?4xafva!R6ieojplwHv&`8bz&i-_Ds$LqvZ)EPFj*H2e0+!
z&o?%jIQzIW-qg4>Os6ceDmGCqd#zmabaxQv@iCX*ZqyOisYP9xhvPV`d*$Y{?MI>@
zQk!hE-dHDTYGdVV3wIi$r*y3TGHuBIwaJ;3uHTt&7EhGE&)zpBahsU>>26)0uYSdf
z!uIr-q(1-ImJ_bzj8gekL({VUWbF-12l>g2q1N@x0~T5CccL8Ja*~;o(K+|Fy}pPe
zu2r|?XU5=iUx(NRmrH38R`0I+h?};GTNjW9o?nYw)1=qc<h&O%P$)mLX4H3ZQ>f>2
zoB9gPu58T=<CQ#PQc5s1UHKGA+P$kMV`$$Hms9Q5vs*iU`>vD?`Q2GFPxMytO&Q^D
z+=2FW&`|@o6nZCAM;tuj(BBe<-QRpf9`Cc|aYB9P_(a~lM*)$Yto6y~GOkCI#ZOaz
zs!WqL2ik7<uE}lepr~08$EppJDhK<1Co_6scq)0-=pS_jn}7QSGl07tpM0(K;@e>h
ztDN%-O45Ib)<$<C?;UK~fNl#t`s?H3OnQ`IKbcPXV-xC_^Y@9$1<!h(N$A7QNk%p-
zhf-RMuBvsEc^^gI@!hhb9OJ#k-Wg^UY|@Tm*M`Rhjq~XSJF+e(P%5@b4P!3pKRa5g
zgw9<3+r-*sEoLXR@4V{GiW|v`Khj7(`_A~vS+xCV1)=M1n9<0(h&L<rbeH4Wm0YZf
zeK&=**Lkgek*$~O6e~QBJC@X>1>A}bIF+VqyuDict#gfMer>s#k!$z0rK^%VE}F9G
zXbbuG5&Q6M)!WR%ZwO8eYD({UP>B=W%>}aQQSnflwc4&=q>Z2}rCzP|d`H2GqNdUa
zuVMV&m(l)3zLOfgMTR{;p!(c-Ehd{9-yq}YvHU|Vjn^;wT*+@eUUBS!8U5(&?w;eU
z_c!lao*gzj+$2Yplr`<>PY@++2||6V^m9*^>U*cDXBzE$>M+X5$&ou6lp0t^c4A8(
z)W_eR^s5}-<ez*F?bNl;^95m#P<M4h+bcual#|L*-!7Be!;W^%5Dsg`^uD-ac#8((
zl9BaoTkqbj^u)1l_E1fEW*;+>f7L~kWEK$;<$v8%V1_^0h~5>{D1U|;)C=wPppbLl
zf~#x>wd{{?OSxI@@I>5vYi#Ua4>`Y(J*3u+*Pbs5cvOS5nOzj36Ab9hSjEOo$ue#o
zepJ-n8K2swX~iFXB1qd-yAbb(N7@7&llE;W=^-4mO=aAgzkFv}rOHt4xM^2amb5P_
z&nz$Eic2(3Z#3HZn<4$6)4w%LXYJC?<-ZKfU;a?dHaKbk<I^pCvbqx&{GD6)vRupS
zuV%+u*ESU9t<p{W{eFJ{spRTtpO{b@?xrt)q}9IK{U=tOR%^B<NjqYEI@s&A)?U`^
z0a<x`$I8AH%q!g{nDEKbHo)>-9VTq3;|Og(G@{(@cTzTRCNXDUkEl$9;T*FiN2W1b
zuVvAS4pxS%TY*Fm7p0n8dhki<NYW)w8@k_;i63@NwP?S(64C}X7u+omc3N^;?$@|6
zpg6T=NtOK3CAmrO@p)Ypk;>E?jnKN{!r1vhvuxtYy|FEWGs)_PXRdZlvWgoTdR5ju
zJg{-Vart0taC_wX1EmGy2D|mY(OG!r?y2A;sYit@eQ=G>!Yo>upWC<?e+s{pGLzHS
mwz*e+qqZ~84xK+kAAw94BhsVKZ#7VSWjZ^!*vsjDG5-dB=QCme

literal 0
HcmV?d00001


From c49be3f5947ef63b894a53e08cfadaa66a2447e4 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 12:36:26 +0100
Subject: [PATCH 27/56] startpage: fix typo

---
 jdav_web/members/templates/members/register_waiting_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/members/templates/members/register_waiting_list.html b/jdav_web/members/templates/members/register_waiting_list.html
index cf7f62f..4e53bfd 100644
--- a/jdav_web/members/templates/members/register_waiting_list.html
+++ b/jdav_web/members/templates/members/register_waiting_list.html
@@ -18,7 +18,7 @@ Da wir durch das Engagment unserer ehrenamtlichen Jugendleitern, aber auch die K
 
 <p>
 Die Anmeldung für die Gruppen <a href="{% url 'startpage:gruppe_detail' group_name='JuMa' %}">JuMa</a>,
-<a href="{% url 'startpage:gruppe_detail' group_name='Kletterteff' %}">Klettertreff</a> und
+<a href="{% url 'startpage:gruppe_detail' group_name='Klettertreff' %}">Klettertreff</a> und
 <a href="{% url 'startpage:gruppe_detail' group_name='Mountainbike' %}">Mountainbike</a> laufen separat.
 </p>
 

From 7bb89dd2d9293a0d7d5425ba647d4db3568804f4 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 12:59:19 +0100
Subject: [PATCH 28/56] docker/production: serve maintenance page on 502

---
 docker/production/docker-compose.yaml      |   2 --
 docker/production/nginx/kompass.nginx.conf |   5 +++++
 jdav_web/static/downtime/502.html          |  15 +++++++++++++++
 jdav_web/static/downtime/base.css          |   9 +++++++++
 jdav_web/static/downtime/favicon.png       | Bin 0 -> 3807 bytes
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 jdav_web/static/downtime/502.html
 create mode 100644 jdav_web/static/downtime/base.css
 create mode 100644 jdav_web/static/downtime/favicon.png

diff --git a/docker/production/docker-compose.yaml b/docker/production/docker-compose.yaml
index feabdbe..35d8daa 100644
--- a/docker/production/docker-compose.yaml
+++ b/docker/production/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 x-kompass:
     &kompass
     image: kompass:production
diff --git a/docker/production/nginx/kompass.nginx.conf b/docker/production/nginx/kompass.nginx.conf
index 5b63859..c1b1103 100644
--- a/docker/production/nginx/kompass.nginx.conf
+++ b/docker/production/nginx/kompass.nginx.conf
@@ -6,6 +6,7 @@ server {
     listen 80;
     server_name 127.0.0.1;
     charset utf-8;
+    error_page 502 /downtime/502.html;
 
     location /static {
         alias /var/www/jdav_web/static;
@@ -15,6 +16,10 @@ server {
         alias /var/www/jdav_web/media;
     }
 
+    location /downtime {
+        alias /var/www/jdav_web/static/downtime;
+    }
+
     location / {
         uwsgi_pass uwsgi;
         include /etc/nginx/uwsgi_params;
diff --git a/jdav_web/static/downtime/502.html b/jdav_web/static/downtime/502.html
new file mode 100644
index 0000000..439f9c4
--- /dev/null
+++ b/jdav_web/static/downtime/502.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+        <link rel="stylesheet" href="/downtime/base.css">
+        <link rel="shortcut icon" type="image/png" href="/downtime/favicon.png"/>
+        <title>Wartungsarbeiten</title>
+</head>
+<body>
+        <div id="main">
+        <h2>Wartungsarbeiten</h2>
+        <p>Unsere Webseite ist zur Zeit wegen Wartungsarbeiten leider nicht verf&uuml;gbar. Bitte
+        versuche es zu einem sp&auml;teren Zeitpunkt nochmal.</p>
+        </div>
+</body>
+</html>
diff --git a/jdav_web/static/downtime/base.css b/jdav_web/static/downtime/base.css
new file mode 100644
index 0000000..832c71a
--- /dev/null
+++ b/jdav_web/static/downtime/base.css
@@ -0,0 +1,9 @@
+#main {
+    text-align: center;
+    font-size: 15pt;
+    width: 60%;
+    margin: 0 auto;
+    overflow: hidden;
+    position: relative;
+    padding-top: 40pt;
+}
diff --git a/jdav_web/static/downtime/favicon.png b/jdav_web/static/downtime/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2a0608ace5225c267782542b9d5ace654f2ce28
GIT binary patch
literal 3807
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

literal 0
HcmV?d00001


From 3453359e1e6cf634d8d45e82d08aea315c55d556 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 13:28:13 +0100
Subject: [PATCH 29/56] startpage: sort groups by name

---
 jdav_web/startpage/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/startpage/views.py b/jdav_web/startpage/views.py
index d7f6eba..66b70bc 100644
--- a/jdav_web/startpage/views.py
+++ b/jdav_web/startpage/views.py
@@ -11,7 +11,7 @@ from .models import Post, Section
 
 # render shortcut adding additional context variables, needed for navbar
 def render(request, template_path, context={}):
-    context['groups'] = Group.objects.filter(show_website=True)
+    context['groups'] = Group.objects.filter(show_website=True).order_by('name')
     context['sections'] = Section.objects.all()
     try:
         context['root_section'] = Section.objects.get(urlname=settings.ROOT_SECTION)

From 60c25cf845494ec545c631474bea051030b1a4d9 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 13:31:38 +0100
Subject: [PATCH 30/56] startpage: allow markdown in group description

---
 jdav_web/startpage/templates/startpage/gruppen/detail.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdav_web/startpage/templates/startpage/gruppen/detail.html b/jdav_web/startpage/templates/startpage/gruppen/detail.html
index fdd63d2..e34205d 100644
--- a/jdav_web/startpage/templates/startpage/gruppen/detail.html
+++ b/jdav_web/startpage/templates/startpage/gruppen/detail.html
@@ -1,10 +1,11 @@
 {% extends "startpage/base_subsite.html" %}
+{% load markdown_extras markdownify %}
 
 {% block content %}
 <h1>{{ group.name }}</h1>
 
 <p>
-{{ group.description }}
+{{ group.description|markdownify }}
 </p>
 
 <h2>Gruppenleitung</h2>

From 17cae5c0098b6266299bc0c90c644ebf8e548959 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 16:27:55 +0100
Subject: [PATCH 31/56] translations: use gender star

---
 .../finance/locale/de/LC_MESSAGES/django.po   |  2 +-
 jdav_web/locale/de/LC_MESSAGES/django.po      | 12 ++--
 .../mailer/locale/de/LC_MESSAGES/django.po    | 26 ++++----
 .../material/locale/de/LC_MESSAGES/django.po  |  2 +-
 .../members/locale/de/LC_MESSAGES/django.po   | 62 +++++++++----------
 .../members/crisis_intervention_list.tex      |  2 +-
 .../members/templates/members/notes_list.tex  |  2 +-
 .../templates/members/seminar_report.tex      |  2 +-
 .../startpage/locale/de/LC_MESSAGES/django.po |  2 +-
 .../templates/admin/members/app_index.html    |  4 +-
 10 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index d0f37a9..ed9eef3 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/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: 2024-11-30 15:59+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index bb7020a..889d64a 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/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: 2024-11-30 15:59+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
@@ -257,20 +257,20 @@ msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:23
-msgid "Generate overview"
-msgstr "Hinweise für Jugendleiter:innen erstellen"
-
-#: templates/admin/members/freizeit/change_form_object_tools.html:30
 msgid "Generate seminar report"
 msgstr "Landesjugendplan Antrag erstellen"
 
+#: templates/admin/members/freizeit/change_form_object_tools.html:30
+msgid "Generate overview"
+msgstr "Hinweise für Jugendleiter:innen erstellen"
+
 #: templates/admin/members/freizeit/change_form_object_tools.html:38
 msgid "Finance overview"
 msgstr "Kostenübersicht"
 
 #: templates/admin/members/member/change_form_object_tools.html:8
 msgid "Invite as user"
-msgstr "Als Kompassbenutzer:in einladen"
+msgstr "Als Kompassbenutzer*in einladen"
 
 #: templates/admin/members/memberunconfirmedproxy/change_form_object_tools.html:8
 msgid "Demote to waiter"
diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
index a1886e1..7cba7ab 100644
--- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/mailer/locale/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: 2024-11-18 21:46+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailer/admin.py:67
+#: mailer/admin.py:68
 msgid "Send message"
 msgstr "Nachricht verschicken"
 
-#: mailer/admin.py:97
+#: mailer/admin.py:98
 msgid "Failed to send message"
 msgstr "Fehler beim Senden der Email"
 
-#: mailer/admin.py:99
+#: mailer/admin.py:100
 msgid "Failed to send some messages"
 msgstr "Fehler beim Senden der Emails"
 
-#: mailer/admin.py:101
+#: mailer/admin.py:102
 msgid "Successfully sent message"
 msgstr "Email wurde erfolgreich verschickt"
 
@@ -53,7 +53,7 @@ msgstr "Name"
 
 #: mailer/models.py:26
 msgid "Forward to participants"
-msgstr "Weiterleitung an Teilnehmer"
+msgstr "Weiterleitung an Teilnehmer*innen"
 
 #: mailer/models.py:29
 msgid "Forward to group"
@@ -70,8 +70,8 @@ msgstr "Email-Adressen"
 #: mailer/models.py:60
 msgid "Either a group or at least one member is required as forward recipient."
 msgstr ""
-"Es muss entweder eine Gruppe oder mindestens ein Teilnehmer als Empfänger "
-"ausgewählt werden."
+"Es muss entweder eine Gruppe oder mindestens ein*e Teilnehmer*in als "
+"Empfänger*in ausgewählt werden."
 
 #: mailer/models.py:68
 msgid "subject"
@@ -95,11 +95,11 @@ msgstr "An Notizliste"
 
 #: mailer/models.py:84
 msgid "to member"
-msgstr "An Teilnehmer"
+msgstr "An Teilnehmer*innen"
 
 #: mailer/models.py:87
 msgid "reply to participant"
-msgstr "Antwort an Teilnehmer"
+msgstr "Antwort an Teilnehmer*innen"
 
 #: mailer/models.py:91
 msgid "reply to custom email address"
@@ -115,7 +115,7 @@ msgstr "Erstellt von"
 
 #: mailer/models.py:113
 msgid "Some other members"
-msgstr "Andere Teilnehmer"
+msgstr "Andere Teilnehmer*innen"
 
 #: mailer/models.py:115
 msgid "recipients"
@@ -137,8 +137,8 @@ msgstr "Kann Mails verschicken"
 msgid ""
 "Either a group, a memberlist or at least one member is required as recipient"
 msgstr ""
-"Es muss entweder eine Gruppe, eine Teilnehmerliste oder mindestens ein "
-"Teilnehmer als Empfänger ausgewählt werden."
+"Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens "
+"ein*e Teilnehmer*in als Empfänger*in ausgewählt werden."
 
 #: mailer/models.py:209
 msgid "file"
diff --git a/jdav_web/material/locale/de/LC_MESSAGES/django.po b/jdav_web/material/locale/de/LC_MESSAGES/django.po
index 6eb6613..12557af 100644
--- a/jdav_web/material/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/material/locale/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: 2024-11-13 23:36+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 8871d4e..d37438a 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-11-30 15:59+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
@@ -52,7 +52,7 @@ msgstr "Organisatorisches"
 
 #: members/admin.py:281
 msgid "Compose new mail to selected members"
-msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
+msgstr "Neue Nachricht an ausgewählte Teilnehmer*innen verfassen"
 
 #: members/admin.py:287
 msgid "Echo required"
@@ -61,11 +61,12 @@ msgstr "Rückmeldung erforderlich"
 #: members/admin.py:289
 msgid "Successfully requested echo from selected members."
 msgstr ""
-"Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt."
+"Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer*innen "
+"verschickt."
 
 #: members/admin.py:290
 msgid "Request echo from selected members"
-msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken"
+msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer*innen verschicken"
 
 #: members/admin.py:296
 #, python-format
@@ -75,7 +76,7 @@ msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 #: members/admin.py:298
 msgid "Successfully invited selected members to join as users."
 msgstr ""
-"Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen."
+"Erfolgreich ausgewählte Teilnehmer*innen aufgefordert Zugangsdaten zu wählen."
 
 #: members/admin.py:305 members/admin.py:322
 msgid "Permission denied."
@@ -88,11 +89,11 @@ msgstr "Kompass Zugangsdaten wählen lassen"
 
 #: members/admin.py:317
 msgid "Invite selected members to join Kompass as users."
-msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen."
+msgstr "Ausgewählte Teilnehmer*innen Kompass Zugangsdaten wählen lassen."
 
 #: members/admin.py:328
 msgid "Member not found."
-msgstr "Teilnehmer:in nicht gefunden."
+msgstr "Teilnehmer*in nicht gefunden."
 
 #: members/admin.py:332
 #, python-format
@@ -247,14 +248,14 @@ msgid ""
 msgstr ""
 "Gib hier bitte alle Personen an, die bei der Ausfahrt dabei sind (auch JL). "
 "Hier kannst du auch spontan kurz vor Abfahrt noch Änderungen machen und so "
-"jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
+"jederzeit die aktuelle Teilnehmer*innenliste für die Krisenintervention "
 "generieren."
 
 #: members/admin.py:811
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
-"Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
+"Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Notizliste "
 "%(name)s anzusehen."
 
 #: members/admin.py:821
@@ -290,7 +291,7 @@ msgstr ""
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
-"Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
+"Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Ausfahrt "
 "%(name)s anzusehen."
 
 #: members/admin.py:882
@@ -587,11 +588,11 @@ msgstr "Führungszeugnis gültig"
 
 #: members/models.py:392
 msgid "member"
-msgstr "Teilnehmer"
+msgstr "Teilnehmer*in"
 
 #: members/models.py:393
 msgid "members"
-msgstr "Teilnehmer"
+msgstr "Teilnehmer*innen"
 
 #: members/models.py:461
 #, python-format
@@ -605,7 +606,7 @@ msgstr "Zugangsdaten für Kompass wählen"
 #: members/models.py:689 members/models.py:885 members/models.py:896
 #: members/models.py:1251 members/models.py:1258
 msgid "Member"
-msgstr "Teilnehmer"
+msgstr "Teilnehmer*in"
 
 #: members/models.py:696
 msgid "Emergency contact"
@@ -706,7 +707,7 @@ msgstr "Kommentar"
 
 #: members/models.py:897 members/models.py:1259
 msgid "Members"
-msgstr "Teilnehmer"
+msgstr "Teilnehmer*innen"
 
 #: members/models.py:931
 msgid "Place"
@@ -847,35 +848,35 @@ msgstr "Aktionen"
 
 #: members/models.py:1417 members/models.py:1447
 msgid "May list members"
-msgstr "Darf folgende Teilnehmer:innen listen"
+msgstr "Darf folgende Teilnehmer*innen listen"
 
 #: members/models.py:1419 members/models.py:1449
 msgid "May view members"
-msgstr "Darf folgende Teilnehmer:innen anzeigen"
+msgstr "Darf folgende Teilnehmer*innen anzeigen"
 
 #: members/models.py:1421 members/models.py:1451
 msgid "May change members"
-msgstr "Darf folgende Teilnehmer:innen ändern"
+msgstr "Darf folgende Teilnehmer*innen ändern"
 
 #: members/models.py:1423 members/models.py:1453
 msgid "May delete members"
-msgstr "Darf folgende Teilnehmer:innen löschen"
+msgstr "Darf folgende Teilnehmer*innen löschen"
 
 #: members/models.py:1427 members/models.py:1457
 msgid "May list members of groups"
-msgstr "Darf Teilnehmer:innen folgender Gruppen listen"
+msgstr "Darf Teilnehmer*innen folgender Gruppen listen"
 
 #: members/models.py:1429 members/models.py:1459
 msgid "May view members of groups"
-msgstr "Darf Teilnehmer:innen folgender Gruppen anzeigen"
+msgstr "Darf Teilnehmer*innen folgender Gruppen anzeigen"
 
 #: members/models.py:1431 members/models.py:1461
 msgid "May change members of groups"
-msgstr "Darf Teilnehmer:innen folgender Gruppen ändern"
+msgstr "Darf Teilnehmer*innen folgender Gruppen ändern"
 
 #: members/models.py:1433 members/models.py:1463
 msgid "May delete members of groups"
-msgstr "Darf Teilnehmer:innen folgender Gruppen löschen"
+msgstr "Darf Teilnehmer*innen folgender Gruppen löschen"
 
 #: members/models.py:1436 members/models.py:1437 members/models.py:1440
 msgid "Permissions"
@@ -1162,9 +1163,9 @@ msgid ""
 "schedule. This requires\n"
 "the seminar report section to be filled out."
 msgstr ""
-"Vollständiger Bericht: Stelle Lernziele und einen detaillierten, tabellierten "
-"Zeitplan dar. Dies benötigt, dass der Seminarbericht in der Ausfahrt "
-"ausgefüllt ist."
+"Vollständiger Bericht: Stelle Lernziele und einen detaillierten, "
+"tabellierten Zeitplan dar. Dies benötigt, dass der Seminarbericht in der "
+"Ausfahrt ausgefüllt ist."
 
 #: members/templates/admin/generate_seminar_report.html:40
 msgid ""
@@ -1181,9 +1182,8 @@ msgid "You may also choose to include the V32 attachment."
 msgstr ""
 "Ein LJP Antrag benötigt immer ein Formblatt (in unserem Fall V32-1 "
 "Themenorientierte Bildungsmaßnahmen). Dieses kannst du automatisch "
-"vorausfüllen lassen und dem Antrag hinzufügen. "
-"Bitte fülle die verbleibenden Felder im Formblatt selbst aus und "
-"unterschreibe das PDF."
+"vorausfüllen lassen und dem Antrag hinzufügen. Bitte fülle die verbleibenden "
+"Felder im Formblatt selbst aus und unterschreibe das PDF."
 
 #: members/templates/admin/generate_seminar_report.html:59
 msgid "Generate"
@@ -1229,11 +1229,11 @@ msgstr "Bitte wähle die Gruppe aus zu der du %(waiter)s einladen möchtest."
 
 #: members/templates/admin/invite_selected_as_user.html:20
 msgid "Invite multiple members as users"
-msgstr "Mehrere Teilnehmer:innen Zugangsdaten wählen lassen"
+msgstr "Mehrere Teilnehmer*innen Zugangsdaten wählen lassen"
 
 #: members/templates/admin/invite_selected_as_user.html:26
 msgid "You selected the following members:"
-msgstr "Du hast die folgenden Teilnehmer:innen ausgewählt:"
+msgstr "Du hast die folgenden Teilnehmer*innen ausgewählt:"
 
 #: members/templates/admin/invite_selected_as_user.html:38
 msgid ""
@@ -1243,7 +1243,7 @@ msgid ""
 "entering one of the current\n"
 "active registration passwords."
 msgstr ""
-"Möchtest du diese Teilnehmer:innen auffordern Zugangsdaten für den Kompass "
+"Möchtest du diese Teilnehmer*innen auffordern Zugangsdaten für den Kompass "
 "zu wählen?Sie werden eine E-Mail mit einem Link erhalten, um, nach Eingabe "
 "eines der aktiven Registrierungspasswörter, Benutzername und Passwort zu "
 "setzen."
diff --git a/jdav_web/members/templates/members/crisis_intervention_list.tex b/jdav_web/members/templates/members/crisis_intervention_list.tex
index 3828b24..b615d1b 100644
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@@ -58,7 +58,7 @@
 \end{textblock*}
 
 % HEADLINE
-{\noindent\LARGE{Teilnehmer:innenliste\\[2mm]Sektionsveranstaltung}}\\[1mm]
+{\noindent\LARGE{Teilnehmer*innenliste\\[2mm]Sektionsveranstaltung}}\\[1mm]
 \textit{Erstellt: {{ creation_date }} }\\
 
 % DESCRIPTION TABLE
diff --git a/jdav_web/members/templates/members/notes_list.tex b/jdav_web/members/templates/members/notes_list.tex
index 2f7e134..fbfa23e 100644
--- a/jdav_web/members/templates/members/notes_list.tex
+++ b/jdav_web/members/templates/members/notes_list.tex
@@ -20,7 +20,7 @@
 \begin{document}
 
 % HEADLINE
-{\noindent\LARGE{Teilnehmer:innenübersicht}}\\[1mm]
+{\noindent\LARGE{Teilnehmer*innenübersicht}}\\[1mm]
 \textit{Erstellt: {{ creation_date }} }\\
 
 % DESCRIPTION
diff --git a/jdav_web/members/templates/members/seminar_report.tex b/jdav_web/members/templates/members/seminar_report.tex
index 15deb3f..d73cb67 100644
--- a/jdav_web/members/templates/members/seminar_report.tex
+++ b/jdav_web/members/templates/members/seminar_report.tex
@@ -119,7 +119,7 @@
 {% endif %}
 {% endif %}
 
-\section{Teilnehmer:innenliste}
+\section{Teilnehmer*innenliste}
 
 \begin{table}[H]
     \begin{tabularx}{1\linewidth}{@{\extracolsep{\fill}}lLl|c|c|c}
diff --git a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po b/jdav_web/startpage/locale/de/LC_MESSAGES/django.po
index 3d7f153..a02680c 100644
--- a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/startpage/locale/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: 2024-11-23 19:12+0100\n"
+"POT-Creation-Date: 2024-12-01 16:23+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"
diff --git a/jdav_web/templates/admin/members/app_index.html b/jdav_web/templates/admin/members/app_index.html
index 8262887..d8c2634 100644
--- a/jdav_web/templates/admin/members/app_index.html
+++ b/jdav_web/templates/admin/members/app_index.html
@@ -5,12 +5,12 @@
 <div class="app-members module current-app">
 <h2>Meine Jugendgruppen</h2>
 <p>
-Hier siehst du alle Teilnehmer:innen deiner Jugendgruppen und alle von dir geleiteten Ausfahrten.
+Hier siehst du alle Teilnehmer*innen deiner Jugendgruppen und alle von dir geleiteten Ausfahrten.
 </p>
 <table>
     <tr>
         <th scope="row">
-            <a href="{% url 'admin:members_member_changelist' %}">Teilnehmer:innen</a>
+            <a href="{% url 'admin:members_member_changelist' %}">Teilnehmer*innen</a>
         </th>
         <td></td>
         <td></td>

From 459d4b0e72c53c5568be04ffb7916d9e6a0f36d8 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 16:56:52 +0100
Subject: [PATCH 32/56] mailer: add sender whitelist field

---
 .../mailer/locale/de/LC_MESSAGES/django.po    | 60 +++++++++++--------
 .../0006_emailaddress_allowed_senders.py      | 19 ++++++
 jdav_web/mailer/models.py                     |  5 ++
 3 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py

diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
index 7cba7ab..afa3394 100644
--- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/mailer/locale/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: 2024-12-01 16:23+0100\n"
+"POT-Creation-Date: 2024-12-01 16:56+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"
@@ -59,100 +59,112 @@ msgstr "Weiterleitung an Teilnehmer*innen"
 msgid "Forward to group"
 msgstr "Weiterleitung an Gruppe"
 
-#: mailer/models.py:46
+#: mailer/models.py:32
+msgid "Allowed sender"
+msgstr "Erlaubte Absender:innen"
+
+#: mailer/models.py:33
+msgid ""
+"Only forward e-mails of members of selected groups. Leave empty to allow all "
+"senders."
+msgstr ""
+"Leite nur E-Mails von Mitgliedern dieser Gruppen weiter. Lasse dieses Feld "
+"frei, um alle Absender*innen zu erlauben."
+
+#: mailer/models.py:51
 msgid "email address"
 msgstr "Email-Adresse"
 
-#: mailer/models.py:47
+#: mailer/models.py:52
 msgid "email addresses"
 msgstr "Email-Adressen"
 
-#: mailer/models.py:60
+#: mailer/models.py:65
 msgid "Either a group or at least one member is required as forward recipient."
 msgstr ""
 "Es muss entweder eine Gruppe oder mindestens ein*e Teilnehmer*in als "
 "Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:68
+#: mailer/models.py:73
 msgid "subject"
 msgstr "Betreff"
 
-#: mailer/models.py:69
+#: mailer/models.py:74
 msgid "content"
 msgstr "Inhalt"
 
-#: mailer/models.py:71
+#: mailer/models.py:76
 msgid "to group"
 msgstr "An Gruppe"
 
-#: mailer/models.py:74
+#: mailer/models.py:79
 msgid "to freizeit"
 msgstr "An Ausfahrt"
 
-#: mailer/models.py:79
+#: mailer/models.py:84
 msgid "to notes list"
 msgstr "An Notizliste"
 
-#: mailer/models.py:84
+#: mailer/models.py:89
 msgid "to member"
 msgstr "An Teilnehmer*innen"
 
-#: mailer/models.py:87
+#: mailer/models.py:92
 msgid "reply to participant"
 msgstr "Antwort an Teilnehmer*innen"
 
-#: mailer/models.py:91
+#: mailer/models.py:96
 msgid "reply to custom email address"
 msgstr "Antwort an Email-Adresse"
 
-#: mailer/models.py:94
+#: mailer/models.py:99
 msgid "sent"
 msgstr "Gesendet"
 
-#: mailer/models.py:95
+#: mailer/models.py:100
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: mailer/models.py:113
+#: mailer/models.py:118
 msgid "Some other members"
 msgstr "Andere Teilnehmer*innen"
 
-#: mailer/models.py:115
+#: mailer/models.py:120
 msgid "recipients"
 msgstr "Empfänger"
 
-#: mailer/models.py:178
+#: mailer/models.py:183
 msgid "message"
 msgstr "Nachricht"
 
-#: mailer/models.py:179
+#: mailer/models.py:184
 msgid "messages"
 msgstr "Nachrichten"
 
-#: mailer/models.py:181
+#: mailer/models.py:186
 msgid "Can submit mails"
 msgstr "Kann Mails verschicken"
 
-#: mailer/models.py:202
+#: mailer/models.py:207
 msgid ""
 "Either a group, a memberlist or at least one member is required as recipient"
 msgstr ""
 "Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens "
 "ein*e Teilnehmer*in als Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:209
+#: mailer/models.py:214
 msgid "file"
 msgstr "Datei"
 
-#: mailer/models.py:214
+#: mailer/models.py:219
 msgid "Empty"
 msgstr "Leer"
 
-#: mailer/models.py:217
+#: mailer/models.py:222
 msgid "attachment"
 msgstr "Anhang"
 
-#: mailer/models.py:218
+#: mailer/models.py:223
 msgid "attachments"
 msgstr "Anhänge"
 
diff --git a/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py b/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py
new file mode 100644
index 0000000..dd6de2f
--- /dev/null
+++ b/jdav_web/mailer/migrations/0006_emailaddress_allowed_senders.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.0.1 on 2024-12-01 15:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0029_alter_member_gender_alter_memberwaitinglist_gender'),
+        ('mailer', '0005_alter_emailaddress_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailaddress',
+            name='allowed_senders',
+            field=models.ManyToManyField(blank=True, help_text='Only forward e-mails of members of selected groups. Leave empty to allow all senders.', related_name='allowed_sender_on_emailaddresses', to='members.Group', verbose_name='Allowed sender'),
+        ),
+    ]
diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 0e90440..96551e3 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -28,6 +28,11 @@ class EmailAddress(models.Model):
     to_groups = models.ManyToManyField('members.Group',
                                        verbose_name=_('Forward to group'),
                                        blank=True)
+    allowed_senders = models.ManyToManyField('members.Group',
+                                             verbose_name=_('Allowed sender'),
+                                             help_text=_('Only forward e-mails of members of selected groups. Leave empty to allow all senders.'),
+                                             blank=True,
+                                             related_name='allowed_sender_on_emailaddresses')
 
     @property
     def email(self):

From df16729bd6188c51dccf9538d159864ec29d81ee Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 18:51:06 +0100
Subject: [PATCH 33/56] mailer: add internal_only flag

---
 jdav_web/mailer/admin.py                      |  3 +-
 .../mailer/locale/de/LC_MESSAGES/django.po    | 68 +++++++++++--------
 .../0007_emailaddress_internal_only.py        | 18 +++++
 jdav_web/mailer/models.py                     |  3 +
 4 files changed, 62 insertions(+), 30 deletions(-)
 create mode 100644 jdav_web/mailer/migrations/0007_emailaddress_internal_only.py

diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index e59a3b5..9c1af2b 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -22,7 +22,8 @@ class AttachmentInline(CommonAdminInlineMixin, admin.TabularInline):
 
 
 class EmailAddressAdmin(FilteredMemberFieldMixin, admin.ModelAdmin):
-    list_display = ('email', )
+    list_display = ('email', 'internal_only')
+    fields = ('name', 'to_members', 'to_groups', 'internal_only')
     #formfield_overrides = {
     #    models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
     #    models.ForeignKey: {'widget': apply_select2(forms.Select)}
diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
index afa3394..c0ef976 100644
--- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/mailer/locale/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: 2024-12-01 16:56+0100\n"
+"POT-Creation-Date: 2024-12-01 18:49+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"
@@ -18,19 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailer/admin.py:68
+#: mailer/admin.py:69
 msgid "Send message"
 msgstr "Nachricht verschicken"
 
-#: mailer/admin.py:98
+#: mailer/admin.py:99
 msgid "Failed to send message"
 msgstr "Fehler beim Senden der Email"
 
-#: mailer/admin.py:100
+#: mailer/admin.py:101
 msgid "Failed to send some messages"
 msgstr "Fehler beim Senden der Emails"
 
-#: mailer/admin.py:102
+#: mailer/admin.py:103
 msgid "Successfully sent message"
 msgstr "Email wurde erfolgreich verschickt"
 
@@ -59,11 +59,21 @@ msgstr "Weiterleitung an Teilnehmer*innen"
 msgid "Forward to group"
 msgstr "Weiterleitung an Gruppe"
 
+#: mailer/models.py:31
+msgid "Restrict to internal email addresses"
+msgstr "Weiterleitung nur von internen E-Mail Adressen erlaubt"
+
 #: mailer/models.py:32
+msgid "Only allow forwarding to this e-mail address from the internal domain."
+msgstr ""
+"Leite nur E-Mails weiter, die von ...@alpenverein-heidelberg.de verschickt "
+"wurden. "
+
+#: mailer/models.py:35
 msgid "Allowed sender"
 msgstr "Erlaubte Absender:innen"
 
-#: mailer/models.py:33
+#: mailer/models.py:36
 msgid ""
 "Only forward e-mails of members of selected groups. Leave empty to allow all "
 "senders."
@@ -71,100 +81,100 @@ msgstr ""
 "Leite nur E-Mails von Mitgliedern dieser Gruppen weiter. Lasse dieses Feld "
 "frei, um alle Absender*innen zu erlauben."
 
-#: mailer/models.py:51
+#: mailer/models.py:54
 msgid "email address"
 msgstr "Email-Adresse"
 
-#: mailer/models.py:52
+#: mailer/models.py:55
 msgid "email addresses"
 msgstr "Email-Adressen"
 
-#: mailer/models.py:65
+#: mailer/models.py:68
 msgid "Either a group or at least one member is required as forward recipient."
 msgstr ""
 "Es muss entweder eine Gruppe oder mindestens ein*e Teilnehmer*in als "
 "Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:73
+#: mailer/models.py:76
 msgid "subject"
 msgstr "Betreff"
 
-#: mailer/models.py:74
+#: mailer/models.py:77
 msgid "content"
 msgstr "Inhalt"
 
-#: mailer/models.py:76
+#: mailer/models.py:79
 msgid "to group"
 msgstr "An Gruppe"
 
-#: mailer/models.py:79
+#: mailer/models.py:82
 msgid "to freizeit"
 msgstr "An Ausfahrt"
 
-#: mailer/models.py:84
+#: mailer/models.py:87
 msgid "to notes list"
 msgstr "An Notizliste"
 
-#: mailer/models.py:89
+#: mailer/models.py:92
 msgid "to member"
 msgstr "An Teilnehmer*innen"
 
-#: mailer/models.py:92
+#: mailer/models.py:95
 msgid "reply to participant"
 msgstr "Antwort an Teilnehmer*innen"
 
-#: mailer/models.py:96
+#: mailer/models.py:99
 msgid "reply to custom email address"
 msgstr "Antwort an Email-Adresse"
 
-#: mailer/models.py:99
+#: mailer/models.py:102
 msgid "sent"
 msgstr "Gesendet"
 
-#: mailer/models.py:100
+#: mailer/models.py:103
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: mailer/models.py:118
+#: mailer/models.py:121
 msgid "Some other members"
 msgstr "Andere Teilnehmer*innen"
 
-#: mailer/models.py:120
+#: mailer/models.py:123
 msgid "recipients"
 msgstr "Empfänger"
 
-#: mailer/models.py:183
+#: mailer/models.py:186
 msgid "message"
 msgstr "Nachricht"
 
-#: mailer/models.py:184
+#: mailer/models.py:187
 msgid "messages"
 msgstr "Nachrichten"
 
-#: mailer/models.py:186
+#: mailer/models.py:189
 msgid "Can submit mails"
 msgstr "Kann Mails verschicken"
 
-#: mailer/models.py:207
+#: mailer/models.py:210
 msgid ""
 "Either a group, a memberlist or at least one member is required as recipient"
 msgstr ""
 "Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens "
 "ein*e Teilnehmer*in als Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:214
+#: mailer/models.py:217
 msgid "file"
 msgstr "Datei"
 
-#: mailer/models.py:219
+#: mailer/models.py:222
 msgid "Empty"
 msgstr "Leer"
 
-#: mailer/models.py:222
+#: mailer/models.py:225
 msgid "attachment"
 msgstr "Anhang"
 
-#: mailer/models.py:223
+#: mailer/models.py:226
 msgid "attachments"
 msgstr "Anhänge"
 
diff --git a/jdav_web/mailer/migrations/0007_emailaddress_internal_only.py b/jdav_web/mailer/migrations/0007_emailaddress_internal_only.py
new file mode 100644
index 0000000..6bc75ce
--- /dev/null
+++ b/jdav_web/mailer/migrations/0007_emailaddress_internal_only.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.1 on 2024-12-01 17:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailer', '0006_emailaddress_allowed_senders'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emailaddress',
+            name='internal_only',
+            field=models.BooleanField(default=False, help_text='Only allow forwarding to this e-mail address from the internal domain.', verbose_name='Restrict to internal email addresses'),
+        ),
+    ]
diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 96551e3..3e08d2f 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -28,6 +28,9 @@ class EmailAddress(models.Model):
     to_groups = models.ManyToManyField('members.Group',
                                        verbose_name=_('Forward to group'),
                                        blank=True)
+    internal_only = models.BooleanField(verbose_name=_('Restrict to internal email addresses'),
+                                        help_text=_('Only allow forwarding to this e-mail address from the internal domain.'),
+                                        default=False)
     allowed_senders = models.ManyToManyField('members.Group',
                                              verbose_name=_('Allowed sender'),
                                              help_text=_('Only forward e-mails of members of selected groups. Leave empty to allow all senders.'),

From 5a5ffea89c546df4a366656f6b842fa645208671 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 21:09:02 +0100
Subject: [PATCH 34/56] members/inviteasuser: reject if mail domain not
 internal

---
 jdav_web/jdav_web/settings/local.py           |   1 +
 jdav_web/members/admin.py                     |  18 +-
 .../members/locale/de/LC_MESSAGES/django.po   | 298 +++++++++---------
 jdav_web/members/models.py                    |  14 +
 4 files changed, 187 insertions(+), 144 deletions(-)

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index 7fdaca4..571293e 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -33,6 +33,7 @@ ECHO_PASSWORD_BIRTHDATE_FORMAT = '%d.%m.%Y'
 
 CONGRATULATE_MEMBERS_MAX = 10
 MAX_AGE_GOOD_CONDUCT_CERTIFICATE_MONTHS = 24
+ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER = ('alpenverein-heidelberg.de', )
 
 # finance
 
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 154d1cd..03ec02f 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -290,12 +290,19 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
     request_echo.short_description = _('Request echo from selected members')
 
     def invite_as_user(self, request, queryset):
+        failures = []
         for member in queryset:
-            member.invite_as_user()
-        if queryset.count() == 1:
+            success = member.invite_as_user()
+            if not success:
+                failures.append(member)
+                messages.error(request,
+                               _('%(name)s does not have a DAV360 email address or is already registered.') % {'name': member.name})
+        if queryset.count() == 1 and len(failures) == 0:
             messages.success(request, _('Successfully invited %(name)s as user.') % {'name': queryset[0].name})
-        else:
+        elif len(failures) == 0:
             messages.success(request, _('Successfully invited selected members to join as users.'))
+        else:
+            messages.warning(request, _('Some members have been invited, others could not be invited.'))
 
     def has_may_invite_as_user_permission(self, request):
         return request.user.has_perm('%s.%s' % (self.opts.app_label, 'may_invite_as_user'))
@@ -332,6 +339,11 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
                 _("%(name)s already has login data.") % {'name': str(m)})
             return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name),
                                                 args=(object_id,)))
+        if not m.has_internal_email():
+            messages.error(request,
+                _("The configured email address for %(name)s is not an internal one.") % {'name': str(m)})
+            return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name),
+                                                args=(object_id,)))
         if "apply" in request.POST:
             self.invite_as_user(request, Member.objects.filter(pk=object_id))
             return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name),
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index d37438a..db93455 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-12-01 16:23+0100\n"
+"POT-Creation-Date: 2024-12-01 21:02+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"
@@ -34,19 +34,19 @@ msgstr "Nein"
 msgid "All"
 msgstr "Alle"
 
-#: members/admin.py:184 members/admin.py:401
+#: members/admin.py:184 members/admin.py:413
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: members/admin.py:189 members/admin.py:406
+#: members/admin.py:189 members/admin.py:418
 msgid "Skills"
 msgstr "Fähigkeiten"
 
-#: members/admin.py:194 members/admin.py:411
+#: members/admin.py:194 members/admin.py:423
 msgid "Others"
 msgstr "Sonstiges"
 
-#: members/admin.py:200 members/admin.py:416
+#: members/admin.py:200 members/admin.py:428
 msgid "Organizational"
 msgstr "Organisatorisches"
 
@@ -68,120 +68,136 @@ msgstr ""
 msgid "Request echo from selected members"
 msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer*innen verschicken"
 
-#: members/admin.py:296
+#: members/admin.py:299
+#, python-format
+msgid "%(name)s does not have a DAV360 email address or is already registered."
+msgstr "%(name)s hat keine DAV360 E-Mail Adresse oder ist bereits registriert."
+
+#: members/admin.py:301
 #, python-format
 msgid "Successfully invited %(name)s as user."
 msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:298
+#: members/admin.py:303
 msgid "Successfully invited selected members to join as users."
 msgstr ""
 "Erfolgreich ausgewählte Teilnehmer*innen aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py:305 members/admin.py:322
+#: members/admin.py:305
+msgid "Some members have been invited, others could not be invited."
+msgstr ""
+"Manche Teilnehmer*innen wurden eingeladen, andere konnten nicht eingeladen "
+"werden."
+
+#: members/admin.py:312 members/admin.py:329
 msgid "Permission denied."
 msgstr "Fehlende Berechtigungen."
 
-#: members/admin.py:312 members/admin.py:341
+#: members/admin.py:319 members/admin.py:353
 #: members/templates/admin/invite_as_user.html:21
 msgid "Invite as user"
 msgstr "Kompass Zugangsdaten wählen lassen"
 
-#: members/admin.py:317
+#: members/admin.py:324
 msgid "Invite selected members to join Kompass as users."
 msgstr "Ausgewählte Teilnehmer*innen Kompass Zugangsdaten wählen lassen."
 
-#: members/admin.py:328
+#: members/admin.py:335
 msgid "Member not found."
 msgstr "Teilnehmer*in nicht gefunden."
 
-#: members/admin.py:332
+#: members/admin.py:339
 #, python-format
 msgid "%(name)s already has login data."
 msgstr "%(name)s hat schon Zugangsdaten."
 
-#: members/admin.py:346
+#: members/admin.py:344
+#, python-format
+msgid "The configured email address for %(name)s is not an internal one."
+msgstr "Die für %(name)s eingestellte E-Mail Adresse ist keine DAV360 Adresse."
+
+#: members/admin.py:358
 #, python-format
 msgid "%(name)s already has a pending invitation as user."
 msgstr ""
 "%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen."
 
-#: members/admin.py:364
+#: members/admin.py:376
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:374 members/models.py:54 members/models.py:1475
+#: members/admin.py:386 members/models.py:54 members/models.py:1489
 msgid "Name"
 msgstr "Name"
 
-#: members/admin.py:450
+#: members/admin.py:462
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
-#: members/admin.py:451
+#: members/admin.py:463
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py:458 members/admin.py:532
+#: members/admin.py:470 members/admin.py:544
 #, python-format
 msgid "Successfully confirmed %(name)s."
 msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 
-#: members/admin.py:462 members/admin.py:535
+#: members/admin.py:474 members/admin.py:547
 #, python-format
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py:467
+#: members/admin.py:479
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py:469
+#: members/admin.py:481
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
 "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
 "sind."
 
-#: members/admin.py:470
+#: members/admin.py:482
 msgid "Confirm selected registrations"
 msgstr "Ausgewählte Registrierungen bestätigen"
 
-#: members/admin.py:493
+#: members/admin.py:505
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:509
+#: members/admin.py:521
 msgid "Demote member to waiter"
 msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
 
-#: members/admin.py:527
+#: members/admin.py:539
 #, python-format
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py:542 members/models.py:389 members/models.py:733
-#: members/models.py:1220
+#: members/admin.py:554 members/models.py:389 members/models.py:747
+#: members/models.py:1234
 msgid "Group"
 msgstr "Gruppe"
 
-#: members/admin.py:576
+#: members/admin.py:588
 #, python-format
 msgid "Successfully asked %(name)s to confirm their waiting status."
 msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 
-#: members/admin.py:577
+#: members/admin.py:589
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:586 members/admin.py:646
+#: members/admin.py:598 members/admin.py:658
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:590 members/admin.py:651
+#: members/admin.py:602 members/admin.py:663
 msgid ""
 "The selected group does not have a contact email. Please first set a contact "
 "email and then try again."
@@ -189,32 +205,32 @@ msgstr ""
 "Die ausgewählte Gruppe hat keine Kontakt E-Mail Adresse. Bitte stelle eine "
 "Kontakt E-Mail Adresse ein und versuche es erneut."
 
-#: members/admin.py:598 members/admin.py:658
+#: members/admin.py:610 members/admin.py:670
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:602 members/admin.py:664
+#: members/admin.py:614 members/admin.py:676
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:609
+#: members/admin.py:621
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:707
+#: members/admin.py:719
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:710
+#: members/admin.py:722
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:713 members/models.py:951
+#: members/admin.py:725 members/models.py:965
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:739
+#: members/admin.py:751
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -227,7 +243,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:757
+#: members/admin.py:769
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -240,7 +256,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:765
+#: members/admin.py:777
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -251,34 +267,34 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer*innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:811
+#: members/admin.py:823
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:821
+#: members/admin.py:833
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:825
+#: members/admin.py:837
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:826
+#: members/admin.py:838
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:827
+#: members/admin.py:839
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:828
+#: members/admin.py:840
 msgid "Prepend V32"
 msgstr "V32 Formblatt einfügen"
 
-#: members/admin.py:844
+#: members/admin.py:856
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -287,48 +303,48 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:874
+#: members/admin.py:886
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:882
+#: members/admin.py:894
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:890
+#: members/admin.py:902
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:894 members/admin.py:926
+#: members/admin.py:906 members/admin.py:938
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Landesjugendplan Antrag erstellen"
 
-#: members/admin.py:907
+#: members/admin.py:919
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:912
+#: members/admin.py:924
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:938
+#: members/admin.py:950
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
-#: members/admin.py:942
+#: members/admin.py:954
 msgid "No statement found. Please add a statement and then retry."
 msgstr ""
 "Keine Abrechnung angelegt. Bitte lege eine Abrechnung and und versuche es "
 "erneut."
 
-#: members/admin.py:946
+#: members/admin.py:958
 msgid ""
 "Successfully submited statement. The finance department will notify you as "
 "soon as possible."
@@ -336,7 +352,7 @@ msgstr ""
 "Abrechnung erfolgreich eingericht. Die Finanzabteilung wird sich bei dir so "
 "schnell wie möglich melden."
 
-#: members/admin.py:949
+#: members/admin.py:961
 #: members/templates/admin/freizeit_finance_overview.html:21
 msgid "Finance overview"
 msgstr "Kostenübersicht"
@@ -373,11 +389,11 @@ msgstr "Samstag"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:55 members/models.py:937
+#: members/models.py:55 members/models.py:951
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:61 members/models.py:929
+#: members/models.py:61 members/models.py:943
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
@@ -414,7 +430,7 @@ msgstr "Jugendleiter"
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:78 members/models.py:1302
+#: members/models.py:78 members/models.py:1316
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
@@ -599,326 +615,326 @@ msgstr "Teilnehmer*innen"
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:672
+#: members/models.py:685
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:689 members/models.py:885 members/models.py:896
-#: members/models.py:1251 members/models.py:1258
+#: members/models.py:703 members/models.py:899 members/models.py:910
+#: members/models.py:1265 members/models.py:1272
 msgid "Member"
 msgstr "Teilnehmer*in"
 
-#: members/models.py:696
+#: members/models.py:710
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:697
+#: members/models.py:711
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:717
+#: members/models.py:731
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:718
+#: members/models.py:732
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:732 members/models.py:777
+#: members/models.py:746 members/models.py:791
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:734
+#: members/models.py:748
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:735 members/templates/members/reject_success.html:6
+#: members/models.py:749 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:739
+#: members/models.py:753
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:740
+#: members/models.py:754
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:747
+#: members/models.py:761
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:749
+#: members/models.py:763
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:751
+#: members/models.py:765
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:752
+#: members/models.py:766
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:763
+#: members/models.py:777
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:764
+#: members/models.py:778
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:766
+#: members/models.py:780
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:770
+#: members/models.py:784
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:771
+#: members/models.py:785
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:778
+#: members/models.py:792
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:802
+#: members/models.py:816
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:809
+#: members/models.py:823
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:864
+#: members/models.py:878
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:876
+#: members/models.py:890
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:890
+#: members/models.py:904
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:897 members/models.py:1259
+#: members/models.py:911 members/models.py:1273
 msgid "Members"
 msgstr "Teilnehmer*innen"
 
-#: members/models.py:931
+#: members/models.py:945
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:932
+#: members/models.py:946
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:934
+#: members/models.py:948
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:935
+#: members/models.py:949
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:936
+#: members/models.py:950
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:939
+#: members/models.py:953
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:952
+#: members/models.py:966
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:955
+#: members/models.py:969
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:956
+#: members/models.py:970
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:956
+#: members/models.py:970
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:956
+#: members/models.py:970
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:966 members/models.py:1282
+#: members/models.py:980 members/models.py:1296
 #: members/templates/admin/freizeit_finance_overview.html:26
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:967
+#: members/models.py:981
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1197 members/models.py:1273 members/models.py:1489
+#: members/models.py:1211 members/models.py:1287 members/models.py:1503
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1198 members/models.py:1216 members/models.py:1490
+#: members/models.py:1212 members/models.py:1230 members/models.py:1504
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1217
+#: members/models.py:1231
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1218
+#: members/models.py:1232
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1242
+#: members/models.py:1256
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1245
+#: members/models.py:1259
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1246
+#: members/models.py:1260
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1264
+#: members/models.py:1278
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1267
+#: members/models.py:1281
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1268
+#: members/models.py:1282
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1275
+#: members/models.py:1289
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1276
+#: members/models.py:1290
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1277
+#: members/models.py:1291
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1278
+#: members/models.py:1292
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1279
+#: members/models.py:1293
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1288 members/models.py:1309
+#: members/models.py:1302 members/models.py:1323
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1289
+#: members/models.py:1303
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1303
+#: members/models.py:1317
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1306
+#: members/models.py:1320
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1314
+#: members/models.py:1328
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1315
+#: members/models.py:1329
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1417 members/models.py:1447
+#: members/models.py:1431 members/models.py:1461
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer*innen listen"
 
-#: members/models.py:1419 members/models.py:1449
+#: members/models.py:1433 members/models.py:1463
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer*innen anzeigen"
 
-#: members/models.py:1421 members/models.py:1451
+#: members/models.py:1435 members/models.py:1465
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer*innen ändern"
 
-#: members/models.py:1423 members/models.py:1453
+#: members/models.py:1437 members/models.py:1467
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer*innen löschen"
 
-#: members/models.py:1427 members/models.py:1457
+#: members/models.py:1441 members/models.py:1471
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen listen"
 
-#: members/models.py:1429 members/models.py:1459
+#: members/models.py:1443 members/models.py:1473
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen anzeigen"
 
-#: members/models.py:1431 members/models.py:1461
+#: members/models.py:1445 members/models.py:1475
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen ändern"
 
-#: members/models.py:1433 members/models.py:1463
+#: members/models.py:1447 members/models.py:1477
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen löschen"
 
-#: members/models.py:1436 members/models.py:1437 members/models.py:1440
+#: members/models.py:1450 members/models.py:1451 members/models.py:1454
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1466 members/models.py:1467 members/models.py:1470
+#: members/models.py:1480 members/models.py:1481 members/models.py:1484
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1476
+#: members/models.py:1490
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1479
+#: members/models.py:1493
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1480
+#: members/models.py:1494
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1491
+#: members/models.py:1505
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1492
+#: members/models.py:1506
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1493
+#: members/models.py:1507
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1494
+#: members/models.py:1508
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1497
+#: members/models.py:1511
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1498
+#: members/models.py:1512
 msgid "Trainings"
 msgstr "Fortbildungen"
 
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 08c8b2b..f2b823a 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -665,13 +665,27 @@ class Member(Person):
         raw = "{0}.{1}".format(self.prename.lower(), self.lastname.lower())
         return raw.replace('ö', 'oe').replace('ä', 'ae').replace('ü', 'ue')
 
+    def has_internal_email(self):
+        """Returns if the configured e-mail address is a DAV360 email address."""
+        match = re.match('(^[^@]*)@(.*)$', self.email)
+        if not match:
+            return False
+        return match.group(2) in settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER
+
     def invite_as_user(self):
         """Invites the member to join Kompass as a user."""
+        if not self.has_internal_email():
+            # dont invite if the email address is not an internal one
+            return False
+        if self.user:
+            # don't reinvite if there is already userdata attached
+            return False
         self.invite_as_user_key = uuid.uuid4().hex
         self.save()
         self.send_mail(_('Set login data for Kompass'),
                        settings.INVITE_AS_USER_TEXT.format(name=self.prename,
                                                            link=get_invite_as_user_key(self.invite_as_user_key)))
+        return True
 
     def led_groups(self):
         """Returns a queryset of groups that this member is a youth leader of."""

From dd7af67b34c3aec9a50b3074847f58d7ac30f94c Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 21:11:58 +0100
Subject: [PATCH 35/56] translations: replace more : with *

---
 jdav_web/finance/locale/de/LC_MESSAGES/django.po        | 2 +-
 jdav_web/jdav_web/settings/components/texts.py          | 2 +-
 jdav_web/locale/de/LC_MESSAGES/django.po                | 2 +-
 jdav_web/members/locale/de/LC_MESSAGES/django.po        | 2 +-
 jdav_web/startpage/templates/startpage/gruppen/faq.html | 2 +-
 jdav_web/templates/admin/index.html                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index ed9eef3..da029e0 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
@@ -351,7 +351,7 @@ msgstr "Ausfahrt"
 #, python-format
 msgid "This excursion featured %(staff_count)s youth leader(s), each costing"
 msgstr ""
-"Diese Ausfahrt hatte %(staff_count)s Jugendleiter:innen. Auf jede:n "
+"Diese Ausfahrt hatte %(staff_count)s Jugendleiter*innen. Auf jede*n "
 "entfallen die folgenden Kosten:"
 
 #: finance/templates/admin/overview_submitted_statement.html:62
diff --git a/jdav_web/jdav_web/settings/components/texts.py b/jdav_web/jdav_web/settings/components/texts.py
index 577e348..68042f8 100644
--- a/jdav_web/jdav_web/settings/components/texts.py
+++ b/jdav_web/jdav_web/settings/components/texts.py
@@ -151,7 +151,7 @@ kannst Du hier den Newsletter deabonnieren:
 
 INVITE_AS_USER_TEXT = """Hallo {name},
 
-du bist Jugendleiter:in in der Sektion %(SEKTION)s. Die Verwaltung unserer Jugendgruppen,
+du bist Jugendleiter*in in der Sektion %(SEKTION)s. Die Verwaltung unserer Jugendgruppen,
 Ausfahrten und Finanzen erfolgt in unserer Online Plattform Kompass. Deine Stammdaten sind
 dort bereits hinterlegt. Damit du dich auch anmelden kannst, folge bitte dem folgenden Link
 und wähle ein Passwort.
diff --git a/jdav_web/locale/de/LC_MESSAGES/django.po b/jdav_web/locale/de/LC_MESSAGES/django.po
index 889d64a..14cfefa 100644
--- a/jdav_web/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/locale/de/LC_MESSAGES/django.po
@@ -262,7 +262,7 @@ msgstr "Landesjugendplan Antrag erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:30
 msgid "Generate overview"
-msgstr "Hinweise für Jugendleiter:innen erstellen"
+msgstr "Hinweise für Jugendleiter*innen erstellen"
 
 #: templates/admin/members/freizeit/change_form_object_tools.html:38
 msgid "Finance overview"
diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index db93455..4cafee4 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po
@@ -1018,7 +1018,7 @@ msgid ""
 "According to the contribution guidelines,\n"
 "%(staff_count)s youth leader(s) receive contributions. Each of them receives"
 msgstr ""
-"Gemäß den Zuschussrichtlinien erhalten %(staff_count)s Jugendleiter:innen "
+"Gemäß den Zuschussrichtlinien erhalten %(staff_count)s Jugendleiter*innen "
 "Zuschüsse. Jeweils sind das"
 
 #: members/templates/admin/freizeit_finance_overview.html:69
diff --git a/jdav_web/startpage/templates/startpage/gruppen/faq.html b/jdav_web/startpage/templates/startpage/gruppen/faq.html
index 1dc29cc..d6de1f3 100644
--- a/jdav_web/startpage/templates/startpage/gruppen/faq.html
+++ b/jdav_web/startpage/templates/startpage/gruppen/faq.html
@@ -10,7 +10,7 @@
 <h3>Wie lange sind die Wartezeiten?</h3>
 
 <p>
-Leider haben wir eine sehr große Nachfrage, der wir mit unseren Jugendleiter:innen und unseren Gruppenplätzen nicht nachkommen können. Die Wartezeiten sind sehr unterscheidlich und hängen vom Alter und den verfügbaren Gruppenplätzen ab. Die Wartezeiten kann zwischen einigen Wochen und mehr als einem Jahr liegen.
+Leider haben wir eine sehr große Nachfrage, der wir mit unseren Jugendleiter*innen und unseren Gruppenplätzen nicht nachkommen können. Die Wartezeiten sind sehr unterscheidlich und hängen vom Alter und den verfügbaren Gruppenplätzen ab. Die Wartezeiten kann zwischen einigen Wochen und mehr als einem Jahr liegen.
 </p>
 
 <h3>Muss mein Kind DAV Mitglied sein?</h3>
diff --git a/jdav_web/templates/admin/index.html b/jdav_web/templates/admin/index.html
index aee2fbf..7f351d6 100644
--- a/jdav_web/templates/admin/index.html
+++ b/jdav_web/templates/admin/index.html
@@ -122,7 +122,7 @@ Hier kannst du E-Mails an deine Gruppe oder an andere Menschen in der JDAV Heide
             <a href="{% settings_value 'WIKI_LINK' %}">Julei-Wiki</a>
         </td>
         <td>
-            Informationen zum Jugendleiter:in-sein.
+            Informationen zum Jugendleiter*in-sein.
         </td>
     </tr>
 </table>

From 28c9da81681fa190cd37a9282ee8904ed559fbf0 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 21:31:39 +0100
Subject: [PATCH 36/56] members: fix has statement check

---
 jdav_web/members/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index f2b823a..4d1c70b 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -1177,7 +1177,7 @@ class Freizeit(CommonModel):
             # Ort, Datum
             'DatumOrt 2': 'Heidelberg, ' + datetime.now().strftime('%d.%m.%Y')
         }
-        if self.statement:
+        if hasattr(self, 'statement'):
             possible_contributions = self.maximal_ljp_contributions
             total_contributions = min(self.statement.total_theoretic, possible_contributions)
             self_participation = max(cvt_to_decimal(0), self.statement.total_theoretic - possible_contributions)

From 8c71eb744f7bff60d9da0c4c68c3d5b5b2221de7 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 21:45:21 +0100
Subject: [PATCH 37/56] finance/translation: fix

---
 jdav_web/finance/locale/de/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/finance/locale/de/LC_MESSAGES/django.po b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
index da029e0..cc5404f 100644
--- a/jdav_web/finance/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/finance/locale/de/LC_MESSAGES/django.po
@@ -184,7 +184,7 @@ msgstr "Erstellt von"
 
 #: finance/models.py:70
 msgid "Submitted by"
-msgstr "Eingereicht bei"
+msgstr "Eingereicht von"
 
 #: finance/models.py:75 finance/models.py:480
 msgid "Authorized by"

From 0a1d85e9240a5c14166db7a6be797c92a91d720a Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 21:54:52 +0100
Subject: [PATCH 38/56] finance: fix permissions on submitted statement

---
 jdav_web/finance/admin.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jdav_web/finance/admin.py b/jdav_web/finance/admin.py
index 41468a0..e096a4b 100644
--- a/jdav_web/finance/admin.py
+++ b/jdav_web/finance/admin.py
@@ -121,9 +121,6 @@ class StatementSubmittedAdmin(admin.ModelAdmin):
     def has_add_permission(self, request, obj=None):
         return False
 
-    def has_change_permission(self, request, obj=None):
-        return True
-
     def get_readonly_fields(self, request, obj=None):
         readonly_fields = ['submitted']
         if obj is not None and obj.submitted:

From 97e446f54ad747773a2fa195e7cc3168bb1d78b9 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Sun, 1 Dec 2024 23:39:38 +0100
Subject: [PATCH 39/56] members/waitinglist: fix permissions

---
 jdav_web/members/admin.py                       | 16 +++++++++++++++-
 jdav_web/members/models.py                      |  7 +++++++
 jdav_web/templates/admin/members/app_index.html |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 03ec02f..14eabd0 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -443,6 +443,20 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
     inlines = [EmergencyContactInline]
     change_form_template = "members/change_member_unconfirmed.html"
 
+    field_view_permissions = {
+        'user': 'members.may_set_auth_user',
+        'good_conduct_certificate_presented_date': 'members.may_change_organizationals',
+        'has_key': 'members.may_change_organizationals',
+        'has_free_ticket_gym': 'members.may_change_organizationals',
+    }
+
+    field_change_permissions = {
+        'user': 'members.may_set_auth_user',
+        'good_conduct_certificate_presented_date': 'members.may_change_organizationals',
+        'has_key': 'members.may_change_organizationals',
+        'has_free_ticket_gym': 'members.may_change_organizationals',
+    }
+
     def has_add_permission(self, request, obj=None):
         return False
 
@@ -554,7 +568,7 @@ class WaiterInviteForm(forms.Form):
                                    label=_('Group'))
 
 
-class InvitationToGroupAdmin(CommonAdminInlineMixin, admin.TabularInline):
+class InvitationToGroupAdmin(admin.TabularInline):
     model = InvitationToGroup
     fields = ['group', 'date', 'status']
     readonly_fields = ['group', 'date', 'status']
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 4d1c70b..ae4ee74 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -498,6 +498,8 @@ class Member(Person):
             return queryset
         elif name == "EmergencyContact":
             return queryset
+        elif name == "MemberUnconfirmedProxy":
+            return queryset
         else:
             raise ValueError(name)
 
@@ -731,6 +733,11 @@ class MemberUnconfirmedProxy(Member):
         verbose_name = _('Unconfirmed registration')
         verbose_name_plural = _('Unconfirmed registrations')
         permissions = (('may_manage_all_registrations', 'Can view and manage all unconfirmed registrations.'),)
+        rules_permissions = {
+            'view_obj': may_view | has_global_perm('members.may_manage_all_registrations'),
+            'change_obj': may_change | has_global_perm('members.may_manage_all_registrations'),
+            'delete_obj': may_delete | has_global_perm('members.may_manage_all_registrations'),
+        }
 
     def __str__(self):
         """String representation"""
diff --git a/jdav_web/templates/admin/members/app_index.html b/jdav_web/templates/admin/members/app_index.html
index d8c2634..ee92ac4 100644
--- a/jdav_web/templates/admin/members/app_index.html
+++ b/jdav_web/templates/admin/members/app_index.html
@@ -24,7 +24,7 @@ Hier siehst du alle Teilnehmer*innen deiner Jugendgruppen und alle von dir gelei
     </tr>
 </table>
 <table>
-{% if perms.members.change_waitinglist %}
+{% if perms.members.may_manage_waiting_list %}
 <br>
 <div class="app-members module current-app">
 <h2>Neue Mitglieder</h2>

From 92e77e8b3c3d99498ff73d97c0415eaeca0c3b41 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 00:17:26 +0100
Subject: [PATCH 40/56] finance: fix permissions

---
 jdav_web/finance/admin.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/jdav_web/finance/admin.py b/jdav_web/finance/admin.py
index e096a4b..e7f0ccd 100644
--- a/jdav_web/finance/admin.py
+++ b/jdav_web/finance/admin.py
@@ -119,6 +119,16 @@ class StatementSubmittedAdmin(admin.ModelAdmin):
     inlines = [BillOnSubmittedStatementInline, TransactionOnSubmittedStatementInline]
 
     def has_add_permission(self, request, obj=None):
+        # Submitted statements should not be added directly, but instead be created
+        # as unsubmitted statements and then submitted.
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return request.user.has_perm('finance.process_statementsubmitted')
+
+    def has_delete_permission(self, request, obj=None):
+        # Submitted statements should not be deleted. Instead they can be rejected
+        # and then deleted as unsubmitted statements.
         return False
 
     def get_readonly_fields(self, request, obj=None):
@@ -245,6 +255,10 @@ class StatementConfirmedAdmin(admin.ModelAdmin):
         # To preserve integrity, no one is allowed to change confirmed statements
         return False
 
+    def has_delete_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to delete confirmed statements
+        return False
+
     def get_urls(self):
         urls = super().get_urls()
 
@@ -290,6 +304,9 @@ class StatementConfirmedAdmin(admin.ModelAdmin):
 
 @admin.register(Transaction)
 class TransactionAdmin(admin.ModelAdmin):
+    """The transaction admin site. This is only used to display transactions. All editing
+    is disabled on this site. All transactions should be changed on the respective statement
+    at the correct stage of the approval chain."""
     list_display = ['member', 'ledger', 'amount', 'reference', 'statement', 'confirmed',
             'confirmed_date', 'confirmed_by']
     list_filter = ('ledger', 'member', 'statement', 'confirmed')
@@ -301,6 +318,18 @@ class TransactionAdmin(admin.ModelAdmin):
             return self.fields
         return super(TransactionAdmin, self).get_readonly_fields(request, obj)
 
+    def has_add_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to add transactions
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to change transactions
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to delete transactions
+        return False
+
 
 @admin.register(Bill)
 class BillAdmin(admin.ModelAdmin):

From 31a7f977ddc2f097eb6f4d1095f185a4ea5c6865 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 01:06:11 +0100
Subject: [PATCH 41/56] finance/models: fix overview for independent statements

---
 jdav_web/finance/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdav_web/finance/models.py b/jdav_web/finance/models.py
index b2bc714..4ad3196 100644
--- a/jdav_web/finance/models.py
+++ b/jdav_web/finance/models.py
@@ -188,7 +188,7 @@ class Statement(CommonModel):
 
         # excursion specific
         if self.excursion is None:
-            return
+            return True
 
         for yl in self.excursion.jugendleiter.all():
             ref = _("Compensation for %(excu)s") % {'excu': self.excursion.name}
@@ -348,7 +348,9 @@ class Statement(CommonModel):
                 'total_per_yl': self.total_per_yl,
                 'total_staff': self.total_staff,
             }
-        return dict(context, **excursion_context)
+            return dict(context, **excursion_context)
+        else:
+            return context
 
     def grouped_bills(self):
         return self.bill_set.values('short_description')\

From edb113562de56f6412325a4e78b2c576316b4397 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 01:39:32 +0100
Subject: [PATCH 42/56] members: fix field permissions

---
 jdav_web/contrib/admin.py                       |  4 ++--
 jdav_web/members/admin.py                       |  2 +-
 .../migrations/0030_alter_member_options.py     | 17 +++++++++++++++++
 jdav_web/members/models.py                      |  3 ++-
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 jdav_web/members/migrations/0030_alter_member_options.py

diff --git a/jdav_web/contrib/admin.py b/jdav_web/contrib/admin.py
index 36119d0..4346029 100644
--- a/jdav_web/contrib/admin.py
+++ b/jdav_web/contrib/admin.py
@@ -22,7 +22,7 @@ class FieldPermissionsAdminMixin:
         for fd in field_desc:
             if fd not in self.field_view_permissions:
                 continue
-            if not request.user.has_perm(self.field_view_permissions[fd], obj):
+            if not request.user.has_perm(self.field_view_permissions[fd]):
                 return False
         return True
 
@@ -43,7 +43,7 @@ class FieldPermissionsAdminMixin:
     def get_readonly_fields(self, request, obj=None):
         readonly_fields = super(FieldPermissionsAdminMixin, self).get_readonly_fields(request, obj)
         return list(readonly_fields) +\
-            [fd for fd, perm in self.field_change_permissions.items() if not request.user.has_perm(perm, obj)]
+            [fd for fd, perm in self.field_change_permissions.items() if not request.user.has_perm(perm)]
 
 
 class ChangeViewAdminMixin:
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 14eabd0..2466faf 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -233,7 +233,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
 
     field_change_permissions = {
         'user': 'members.may_set_auth_user',
-        'group': 'members.may_change_group',
+        'group': 'members.may_change_member_group',
         'good_conduct_certificate_presented_date': 'members.may_change_organizationals',
         'has_key': 'members.may_change_organizationals',
         'has_free_ticket_gym': 'members.may_change_organizationals',
diff --git a/jdav_web/members/migrations/0030_alter_member_options.py b/jdav_web/members/migrations/0030_alter_member_options.py
new file mode 100644
index 0000000..7a65370
--- /dev/null
+++ b/jdav_web/members/migrations/0030_alter_member_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.0.1 on 2024-12-02 00:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0029_alter_member_gender_alter_memberwaitinglist_gender'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='member',
+            options={'default_permissions': ('add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view'), 'permissions': (('may_see_qualities', 'Is allowed to see the quality overview'), ('may_set_auth_user', 'Is allowed to set auth user member connections.'), ('may_change_member_group', 'Can change the group field'), ('may_invite_as_user', 'Is allowed to invite a member to set login data.'), ('may_change_organizationals', 'Is allowed to set organizational settings on members.')), 'verbose_name': 'member', 'verbose_name_plural': 'members'},
+        ),
+    ]
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index ae4ee74..ad33ae8 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -394,8 +394,9 @@ class Member(Person):
         permissions = (
             ('may_see_qualities', 'Is allowed to see the quality overview'),
             ('may_set_auth_user', 'Is allowed to set auth user member connections.'),
-            ('change_member_group', 'Can change the group field'),
+            ('may_change_member_group', 'Can change the group field'),
             ('may_invite_as_user', 'Is allowed to invite a member to set login data.'),
+            ('may_change_organizationals', 'Is allowed to set organizational settings on members.'),
         )
         rules_permissions = {
             'members': rules.always_allow,

From ec404c74358ff15d692bad7523c2d6204025a3f9 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 01:39:59 +0100
Subject: [PATCH 43/56] finance: alter field

---
 .../migrations/0004_alter_bill_amount.py       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 jdav_web/finance/migrations/0004_alter_bill_amount.py

diff --git a/jdav_web/finance/migrations/0004_alter_bill_amount.py b/jdav_web/finance/migrations/0004_alter_bill_amount.py
new file mode 100644
index 0000000..127b3ee
--- /dev/null
+++ b/jdav_web/finance/migrations/0004_alter_bill_amount.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.1 on 2024-12-02 00:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0003_alter_bill_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bill',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=6, verbose_name='Amount'),
+        ),
+    ]

From 8327b0a3b9123fa17ae26ccde232cf2e3dbae87e Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 01:49:01 +0100
Subject: [PATCH 44/56] mailer: remove footer

---
 jdav_web/mailer/mailutils.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jdav_web/mailer/mailutils.py b/jdav_web/mailer/mailutils.py
index c9478de..0da9b09 100644
--- a/jdav_web/mailer/mailutils.py
+++ b/jdav_web/mailer/mailutils.py
@@ -51,10 +51,8 @@ def send(subject, content, sender, recipients, message_id=None, reply_to=None,
 def get_content(content, registration_complete=True):
     url = prepend_base_url("/newsletter/unsubscribe")
     prepend = settings.PREPEND_INCOMPLETE_REGISTRATION_TEXT
-    footer = settings.MAIL_FOOTER.format(link=url)
-    text = "{prepend}{content}{footer}".format(prepend="" if registration_complete else prepend,
-                                                     content=content,
-                                                     footer=footer)
+    text = "{prepend}{content}".format(prepend="" if registration_complete else prepend,
+                                       content=content)
     return text
 
 

From 8633c41b8aac566e4d14c4543f017acc69e6e3bf Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 20:57:47 +0100
Subject: [PATCH 45/56] mailer: remove manual message ids

---
 jdav_web/mailer/models.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 3e08d2f..e8486f8 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -151,8 +151,6 @@ class Message(CommonModel):
         # remove any underscores from subject to prevent Arne from using
         # terrible looking underscores in subjects
         self.subject = self.subject.replace('_', ' ')
-        # generate message id
-        message_id = "<{pk}@{domain}>".format(pk=self.pk, domain=settings.DOMAIN)
         # reply to addresses
         reply_to = [jl.association_email for jl in self.reply_to.all()]
         reply_to.extend([ml.email for ml in self.reply_to_email_address.all()])
@@ -165,7 +163,6 @@ class Message(CommonModel):
             success = send(self.subject, get_content(self.content, registration_complete=True),
                            from_addr,
                            emails,
-                           message_id=message_id,
                            attachments=attach,
                            reply_to=reply_to)
             if success == SENT or success == PARTLY_SENT:

From 3d60f7e9bf6e55e41bd34b89b50bdccdf637aee0 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 21:41:51 +0100
Subject: [PATCH 46/56] members/models: normalize usernames, use username as
 association name if available

---
 jdav_web/members/models.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index ad33ae8..6a5f983 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 import uuid
 import pytz
+import unicodedata
 import re
 import csv
 from django.db import models
@@ -368,11 +369,19 @@ class Member(Person):
         """A synonym for the email field."""
         return self.email
 
+    @property
+    def username(self):
+        """Return the username. Either this the name of the linked user, or
+        it is the suggested username."""
+        if not self.user:
+            return self.suggested_username()
+        else:
+            return self.user.username
+
     @property
     def association_email(self):
         """Returning the association email of the member"""
-        raw = "{0}.{1}@{2}".format(self.prename.lower(), self.lastname.lower(), settings.DOMAIN)
-        return raw.replace('ö', 'oe').replace('ä', 'ae').replace('ü', 'ue')
+        return "{username}@{domain}".format(username=self.username, domain=settings.DOMAIN)
 
     def registration_complete(self):
         """Check if all necessary fields are set."""
@@ -666,7 +675,7 @@ class Member(Person):
     def suggested_username(self):
         """Returns a suggested username given by {prename}.{lastname}."""
         raw = "{0}.{1}".format(self.prename.lower(), self.lastname.lower())
-        return raw.replace('ö', 'oe').replace('ä', 'ae').replace('ü', 'ue')
+        return normalize_name(raw)
 
     def has_internal_email(self):
         """Returns if the configured e-mail address is a DAV360 email address."""
@@ -1749,3 +1758,8 @@ def import_from_csv_waitinglist(path):
 
     for row in rows:
         transform_row(row)
+
+
+def normalize_name(raw):
+    noumlaut = raw.replace('ö', 'oe').replace('ä', 'ae').replace('ü', 'ue').replace(' ', '_')
+    return unicodedata.normalize('NFKD', noumlaut).encode('ascii', 'ignore').decode('ascii')

From e2f9eb7db038426136ce485891b074665bcb8207 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 22:02:19 +0100
Subject: [PATCH 47/56] mailer: add option to switch between sending from one
 email address vs from personalized email addresses

---
 jdav_web/jdav_web/settings/local.py | 4 ++++
 jdav_web/mailer/admin.py            | 9 +++++++--
 jdav_web/mailer/models.py           | 9 ++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index 571293e..e1b000c 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -35,6 +35,10 @@ CONGRATULATE_MEMBERS_MAX = 10
 MAX_AGE_GOOD_CONDUCT_CERTIFICATE_MONTHS = 24
 ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER = ('alpenverein-heidelberg.de', )
 
+# mail mode
+
+SEND_FROM_ASSOCIATION_EMAIL = os.environ.get('SEND_FROM_ASSOCIATION_EMAIL', '0') == '1'
+
 # finance
 
 ALLOWANCE_PER_DAY = 22
diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index 9c1af2b..a889d06 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -92,8 +92,13 @@ class MessageAdmin(FilteredMemberFieldMixin, CommonAdminMixin, ObjectPermissions
 
 def submit_message(msg, request):
     sender = None
-    if hasattr(request.user, 'member'):
-        sender = request.user.member
+    if not hasattr(request.user, 'member'):
+        messages.error(request, _("Your account is not connected to a member. Please contact your system administrator."))
+        return
+    sender = request.user.member
+    if not sender.has_internal_email():
+        messages.error(request, _("Your email address is not an internal email address. Please change your email address and try again."))
+        return
     success = msg.submit(sender)
     if success == NOT_SENT:
         messages.error(request, _("Failed to send message"))
diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index e8486f8..5059d11 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -155,10 +155,17 @@ class Message(CommonModel):
         reply_to = [jl.association_email for jl in self.reply_to.all()]
         reply_to.extend([ml.email for ml in self.reply_to_email_address.all()])
         # set correct from address
-        if sender is None:
+        # if the sender is none or if sending from association emails has been
+        # disabled, use the default sending mail
+        if sender is None or not settings.SEND_FROM_ASSOCIATION_EMAIL:
             from_addr = settings.DEFAULT_SENDING_MAIL
         else:
             from_addr = sender.association_email
+        # if sending from the association email has been disabled,
+        # a sender was supplied and the reply to is empty, add the sender's
+        # DAV360 email as reply to
+        if sender and not settings.SEND_FROM_ASSOCIATION_EMAIL and sender.has_internal_email() and reply_to == []:
+            reply_to.append(sender.email)
         try:
             success = send(self.subject, get_content(self.content, registration_complete=True),
                            from_addr,

From b7804884c028822ef34aff7e073389a496427f5b Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 22:18:36 +0100
Subject: [PATCH 48/56] Revert "mailer: remove manual message ids"

This reverts commit 8633c41b8aac566e4d14c4543f017acc69e6e3bf.
---
 jdav_web/mailer/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 5059d11..a33267b 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -151,6 +151,8 @@ class Message(CommonModel):
         # remove any underscores from subject to prevent Arne from using
         # terrible looking underscores in subjects
         self.subject = self.subject.replace('_', ' ')
+        # generate message id
+        message_id = "<{pk}@{domain}>".format(pk=self.pk, domain=settings.DOMAIN)
         # reply to addresses
         reply_to = [jl.association_email for jl in self.reply_to.all()]
         reply_to.extend([ml.email for ml in self.reply_to_email_address.all()])
@@ -170,6 +172,7 @@ class Message(CommonModel):
             success = send(self.subject, get_content(self.content, registration_complete=True),
                            from_addr,
                            emails,
+                           message_id=message_id,
                            attachments=attach,
                            reply_to=reply_to)
             if success == SENT or success == PARTLY_SENT:

From 5cee4966624c06ce72a70dab9558920f4f9bedb9 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 22:27:21 +0100
Subject: [PATCH 49/56] mailer: add translations

---
 .../mailer/locale/de/LC_MESSAGES/django.po    | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
index c0ef976..bb09a36 100644
--- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/mailer/locale/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: 2024-12-01 18:49+0100\n"
+"POT-Creation-Date: 2024-12-02 22:26+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"
@@ -22,15 +22,31 @@ msgstr ""
 msgid "Send message"
 msgstr "Nachricht verschicken"
 
-#: mailer/admin.py:99
+#: mailer/admin.py:96
+msgid ""
+"Your account is not connected to a member. Please contact your system "
+"administrator."
+msgstr ""
+"Dein Account ist nicht mit eine*r Teilnehmer*in verknüpft. Bitte kontaktiere "
+"deine*n Systemadministrator*in."
+
+#: mailer/admin.py:100
+msgid ""
+"Your email address is not an internal email address. Please change your "
+"email address and try again."
+msgstr ""
+"Deine E-Mail Adresse keine DAV360 E-Mail Adresse. Bitte stelle sicher, dass "
+"deine E-Mail Adresse mit @alpenverein-heidelberg.de endet."
+
+#: mailer/admin.py:104
 msgid "Failed to send message"
 msgstr "Fehler beim Senden der Email"
 
-#: mailer/admin.py:101
+#: mailer/admin.py:106
 msgid "Failed to send some messages"
 msgstr "Fehler beim Senden der Emails"
 
-#: mailer/admin.py:103
+#: mailer/admin.py:108
 msgid "Successfully sent message"
 msgstr "Email wurde erfolgreich verschickt"
 
@@ -143,38 +159,38 @@ msgstr "Andere Teilnehmer*innen"
 msgid "recipients"
 msgstr "Empfänger"
 
-#: mailer/models.py:186
+#: mailer/models.py:193
 msgid "message"
 msgstr "Nachricht"
 
-#: mailer/models.py:187
+#: mailer/models.py:194
 msgid "messages"
 msgstr "Nachrichten"
 
-#: mailer/models.py:189
+#: mailer/models.py:196
 msgid "Can submit mails"
 msgstr "Kann Mails verschicken"
 
-#: mailer/models.py:210
+#: mailer/models.py:217
 msgid ""
 "Either a group, a memberlist or at least one member is required as recipient"
 msgstr ""
 "Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens "
 "ein*e Teilnehmer*in als Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:217
+#: mailer/models.py:224
 msgid "file"
 msgstr "Datei"
 
-#: mailer/models.py:222
+#: mailer/models.py:229
 msgid "Empty"
 msgstr "Leer"
 
-#: mailer/models.py:225
+#: mailer/models.py:232
 msgid "attachment"
 msgstr "Anhang"
 
-#: mailer/models.py:226
+#: mailer/models.py:233
 msgid "attachments"
 msgstr "Anhänge"
 

From 32e361151fda272a736bd358fa4c35057a83cc66 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 22:49:49 +0100
Subject: [PATCH 50/56] mailer: set name in sender and reply to

---
 jdav_web/jdav_web/settings/components/emails.py |  1 +
 jdav_web/mailer/mailutils.py                    |  6 ++++++
 jdav_web/mailer/models.py                       | 13 ++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jdav_web/jdav_web/settings/components/emails.py b/jdav_web/jdav_web/settings/components/emails.py
index a1b7a92..a93ec23 100644
--- a/jdav_web/jdav_web/settings/components/emails.py
+++ b/jdav_web/jdav_web/settings/components/emails.py
@@ -14,3 +14,4 @@ CELERY_EMAIL_TASK_CONFIG = {
 }
 
 DEFAULT_SENDING_MAIL = os.environ.get('EMAIL_SENDING_ADDRESS', 'django@localhost')
+DEFAULT_SENDING_NAME = os.environ.get('EMAIL_SENDING_NAME', 'Kompass')
diff --git a/jdav_web/mailer/mailutils.py b/jdav_web/mailer/mailutils.py
index 0da9b09..b2fe2d9 100644
--- a/jdav_web/mailer/mailutils.py
+++ b/jdav_web/mailer/mailutils.py
@@ -19,6 +19,8 @@ def send(subject, content, sender, recipients, message_id=None, reply_to=None,
         kwargs = {"reply_to": reply_to}
     else:
         kwargs = {}
+    if sender == settings.DEFAULT_SENDING_MAIL:
+        sender = addr_with_name(settings.DEFAULT_SENDING_MAIL, settings.DEFAULT_SENDING_NAME)
     url = prepend_base_url("/newsletter/unsubscribe")
     headers = {'List-Unsubscribe': '<{unsubscribe_url}>'.format(unsubscribe_url=url)}
     if message_id is not None:
@@ -89,3 +91,7 @@ def get_invite_as_user_key(key):
 
 def prepend_base_url(absolutelink):
     return "{protocol}://{base}{link}".format(protocol=settings.PROTOCOL, base=settings.BASE_URL, link=absolutelink)
+
+
+def addr_with_name(addr, name):
+    return "{name} <{addr}>".format(name=name, addr=addr)
diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index a33267b..bed3877 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -3,7 +3,8 @@ from django.core.exceptions import ValidationError
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import gettext
-from .mailutils import send, get_content, NOT_SENT, SENT, PARTLY_SENT
+from .mailutils import send, get_content, NOT_SENT, SENT, PARTLY_SENT,\
+        addr_with_name
 from utils import RestrictedFileField
 from jdav_web.celery import app
 from django.core.validators import RegexValidator
@@ -159,15 +160,17 @@ class Message(CommonModel):
         # set correct from address
         # if the sender is none or if sending from association emails has been
         # disabled, use the default sending mail
-        if sender is None or not settings.SEND_FROM_ASSOCIATION_EMAIL:
-            from_addr = settings.DEFAULT_SENDING_MAIL
+        if sender is None:
+            from_addr = addr_with_name(settings.DEFAULT_SENDING_MAIL, settings.DEFAULT_SENDING_NAME)
+        elif sender and settings.SEND_FROM_ASSOCIATION_EMAIL:
+            from_addr = addr_with_name(sender.association_email, sender.name)
         else:
-            from_addr = sender.association_email
+            from_addr = addr_with_name(settings.DEFAULT_SENDING_MAIL, sender.name)
         # if sending from the association email has been disabled,
         # a sender was supplied and the reply to is empty, add the sender's
         # DAV360 email as reply to
         if sender and not settings.SEND_FROM_ASSOCIATION_EMAIL and sender.has_internal_email() and reply_to == []:
-            reply_to.append(sender.email)
+            reply_to.append(addr_with_name(sender.email, sender.name))
         try:
             success = send(self.subject, get_content(self.content, registration_complete=True),
                            from_addr,

From b3da0b1083a7d02ce886a0eebec31e7e41147242 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 22:50:44 +0100
Subject: [PATCH 51/56] mailer: fix translation

---
 .../mailer/locale/de/LC_MESSAGES/django.po    | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po b/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
index bb09a36..7a7e0ec 100644
--- a/jdav_web/mailer/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/mailer/locale/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: 2024-12-02 22:26+0100\n"
+"POT-Creation-Date: 2024-12-02 22:50+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"
@@ -35,8 +35,8 @@ msgid ""
 "Your email address is not an internal email address. Please change your "
 "email address and try again."
 msgstr ""
-"Deine E-Mail Adresse keine DAV360 E-Mail Adresse. Bitte stelle sicher, dass "
-"deine E-Mail Adresse mit @alpenverein-heidelberg.de endet."
+"Deine E-Mail Adresse ist keine DAV360 E-Mail Adresse. Bitte stelle sicher, "
+"dass deine E-Mail Adresse mit @alpenverein-heidelberg.de endet."
 
 #: mailer/admin.py:104
 msgid "Failed to send message"
@@ -59,37 +59,37 @@ msgstr "Verteiler"
 msgid "Congratulation %(name)s"
 msgstr "Herzlichen Glückwunsch %(name)s"
 
-#: mailer/models.py:19
+#: mailer/models.py:20
 msgid "Only alphanumeric characters, ., - and _ are allowed"
 msgstr "Nur Buchstaben, Zahlen, ., . und _ sind erlaubt"
 
-#: mailer/models.py:24
+#: mailer/models.py:25
 msgid "name"
 msgstr "Name"
 
-#: mailer/models.py:26
+#: mailer/models.py:27
 msgid "Forward to participants"
 msgstr "Weiterleitung an Teilnehmer*innen"
 
-#: mailer/models.py:29
+#: mailer/models.py:30
 msgid "Forward to group"
 msgstr "Weiterleitung an Gruppe"
 
-#: mailer/models.py:31
+#: mailer/models.py:32
 msgid "Restrict to internal email addresses"
 msgstr "Weiterleitung nur von internen E-Mail Adressen erlaubt"
 
-#: mailer/models.py:32
+#: mailer/models.py:33
 msgid "Only allow forwarding to this e-mail address from the internal domain."
 msgstr ""
 "Leite nur E-Mails weiter, die von ...@alpenverein-heidelberg.de verschickt "
 "wurden. "
 
-#: mailer/models.py:35
+#: mailer/models.py:36
 msgid "Allowed sender"
 msgstr "Erlaubte Absender:innen"
 
-#: mailer/models.py:36
+#: mailer/models.py:37
 msgid ""
 "Only forward e-mails of members of selected groups. Leave empty to allow all "
 "senders."
@@ -97,100 +97,100 @@ msgstr ""
 "Leite nur E-Mails von Mitgliedern dieser Gruppen weiter. Lasse dieses Feld "
 "frei, um alle Absender*innen zu erlauben."
 
-#: mailer/models.py:54
+#: mailer/models.py:55
 msgid "email address"
 msgstr "Email-Adresse"
 
-#: mailer/models.py:55
+#: mailer/models.py:56
 msgid "email addresses"
 msgstr "Email-Adressen"
 
-#: mailer/models.py:68
+#: mailer/models.py:69
 msgid "Either a group or at least one member is required as forward recipient."
 msgstr ""
 "Es muss entweder eine Gruppe oder mindestens ein*e Teilnehmer*in als "
 "Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:76
+#: mailer/models.py:77
 msgid "subject"
 msgstr "Betreff"
 
-#: mailer/models.py:77
+#: mailer/models.py:78
 msgid "content"
 msgstr "Inhalt"
 
-#: mailer/models.py:79
+#: mailer/models.py:80
 msgid "to group"
 msgstr "An Gruppe"
 
-#: mailer/models.py:82
+#: mailer/models.py:83
 msgid "to freizeit"
 msgstr "An Ausfahrt"
 
-#: mailer/models.py:87
+#: mailer/models.py:88
 msgid "to notes list"
 msgstr "An Notizliste"
 
-#: mailer/models.py:92
+#: mailer/models.py:93
 msgid "to member"
 msgstr "An Teilnehmer*innen"
 
-#: mailer/models.py:95
+#: mailer/models.py:96
 msgid "reply to participant"
 msgstr "Antwort an Teilnehmer*innen"
 
-#: mailer/models.py:99
+#: mailer/models.py:100
 msgid "reply to custom email address"
 msgstr "Antwort an Email-Adresse"
 
-#: mailer/models.py:102
+#: mailer/models.py:103
 msgid "sent"
 msgstr "Gesendet"
 
-#: mailer/models.py:103
+#: mailer/models.py:104
 msgid "Created by"
 msgstr "Erstellt von"
 
-#: mailer/models.py:121
+#: mailer/models.py:122
 msgid "Some other members"
 msgstr "Andere Teilnehmer*innen"
 
-#: mailer/models.py:123
+#: mailer/models.py:124
 msgid "recipients"
 msgstr "Empfänger"
 
-#: mailer/models.py:193
+#: mailer/models.py:196
 msgid "message"
 msgstr "Nachricht"
 
-#: mailer/models.py:194
+#: mailer/models.py:197
 msgid "messages"
 msgstr "Nachrichten"
 
-#: mailer/models.py:196
+#: mailer/models.py:199
 msgid "Can submit mails"
 msgstr "Kann Mails verschicken"
 
-#: mailer/models.py:217
+#: mailer/models.py:220
 msgid ""
 "Either a group, a memberlist or at least one member is required as recipient"
 msgstr ""
 "Es muss entweder eine Gruppe, eine Teilnehmer*innenliste oder mindestens "
 "ein*e Teilnehmer*in als Empfänger*in ausgewählt werden."
 
-#: mailer/models.py:224
+#: mailer/models.py:227
 msgid "file"
 msgstr "Datei"
 
-#: mailer/models.py:229
+#: mailer/models.py:232
 msgid "Empty"
 msgstr "Leer"
 
-#: mailer/models.py:232
+#: mailer/models.py:235
 msgid "attachment"
 msgstr "Anhang"
 
-#: mailer/models.py:233
+#: mailer/models.py:236
 msgid "attachments"
 msgstr "Anhänge"
 

From 420f0746205cee50f415ceb375810464b4c3aaf2 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Mon, 2 Dec 2024 23:05:41 +0100
Subject: [PATCH 52/56] members/echo: fix typo

---
 jdav_web/members/locale/de/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index 4cafee4..b08108f 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po
@@ -1339,7 +1339,7 @@ msgid ""
 "Thanks for echoing back. Please enter the password, which you can find in "
 "the email we sent you.\n"
 msgstr ""
-"Bitte gib dein Passwort ein. Weitere Informationenzur Rückmeldung findest du "
+"Bitte gib dein Passwort ein. Weitere Informationen zur Rückmeldung findest du "
 "in der E-Mail.\n"
 
 #: members/templates/members/echo_password.html:24

From a24c23b13e39ad90bab6376bb414a4c10e890107 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Tue, 3 Dec 2024 00:05:37 +0100
Subject: [PATCH 53/56] startpage: improve mobile adaption

---
 jdav_web/static/startpage/css/base.css        | 24 +++++++++++--------
 jdav_web/static/startpage/css/people_grid.css |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/jdav_web/static/startpage/css/base.css b/jdav_web/static/startpage/css/base.css
index c36d62e..2530db7 100644
--- a/jdav_web/static/startpage/css/base.css
+++ b/jdav_web/static/startpage/css/base.css
@@ -92,24 +92,28 @@ h6 {
 }
 
 .content {
-    width: 55%;
+    max-width: 100%;
+    width: 1000px;
     margin: 0 auto;
+    padding-left: 20px;
+    padding-right: 20px;
     overflow: hidden;
     position: relative;
     padding-top: 40px;
     padding-bottom: 40px;
 }
 
-.column {
-  float: left;
-  width: 50%;
-  padding: 0 20px;
-}
+@media only screen and (min-width: 1024px) {
+    .column {
+      float: left;
+      width: 50%;
+    }
 
-/* Clear floats after the columns */
-.row:after {
-  content: "";
-  clear: both;
+    /* Clear floats after the columns */
+    .row:after {
+      content: "";
+      clear: both;
+    }
 }
 
 .footer a {
diff --git a/jdav_web/static/startpage/css/people_grid.css b/jdav_web/static/startpage/css/people_grid.css
index 2d37a09..8bad66b 100644
--- a/jdav_web/static/startpage/css/people_grid.css
+++ b/jdav_web/static/startpage/css/people_grid.css
@@ -1,7 +1,7 @@
 .grid-container {
     display: grid;
     grid-gap: 10px;
-    grid-template-columns: repeat(4, 1fr);
+    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
     padding: 15px;
 }
 

From d3ceb81cc3906c162bd72e77c81db4e2693bbd1e Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Tue, 3 Dec 2024 00:17:18 +0100
Subject: [PATCH 54/56] members/echo: check key validity before password
 requesting password

---
 jdav_web/members/views.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index f737976..57f0703 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -124,6 +124,13 @@ def echo(request):
         return HttpResponseRedirect(reverse('startpage:index'))
 
     if request.method == 'GET':
+        key = request.GET['key']
+        # try to get a member from the supplied echo key
+        try:
+            member = Member.objects.get(echo_key=key)
+        except Member.DoesNotExist:
+            return render_echo_failed(request, _("invalid"))
+
         # show password
         return render_echo_password(request, request.GET['key'])
 

From 0845c04001cecb4f37c039671fda18d0e676e7fb Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Tue, 3 Dec 2024 00:21:39 +0100
Subject: [PATCH 55/56] members/echo: don't invalidate echo key after echoing,
 only expiry invalidates now

---
 jdav_web/jdav_web/settings/local.py | 1 +
 jdav_web/members/models.py          | 2 +-
 jdav_web/members/views.py           | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jdav_web/jdav_web/settings/local.py b/jdav_web/jdav_web/settings/local.py
index e1b000c..28f0c56 100644
--- a/jdav_web/jdav_web/settings/local.py
+++ b/jdav_web/jdav_web/settings/local.py
@@ -28,6 +28,7 @@ LJP_CONTRIBUTION_PER_DAY = 25
 # echo
 
 ECHO_PASSWORD_BIRTHDATE_FORMAT = '%d.%m.%Y'
+ECHO_GRACE_PERIOD = 30
 
 # misc
 
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 6a5f983..11314f5 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -326,7 +326,7 @@ class Member(Person):
 
     def generate_echo_key(self):
         self.echo_key = uuid.uuid4().hex
-        self.echo_expire = timezone.now() + timezone.timedelta(days=30)
+        self.echo_expire = timezone.now() + timezone.timedelta(days=settings.ECHO_GRACE_PERIOD)
         self.echoed = False
         self.save()
         return self.echo_key
diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index 57f0703..37e9c86 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -158,7 +158,9 @@ def echo(request):
                 raise ValueError(_("Invalid emergency contacts"))
             form.save()
             emergency_contacts_formset.save()
-            member.echo_key, member.echo_expire = "", timezone.now()
+            # We don't invalidate the echo key, so the user
+            # can echo again if wanted.
+            # member.echo_key, member.echo_expire = "", timezone.now()
             member.echoed = True
             member.save()
             return render_echo_success(request, member.prename)

From 67aeb0c03a7a9a6980b27743d91687005ee462c3 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Tue, 3 Dec 2024 00:28:39 +0100
Subject: [PATCH 56/56] members/echo: make gender editable, change wording

---
 .../members/locale/de/LC_MESSAGES/django.po   | 396 +++++++++---------
 .../templates/members/member_form.html        |   2 +-
 jdav_web/members/views.py                     |   4 +-
 3 files changed, 203 insertions(+), 199 deletions(-)

diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index b08108f..62ef53b 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/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: 2024-12-01 21:02+0100\n"
+"POT-Creation-Date: 2024-12-03 00:26+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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: members/admin.py:126 members/models.py:382
+#: members/admin.py:126 members/models.py:391
 msgid "Registration complete"
 msgstr "Anmeldung vollständig"
 
@@ -126,78 +126,78 @@ msgstr ""
 msgid "activity"
 msgstr "Aktivität"
 
-#: members/admin.py:386 members/models.py:54 members/models.py:1489
+#: members/admin.py:386 members/models.py:55 members/models.py:1506
 msgid "Name"
 msgstr "Name"
 
-#: members/admin.py:462
+#: members/admin.py:476
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
-#: members/admin.py:463
+#: members/admin.py:477
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py:470 members/admin.py:544
+#: members/admin.py:484 members/admin.py:558
 #, python-format
 msgid "Successfully confirmed %(name)s."
 msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 
-#: members/admin.py:474 members/admin.py:547
+#: members/admin.py:488 members/admin.py:561
 #, python-format
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py:479
+#: members/admin.py:493
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py:481
+#: members/admin.py:495
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
 "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
 "sind."
 
-#: members/admin.py:482
+#: members/admin.py:496
 msgid "Confirm selected registrations"
 msgstr "Ausgewählte Registrierungen bestätigen"
 
-#: members/admin.py:505
+#: members/admin.py:519
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py:521
+#: members/admin.py:535
 msgid "Demote member to waiter"
 msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
 
-#: members/admin.py:539
+#: members/admin.py:553
 #, python-format
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py:554 members/models.py:389 members/models.py:747
-#: members/models.py:1234
+#: members/admin.py:568 members/models.py:398 members/models.py:764
+#: members/models.py:1251
 msgid "Group"
 msgstr "Gruppe"
 
-#: members/admin.py:588
+#: members/admin.py:602
 #, python-format
 msgid "Successfully asked %(name)s to confirm their waiting status."
 msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
 
-#: members/admin.py:589
+#: members/admin.py:603
 msgid "Ask selected waiters to confirm their waiting status"
 msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
 
-#: members/admin.py:598 members/admin.py:658
+#: members/admin.py:612 members/admin.py:672
 msgid ""
 "An error occurred while trying to invite said members. Please try again."
 msgstr ""
 "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
 "nochmal. "
 
-#: members/admin.py:602 members/admin.py:663
+#: members/admin.py:616 members/admin.py:677
 msgid ""
 "The selected group does not have a contact email. Please first set a contact "
 "email and then try again."
@@ -205,32 +205,32 @@ msgstr ""
 "Die ausgewählte Gruppe hat keine Kontakt E-Mail Adresse. Bitte stelle eine "
 "Kontakt E-Mail Adresse ein und versuche es erneut."
 
-#: members/admin.py:610 members/admin.py:670
+#: members/admin.py:624 members/admin.py:684
 #, python-format
 msgid "Successfully invited %(name)s to %(group)s."
 msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
 
-#: members/admin.py:614 members/admin.py:676
+#: members/admin.py:628 members/admin.py:690
 msgid "Select group for invitation"
 msgstr "Wähle Gruppe für Einladung aus"
 
-#: members/admin.py:621
+#: members/admin.py:635
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py:719
+#: members/admin.py:733
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: members/admin.py:722
+#: members/admin.py:736
 msgid "Tour type"
 msgstr "Art der Tour"
 
-#: members/admin.py:725 members/models.py:965
+#: members/admin.py:739 members/models.py:982
 msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
-#: members/admin.py:751
+#: members/admin.py:765
 msgid ""
 "Please list here all expenses in relation with this excursion and upload "
 "relevant bills. These have to be permanently stored for the application of "
@@ -243,7 +243,7 @@ msgstr ""
 "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
 "wären z.B. Anreise, Verpflegung, Material etc.)."
 
-#: members/admin.py:769
+#: members/admin.py:783
 msgid ""
 "Here you can work on a seminar report for applying for financial "
 "contributions from Landesjugendplan (LJP). More information on creating a "
@@ -256,7 +256,7 @@ msgstr ""
 "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
 "herunterladen."
 
-#: members/admin.py:777
+#: members/admin.py:791
 msgid ""
 "Please list all participants (also youth leaders) of this excursion. Here "
 "you can still make changes just before departure and hence generate the "
@@ -267,34 +267,34 @@ msgstr ""
 "jederzeit die aktuelle Teilnehmer*innenliste für die Krisenintervention "
 "generieren."
 
-#: members/admin.py:823
+#: members/admin.py:837
 #, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Notizliste "
 "%(name)s anzusehen."
 
-#: members/admin.py:833
+#: members/admin.py:847
 msgid "Generate PDF summary"
 msgstr "Übersicht erstellen"
 
-#: members/admin.py:837
+#: members/admin.py:851
 msgid "Full report"
 msgstr "Vollständiger Seminarbericht"
 
-#: members/admin.py:838
+#: members/admin.py:852
 msgid "Costs and participants only"
 msgstr "Nur Kosten und Teilnehmende"
 
-#: members/admin.py:839
+#: members/admin.py:853
 msgid "Mode"
 msgstr "Modus"
 
-#: members/admin.py:840
+#: members/admin.py:854
 msgid "Prepend V32"
 msgstr "V32 Formblatt einfügen"
 
-#: members/admin.py:856
+#: members/admin.py:870
 msgid ""
 "General information on your excursion. These are partly relevant for the "
 "amount of financial compensation (means of transport, travel distance, etc.)."
@@ -303,48 +303,48 @@ msgstr ""
 "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
 "Fahrstrecke in km)."
 
-#: members/admin.py:886
+#: members/admin.py:900
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer*innen der Ausfahrt "
 "%(name)s anzusehen."
 
-#: members/admin.py:894
+#: members/admin.py:908
 msgid "Generate crisis intervention list"
 msgstr "Kriseninterventionsliste erstellen"
 
-#: members/admin.py:902
+#: members/admin.py:916
 msgid "Generate overview"
 msgstr "Hinweise für Jugendleiter erstellen"
 
-#: members/admin.py:906 members/admin.py:938
+#: members/admin.py:920 members/admin.py:952
 #: members/templates/admin/generate_seminar_report.html:21
 msgid "Generate seminar report"
 msgstr "Landesjugendplan Antrag erstellen"
 
-#: members/admin.py:919
+#: members/admin.py:933
 msgid "Please select a mode."
 msgstr "Bitte wähle einen Modus aus."
 
-#: members/admin.py:924
+#: members/admin.py:938
 msgid ""
 "Full mode is only available, if the seminar report section is filled out."
 msgstr ""
 "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
 "ausgefüllt ist. "
 
-#: members/admin.py:950
+#: members/admin.py:964
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
-#: members/admin.py:954
+#: members/admin.py:968
 msgid "No statement found. Please add a statement and then retry."
 msgstr ""
 "Keine Abrechnung angelegt. Bitte lege eine Abrechnung and und versuche es "
 "erneut."
 
-#: members/admin.py:958
+#: members/admin.py:972
 msgid ""
 "Successfully submited statement. The finance department will notify you as "
 "soon as possible."
@@ -352,7 +352,7 @@ msgstr ""
 "Abrechnung erfolgreich eingericht. Die Finanzabteilung wird sich bei dir so "
 "schnell wie möglich melden."
 
-#: members/admin.py:961
+#: members/admin.py:975
 #: members/templates/admin/freizeit_finance_overview.html:21
 msgid "Finance overview"
 msgstr "Kostenübersicht"
@@ -361,580 +361,580 @@ msgstr "Kostenübersicht"
 msgid "member administration"
 msgstr "Meine Jugendgruppe"
 
-#: members/models.py:40
+#: members/models.py:41
 msgid "Monday"
 msgstr "Montag"
 
-#: members/models.py:41
+#: members/models.py:42
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: members/models.py:42
+#: members/models.py:43
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: members/models.py:43
+#: members/models.py:44
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: members/models.py:44
+#: members/models.py:45
 msgid "Friday"
 msgstr "Freitag"
 
-#: members/models.py:45
+#: members/models.py:46
 msgid "Saturday"
 msgstr "Samstag"
 
-#: members/models.py:46
+#: members/models.py:47
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: members/models.py:55 members/models.py:951
+#: members/models.py:56 members/models.py:968
 msgid "Description"
 msgstr "Beschreibung"
 
-#: members/models.py:61 members/models.py:943
+#: members/models.py:62 members/models.py:960
 #: members/templates/members/change_member.html:18
 msgid "Activity"
 msgstr "Aktivität"
 
-#: members/models.py:62
+#: members/models.py:63
 msgid "Activities"
 msgstr "Aktivitäten"
 
-#: members/models.py:70
+#: members/models.py:71
 msgid "name"
 msgstr "Name"
 
-#: members/models.py:71
+#: members/models.py:72
 msgid "description"
 msgstr "Beschreibung"
 
-#: members/models.py:72
+#: members/models.py:73
 msgid "show on website"
 msgstr "Auf der Webseite anzeigen"
 
-#: members/models.py:73
+#: members/models.py:74
 msgid "lowest year"
 msgstr "Ab Jahrgang"
 
-#: members/models.py:74
+#: members/models.py:75
 msgid "highest year"
 msgstr "Bis Jahrgang"
 
-#: members/models.py:75
+#: members/models.py:76
 msgid "youth leaders"
 msgstr "Jugendleiter"
 
-#: members/models.py:77
+#: members/models.py:78
 msgid "week day"
 msgstr "Wochentag"
 
-#: members/models.py:78 members/models.py:1316
+#: members/models.py:79 members/models.py:1333
 msgid "Starting time"
 msgstr "Zeitpunkt"
 
-#: members/models.py:79
+#: members/models.py:80
 msgid "Ending time"
 msgstr "Endzeitpunkt"
 
-#: members/models.py:81
+#: members/models.py:82
 msgid "Contact email"
 msgstr "Kontakt Email"
 
-#: members/models.py:91 members/models.py:258
+#: members/models.py:92 members/models.py:259
 msgid "group"
 msgstr "Gruppe"
 
-#: members/models.py:92
+#: members/models.py:93
 msgid "groups"
 msgstr "Gruppen"
 
-#: members/models.py:108
+#: members/models.py:109
 msgid "prename"
 msgstr "Vorname"
 
-#: members/models.py:109
+#: members/models.py:110
 msgid "last name"
 msgstr "Nachname"
 
-#: members/models.py:112
+#: members/models.py:113
 msgid "Email confirmed"
 msgstr "Emailadresse bestätigt"
 
-#: members/models.py:149
+#: members/models.py:150
 msgid "Email confirmation needed"
 msgstr "Email Bestätigung erforderlich"
 
-#: members/models.py:189 members/models.py:232
+#: members/models.py:190 members/models.py:233
 msgid "phone number"
 msgstr "Telefonnummer (mobil)"
 
-#: members/models.py:199
+#: members/models.py:200
 msgid "birth date"
 msgstr "Geburtsdatum"
 
-#: members/models.py:204
+#: members/models.py:205
 msgid "Gender"
 msgstr "Gender"
 
-#: members/models.py:205
+#: members/models.py:206
 msgid "comments"
 msgstr "Kommentare"
 
-#: members/models.py:229
+#: members/models.py:230
 msgid "Alternative email confirmed"
 msgstr "Alternative E-Mail Adresse bestätigt"
 
-#: members/models.py:233
+#: members/models.py:234
 msgid "street and house number"
 msgstr "Straße und Hausnummer"
 
-#: members/models.py:234
+#: members/models.py:235
 msgid "Postcode"
 msgstr "PLZ"
 
-#: members/models.py:236
+#: members/models.py:237
 msgid "town"
 msgstr "Stadt"
 
-#: members/models.py:237
+#: members/models.py:238
 msgid "Address extra"
 msgstr "Adress-Zusatz"
 
-#: members/models.py:238
+#: members/models.py:239
 msgid "Country"
 msgstr "Land"
 
-#: members/models.py:240
+#: members/models.py:241
 msgid "Good conduct certificate presented on"
 msgstr "Führungszeugnis vorgelegt am"
 
-#: members/models.py:241
+#: members/models.py:242
 msgid "Joined on"
 msgstr "Eintritt"
 
-#: members/models.py:242
+#: members/models.py:243
 msgid "Left on"
 msgstr "Austritt"
 
-#: members/models.py:243
+#: members/models.py:244
 msgid "Has key"
 msgstr "Hat Jugendraumschlüssel"
 
-#: members/models.py:244
+#: members/models.py:245
 msgid "Has a free ticket for the climbing gym"
 msgstr "Hat Freikarte für Kletterhalle"
 
-#: members/models.py:245
+#: members/models.py:246
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py:246
+#: members/models.py:247
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
 
-#: members/models.py:247
+#: members/models.py:248
 msgid "Climbing badge"
 msgstr "Kletterschein"
 
-#: members/models.py:248
+#: members/models.py:249
 msgid "Alpine experience"
 msgstr "Alpine Erfahrung"
 
-#: members/models.py:249
+#: members/models.py:250
 msgid "Allergies"
 msgstr "Allergieen"
 
-#: members/models.py:250
+#: members/models.py:251
 msgid "Medication"
 msgstr "Medikamente"
 
-#: members/models.py:251
+#: members/models.py:252
 msgid "Tetanus vaccination"
 msgstr "Tetanusimpfung"
 
-#: members/models.py:252
+#: members/models.py:253
 msgid "Photos may be taken"
 msgstr "Fotoerlaubnis"
 
-#: members/models.py:253
+#: members/models.py:254
 msgid "Legal guardians"
 msgstr "Erziehungsberechtigte"
 
-#: members/models.py:255
+#: members/models.py:256
 msgid "May cancel a group appointment independently"
 msgstr "Darf sich allein von der Gruppenstunde abmelden"
 
-#: members/models.py:262
+#: members/models.py:263
 msgid "receives newsletter"
 msgstr "Erhält den Newsletter"
 
-#: members/models.py:266
+#: members/models.py:267
 msgid "created"
 msgstr "erstellt"
 
-#: members/models.py:267
+#: members/models.py:268
 msgid "Active"
 msgstr "Aktiv"
 
-#: members/models.py:268
+#: members/models.py:269
 msgid "registration form"
 msgstr "Anmeldeformular"
 
-#: members/models.py:276
+#: members/models.py:277
 msgid "image"
 msgstr "Bild"
 
-#: members/models.py:285
+#: members/models.py:286
 msgid "Echoed"
 msgstr "Rückgemeldet"
 
-#: members/models.py:286
+#: members/models.py:287
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: members/models.py:288
+#: members/models.py:289
 msgid "Login data"
 msgstr "Zugangsdaten"
 
-#: members/models.py:318
+#: members/models.py:319
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py:392
+#: members/models.py:401
 msgid "member"
 msgstr "Teilnehmer*in"
 
-#: members/models.py:393
+#: members/models.py:402
 msgid "members"
 msgstr "Teilnehmer*innen"
 
-#: members/models.py:461
+#: members/models.py:471
 #, python-format
 msgid "New unconfirmed registration for group %(group)s"
 msgstr "Neue unbestätigte Registrierung für Gruppe %(group)s"
 
-#: members/models.py:685
+#: members/models.py:697
 msgid "Set login data for Kompass"
 msgstr "Zugangsdaten für Kompass wählen"
 
-#: members/models.py:703 members/models.py:899 members/models.py:910
-#: members/models.py:1265 members/models.py:1272
+#: members/models.py:715 members/models.py:916 members/models.py:927
+#: members/models.py:1282 members/models.py:1289
 msgid "Member"
 msgstr "Teilnehmer*in"
 
-#: members/models.py:710
+#: members/models.py:722
 msgid "Emergency contact"
 msgstr "Notfallkontakt"
 
-#: members/models.py:711
+#: members/models.py:723
 msgid "Emergency contacts"
 msgstr "Notfallkontakte"
 
-#: members/models.py:731
+#: members/models.py:743
 msgid "Unconfirmed registration"
 msgstr "Unbestätigte Registrierung"
 
-#: members/models.py:732
+#: members/models.py:744
 msgid "Unconfirmed registrations"
 msgstr "Unbestätigte Registrierungen"
 
-#: members/models.py:746 members/models.py:791
+#: members/models.py:763 members/models.py:808
 msgid "Waiter"
 msgstr "Wartende Person"
 
-#: members/models.py:748
+#: members/models.py:765
 msgid "Invitation date"
 msgstr "Einladungsdatum"
 
-#: members/models.py:749 members/templates/members/reject_success.html:6
+#: members/models.py:766 members/templates/members/reject_success.html:6
 #: members/templates/members/reject_success.html:11
 msgid "Invitation rejected"
 msgstr "Einladung abgelehnt"
 
-#: members/models.py:753
+#: members/models.py:770
 msgid "Invitation to group"
 msgstr "Gruppeneinladung"
 
-#: members/models.py:754
+#: members/models.py:771
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py:761
+#: members/models.py:778
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py:763
+#: members/models.py:780
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py:765
+#: members/models.py:782
 msgid "Undecided"
 msgstr "Ausstehend"
 
-#: members/models.py:766
+#: members/models.py:783
 msgid "Status"
 msgstr "Status"
 
-#: members/models.py:777
+#: members/models.py:794
 msgid "Do you want to tell us something else?"
 msgstr "Möchtest du uns noch etwas mitteilen?"
 
-#: members/models.py:778
+#: members/models.py:795
 msgid "application date"
 msgstr "Bewerbungsdatum"
 
-#: members/models.py:780
+#: members/models.py:797
 msgid "Last wait confirmation"
 msgstr "Letzte Wartebestätigung"
 
-#: members/models.py:784
+#: members/models.py:801
 msgid "Last reminder"
 msgstr "Letzte Erinnerung"
 
-#: members/models.py:785
+#: members/models.py:802
 msgid "Missed reminders"
 msgstr "Verpasste Erinnerungen"
 
-#: members/models.py:792
+#: members/models.py:809
 msgid "Waiters"
 msgstr "Warteliste"
 
-#: members/models.py:816
+#: members/models.py:833
 msgid "Waiting status confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
-#: members/models.py:823
+#: members/models.py:840
 msgid "Waiting confirmation needed"
 msgstr "Wartelistenplatzbestätigung erforderlich"
 
-#: members/models.py:878
+#: members/models.py:895
 msgid "Invitation to trial group meeting"
 msgstr "Einladung zu Schnupperstunde"
 
-#: members/models.py:890
+#: members/models.py:907
 msgid "Unregistered from waiting list"
 msgstr "Von der Warteliste abgemeldet"
 
-#: members/models.py:904
+#: members/models.py:921
 msgid "Comment"
 msgstr "Kommentar"
 
-#: members/models.py:911 members/models.py:1273
+#: members/models.py:928 members/models.py:1290
 msgid "Members"
 msgstr "Teilnehmer*innen"
 
-#: members/models.py:945
+#: members/models.py:962
 msgid "Place"
 msgstr "Stützpunkt / Ort"
 
-#: members/models.py:946
+#: members/models.py:963
 msgid "Destination (optional)"
 msgstr "ggf. Ziel"
 
-#: members/models.py:948
+#: members/models.py:965
 msgid "e.g. a peak"
 msgstr "z.B. ein Gipfel"
 
-#: members/models.py:949
+#: members/models.py:966
 msgid "Begin"
 msgstr "Anfang"
 
-#: members/models.py:950
+#: members/models.py:967
 msgid "End (optional)"
 msgstr "Ende"
 
-#: members/models.py:953
+#: members/models.py:970
 msgid "Groups"
 msgstr "Gruppen"
 
-#: members/models.py:966
+#: members/models.py:983
 msgid "Kilometers traveled"
 msgstr "Fahrstrecke in Kilometer"
 
-#: members/models.py:969
+#: members/models.py:986
 msgid "Categories"
 msgstr "Kategorien"
 
-#: members/models.py:970
+#: members/models.py:987
 msgid "easy"
 msgstr "leicht"
 
-#: members/models.py:970
+#: members/models.py:987
 msgid "medium"
 msgstr "mittel"
 
-#: members/models.py:970
+#: members/models.py:987
 msgid "hard"
 msgstr "schwer"
 
-#: members/models.py:980 members/models.py:1296
+#: members/models.py:997 members/models.py:1313
 #: members/templates/admin/freizeit_finance_overview.html:26
 msgid "Excursion"
 msgstr "Ausfahrt"
 
-#: members/models.py:981
+#: members/models.py:998
 msgid "Excursions"
 msgstr "Ausfahrten"
 
-#: members/models.py:1211 members/models.py:1287 members/models.py:1503
+#: members/models.py:1228 members/models.py:1304 members/models.py:1520
 msgid "Title"
 msgstr "Titel"
 
-#: members/models.py:1212 members/models.py:1230 members/models.py:1504
+#: members/models.py:1229 members/models.py:1247 members/models.py:1521
 msgid "Date"
 msgstr "Datum"
 
-#: members/models.py:1231
+#: members/models.py:1248
 msgid "Location"
 msgstr "Ort"
 
-#: members/models.py:1232
+#: members/models.py:1249
 msgid "Topic"
 msgstr "Thema"
 
-#: members/models.py:1256
+#: members/models.py:1273
 msgid "Jugendleiter"
 msgstr "Jugendleiter"
 
-#: members/models.py:1259
+#: members/models.py:1276
 msgid "Klettertreff"
 msgstr "Klettertreff"
 
-#: members/models.py:1260
+#: members/models.py:1277
 msgid "Klettertreffs"
 msgstr "Klettertreffs"
 
-#: members/models.py:1278
+#: members/models.py:1295
 msgid "Password"
 msgstr "Passwort"
 
-#: members/models.py:1281
+#: members/models.py:1298
 msgid "registration password"
 msgstr "Registrierungspassort"
 
-#: members/models.py:1282
+#: members/models.py:1299
 msgid "registration passwords"
 msgstr "Registrierungspasswörter"
 
-#: members/models.py:1289
+#: members/models.py:1306
 msgid "Alpinistic goals"
 msgstr "Alpintechnische Ziele"
 
-#: members/models.py:1290
+#: members/models.py:1307
 msgid "Pedagogic goals"
 msgstr "Pädagogische Ziele"
 
-#: members/models.py:1291
+#: members/models.py:1308
 msgid "Content and methods"
 msgstr "Inhalte und Methoden"
 
-#: members/models.py:1292
+#: members/models.py:1309
 msgid "Evaluation"
 msgstr "Wertung"
 
-#: members/models.py:1293
+#: members/models.py:1310
 msgid "Experiences and possible improvements"
 msgstr "Erfahrungen und Verbesserungsvorschläge"
 
-#: members/models.py:1302 members/models.py:1323
+#: members/models.py:1319 members/models.py:1340
 msgid "LJP Proposal"
 msgstr "Seminarbericht"
 
-#: members/models.py:1303
+#: members/models.py:1320
 msgid "LJP Proposals"
 msgstr "Seminarberichte"
 
-#: members/models.py:1317
+#: members/models.py:1334
 msgid "Duration in hours"
 msgstr "Dauer in Stunden"
 
-#: members/models.py:1320
+#: members/models.py:1337
 msgid "Activity and method"
 msgstr "Art der Aktion inkl. Methode"
 
-#: members/models.py:1328
+#: members/models.py:1345
 msgid "Intervention"
 msgstr "Aktion"
 
-#: members/models.py:1329
+#: members/models.py:1346
 msgid "Interventions"
 msgstr "Aktionen"
 
-#: members/models.py:1431 members/models.py:1461
+#: members/models.py:1448 members/models.py:1478
 msgid "May list members"
 msgstr "Darf folgende Teilnehmer*innen listen"
 
-#: members/models.py:1433 members/models.py:1463
+#: members/models.py:1450 members/models.py:1480
 msgid "May view members"
 msgstr "Darf folgende Teilnehmer*innen anzeigen"
 
-#: members/models.py:1435 members/models.py:1465
+#: members/models.py:1452 members/models.py:1482
 msgid "May change members"
 msgstr "Darf folgende Teilnehmer*innen ändern"
 
-#: members/models.py:1437 members/models.py:1467
+#: members/models.py:1454 members/models.py:1484
 msgid "May delete members"
 msgstr "Darf folgende Teilnehmer*innen löschen"
 
-#: members/models.py:1441 members/models.py:1471
+#: members/models.py:1458 members/models.py:1488
 msgid "May list members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen listen"
 
-#: members/models.py:1443 members/models.py:1473
+#: members/models.py:1460 members/models.py:1490
 msgid "May view members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen anzeigen"
 
-#: members/models.py:1445 members/models.py:1475
+#: members/models.py:1462 members/models.py:1492
 msgid "May change members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen ändern"
 
-#: members/models.py:1447 members/models.py:1477
+#: members/models.py:1464 members/models.py:1494
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen löschen"
 
-#: members/models.py:1450 members/models.py:1451 members/models.py:1454
+#: members/models.py:1467 members/models.py:1468 members/models.py:1471
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py:1480 members/models.py:1481 members/models.py:1484
+#: members/models.py:1497 members/models.py:1498 members/models.py:1501
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
-#: members/models.py:1490
+#: members/models.py:1507
 msgid "Permission needed"
 msgstr "Freigabe erforderlich"
 
-#: members/models.py:1493
+#: members/models.py:1510
 msgid "Training category"
 msgstr "Fortbildungstyp"
 
-#: members/models.py:1494
+#: members/models.py:1511
 msgid "Training categories"
 msgstr "Fortbildungstypen"
 
-#: members/models.py:1505
+#: members/models.py:1522
 msgid "Category"
 msgstr "Kategorien"
 
-#: members/models.py:1506
+#: members/models.py:1523
 msgid "Comments"
 msgstr "Kommentar"
 
-#: members/models.py:1507
+#: members/models.py:1524
 msgid "Participated"
 msgstr "Teilgenommmen"
 
-#: members/models.py:1508
+#: members/models.py:1525
 msgid "Passed"
 msgstr "Bestanden"
 
-#: members/models.py:1511
+#: members/models.py:1528
 msgid "Training"
 msgstr "Fortbildung"
 
-#: members/models.py:1512
+#: members/models.py:1529
 msgid "Trainings"
 msgstr "Fortbildungen"
 
@@ -1339,11 +1339,10 @@ msgid ""
 "Thanks for echoing back. Please enter the password, which you can find in "
 "the email we sent you.\n"
 msgstr ""
-"Bitte gib dein Passwort ein. Weitere Informationen zur Rückmeldung findest du "
-"in der E-Mail.\n"
+"Bitte gib dein Passwort ein. Weitere Informationen zur Rückmeldung findest "
+"du in der E-Mail.\n"
 
 #: members/templates/members/echo_password.html:24
-#: members/templates/members/member_form.html:37
 #: members/templates/members/register_password.html:22
 #: members/templates/members/register_waiting_list.html:39
 msgid "submit"
@@ -1444,6 +1443,10 @@ msgstr ""
 "Ich bin einverstanden, dass meine Daten auf dem Server der JDAV %(sektion)s "
 "gespeichert und verarbeitet werden."
 
+#: members/templates/members/member_form.html:37
+msgid "Save"
+msgstr "Speichern"
+
 #: members/templates/members/member_form.html:103
 msgid "This file is bigger than the maximal allowed file size of 5 MiB."
 msgstr "Diese Datei ist größer als die maximal erlaubte Dateigröße von 5 MiB."
@@ -1647,19 +1650,20 @@ msgstr ""
 msgid "optional additional email address"
 msgstr "Optionale zusätzliche E-Mailadresse"
 
-#: members/views.py:97 members/views.py:177
+#: members/views.py:97 members/views.py:186
 msgid "The entered password is wrong."
 msgstr "Das eingegebene Passwort ist falsch."
 
-#: members/views.py:131 members/views.py:139 members/views.py:334
+#: members/views.py:132 members/views.py:138 members/views.py:146
+#: members/views.py:343
 msgid "invalid"
 msgstr "ungültig"
 
-#: members/views.py:142 members/views.py:336
+#: members/views.py:149 members/views.py:345
 msgid "expired"
 msgstr "abgelaufen"
 
-#: members/views.py:151
+#: members/views.py:158
 msgid "Invalid emergency contacts"
 msgstr "Ungültige Notfallkontakte"
 
diff --git a/jdav_web/members/templates/members/member_form.html b/jdav_web/members/templates/members/member_form.html
index 6969e50..e357cfa 100644
--- a/jdav_web/members/templates/members/member_form.html
+++ b/jdav_web/members/templates/members/member_form.html
@@ -34,7 +34,7 @@
     <input type="hidden" name="waiter_key" value="{{ waiter_key }}">
     <input type="hidden" name="save">
     <input type="hidden" name="key" value="{{ key }}">
-    <p><input type="submit" value="{% trans "submit" %}"/></p>
+    <p><input type="submit" value="{% trans "Save" %}"/></p>
 </form>
 
 <div id="empty_form" class="form-row" style="display:none">
diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index 37e9c86..4824c15 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -13,8 +13,8 @@ from django.conf import settings
 class MemberForm(ModelForm):
     class Meta:
         model = Member
-        fields = ['prename', 'lastname', 'street', 'plz', 'town', 'address_extra',
-                  'phone_number', 'dav_badge_no']
+        fields = ['prename', 'lastname', 'gender', 'street', 'plz', 'town',
+                  'address_extra', 'phone_number', 'dav_badge_no']
 
 class MemberRegistrationForm(ModelForm):
     def __init__(self, *args, **kwargs):