From fc479c2b6132468c4e6128b8e7f7ef3373a4ca5f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 19 Aug 2019 21:56:37 +0200 Subject: [PATCH] adding names --- rowers/management/commands/processalerts.py | 2 ++ rowers/tasks.py | 4 +++- rowers/templates/alertemail.html | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rowers/management/commands/processalerts.py b/rowers/management/commands/processalerts.py index acd48c35..37dce806 100644 --- a/rowers/management/commands/processalerts.py +++ b/rowers/management/commands/processalerts.py @@ -48,6 +48,8 @@ class Command(BaseCommand): alert.manager.email, alert.manager.first_name, alert.manager.last_name, + alert.rower.user.first_name, + alert.name, stats,debug=True) # advance next_run diff --git a/rowers/tasks.py b/rowers/tasks.py index c6f8316c..dbd1f774 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -758,7 +758,7 @@ def handle_updatedps(useremail, workoutids, debug=False,**kwargs): @app.task def handle_send_email_alert( - useremail, userfirstname, userlastname, stats, **kwargs): + useremail, userfirstname, userlastname, rowerfirstname, alertname, stats, **kwargs): if 'debug' in kwargs: debug = kwargs['debug'] @@ -777,6 +777,8 @@ def handle_send_email_alert( 'first_name':userfirstname, 'last_name':userlastname, 'siteurl':siteurl, + 'rowerfirstname':rowerfirstname, + 'alertname':alertname, } res = send_template_email(from_email,[useremail],subject, diff --git a/rowers/templates/alertemail.html b/rowers/templates/alertemail.html index bd3df931..7a05bc84 100644 --- a/rowers/templates/alertemail.html +++ b/rowers/templates/alertemail.html @@ -4,7 +4,7 @@

Dear {{ first_name }},

- Here is the report for your alert on rowsandall.com. + Here is the report for your alert {{ alertname }} on rowsandall.com. This is a report for your athlete {{ rowerfirstname }}.

{% for key, value in report.items() %}