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

FIX #35 and #36: add new event stati canceled and realized
Some checks failed
buildbot/tox Build done.
Details

Browse Source
This commit is contained in:
heinzel
2021-01-07 12:52:21 +01:00
parent 642971e469
commit 269d59f460
10 changed files with 164 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dav_events/templates/dav_events/emails/event_canceled.txt Normal file
View File

@@ -0,0 +1,14 @@
Hallo {{ recipient.first_name }},
{{ editor.get_full_name|default:'Jemand' }} hat die folgende Veranstaltung abgesagt:
{{ event }}
Link zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }}
Ausschreibung:
==============
{{ event.render_as_text }}{% if internal_note %}
Bearbeitungshinweis:
====================
{{ internal_note }}{% endif %}

22
dav_events/templates/dav_events/event_detail.html
View File

@@ -146,6 +146,28 @@
{% trans 'Veröffentlichung bestätigen' %}
</a>
{% endif %}
{% if has_permission_realize and is_started and not is_canceled %}
<a id="btn-realize" class="btn btn-sm {% if not is_realized %}btn-dav-lime{% else %}btn-default disabled{% endif %}"
href="{% url 'dav_events:updatestatus' event.pk 'realized' %}">
{% if is_realized %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
{% endif %}
{% trans 'Durchgeführt' %}
</a>
{% endif %}
{% if has_permission_cancel and is_submitted and not is_realized %}
<a id="btn-cancel" class="btn btn-sm {% if not is_canceled %}btn-dav-mandarin{% else %}btn-default disabled{% endif %}"
href="{% url 'dav_events:updatestatus' event.pk 'canceled' %}">
{% if is_canceled %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
{% endif %}
{% trans 'Abgesagt' %}
</a>
{% endif %}
{% if has_permission_clear %}
<a id="btn-confirmclearance" class="btn btn-sm {% if not is_cleared %}btn-black{% else %}btn-default disabled{% endif %}"
href="{% url 'dav_events:updatestatus' event.pk 'cleared' %}">

6
dav_events/templates/dav_events/event_registrations.html
View File

@@ -182,8 +182,10 @@
<strong>{% trans 'Anmeldestatus' %}:</strong>
{% if not event.registration_required %}
<span class="label label-success">{% trans 'Anmeldung nicht erforderlich' %}</span>
{% elif is_done %}
<span class="label label-default">{% trans 'Veranstaltung beendet' %}</span>
{% elif is_canceled %}
<span class="label label-dav-mandarin">{% trans 'Veranstaltung abgesagt' %}</span>
{% elif is_realized or is_expired %}
<span class="label label-dav-lime">{% trans 'Veranstaltung beendet' %}</span>
{% elif event.registration_closed %}
<span class="label label-danger">{% trans 'Anmeldung geschlossen' %}</span>
{% elif event.is_deadline_expired %}

12
dav_events/templates/dav_events/event_update_form.html
View File

@@ -54,7 +54,17 @@
<form action="" method="post">
{% csrf_token %}
{% if is_expired %}
{% if is_realized %}
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{% trans 'Diese Veranstaltung wurde bereits durchgeführt.' %}
</div>
{% elif is_canceled %}
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{% trans 'Diese Veranstaltung ist abgesagt.' %}
</div>
{% elif is_expired %}
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{% trans 'Diese Veranstaltung ist bereits ausgelaufen.' %}