From 6d6d269ce9254d99730cc305049955cfdfba9802 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 2 Dec 2018 20:37:02 +0100 Subject: [PATCH] emails with site url --- rowers/tasks.py | 3 ++ rowers/templates/disqualificationemail.html | 3 +- rowers/templates/raceregisteredemail.html | 8 +++- rowers/templates/racesubmissionemail.html | 8 +++- rowers/urls.py | 4 ++ rowers/views.py | 42 +++++++++++++++++++++ 6 files changed, 65 insertions(+), 3 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index c319b1e4..d1f6855e 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -758,6 +758,7 @@ def handle_sendemail_raceregistration( d = { 'username':username, 'registeredname':registeredname, + 'siteurl':siteurl, 'racename':racename, 'raceid':raceid, } @@ -786,6 +787,7 @@ def handle_sendemail_racesubmission( d = { 'username':username, + 'siteurl':siteurl, 'registeredname':registeredname, 'racename':racename, 'raceid':raceid, @@ -816,6 +818,7 @@ def handle_send_disqualification_email( d = { 'username':username, 'reason':reason, + 'siteurl':siteurl, 'message': strip_tags(message), 'racename':racename, } diff --git a/rowers/templates/disqualificationemail.html b/rowers/templates/disqualificationemail.html index 1c7dca91..c72af9fc 100644 --- a/rowers/templates/disqualificationemail.html +++ b/rowers/templates/disqualificationemail.html @@ -4,7 +4,8 @@

Unfortunately, the result that you have submitted - for the virtual race {{ racename }} + for the virtual race + {{ racename }} has been rejected by the race organizer.

diff --git a/rowers/templates/raceregisteredemail.html b/rowers/templates/raceregisteredemail.html index f16d120e..a06cf100 100644 --- a/rowers/templates/raceregisteredemail.html +++ b/rowers/templates/raceregisteredemail.html @@ -9,7 +9,13 @@

You can check race participants and results on the race page on Rowsandall: - {{ racename }} + {{ racename }} +

+ +

+ You are receiving this email because you are on the start list for this race. + If you do not wish to receive these notifications, you can switch them off + throught the link above.

diff --git a/rowers/templates/racesubmissionemail.html b/rowers/templates/racesubmissionemail.html index 263fd867..2337bbd1 100644 --- a/rowers/templates/racesubmissionemail.html +++ b/rowers/templates/racesubmissionemail.html @@ -9,7 +9,13 @@

Check out the results on the race page! - {{ racename }} + {{ racename }} +

+ +

+ You are receiving this email because you are on the start list for this race. + If you do not wish to receive these notifications, you can switch them off + throught the link above.

diff --git a/rowers/urls.py b/rowers/urls.py index 4948b2b4..76ffa360 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -144,6 +144,10 @@ urlpatterns = [ url(r'^virtualevents$',views.virtualevents_view), url(r'^virtualevent/create$',views.virtualevent_create_view), url(r'^virtualevent/createindoor$',views.indoorvirtualevent_create_view), + url(r'^raceregistration/togglenotification/(?P\d+)/$', + views.virtualevent_toggle_email_view), + url(r'^indoorraceregistration/togglenotification/(?P\d+)/$', + views.indoorvirtualevent_toggle_email_view), url(r'^virtualevent/(?P\d+)$',views.virtualevent_view), url(r'^virtualevent/(?P\d+)/edit$',views.virtualevent_edit_view), url(r'^virtualevent/(?P\d+)/editindoor$',views.indoorvirtualevent_edit_view), diff --git a/rowers/views.py b/rowers/views.py index 4d1df1a8..8c089562 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -16695,6 +16695,48 @@ def virtualevent_register_view(request,id=0): }) +@login_required() +def virtualevent_toggle_email_view(request,id=0): + r = getrower(request.user) + race = VirtualRace.objects.get(id=id) + records = VirtualRaceResult.objects.filter(userid=r.id,race=race) + + if True in [record.emailnotifications for record in records]: + newsetting = False + else: + newsetting = True + + for record in records: + record.emailnotifications = newsetting + record.save() + + url = reverse(virtualevent_view, + kwargs={'id':record.race.id}) + + return HttpResponseRedirect(url) + +@login_required() +def indoorvirtualevent_toggle_email_view(request,id=0): + r = getrower(request.user) + race = VirtualRace.objects.get(id=id) + + records = IndoorVirtualRaceResult.objects.filter(userid=r.id, + race=race) + + if True in [record.emailnotifications for record in records]: + newsetting = False + else: + newsetting = True + + for record in records: + record.emailnotifications = newsetting + record.save() + + url = reverse(virtualevent_view, + kwargs={'id':record.race.id}) + + return HttpResponseRedirect(url) + @login_required() def indoorvirtualevent_register_view(request,id=0): r = getrower(request.user)