DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

UPD: dav_registration: display canceled state of events
All checks were successful
buildbot/tox Build done.
Details

Browse Source
This commit is contained in:
heinzel
2021-01-27 11:11:03 +01:00
parent 4b772e743b
commit 2b8c60a675
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dav_events/models/event.py
View File

@@ -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()

13
dav_registration/templates/dav_registration/event_list.html
View File

@@ -25,11 +25,14 @@
</div>
<div class="pull-right" style="margin-left: 1em;">
{% if event.registration_closed %}
<span class="text-primary"><span class="glyphicon glyphicon-tent"></span></span>
<span class="text-primary"><span class="glyphicon glyphicon-list-alt"></span></span>
<span class="text-primary"><strong>{% trans 'Teilnehmerliste voll' %}</strong></span>
{% elif event.is_deadline_expired %}
<span class="text-danger"><span class="glyphicon glyphicon-time"></span></span>
<span class="text-danger"><strong>{% trans 'Anmeldeschluss abgelaufen' %}</strong></span>
{% elif event.is_canceled %}
<span class="text-danger"><span class="glyphicon glyphicon-erase"></span></span>
<span class="text-danger"><strong>{% trans 'Abgesagt' %}</strong></span>
{% elif not event.registration_required %}
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'Details' %} - {% trans 'keine Anmeldung nötig' %}</a>
{% else %}
@@ -54,20 +57,26 @@
</a>
</span></strong>
<p>
{% if event.is_canceled %}<del>{% endif %}
{{ event.get_formated_date }}
{% if event.get_alt_formated_date %}
<br />({% trans 'Ersatztermin' %}: {{ event.get_alt_formated_date }})
{% endif %}
{% if event.is_canceled %}</del>{% endif %}
</p>
<div class="panel panel-default collapse" id="collapseDetails{{ event.id }}" style="margin-top: 2ex;">
<ul class="list-group">
<li class="list-group-item">
{% if event.is_canceled %}<del>{% endif %}
{% render_event_paragraphs event %}
{% if event.is_canceled %}</del>{% endif %}
</li>
<li class="list-group-item">
{% if event.is_canceled %}<del>{% endif %}
{% render_event_facts event %}
{% if event.is_canceled %}</del>{% endif %}
</li>
{% 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 %}
<li class="list-group-item">
{% if not event.registration_required %}
<div class="alert alert-info">