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

added emailbounced keyword to tasks

Browse Source
This commit is contained in:
Sander Roosendaal
2018-03-18 09:55:49 +01:00
parent 4f1433830e
commit 77bb53466e
5 changed files with 242 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
rowers/views.py
View File

@@ -1708,7 +1708,18 @@ def workout_tcxemail_view(request,id=0):
r = getrower(request.user)
w = get_workout(id)
if (checkworkoutuser(request.user,w)):
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False)
if r.emailbounced:
message = "Please check your email address first. Email to this address bounced."
messages.error(request, message)
return HttpResponseRedirect(
reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
)
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False)
if tcxfile == 0:
message = "Something went wrong (TCX export) "+tcxmessg
messages.error(request,message)
@@ -1726,11 +1737,12 @@ def workout_tcxemail_view(request,id=0):
successmessage = "The TCX file was sent to you per email"
messages.info(request,successmessage)
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
response = HttpResponseRedirect(url)
else:
@@ -1750,6 +1762,16 @@ def workout_gpxemail_view(request,id=0):
message = ""
successmessage = ""
r = Rower.objects.get(user=request.user)
if r.emailbounced:
message = "Please check your email address first. Email to this address bounced."
messages.error(request, message)
return HttpResponseRedirect(
reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
)
w = get_workout(id)
if (checkworkoutuser(request.user,w)):
@@ -1787,6 +1809,15 @@ def workout_gpxemail_view(request,id=0):
@login_required()
def workouts_summaries_email_view(request):
r = getrower(request.user)
if r.emailbounced:
message = "Please check your email address first. Email to this address bounced."
messages.error(request, message)
return HttpResponseRedirect(
reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
)
if request.method == 'POST':
form = DateRangeForm(request.POST)
@@ -1819,6 +1850,16 @@ def workouts_summaries_email_view(request):
def workout_csvemail_view(request,id=0):
message = ""
r = getrower(request.user)
if r.emailbounced:
message = "Please check your email address first. Email to this address bounced."
messages.error(request, message)
return HttpResponseRedirect(
reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
)
w = get_workout(id)
if (checkworkoutuser(request.user,w)):
@@ -11229,6 +11270,7 @@ def rower_edit_view(request,rowerid=0,message=""):
birthdate = cd['birthdate']
showfavoritechartnotes = cd['showfavoritechartnotes']
getemailnotifications = cd['getemailnotifications']
getimportantemails = cd['getimportantemails']
defaulttimezone=cd['defaulttimezone']
u = r.user
if u.email != email and len(email):
@@ -11247,6 +11289,7 @@ def rower_edit_view(request,rowerid=0,message=""):
r.defaulttimezone=defaulttimezone
r.weightcategory = weightcategory
r.getemailnotifications = getemailnotifications
r.getimportantemails = getimportantemails
r.defaultlandingpage = defaultlandingpage
r.showfavoritechartnotes = showfavoritechartnotes
r.sex = sex
@@ -11587,7 +11630,8 @@ def rower_calcdps_view(request):
r = getrower(request.user)
ws = [(w.id,w.csvfilename) for w in Workout.objects.filter(user=r)]
res = myqueue(queue,handle_updatedps,r.user.email,ws,debug=False)
res = myqueue(queue,handle_updatedps,r.user.email,ws,debug=False,
emailbounced=r.emailbounced)
messages.info(request,"Your workouts are being updated in the background. You will receive email when this is done.")