From 5978e6ab5b8432ba1dc94d28776ede600e97f885 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Wed, 30 Jul 2025 08:53:10 +0200 Subject: [PATCH] fix(members): explain ticket_no field and move it+badge_no to others tab --- jdav_web/members/admin.py | 5 ++--- jdav_web/members/models.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index f304c7b..3072b49 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -196,7 +196,6 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin): ('join_date', 'leave_date'), 'comments', 'legal_guardians', - ('dav_badge_no', 'ticket_no'), 'active', 'echoed', 'user', ] @@ -214,8 +213,8 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin): ), (_("Others"), { - 'fields': ['allergies', 'tetanus_vaccination', 'medication', 'photos_may_be_taken', - 'may_cancel_appointment_independently'] + 'fields': ['dav_badge_no', 'ticket_no', 'allergies', 'tetanus_vaccination', + 'medication', 'photos_may_be_taken','may_cancel_appointment_independently'] } ), (_("Organizational"), diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index a7e6d32..f1a5ebf 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -309,6 +309,8 @@ class Member(Person): has_key = models.BooleanField(_('Has key'), default=False) has_free_ticket_gym = models.BooleanField(_('Has a free ticket for the climbing gym'), default=False) dav_badge_no = models.CharField(max_length=20, verbose_name=_('DAV badge number'), default='', blank=True) + + # use this to store a climbing gym customer or membership id, used to print on meeting checklists ticket_no = models.CharField(max_length=20, verbose_name=_('entrance ticket number'), default='', blank=True) swimming_badge = models.BooleanField(verbose_name=_('Knows how to swim'), default=False) climbing_badge = models.CharField(max_length=100, verbose_name=_('Climbing badge'), default='', blank=True)