fix(members): explain ticket_no field and move it+badge_no to others tab

pull/174/head
mariusrklein 5 months ago
parent d13143fbf0
commit bf68ba92d0

@ -196,7 +196,6 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
('join_date', 'leave_date'), ('join_date', 'leave_date'),
'comments', 'comments',
'legal_guardians', 'legal_guardians',
('dav_badge_no', 'ticket_no'),
'active', 'echoed', 'active', 'echoed',
'user', 'user',
] ]
@ -214,8 +213,8 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
), ),
(_("Others"), (_("Others"),
{ {
'fields': ['allergies', 'tetanus_vaccination', 'medication', 'photos_may_be_taken', 'fields': ['dav_badge_no', 'ticket_no', 'allergies', 'tetanus_vaccination',
'may_cancel_appointment_independently'] 'medication', 'photos_may_be_taken','may_cancel_appointment_independently']
} }
), ),
(_("Organizational"), (_("Organizational"),

@ -310,6 +310,8 @@ class Member(Person):
has_key = models.BooleanField(_('Has key'), default=False) has_key = models.BooleanField(_('Has key'), default=False)
has_free_ticket_gym = models.BooleanField(_('Has a free ticket for the climbing gym'), 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) 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) 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) 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) climbing_badge = models.CharField(max_length=100, verbose_name=_('Climbing badge'), default='', blank=True)

Loading…
Cancel
Save