diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 9ccabcd..3bcde34 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -196,7 +196,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin): ('join_date', 'leave_date'), 'comments', 'legal_guardians', - 'dav_badge_no', + ('dav_badge_no', 'ticket_no'), 'active', 'echoed', 'user', ] diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index 011eb30..3054b89 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-04-27 23:00+0200\n" +"POT-Creation-Date: 2025-06-22 13:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -675,6 +675,10 @@ msgstr "Hat Freikarte für Kletterhalle" msgid "DAV badge number" msgstr "DAV Mitgliedsnummer" +#: members/models.py +msgid "entrance ticket number" +msgstr "Eintrittskarten Nummer" + #: members/models.py msgid "Knows how to swim" msgstr "Kann schwimmen" @@ -1397,9 +1401,9 @@ msgid "" "%(total_org_fee_theoretical)s € is charged against the other transactions." msgstr "" "Achtung: %(old_participant_count)s Teilnehmende der Ausfahrt sind 27 oder " -"älter. Für diese Teilnehmende(n) ist ein Org-Beitrag von %(org_fee)s € pro Tag " -"fällig. Durch die Länge der Ausfahrt von %(duration)s Tagen werden insgesamt " -"%(total_org_fee_theoretical)s € mit den Zuschüssen und " +"älter. Für diese Teilnehmende(n) ist ein Org-Beitrag von %(org_fee)s € pro " +"Tag fällig. Durch die Länge der Ausfahrt von %(duration)s Tagen werden " +"insgesamt %(total_org_fee_theoretical)s € mit den Zuschüssen und " "Aufwandsentschädigungen verrechnet, sofern diese in Anspruch genommen werden." #: members/templates/admin/freizeit_finance_overview.html diff --git a/jdav_web/members/migrations/0041_member_ticket_no.py b/jdav_web/members/migrations/0041_member_ticket_no.py new file mode 100644 index 0000000..07b60b3 --- /dev/null +++ b/jdav_web/members/migrations/0041_member_ticket_no.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.20 on 2025-06-22 11:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0040_invitationtogroup_created_by'), + ] + + operations = [ + migrations.AddField( + model_name='member', + name='ticket_no', + field=models.CharField(blank=True, default='', max_length=20, verbose_name='entrance ticket number'), + ), + ] diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 9a46501..666df7b 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -309,6 +309,7 @@ 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) + 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) alpine_experience = models.TextField(verbose_name=_('Alpine experience'), default='', blank=True)