From 9b66301da13f775ef76f138c8cd5cd1c9d78220c Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Wed, 16 Oct 2024 23:10:37 +0200
Subject: [PATCH] members: reorganize fields on admin page

---
 jdav_web/members/admin.py                     | 101 ++++++++++++++----
 .../templates/members/change_member.html      |   2 +
 2 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index d6fef57..fce409f 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -158,25 +158,52 @@ class RegistrationFilter(admin.SimpleListFilter):
 
 # Register your models here.
 class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
-    fields = ['prename', 'lastname', 'email',
-              'alternative_email',
-              'street', 'plz', 'town', 'address_extra', 'country',
-              'phone_number', 'birth_date', 'gender',
-              'dav_badge_no',
-              'group',
-              'swimming_badge', 'climbing_badge', 'alpine_experience', 'allergies',
-              'medication', 'tetanus_vaccination', 'photos_may_be_taken', 'legal_guardians',
-              ('good_conduct_certificate_presented_date', 'good_conduct_certificate_presentation_needed'),
-              'iban', 'has_key', 'has_free_ticket_gym', 'gets_newsletter',
-              'registration_form', 'image',
-              'active', 'echoed',
-              ('join_date', 'leave_date'),
-              'comments', 'user']
+    fieldsets = [
+        (None,
+         {
+             'fields': [('prename', 'lastname'),
+                ('email', 'alternative_email'),
+                'phone_number',
+                'group', 'registration_form', 'image',
+                ('join_date', 'leave_date'),
+                'comments',
+                'legal_guardians',
+                'dav_badge_no',
+                'active', 'echoed', 'gets_newsletter',
+                'user',
+             ]
+         }
+        ),
+        (_("Contact information"),
+         {
+             'fields': ['street', 'plz', 'town', 'address_extra', 'country', 'iban']
+         }
+        ),
+        (_("Skills"),
+         {
+             'fields': ['swimming_badge', 'climbing_badge', 'alpine_experience']
+         }
+        ),
+        (_("Others"),
+         {
+             'fields': ['allergies', 'tetanus_vaccination', 'medication', 'photos_may_be_taken']
+         }
+        ),
+        (_("Organizational"),
+         {
+             'fields': [
+                 ('good_conduct_certificate_presented_date',
+                  'good_conduct_certificate_presentation_needed'),
+                 'has_key', 'has_free_ticket_gym']
+         }
+        ),
+    ]
     list_display = ('name_text_or_link', 'birth_date', 'age', 'get_group', 'gets_newsletter',
                     'registration_complete', 'active', 'echoed', 'comments', 'activity_score')
     search_fields = ('prename', 'lastname', 'email')
     list_filter = ('group', 'gets_newsletter', RegistrationFilter, 'active')
     list_display_links = None
+    readonly_fields = ['echoed']
     inlines = [EmergencyContactInline, TrainingOnMemberInline, PermissionOnMemberInline]
     #formfield_overrides = {
     #    ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
@@ -256,12 +283,46 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
 
 
 class MemberUnconfirmedAdmin(admin.ModelAdmin):
-    fields = ['prename', 'lastname',
-              ('email', 'confirmed_mail'),
-              ('alternative_email', 'confirmed_alternative_mail'),
-              'street', 'plz',
-              'town', 'phone_number', 'birth_date', 'gender', 'group',
-              'registration_form', 'comments']
+    fieldsets = [
+        (None,
+         {
+             'fields': [('prename', 'lastname'),
+                ('email', 'alternative_email'),
+                'phone_number',
+                'group', 'registration_form', 'image',
+                ('join_date', 'leave_date'),
+                'comments',
+                'legal_guardians',
+                'dav_badge_no',
+                'active', 'echoed', 'gets_newsletter',
+                'user',
+             ]
+         }
+        ),
+        (_("Contact information"),
+         {
+             'fields': ['street', 'plz', 'town', 'address_extra', 'country', 'iban']
+         }
+        ),
+        (_("Skills"),
+         {
+             'fields': ['swimming_badge', 'climbing_badge', 'alpine_experience']
+         }
+        ),
+        (_("Others"),
+         {
+             'fields': ['allergies', 'tetanus_vaccination', 'medication', 'photos_may_be_taken']
+         }
+        ),
+        (_("Organizational"),
+         {
+             'fields': [
+                 ('good_conduct_certificate_presented_date',
+                  'good_conduct_certificate_presentation_needed'),
+                 'has_key', 'has_free_ticket_gym']
+         }
+        ),
+    ]
     list_display = ('name', 'birth_date', 'age', 'get_group', 'confirmed_mail', 'confirmed_alternative_mail')
     search_fields = ('prename', 'lastname', 'email')
     list_filter = ('group', 'confirmed_mail', 'confirmed_alternative_mail')
diff --git a/jdav_web/members/templates/members/change_member.html b/jdav_web/members/templates/members/change_member.html
index abebd06..57c31f6 100644
--- a/jdav_web/members/templates/members/change_member.html
+++ b/jdav_web/members/templates/members/change_member.html
@@ -3,6 +3,7 @@
 {% load static %}
 {% block after_field_sets %}
 
+<!--
 <p><b>{% trans "Participations:" %}</b></p>
 <ul>
 {% for activity in activities %}
@@ -25,5 +26,6 @@
 {% endfor %}
 </table>
 {% endif %}
+-->
 
 {% endblock %}