diff --git a/dav_base/static/dav_base/css/local.css b/dav_base/static/dav_base/css/local.css index 8f3980e..199fe19 100644 --- a/dav_base/static/dav_base/css/local.css +++ b/dav_base/static/dav_base/css/local.css @@ -13,7 +13,8 @@ * purple #866dac #566088 #e1d8f0 #c2b0e1 #a694c2 #866dac #8067a8 #2f263c #5a4876 -------- MTB - ----- ------ * plum #aa6c95 #784c69 #f0d4e7 #e6b0d4 #be91af #aa6c95 #a66691 #3c2635 #764867 -------- ----- famil ------ * brown #??? #??? #??? #??? #925f36 #??? #??? #??? #??? -------- ----- ----- ------ - * black #??? #??? #??? #??? #??? #??? #??? #??? #??? -------- ----- ----- clear + * black #333 #??? #333 #??? #??? #??? #??? #??? #??? -------- ----- ----- clear + * gray #??? #??? #878787 #??? #??? #??? #??? #??? #??? -------- ----- ----- ------ * white #??? #??? #??? #??? #??? #??? #??? #??? #??? -------- ----- ----- ------ */ diff --git a/dav_events/migrations/0045_alter_eventstatus_bootstrap_context_and_more.py b/dav_events/migrations/0045_alter_eventstatus_bootstrap_context_and_more.py new file mode 100644 index 0000000..1513ac1 --- /dev/null +++ b/dav_events/migrations/0045_alter_eventstatus_bootstrap_context_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 5.2.13 on 2026-06-16 13:21 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dav_events', '0044_alter_event_level'), + ] + + operations = [ + migrations.AlterField( + model_name='eventstatus', + name='bootstrap_context', + field=models.CharField(blank=True, choices=[('default', 'default'), ('primary', 'primary'), ('success', 'success'), ('info', 'info'), ('warning', 'warning'), ('danger', 'danger'), ('dav-purple', 'dav-purple'), ('dav-lime', 'dav-lime'), ('dav-cyan', 'dav-cyan'), ('dav-caramel', 'dav-caramel'), ('dav-mandarin', 'dav-mandarin'), ('dav-brown', 'dav-brown'), ('orange', 'orange'), ('green', 'green'), ('blue', 'blue'), ('yellow', 'yellow'), ('red', 'red'), ('mandarin', 'mandarin'), ('lime', 'lime'), ('cyan', 'cyan'), ('caramel', 'caramel'), ('purple', 'purple'), ('plum', 'plum'), ('black', 'black'), ('white', 'white')], max_length=20), + ), + migrations.AlterField( + model_name='participant', + name='dav_number', + field=models.CharField(blank=True, max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'), + ), + migrations.AlterField( + model_name='trashedparticipant', + name='dav_number', + field=models.CharField(blank=True, max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'), + ), + ] diff --git a/dav_events/models/eventstatus.py b/dav_events/models/eventstatus.py index 58e8e8c..db97e39 100644 --- a/dav_events/models/eventstatus.py +++ b/dav_events/models/eventstatus.py @@ -11,13 +11,25 @@ BOOTSTRAP_CONTEXT_CHOICES = ( ('info', 'info'), ('warning', 'warning'), ('danger', 'danger'), - ('black', 'black'), ('dav-purple', 'dav-purple'), ('dav-lime', 'dav-lime'), ('dav-cyan', 'dav-cyan'), ('dav-caramel', 'dav-caramel'), ('dav-mandarin', 'dav-mandarin'), ('dav-brown', 'dav-brown'), + ('orange', 'orange'), + ('green', 'green'), + ('blue', 'blue'), + ('yellow', 'yellow'), + ('red', 'red'), + ('mandarin', 'mandarin'), + ('lime', 'lime'), + ('cyan', 'cyan'), + ('caramel', 'caramel'), + ('purple', 'purple'), + ('plum', 'plum'), + ('black', 'black'), + ('white', 'white'), ) diff --git a/dav_events/templates/dav_events/event_registrations.html b/dav_events/templates/dav_events/event_registrations.html index 9343c60..f2279c6 100644 --- a/dav_events/templates/dav_events/event_registrations.html +++ b/dav_events/templates/dav_events/event_registrations.html @@ -183,9 +183,9 @@ {% if not event.registration_required %} {% trans 'Anmeldung nicht erforderlich' %} {% elif is_canceled %} - {% trans 'Veranstaltung abgesagt' %} + {% trans 'Veranstaltung abgesagt' %} {% elif is_realized or is_expired %} - {% trans 'Veranstaltung beendet' %} + {% trans 'Veranstaltung beendet' %} {% elif event.registration_closed %} {% trans 'Anmeldung geschlossen' %} {% elif event.is_deadline_expired %} diff --git a/dav_events/workflow.py b/dav_events/workflow.py index 515ed77..970536a 100644 --- a/dav_events/workflow.py +++ b/dav_events/workflow.py @@ -21,18 +21,18 @@ oneday = datetime.timedelta(1) DEFAULT_EVENT_STATI = { 'void': (0, _(u'Ungültig'), None), - 'draft': (10, _(u'Entwurf'), 'info'), - 'submitted': (30, _(u'Eingereicht'), 'danger'), - 'accepted': (50, _(u'Freigegeben'), 'warning'), - 'publishing_facebook': (68, _(u'Veröffentlichung (Facebook)'), 'warning'), - 'publishing_web': (69, _(u'Veröffentlichung (Web)'), 'warning'), - 'publishing': (70, _(u'Veröffentlichung'), 'warning'), - 'published_facebook': (78, _(u'Veröffentlicht (Facebook)'), 'success'), - 'published_web': (79, _(u'Veröffentlicht (Web)'), 'success'), - 'published': (80, _(u'Veröffentlicht'), 'success'), + 'draft': (10, _(u'Entwurf'), 'blue'), + 'submitted': (30, _(u'Eingereicht'), 'red'), + 'accepted': (50, _(u'Freigegeben'), 'yellow'), + 'publishing_facebook': (68, _(u'Veröffentlichung (Facebook)'), 'yellow'), + 'publishing_web': (69, _(u'Veröffentlichung (Web)'), 'yellow'), + 'publishing': (70, _(u'Veröffentlichung'), 'yellow'), + 'published_facebook': (78, _(u'Veröffentlicht (Facebook)'), 'green'), + 'published_web': (79, _(u'Veröffentlicht (Web)'), 'green'), + 'published': (80, _(u'Veröffentlicht'), 'green'), 'expired': (100, _(u'Ausgelaufen'), None), - 'canceled': (101, _(u'Abgesagt'), 'dav-mandarin'), - 'realized': (102, _(u'Durchgeführt'), 'dav-lime'), + 'canceled': (101, _(u'Abgesagt'), 'mandarin'), + 'realized': (102, _(u'Durchgeführt'), 'lime'), 'cleared': (110, _(u'Abgerechnet'), 'black'), } diff --git a/dav_registration/migrations/0013_alter_registration_dav_number.py b/dav_registration/migrations/0013_alter_registration_dav_number.py new file mode 100644 index 0000000..a618280 --- /dev/null +++ b/dav_registration/migrations/0013_alter_registration_dav_number.py @@ -0,0 +1,19 @@ +# Generated by Django 5.2.13 on 2026-06-16 13:21 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dav_registration', '0012_alter_registrationstatus_accepted'), + ] + + operations = [ + migrations.AlterField( + model_name='registration', + name='dav_number', + field=models.CharField(blank=True, help_text='Deine Mitgliedsnummer findest du unter dem Strichcode auf deinem DAV Ausweis.
Beispiel: 131/00/012345 (der Teil bis zum ersten * genügt)', max_length=62, validators=[django.core.validators.RegexValidator('^([0-9]{3}/[0-9]{2}/)?[0-9]{1,6}([*x ][0-9]{4})?([*x ][0-9]{4}[*x ][0-9]{4})?([*x ][0-9]{8})?$', 'Ungültiges Format.')], verbose_name='DAV Mitgliedsnummer'), + ), + ]