From 10cdc1901153ef1862088bb9ac3befcbffd80906 Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Sat, 20 Sep 2025 02:49:04 +0200 Subject: [PATCH] feat(members/admin): show existence of registration form in list view --- jdav_web/members/admin.py | 3 ++- jdav_web/members/locale/de/LC_MESSAGES/django.po | 9 ++++++++- jdav_web/members/models.py | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 3c290c0..fd423b4 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -426,7 +426,8 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin): } ), ] - list_display = ('name', 'birth_date', 'age', 'get_group', 'confirmed_mail', 'confirmed_alternative_mail') + list_display = ('name', 'birth_date', 'age', 'get_group', 'confirmed_mail', 'confirmed_alternative_mail', + 'registration_form_uploaded') search_fields = ('prename', 'lastname', 'email') list_filter = ('group', 'confirmed_mail', 'confirmed_alternative_mail') readonly_fields = ['confirmed_mail', 'confirmed_alternative_mail', diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 6f709e8..ed60f99 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: 2025-09-19 21:35+0200\n" +"POT-Creation-Date: 2025-09-20 02:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -777,6 +777,10 @@ msgstr "Teilnehmer*in" msgid "members" msgstr "Teilnehmer*innen" +#: members/models.py +msgid "Registration form" +msgstr "Anmeldeformular" + #: members/models.py msgid "Upload registration form" msgstr "Anmeldeformular hochladen" @@ -1794,14 +1798,17 @@ msgid "thereof leaders:" msgstr "davon Leitung:" #: members/templates/admin/request_registration_form.html +#: members/tests/basic.py msgid "Request registration form" msgstr "Anmeldeformular anfragen" #: members/templates/admin/request_registration_form.html +#, python-format msgid "Do you want to ask %(member)s to upload their registration form?" msgstr "Möchtest du %(member)s auffordern das Anmeldeformular hochzuladen?" #: members/templates/admin/request_registration_form.html +#, python-format msgid "Warning: %(member)s has already uploaded a registration form." msgstr "Warnung: %(member)s hat bereits ein Anmeldeformular hochgeladen." diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 4c59373..60b3cf6 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -565,6 +565,12 @@ class Member(Person): waiter.delete() return self.request_mail_confirmation(rerequest=False) + def registration_form_uploaded(self): + print(self.registration_form.name) + return not self.registration_form.name is None and self.registration_form.name != "" + registration_form_uploaded.boolean = True + registration_form_uploaded.short_description = _('Registration form') + def registration_ready(self): """Returns if the member is currently unconfirmed and all email addresses are confirmed."""