Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
06d963fd
Commit
06d963fd
authored
Nov 16, 2016
by
Wietse Kuipers
Browse files
Added a check all as present and paid button
parent
badacdb9
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/events/locale/nl/LC_MESSAGES/django.mo
View file @
06d963fd
No preview for this file type
website/events/locale/nl/LC_MESSAGES/django.po
View file @
06d963fd
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-1
0 1
1:4
7
+0100\n"
"PO-Revision-Date: 2016-11-1
0 1
1:4
7
+0100\n"
"POT-Creation-Date: 2016-11-1
6 2
1:4
1
+0100\n"
"PO-Revision-Date: 2016-11-1
6 2
1:4
2
+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -46,7 +46,7 @@ msgstr "volgorde"
msgid "No registration required"
msgstr "Geen registratie vereist"
#: events/models.py:28 events/templates/events/admin/details.html:6
5
#: events/models.py:28 events/templates/events/admin/details.html:6
6
msgid "title"
msgstr "titel"
...
...
@@ -62,7 +62,7 @@ msgstr "starttijd"
msgid "end time"
msgstr "eindtijd"
#: events/models.py:45 events/templates/events/admin/details.html:
69
#: events/models.py:45 events/templates/events/admin/details.html:
70
msgid "organiser"
msgstr "organisator"
...
...
@@ -78,7 +78,7 @@ msgstr "einde registratie"
msgid "cancel deadline"
msgstr "afmelddeadline"
#: events/models.py:68 events/templates/events/admin/details.html:7
3
#: events/models.py:68 events/templates/events/admin/details.html:7
4
#: events/templates/events/event.html:32
msgid "location"
msgstr "locatie"
...
...
@@ -93,12 +93,12 @@ msgstr ""
"Locatie van ’t Huygens: Heyendaalseweg 135, Nijmegen. Dit veld wordt niet "
"getoond als tekst!!"
#: events/models.py:80 events/templates/events/admin/details.html:7
5
#: events/models.py:80 events/templates/events/admin/details.html:7
6
#: events/templates/events/event.html:37
msgid "price"
msgstr "prijs"
#: events/models.py:88 events/templates/events/admin/details.html:7
7
#: events/models.py:88 events/templates/events/admin/details.html:7
8
msgid "cost"
msgstr "kosten"
...
...
@@ -255,29 +255,33 @@ msgstr "afgemeld"
msgid "Export registrations"
msgstr "Exporteer registraties"
#: events/templates/events/admin/details.html:58
#: events/templates/events/admin/details.html:51
msgid "Set all registered to paid and present"
msgstr "Zet iedereen op betaald en present"
#: events/templates/events/admin/details.html:59
msgid "Event properties"
msgstr "Eigenschappen van evenement"
#: events/templates/events/admin/details.html:6
1
#: events/templates/events/admin/details.html:6
2
#: events/templates/events/admin/registrations_table.html:46
msgid "change"
msgstr "verander"
#: events/templates/events/admin/details.html:6
7
#: events/templates/events/admin/details.html:6
8
#: events/templates/events/admin/registrations_table.html:7
msgid "date"
msgstr "datum"
#: events/templates/events/admin/details.html:7
1
#: events/templates/events/admin/details.html:7
2
msgid "registration period"
msgstr "registratieperiode"
#: events/templates/events/admin/details.html:
79
#: events/templates/events/admin/details.html:
80
msgid "registration required"
msgstr "registratie vereist"
#: events/templates/events/admin/details.html:8
2
#: events/templates/events/admin/details.html:8
3
msgid "registration message"
msgstr "registratiebericht"
...
...
website/events/templates/events/admin/details.html
View file @
06d963fd
...
...
@@ -48,6 +48,7 @@
{% endwith %}
<br>
<a
href=
"{% url 'events:export' event_id=event.pk %}"
class=
"button"
>
{% trans "Export registrations" %}
</a>
<a
href=
"{% url 'events:all_present' event_id=event.pk %}"
class=
"button"
>
{% trans "Set all registered to paid and present" %}
</a>
</div>
</div>
{% endblock %}
...
...
website/events/urls.py
View file @
06d963fd
...
...
@@ -17,6 +17,8 @@ urlpatterns = [
url
(
r
'admin/(?P<event_id>\d+)/registration/$'
,
views
.
admin_change_registration
,
name
=
'admin-registration'
),
url
(
r
'admin/(?P<event_id>\d+)/export/$'
,
views
.
export
,
name
=
'export'
),
url
(
r
'admin/(?P<event_id>\d+)/all_present/$'
,
views
.
all_present
,
name
=
'all_present'
),
url
(
r
'^(?P<event_id>\d+)/$'
,
views
.
event
,
name
=
'event'
),
url
(
r
'^(?P<event_id>\d+)/registration/(?P<action>[-\w]+)/$'
,
views
.
registration
,
name
=
'registration'
),
...
...
website/events/views.py
View file @
06d963fd
...
...
@@ -6,7 +6,7 @@ from django.contrib import messages
from
django.contrib.admin.views.decorators
import
staff_member_required
from
django.contrib.auth.decorators
import
login_required
,
permission_required
from
django.core.mail
import
EmailMessage
from
django.http
import
HttpResponse
,
JsonResponse
from
django.http
import
HttpResponse
,
HttpResponseRedirect
,
JsonResponse
from
django.shortcuts
import
get_object_or_404
,
redirect
,
render
from
django.template
import
Context
from
django.template.loader
import
get_template
...
...
@@ -295,3 +295,15 @@ def registration(request, event_id, action=None):
waiting_list_notification
.
send
()
return
redirect
(
event
)
@
staff_member_required
@
permission_required
(
'events.change_event'
)
def
all_present
(
request
,
event_id
):
event
=
get_object_or_404
(
Event
,
pk
=
event_id
)
registrations
=
event
.
registration_set
.
all
()
for
registration
in
registrations
:
registration
.
present
=
True
registration
.
paid
=
True
registration
.
save
()
return
HttpResponseRedirect
(
'/events/admin/{}'
.
format
(
event_id
))
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment