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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-19 19:45:37 +01:00
parent 766f9bdc03 886fdc5881
commit 11ffb0cc5f
2 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
rowers/views.py
View File

@@ -834,26 +834,42 @@ def list_c2_upload_view(request,id=0):
@login_required()
def workout_tcxemail_view(request,id=0):
message = ""
successmessage = ""
r = Rower.objects.get(user=request.user)
w = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,w)):
tcxfile = stravastuff.createstravaworkoutdata(w)
if settings.DEBUG:
res = handle_sendemailtcx.delay(r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
try:
tcxfile = stravastuff.createstravaworkoutdata(w)
if settings.DEBUG:
res = handle_sendemailtcx.delay(r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
else:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
else:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
successmessage = "The TCX file was sent to you per email"
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
'successmessage':successmessage,
successmessage = "The TCX file was sent to you per email"
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
'successmessage':successmessage,
})
except:
successmessage = ""
message = "Something went wrong (strava export) "+str(sys.exc_info()[0])
with open("media/c2errors.log","a") as errorlog:
errorstring = str(sys.exc_info()[0])
timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\r\n")
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
'message':message,
})
response = HttpResponseRedirect(url)
else:
@@ -982,7 +998,9 @@ def workout_c2_upload_view(request,id=0):
except:
message = "Unexpected Error: "+str(sys.exc_info()[0])
with open("media/c2errors.log","a") as errorlog:
errorlog.write("Unexpected Error: "+str(sys.exc_info()[0]))
errorstring = str(sys.exc_info()[0])
timestr = time.strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\n")
# check for duplicate error first
if (response.status_code == 409 ):
@@ -1000,13 +1018,18 @@ def workout_c2_upload_view(request,id=0):
except:
message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text
with open("media/c2errors.log","a") as errorlog:
errorlog.write("Unexpected Error: "+str(sys.exc_info()[0]))
errorstring = str(sys.exc_info()[0])
timestr = time.strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\n")
else:
s = response
message = "Something went wrong in workout_c2_upload_view. C2 sync failed."
with open("media/c2errors.log","a") as errorlog:
errorlog.write("Unexpected Error: "+response.text())
errorstring = str(sys.exc_info()[0])
timestr = time.strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\n")
else:
message = "You are not authorized to upload this workout"