From 2b8c60a6758df088b6437f517ec17b5c5903a1b2 Mon Sep 17 00:00:00 2001 From: heinzel Date: Wed, 27 Jan 2021 11:11:03 +0100 Subject: [PATCH] UPD: dav_registration: display canceled state of events --- dav_events/models/event.py | 3 +++ .../templates/dav_registration/event_list.html | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dav_events/models/event.py b/dav_events/models/event.py index bd0a147..18c33d6 100644 --- a/dav_events/models/event.py +++ b/dav_events/models/event.py @@ -354,6 +354,9 @@ class Event(models.Model): today = datetime.date.today() return self.deadline and self.deadline < today + def is_canceled(self): + return self.workflow.has_reached_status('canceled') + def get_number(self): return self.workflow.get_number() diff --git a/dav_registration/templates/dav_registration/event_list.html b/dav_registration/templates/dav_registration/event_list.html index 9636609..b6a65e5 100644 --- a/dav_registration/templates/dav_registration/event_list.html +++ b/dav_registration/templates/dav_registration/event_list.html @@ -25,11 +25,14 @@
{% if event.registration_closed %} - + {% trans 'Teilnehmerliste voll' %} {% elif event.is_deadline_expired %} {% trans 'Anmeldeschluss abgelaufen' %} + {% elif event.is_canceled %} + + {% trans 'Abgesagt' %} {% elif not event.registration_required %} {% trans 'Details' %} - {% trans 'keine Anmeldung nötig' %} {% else %} @@ -54,20 +57,26 @@

+ {% if event.is_canceled %}{% endif %} {{ event.get_formated_date }} {% if event.get_alt_formated_date %}
({% trans 'Ersatztermin' %}: {{ event.get_alt_formated_date }}) {% endif %} + {% if event.is_canceled %}
{% endif %}

  • + {% if event.is_canceled %}{% endif %} {% render_event_paragraphs event %} + {% if event.is_canceled %}{% endif %}
  • + {% if event.is_canceled %}{% endif %} {% render_event_facts event %} + {% if event.is_canceled %}{% endif %}
  • - {% if not event.registration_closed and not event.is_deadline_expired %} + {% if not event.registration_closed and not event.is_deadline_expired and not event.is_canceled %}
  • {% if not event.registration_required %}
    -- 2.52.0