sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

logic around emailbounces

Browse Source
This commit is contained in:
Sander Roosendaal
2018-03-18 10:17:01 +01:00
parent 77bb53466e
commit f5f6de50c6
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rowers/views.py
View File

@@ -1733,7 +1733,9 @@ def workout_tcxemail_view(request,id=0):
r.user.first_name, r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email, r.user.email,
tcxfile) tcxfile,
emailbounced = r.emailbounced
)
successmessage = "The TCX file was sent to you per email" successmessage = "The TCX file was sent to you per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -1782,7 +1784,9 @@ def workout_gpxemail_view(request,id=0):
res = myqueue(queuehigh,handle_sendemailtcx, res = myqueue(queuehigh,handle_sendemailtcx,
r.user.first_name, r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email,gpxfilename) r.user.email,gpxfilename,
emailbounced = r.emailbounced
)
successmessage = "The GPX file was sent to you per email" successmessage = "The GPX file was sent to you per email"
@@ -1834,7 +1838,9 @@ def workouts_summaries_email_view(request):
r.user.first_name, r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email, r.user.email,
filename) filename,
emailbounced = r.emailbounced
)
messages.info(request,'The summary CSV file was sent to you per email') messages.info(request,'The summary CSV file was sent to you per email')
else: else:
form = DateRangeForm() form = DateRangeForm()
@@ -1866,7 +1872,9 @@ def workout_csvemail_view(request,id=0):
csvfile = w.csvfilename csvfile = w.csvfilename
res = myqueue(queuehigh,handle_sendemailcsv,r.user.first_name, res = myqueue(queuehigh,handle_sendemailcsv,r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email,csvfile) r.user.email,csvfile,
emailbounced = r.emailbounced
)
successmessage = "The CSV file was sent to you per email" successmessage = "The CSV file was sent to you per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -7176,6 +7184,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
ps=[r.p0,r.p1,r.p2,r.p3], ps=[r.p0,r.p1,r.p2,r.p3],
ratio=r.cpratio, ratio=r.cpratio,
quick_calc = quick_calc, quick_calc = quick_calc,
emailbounced = r.emailbounced
) )
try: try:
@@ -8578,12 +8587,15 @@ def workout_comment_view(request,id=0):
r.user.email, r.user.email,
request.user.first_name, request.user.first_name,
request.user.last_name, request.user.last_name,
comment,w.name,w.id) comment,w.name,w.id,
emailbounced = r.emailbounced
)
commenters = {oc.user for oc in comments if oc.notification} commenters = {oc.user for oc in comments if oc.notification}
for u in commenters: for u in commenters:
a_messages.info(u,message) a_messages.info(u,message)
if u != request.user and u != r.user: if u != request.user and u != r.user:
ocr = Rower.objects.get(user=u)
res = myqueue(queuelow, res = myqueue(queuelow,
handle_sendemailnewresponse, handle_sendemailnewresponse,
u.first_name, u.first_name,
@@ -8594,7 +8606,9 @@ def workout_comment_view(request,id=0):
comment, comment,
w.name, w.name,
w.id, w.id,
c.id) c.id,
emailbounced = ocr.emailbounced
)
url = reverse(workout_comment_view,kwargs = { url = reverse(workout_comment_view,kwargs = {
'id':id}) 'id':id})
@@ -10377,7 +10391,9 @@ def team_workout_upload_view(request,message="",
handle_zip_file, handle_zip_file,
r.user.email, r.user.email,
t, t,
f2) f2,
emailbounced = r.emailbounced
)
messages.info( messages.info(
request, request,