adding email conf
This commit is contained in:
@@ -515,7 +515,6 @@ def handle_check_race_course(self,
|
|||||||
|
|
||||||
logfile = 'courselog_{workoutid}_{courseid}.log'.format(workoutid=workoutid,courseid=courseid)
|
logfile = 'courselog_{workoutid}_{courseid}.log'.format(workoutid=workoutid,courseid=courseid)
|
||||||
|
|
||||||
|
|
||||||
if 'debug' in kwargs: # pragma: no cover
|
if 'debug' in kwargs: # pragma: no cover
|
||||||
debug = kwargs['debug']
|
debug = kwargs['debug']
|
||||||
else:
|
else:
|
||||||
@@ -544,6 +543,10 @@ def handle_check_race_course(self,
|
|||||||
if 'summary' in kwargs:
|
if 'summary' in kwargs:
|
||||||
summary = kwargs['summary']
|
summary = kwargs['summary']
|
||||||
|
|
||||||
|
successemail = False
|
||||||
|
if 'successemail' in kwargs:
|
||||||
|
successemail = kwargs['successemail']
|
||||||
|
|
||||||
columns = ['time',' latitude',' longitude','cum_dist']
|
columns = ['time',' latitude',' longitude','cum_dist']
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -742,7 +745,6 @@ def handle_check_race_course(self,
|
|||||||
result = conn.execute(query)
|
result = conn.execute(query)
|
||||||
|
|
||||||
if summary:
|
if summary:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
row = rdata(csvfile=f1)
|
row = rdata(csvfile=f1)
|
||||||
except IOError: # pragma: no cover
|
except IOError: # pragma: no cover
|
||||||
@@ -771,6 +773,11 @@ def handle_check_race_course(self,
|
|||||||
conn.close()
|
conn.close()
|
||||||
engine.dispose()
|
engine.dispose()
|
||||||
|
|
||||||
|
if successemail:
|
||||||
|
handle_sendemail_coursesucceed(
|
||||||
|
useremail, userfirstname, logfile, workoutid
|
||||||
|
)
|
||||||
|
|
||||||
os.remove(logfile)
|
os.remove(logfile)
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
@@ -825,6 +832,8 @@ def handle_check_race_course(self,
|
|||||||
|
|
||||||
return 2
|
return 2
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return 0 # pragma: no cover
|
return 0 # pragma: no cover
|
||||||
|
|
||||||
|
|
||||||
@@ -1463,6 +1472,32 @@ def handle_sendemail_raceregistration(
|
|||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
def handle_sendemail_coursesucceed(
|
||||||
|
useremail, username, logfile, workoutid, **kwargs
|
||||||
|
):
|
||||||
|
if 'debug' in kwargs: # pragma: no cover
|
||||||
|
debug = kwargs['debug']
|
||||||
|
else:
|
||||||
|
debug = True
|
||||||
|
|
||||||
|
subject = "The validation of your course has succeeded"
|
||||||
|
|
||||||
|
from_email = 'Rowsandall <info@rowsandall.com>'
|
||||||
|
|
||||||
|
d = {
|
||||||
|
'username':username,
|
||||||
|
'workoutid':encoder.encode_hex(workoutid),
|
||||||
|
}
|
||||||
|
|
||||||
|
res = send_template_email(from_email,[useremail],
|
||||||
|
subject,
|
||||||
|
'trajectorysuccessemail.html',
|
||||||
|
d,
|
||||||
|
attach_file=logfile,
|
||||||
|
**kwargs)
|
||||||
|
|
||||||
|
return 1
|
||||||
|
|
||||||
def handle_sendemail_coursefail(
|
def handle_sendemail_coursefail(
|
||||||
useremail, username, logfile, **kwargs):
|
useremail, username, logfile, **kwargs):
|
||||||
|
|
||||||
|
|||||||
18
rowers/templates/trajectorysuccessemail.html
Normal file
18
rowers/templates/trajectorysuccessemail.html
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{% extends "emailbase.html" %}
|
||||||
|
{% block body %}
|
||||||
|
<p>Dear <strong>{{ username }}</strong>,</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
We have successfully validated the course for your
|
||||||
|
<a href="https://rowsandall.com/rowers/workout/{{ workoutid }}/">workout</a>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
<p>
|
||||||
|
The attachment contains the validation log.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Best Regards, the Rowsandall Team
|
||||||
|
</p>
|
||||||
|
{% endblock %}
|
||||||
@@ -6218,7 +6218,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
|
|||||||
record.save()
|
record.save()
|
||||||
|
|
||||||
job = myqueue(
|
job = myqueue(
|
||||||
queue,
|
queuehigh,
|
||||||
handle_check_race_course,
|
handle_check_race_course,
|
||||||
row.csvfilename,
|
row.csvfilename,
|
||||||
row.id,
|
row.id,
|
||||||
@@ -6227,6 +6227,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
|
|||||||
r.user.email,
|
r.user.email,
|
||||||
r.user.first_name,
|
r.user.first_name,
|
||||||
summary=True,
|
summary=True,
|
||||||
|
successemail=True,
|
||||||
)
|
)
|
||||||
messages.info(request,'We are checking your time on the course in the background')
|
messages.info(request,'We are checking your time on the course in the background')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user