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

MIGRATION! ADD: first things for a event registration mangement page.

Browse Source
This commit is contained in:
heinzel
2019-05-29 16:50:02 +02:00
parent a189f5dbe6
commit bee1623529
12 changed files with 382 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dav_registration/templates/dav_registration/event_detail.html
View File

@@ -5,7 +5,14 @@
{% block head-title %}{{ event.number }} - {{ block.super }}{% endblock head-title %}
{% block messages %}
{% if event.is_deadline_expired %}
{% if event.registration_closed %}
<div class="container-fluid">
<div class="alert alert-danger">
Die Teilnehmerliste ist bereits voll!<br />
Eine Anmeldung ist nicht mehr möglich.
</div>
</div>
{% elif event.is_deadline_expired %}
<div class="container-fluid">
<div class="alert alert-danger">
Der Anmeldeschluss ist bereits abgelaufen!<br />
@@ -45,7 +52,7 @@
{% endblocktrans %}
</div>
{% endif %}
{% if not event.is_deadline_expired %}
{% if not event.registration_closed and not event.is_deadline_expired %}
<a class="btn btn-primary" href="{% url 'dav_registration:register' event.pk %}">{% trans 'Anmeldung' %}</a>
{% endif %}
<a class="btn btn-danger" href="{% url 'dav_registration:events' %}">{% trans 'Zurück' %}</a>

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

@@ -24,9 +24,12 @@
</a>
</div>
<div class="pull-right" style="margin-left: 1em;">
{% if event.is_deadline_expired %}
<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span></span>
<span class="text-danger">{% trans 'Anmeldeschluss abgelaufen' %}</span>
{% if event.registration_closed %}
<span class="text-primary"><span class="glyphicon glyphicon-tent"></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>
{% else %}
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'Details & Anmeldung' %}</a>
{% endif %}
@@ -58,7 +61,7 @@
<li class="list-group-item">
{% render_event_facts event %}
</li>
{% if not event.is_deadline_expired %}
{% if not event.registration_closed and not event.is_deadline_expired %}
<li class="list-group-item">
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'zur Anmeldung' %}</a>
</li>

2
dav_registration/templates/dav_registration/registration_form.html
View File

@@ -110,7 +110,7 @@
<div class="well well-sm">
<p><small>
<strong>
Die erfolgreiche Anmeldung bedeutet nicht, dass du auf jeden Fall
Die erfolgreiche Anmeldung hier im Portal bedeutet nicht, dass du auf jeden Fall
an der Tour oder dem Kurs teilnehmen kannst.
</strong>
<br />

3
dav_registration/views.py
View File

@@ -37,6 +37,7 @@ class EventListView(generic.ListView):
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
# filter &= Q(registration_closed=False)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).order_by('first_day', 'number').distinct()
@@ -55,6 +56,7 @@ class EventDetailView(generic.DetailView):
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
# filter &= Q(registration_closed=False)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).distinct()
@@ -76,6 +78,7 @@ class RegistrationView(generic.CreateView):
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
filter &= Q(registration_closed=False)
filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = Event.objects.filter(filter).distinct()