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

Fix #9 Registrations: Add support for non members
All checks were successful
buildbot/tox Build done.
Details

Browse Source
This commit is contained in:
heinzel
2020-10-15 17:44:12 +02:00
parent 28a35d98d2
commit 63026e429b
16 changed files with 315 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dav_event_office/templates/dav_event_office/event_detail.html
View File

@@ -131,11 +131,22 @@
<div id="collapseRegistrations" class="panel-collapse collapse"
role="tabpanel" aria-labelledby="headingRegistrations">
<div class="panel-body">
{% for registration in registrations %}
{% for registration in registrations_all %}
<form action="" method="post" class="form-inline">
{% csrf_token %}
<input type="hidden" name="registration" value="{{ registration.id }}">
{% if has_permission_update_participants %}
{% if registration.answered %}
<button disabled="disabled"
class="btn btn-link no-padding" title="Anmeldung wurde bereits bearbeitet">
<span class="text-muted">{% bootstrap_icon 'plus-sign' %}</span>
</button>
&nbsp;
<button disabled="disabled"
class="btn btn-link no-padding" title="Anmeldung wurde bereits bearbeitet">
<span class="text-muted">{% bootstrap_icon 'minus-sign' %}</span>
</button>
&nbsp;
{% elif has_permission_update_participants %}
<button type="submit" name="action" value="accept_registration"
class="btn btn-link no-padding" title="zur Teilnehmerliste hinzufügen">
<span class="text-success">{% bootstrap_icon 'plus-sign' %}</span>
@@ -148,7 +159,7 @@
&nbsp;
{% endif %}
{% if registration.answered %}
<span class="text-muted">
<s class="text-muted">
{% endif %}
{{ registration.get_full_name }}
(<a href="mailto:{{ registration.email_address }}">{{ registration.email_address }}</a>,
@@ -162,12 +173,13 @@
<span title="{{ registration.get_info }}">
{% bootstrap_icon 'info-sign' %}
</span>
&nbsp;
{% if registration.answered %}
</span>
</s>
{% endif %}
</form>
{% empty %}
{% trans 'Keine unbearbeiteten Anmeldungen vorhanden' %}
{% trans 'Keine Anmeldungen vorhanden' %}
{% endfor %}
</div>
</div>
@@ -189,7 +201,12 @@
<small>
(<a href="mailto:{{ participant.email_address }}">{{ participant.email_address }}</a>, {{ participant.phone_number }})
</small>
&nbsp; {{ participant.dav_number }}
&nbsp;
{% if participant.dav_member %}
{{ participant.dav_number|default:'Fehler! heinzel Bescheid geben!' }}
{% else %}
{% trans 'Nicht Mitglied' %}
{% endif %}
<div class="pull-right">
<form action="" method="post" class="form-inline">
{% csrf_token %}

5
dav_event_office/templates/dav_event_office/includes/participant_form.html
View File

@@ -29,9 +29,12 @@
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-3">
{% bootstrap_field form.dav_number %}
</div>
<div class="col-sm-3">
{% bootstrap_field form.dav_member %}
</div>
<div class="col-sm-6">
{% bootstrap_field form.emergency_contact %}
</div>

6
dav_event_office/templates/dav_event_office/participant_list.html
View File

@@ -55,7 +55,11 @@
{{ participant.personal_names }}
</td>
<td>
{{ participant.dav_number }}
{% if participant.dav_member %}
{{ participant.dav_number|default:'Fehler! heinzel Bescheid geben!' }}
{% else %}
{% trans 'Nicht Mitglied' %}
{% endif %}
</td>
<td data-order="{{ participant.paid }} {{ event.charge|floatformat:'-2' }}"
data-search="{% if participant.paid %}{% trans 'Grün' %}{% else %}{% trans 'Rot' %}{% endif %} {{ event.charge|floatformat:'-2' }}">