diff --git a/rowers/tasks.py b/rowers/tasks.py index fefe1b29..cbf98d8d 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1725,6 +1725,98 @@ def handle_sendemail_coachrequest(email,name,code,coachname, return 1 +@app.task +def handle_sendemail_coachoffer_rejected(coachemail,coachname,name, + debug=False,**kwargs): + + fullemail = coachemail + subject = '{n} has rejected your offer to be his coach on rowsandall.com'.format(n=name) + from_email = 'Rowsandall ' + siteurl = SITE_URL + if debug: + siteurl = SITE_URL_DEV + + d = { + 'name':name, + 'coach':coachname, + 'siteurl':siteurl, + } + + res = send_template_email(from_email,[fullemail], + subject,'coachofferrejectedemail.html', + d, + **kwargs) + return 1 + +@app.task +def handle_sendemail_coachrequest_rejected(email,coachname,name, + debug=False,**kwargs): + + fullemail = email + subject = '{n} has rejected your coaching request on rowsandall.com'.format(n=coachname) + from_email = 'Rowsandall ' + siteurl = SITE_URL + if debug: + siteurl = SITE_URL_DEV + + d = { + 'name':name, + 'coach':coachname, + 'siteurl':siteurl, + } + + res = send_template_email(from_email,[fullemail], + subject,'coachrequestrejectedemail.html', + d, + **kwargs) + return 1 + +@app.task +def handle_sendemail_coachrequest_accepted(email,coachname,name, + debug=False,**kwargs): + + fullemail = email + subject = '{n} has accepted your coaching request on rowsandall.com'.format(n=coachname) + from_email = 'Rowsandall ' + siteurl = SITE_URL + if debug: + siteurl = SITE_URL_DEV + + d = { + 'name':name, + 'coach':coachname, + 'siteurl':siteurl, + } + + res = send_template_email(from_email,[fullemail], + subject,'coachrequestacceptedmail.html', + d, + **kwargs) + return 1 + +@app.task +def handle_sendemail_coachoffer_accepted(coachemail,coachname,name, + debug=False,**kwargs): + + fullemail = coachemail + subject = '{n} has accepted your coaching offer on rowsandall.com'.format(n=name) + from_email = 'Rowsandall ' + siteurl = SITE_URL + if debug: + siteurl = SITE_URL_DEV + + d = { + 'name':name, + 'coach':coachname, + 'siteurl':siteurl, + } + + res = send_template_email(from_email,[fullemail], + subject,'coachofferacceptedemail.html', + d, + **kwargs) + return 1 + @app.task def handle_sendemail_coacheerequest(email,name,code,coachname, debug=False,**kwargs): @@ -1743,8 +1835,6 @@ def handle_sendemail_coacheerequest(email,name,code,coachname, 'siteurl':siteurl } - form_email = 'Rowsandall ' - res = send_template_email(from_email,[fullemail], subject,'coacheerequestemail.html',d, **kwargs) diff --git a/rowers/teams.py b/rowers/teams.py index 25500897..78e51d0a 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -362,8 +362,10 @@ def reject_revoke_coach_offer(user,id): if rekwest.coach.user == user: rekwest.delete() + return (1,'Request removed') elif rekwest.user == user: + send_coachoffer_rejected_email(rekwest) rekwest.delete() return (1,'Request removed') else: @@ -376,6 +378,7 @@ def reject_revoke_coach_request(user,id): return (0,'The request is invalid') if rekwest.coach.user == user: + send_coachrequest_rejected_email(rekwest) rekwest.delete() return (1,'Request rejected') elif rekwest.user == user: @@ -622,6 +625,8 @@ def process_coachrequest_code(coach,code): result = add_coach(coach,rekwest.user.rower) if not result: return (result,"Something went wrong") + else: + send_coachrequest_accepted_email(rekwest) rekwest.delete() @@ -641,9 +646,52 @@ def process_coachoffer_code(user,code): result = add_coach(rekwest.coach,rekwest.user.rower) if not result: return (result,"Something went wrong") - + else: + send_coachoffer_accepted_email(rekwest) + rekwest.delete() return result +def send_coachoffer_rejected_email(rekwest): + coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name + coachemail = rekwest.coach.user.email + + name = rekwest.user.first_name + " " + rekwst.user.last_name + + res = myqueue(queuehigh, + handle_sendemail_coachoffer_rejected, + coachemail,coachname,name) + +def send_coachrequest_rejected_email(rekwest): + coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name + email = rekwest.user.email + + name = rekwest.user.first_name + " " + rekwst.user.last_name + + res = myqueue(queuehigh, + handle_sendemail_coachrequest_rejected, + email,coachname,name) + +def send_coachrequest_accepted_email(rekwest): + coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name + email = rekwest.user.email + + name = rekwest.user.first_name + " " + rekwst.user.last_name + + res = myqueue(queuehigh, + handle_sendemail_coachrequest_accepted, + email,coachname,name) + + +def send_coachoffer_accepted_email(rekwest): + coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name + coachemail = rekwest.coach.user.email + + name = rekwest.user.first_name + " " + rekwst.user.last_name + + res = myqueue(queuehigh, + handle_sendemail_coachoffer_accepted, + coachemail,coachname,name) + diff --git a/rowers/templates/coachofferacceptedemail.html b/rowers/templates/coachofferacceptedemail.html new file mode 100644 index 00000000..33f7e77a --- /dev/null +++ b/rowers/templates/coachofferacceptedemail.html @@ -0,0 +1,21 @@ +{% extends "emailbase.html" %} + +{% block body %} +

Dear {{ coachname }},

+ +

+ {{ name }} has accepted your coaching offer on + rowsandall.com +

+ +

+ Until you remove {{ name }} from your list of athletes, {{ name }}, + you + will be able to upload workouts on behalf of {{ name }}, run analysis for + and change power and heart rate zone settings for {{ name }}. +

+ +

+ Best Regards, the Rowsandall Team +

+{% endblock %} diff --git a/rowers/templates/coachofferrejectedemail.html b/rowers/templates/coachofferrejectedemail.html new file mode 100644 index 00000000..b40d5cd6 --- /dev/null +++ b/rowers/templates/coachofferrejectedemail.html @@ -0,0 +1,14 @@ +{% extends "emailbase.html" %} + +{% block body %} +

Dear {{ coachname }},

+ +

+ {{ name }} has rejected your offer to become his coach on + rowsandall.com +

+ +

+ Best Regards, the Rowsandall Team +

+{% endblock %} diff --git a/rowers/templates/coachrequestacceptedemail.html b/rowers/templates/coachrequestacceptedemail.html new file mode 100644 index 00000000..7c19fd04 --- /dev/null +++ b/rowers/templates/coachrequestacceptedemail.html @@ -0,0 +1,20 @@ +{% extends "emailbase.html" %} + +{% block body %} +

Dear {{ name }},

+ +

+ {{ coachname }} has accepted your coaching request on + rowsandall.com +

+ +

+ Until you remove {{ coachname }} from your list of coaches, {{ coachname }} + will be able to upload workouts on your behalf, run analysis for you + and change your power and heart rate zone settings. +

+ +

+ Best Regards, the Rowsandall Team +

+{% endblock %} diff --git a/rowers/templates/coachrequestrejectedemail.html b/rowers/templates/coachrequestrejectedemail.html new file mode 100644 index 00000000..bdc1b3e2 --- /dev/null +++ b/rowers/templates/coachrequestrejectedemail.html @@ -0,0 +1,14 @@ +{% extends "emailbase.html" %} + +{% block body %} +

Dear {{ name }},

+ +

+ {{ coachname }} has rejected your coaching request on + rowsandall.com +

+ +

+ Best Regards, the Rowsandall Team +

+{% endblock %}