Commit 1120a287 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'feature/cancellation-date-admin' into 'master'

Show cancellation dates in event admin

Closes #499

See merge request !659
parents b09c91a4 284675f9
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-11 19:22+0200\n" "POT-Creation-Date: 2018-01-16 21:52+0100\n"
"PO-Revision-Date: 2017-10-11 19:34+0200\n" "PO-Revision-Date: 2018-01-16 21:53+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n" "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -18,27 +18,27 @@ msgstr "" ...@@ -18,27 +18,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.4\n" "X-Generator: Poedit 2.0.4\n"
#: admin.py:86 #: admin.py:83
msgid "Event Date" msgid "Event Date"
msgstr "Evenementdatum" msgstr "Evenementdatum"
#: admin.py:91 #: admin.py:92
msgid "Registration Start" msgid "Registration Start"
msgstr "Start Aanmelden" msgstr "Start Aanmelden"
#: admin.py:94 #: admin.py:95
msgid "Edit" msgid "Edit"
msgstr "Aanpassen" msgstr "Aanpassen"
#: admin.py:104 #: admin.py:105
msgid "Number of participants" msgid "Number of participants"
msgstr "Aantal deelnemers" msgstr "Aantal deelnemers"
#: admin.py:108 #: admin.py:109
msgid "Publish selected events" msgid "Publish selected events"
msgstr "Publiceer geselecteerde evenementen" msgstr "Publiceer geselecteerde evenementen"
#: admin.py:112 #: admin.py:113
msgid "Unpublish selected events" msgid "Unpublish selected events"
msgstr "Publicatie van geselecteerde evenementen ongedaan maken" msgstr "Publicatie van geselecteerde evenementen ongedaan maken"
...@@ -111,7 +111,7 @@ msgstr "Pin" ...@@ -111,7 +111,7 @@ msgstr "Pin"
msgid "No" msgid "No"
msgstr "Nee" msgstr "Nee"
#: emails.py:24 #: emails.py:30
msgid "[THALIA] Notification about your registration for '{}'" msgid "[THALIA] Notification about your registration for '{}'"
msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’" msgstr "[THALIA] Bericht over je aanmelding voor ‘{}’"
...@@ -155,7 +155,7 @@ msgstr "Geen aanmelding vereist" ...@@ -155,7 +155,7 @@ msgstr "Geen aanmelding vereist"
msgid "title" msgid "title"
msgstr "titel" msgstr "titel"
#: models.py:36 models.py:398 #: models.py:36 models.py:406
msgid "description" msgid "description"
msgstr "beschrijving" msgstr "beschrijving"
...@@ -253,131 +253,131 @@ msgstr "Standaard:" ...@@ -253,131 +253,131 @@ msgstr "Standaard:"
msgid "published" msgid "published"
msgstr "gepubliceerd" msgstr "gepubliceerd"
#: models.py:192 #: models.py:196
msgid "Can't have an event travel back in time" msgid "Can't have an event travel back in time"
msgstr "Een evenement kan niet terugreizen in de tijd" msgstr "Een evenement kan niet terugreizen in de tijd"
#: models.py:196 #: models.py:200
msgid "The fine for this event is too low (must be at least €5)." msgid "The fine for this event is too low (must be at least €5)."
msgstr "De boete voor dit evenement is te laag (minimaal €5)." msgstr "De boete voor dit evenement is te laag (minimaal €5)."
#: models.py:203 #: models.py:207
msgid "Doesn't make sense to have this if you require registrations." msgid "Doesn't make sense to have this if you require registrations."
msgstr "Het is niet logisch om dit te hebben als je aanmelden vereist." msgstr "Het is niet logisch om dit te hebben als je aanmelden vereist."
#: models.py:208 #: models.py:212
msgid "If registration is required, you need a start of registration" msgid "If registration is required, you need a start of registration"
msgstr "" msgstr ""
"Als aanmelden vereist is, dan heb je een starttijd voor de aanmeldperiode " "Als aanmelden vereist is, dan heb je een starttijd voor de aanmeldperiode "
"nodig" "nodig"
#: models.py:213 #: models.py:217
msgid "If registration is required, you need an end of registration" msgid "If registration is required, you need an end of registration"
msgstr "" msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode " "Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig" "nodig"
#: models.py:218 #: models.py:222
msgid "If registration is required, you need a deadline for the cancellation" msgid "If registration is required, you need a deadline for the cancellation"
msgstr "" msgstr ""
"Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode " "Als aanmelden vereist is, dan heb je een eindtijd voor de aanmeldperiode "
"nodig" "nodig"
#: models.py:223 #: models.py:227
msgid "The cancel deadline should be before the start of the event." msgid "The cancel deadline should be before the start of the event."
msgstr "De afmelddeadline moet voor de start van het evenement liggen." msgstr "De afmelddeadline moet voor de start van het evenement liggen."
#: models.py:227 #: models.py:231
msgid "Registration start should be before registration end" msgid "Registration start should be before registration end"
msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen" msgstr "De starttijd voor de aanmeldperiode moet voor de eindtijd liggen"
#: models.py:236 #: models.py:240
msgid "This organiser does not have a contact mailinglist." msgid "This organiser does not have a contact mailinglist."
msgstr "De organisator heeft geen contact mailinglijst." msgstr "De organisator heeft geen contact mailinglijst."
#: models.py:265 #: models.py:274
msgid "No payment" msgid "No payment"
msgstr "Niet betaald" msgstr "Niet betaald"
#: models.py:266 #: models.py:275
msgid "Paid with cash" msgid "Paid with cash"
msgstr "Contant betaald" msgstr "Contant betaald"
#: models.py:267 #: models.py:276
msgid "Paid with card" msgid "Paid with card"
msgstr "Pin betaald" msgstr "Pin betaald"
#: models.py:280 templates/events/admin/registrations_table.html:6 #: models.py:288 templates/events/admin/registrations_table.html:6
msgid "name" msgid "name"
msgstr "naam" msgstr "naam"
#: models.py:282 #: models.py:290
msgid "Use this for non-members" msgid "Use this for non-members"
msgstr "Gebruikt dit voor niet-leden" msgstr "Gebruikt dit voor niet-leden"
#: models.py:287 #: models.py:295 templates/events/admin/registrations_table.html:10
msgid "registration date" msgid "registration date"
msgstr "aanmelddatum" msgstr "aanmelddatum"
#: models.py:289 #: models.py:297 templates/events/admin/registrations_table.html:8
msgid "cancellation date" msgid "cancellation date"
msgstr "afmelddatum" msgstr "afmelddatum"
#: models.py:294 templates/events/admin/registrations_table.html:11 #: models.py:302 templates/events/admin/registrations_table.html:15
msgid "present" msgid "present"
msgstr "aanwezig" msgstr "aanwezig"
#: models.py:301 #: models.py:309
msgid "payment" msgid "payment"
msgstr "betaling" msgstr "betaling"
#: models.py:354 models.py:355 #: models.py:362 models.py:363
msgid "Either specify a member or a name" msgid "Either specify a member or a name"
msgstr "Geef een lid of een naam op" msgstr "Geef een lid of een naam op"
#: models.py:378 #: models.py:386
msgid "Checkbox" msgid "Checkbox"
msgstr "Checkbox" msgstr "Checkbox"
#: models.py:379 #: models.py:387
msgid "Text" msgid "Text"
msgstr "Text" msgstr "Text"
#: models.py:380 #: models.py:388
msgid "Integer" msgid "Integer"
msgstr "Integer" msgstr "Integer"
#: models.py:385 #: models.py:393
msgid "field type" msgid "field type"
msgstr "veldtype" msgstr "veldtype"
#: models.py:392 #: models.py:400
msgid "field name" msgid "field name"
msgstr "veldnaam" msgstr "veldnaam"
#: models.py:404 #: models.py:412
msgid "required" msgid "required"
msgstr "verplicht" msgstr "verplicht"
#: models.py:456 #: models.py:464
msgid "last changed" msgid "last changed"
msgstr "laatst aangepast" msgstr "laatst aangepast"
#: services.py:81 #: services.py:82
msgid "" msgid ""
"You cannot re-register anymore since you've cancelled after the deadline." "You cannot re-register anymore since you've cancelled after the deadline."
msgstr "" msgstr ""
"Je kunt je niet opnieuw aanmelden omdat je je hebt afgemeld na de deadline." "Je kunt je niet opnieuw aanmelden omdat je je hebt afgemeld na de deadline."
#: services.py:91 #: services.py:92
msgid "You were already registered." msgid "You were already registered."
msgstr "Je bent al aangemeld." msgstr "Je bent al aangemeld."
#: services.py:93 #: services.py:94
msgid "You may not register." msgid "You may not register."
msgstr "Je mag je niet aanmelden." msgstr "Je mag je niet aanmelden."
#: services.py:121 services.py:135 services.py:186 #: services.py:123 services.py:137 services.py:189
msgid "You are not registered for this event." msgid "You are not registered for this event."
msgstr "Je bent niet aangemeld voor dit evenement." msgstr "Je bent niet aangemeld voor dit evenement."
...@@ -446,12 +446,11 @@ msgid "Event properties" ...@@ -446,12 +446,11 @@ msgid "Event properties"
msgstr "Eigenschappen van evenement" msgstr "Eigenschappen van evenement"
#: templates/events/admin/details.html:64 #: templates/events/admin/details.html:64
#: templates/events/admin/registrations_table.html:50 #: templates/events/admin/registrations_table.html:58
msgid "change" msgid "change"
msgstr "verander" msgstr "verander"
#: templates/events/admin/details.html:70 #: templates/events/admin/details.html:70
#: templates/events/admin/registrations_table.html:7
msgid "date" msgid "date"
msgstr "datum" msgstr "datum"
...@@ -498,31 +497,31 @@ msgstr "" ...@@ -498,31 +497,31 @@ msgstr ""
"Sommige geregistreerden zijn met de hand toegevoegd, en komen dus niet in de " "Sommige geregistreerden zijn met de hand toegevoegd, en komen dus niet in de "
"bovenstaande lijst voor:" "bovenstaande lijst voor:"
#: templates/events/admin/registrations_table.html:12 #: templates/events/admin/registrations_table.html:16
msgid "not paid" msgid "not paid"
msgstr "niet betaald" msgstr "niet betaald"
#: templates/events/admin/registrations_table.html:13 #: templates/events/admin/registrations_table.html:17
msgid "paid cash" msgid "paid cash"
msgstr "contant betaald" msgstr "contant betaald"
#: templates/events/admin/registrations_table.html:14 #: templates/events/admin/registrations_table.html:18
msgid "paid card" msgid "paid card"
msgstr "pin betaald" msgstr "pin betaald"
#: templates/events/admin/registrations_table.html:16 #: templates/events/admin/registrations_table.html:20
msgid "late" msgid "late"
msgstr "te laat" msgstr "te laat"
#: templates/events/admin/registrations_table.html:20 #: templates/events/admin/registrations_table.html:24
msgid "add" msgid "add"
msgstr "toevoegen" msgstr "toevoegen"
#: templates/events/admin/registrations_table.html:54 #: templates/events/admin/registrations_table.html:62
msgid "registered" msgid "registered"
msgstr "aangemeld" msgstr "aangemeld"
#: templates/events/admin/registrations_table.html:55 #: templates/events/admin/registrations_table.html:63
#, python-format #, python-format
msgid "Nobody %(verb)s yet" msgid "Nobody %(verb)s yet"
msgstr "Niemand heeft zich %(verb)s" msgstr "Niemand heeft zich %(verb)s"
...@@ -707,10 +706,6 @@ msgstr "Aanmelding voor %(title)s" ...@@ -707,10 +706,6 @@ msgstr "Aanmelding voor %(title)s"
msgid "Save" msgid "Save"
msgstr "Opslaan" msgstr "Opslaan"
#: templates/events/registration.html:38
msgid "Cancel"
msgstr "Annuleer"
#: views.py:73 #: views.py:73
msgid "Registration successful." msgid "Registration successful."
msgstr "Je aanmelding was succesvol." msgstr "Je aanmelding was succesvol."
...@@ -719,10 +714,13 @@ msgstr "Je aanmelding was succesvol." ...@@ -719,10 +714,13 @@ msgstr "Je aanmelding was succesvol."
msgid "Registration successfully cancelled." msgid "Registration successfully cancelled."
msgstr "Je afmelding was succesvol." msgstr "Je afmelding was succesvol."
#: views.py:119 #: views.py:120
msgid "Registration successfully saved." msgid "Registration successfully saved."
msgstr "Je afmelding is succesvol opgeslagen." msgstr "Je afmelding is succesvol opgeslagen."
#~ msgid "Cancel"
#~ msgstr "Annuleer"
#~ msgid "Card" #~ msgid "Card"
#~ msgstr "Pin" #~ msgstr "Pin"
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{% endif %} {% endif %}
<h2>{% trans "cancellations"|capfirst %}</h2> <h2>{% trans "cancellations"|capfirst %}</h2>
{% trans "cancelled" as cancelled %} {% trans "cancelled" as cancelled %}
{% include 'events/admin/registrations_table.html' with registrations=event.cancellations verb=cancelled addlink=False %} {% include 'events/admin/registrations_table.html' with registrations=event.cancellations cancellations=True verb=cancelled addlink=False %}
{% endwith %} {% endwith %}
<br> <br>
<a href="{% url 'events:export' event_id=event.pk %}" class="button">{% trans "Export registrations" %}</a> <a href="{% url 'events:export' event_id=event.pk %}" class="button">{% trans "Export registrations" %}</a>
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
<thead> <thead>
<tr> <tr>
<th scope="col">{% trans "name"|capfirst %}</th> <th scope="col">{% trans "name"|capfirst %}</th>
<th scope="col">{% trans "date"|capfirst %}</th> <th scope="col">{% trans "registration date"|capfirst %}</th>
{% if cancellations %}
<th scope="col">{% trans "cancellation date"|capfirst %}</th>
{% endif %}
{% for field in fields %} {% for field in fields %}
<th scope="col">{{ field.name }}</th> <th scope="col">{{ field.name }}</th>
{% endfor %} {% endfor %}
...@@ -31,6 +34,9 @@ ...@@ -31,6 +34,9 @@
<td>{{ registration.name }}</td> <td>{{ registration.name }}</td>
{% endif %} {% endif %}
<td>{{ registration.date }}</td> <td>{{ registration.date }}</td>
{% if cancellations %}
<td>{{ registration.date_cancelled }}</td>
{% endif %}
{% for field in registration.information_fields %} {% for field in registration.information_fields %}
{% if not field.value %} {% if not field.value %}
<td></td> <td></td>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment