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

strava upload improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-22 14:19:43 +02:00
parent 15ac9e7815
commit b3564313dd
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/views.py
View File

@@ -1060,9 +1060,9 @@ def workout_tcxemail_view(request,id=0):
raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)):
try:
tcxfile = stravastuff.createstravaworkoutdata(w)
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w)
if tcxfile == 0:
message = "Something went wrong (TCX export)"
message = "Something went wrong (TCX export) "+tcxmessg
messages.error(request,message)
url = reverse(workout_export_view,
kwargs = {
@@ -1179,7 +1179,7 @@ def workout_csvtoadmin_view(request,id=0):
successmessage = "The CSV file was sent to the site admin per email"
messages.info(request,successmessage)
url = reverse(workout_export_view,
url = reverse(workout_view,
kwargs = {
'id':str(w.id),
})
@@ -1263,7 +1263,7 @@ def workout_strava_upload_view(request,id=0):
raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)):
try:
tcxfile = stravastuff.createstravaworkoutdata(w)
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w)
if tcxfile:
with open(tcxfile,'rb') as f:
res,mes = stravastuff.handle_stravaexport(f,w.name,
@@ -1287,7 +1287,11 @@ def workout_strava_upload_view(request,id=0):
try:
w.uploadedtostrava = res
w.save()
os.remove(tcxfile)
try:
os.remove(tcxfile)
except WindowsError:
print tcxfile
pass
url = "/rowers/workout/"+str(w.id)+"/edit"
messages.info(request,mes)
@@ -1299,8 +1303,8 @@ def workout_strava_upload_view(request,id=0):
errorlog.write("views.py line 826\r\n")
message = 'Error: '+errorstring
messages.error(request,message)
else:
message = "Strava Upload error"
else: # No tcxfile
message = "Strava Data error "+tcxmessg
messages.error(request,message)
w.uploadedtostrava = -1
w.save()