diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 745ca19f..2a2021e5 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -541,7 +541,7 @@ def process_callback(request): # Uploading workout def workout_c2_upload(user,w): - response = 'trying C2 upload' + message = 'trying C2 upload' thetoken = c2_open(user) r = Rower.objects.get(user=user) @@ -565,7 +565,7 @@ def workout_c2_upload(user,w): response = requests.post(url,headers=headers,data=json.dumps(data)) if (response.status_code == 409 ): - message = "Duplicate error" + message = "Concept2 Duplicate error" w.uploadedtoc2 = -1 c2id = -1 w.save() @@ -581,7 +581,7 @@ def workout_c2_upload(user,w): c2id = 0 else: - message = "You are not authorized to upload this workout" + message = "You are not authorized to upload this workout to Concept2" c2id = 0 return message,c2id diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py index bcc0edee..2d025ce4 100644 --- a/rowers/runkeeperstuff.py +++ b/rowers/runkeeperstuff.py @@ -319,7 +319,7 @@ def get_userid(access_token): return str(res) def workout_runkeeper_upload(user,w): - message = "" + message = "Uploading to Runkeeper" rkid = 0 r = w.user @@ -332,7 +332,7 @@ def workout_runkeeper_upload(user,w): if (checkworkoutuser(user,w)): data = createrunkeeperworkoutdata(w) if not data: - message = "Data error" + message = "Data error in Runkeeper Upload" rkid = 0 return message, rkid @@ -357,7 +357,7 @@ def workout_runkeeper_upload(user,w): rkuri = geturifromid(thetoken,rkid) w.uploadedtorunkeeper = rkid w.save() - return '',rkid + return 'Successfully synchronized to Runkeeper',rkid else: s = response message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text) diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py index 053f6915..629f166e 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -319,7 +319,7 @@ def getidfromresponse(response): def workout_sporttracks_upload(user,w): - message = "" + message = "Uploading to SportTracks" stid = 0 # ready to upload. Hurray r = w.user @@ -353,7 +353,7 @@ def workout_sporttracks_upload(user,w): stid = getidfromresponse(response) w.uploadedtosporttracks = stid w.save() - return '',stid + return 'Successfully synced to SportTracks',stid else: s = response message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 270ff2cd..75fdc740 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -275,7 +275,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description=''): message = 'Workout successfully synchronized to Strava' except: res = 0 - + message = 'Strava upload timed out' # description doesn't work yet. Have to wait for stravalib to update @@ -289,7 +289,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description=''): def workout_strava_upload(user,w): - message = "" + message = "Uploading to Strava" stravaid=-1 r = Rower.objects.get(user=user) res = -1 @@ -322,7 +322,7 @@ def workout_strava_upload(user,w): os.remove(tcxfile) except WindowsError: pass - message = '' + message = mes stravaid = res return message,stravaid else: diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index 7331a512..efff14bb 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -283,7 +283,6 @@ def uploadactivity(access_token,filename,description='', with open("media/tperrors.log","a") as errorlog: errorlog.write(str(resp.status_code)) errorlog.write("\r\n") - print "noot" timestr = strftime("%Y%m%d-%H%M%S") errorlog.write(timestr+"\r\n") errorlog.write("\r\n") @@ -296,14 +295,13 @@ def uploadactivity(access_token,filename,description='', errorlog.write("\r\n") return 0,resp.reason,resp.status_code,headers else: - print resp.json() return resp.json()[0]["Id"],"ok",200,"" return 0 def workout_tp_upload(user,w): - message = "" + message = "Uploading to TrainingPeaks" tpid = 0 r = w.user @@ -333,7 +331,7 @@ def workout_tp_upload(user,w): tpid = res w.save() os.remove(tcxfile) - return '',tpid + return 'Successfully synchronized to TrainingPeaks',tpid else: # no tcxfile message = "Upload to TrainingPeaks failed" diff --git a/rowers/underarmourstuff.py b/rowers/underarmourstuff.py index 6dfbbc97..277b72bb 100644 --- a/rowers/underarmourstuff.py +++ b/rowers/underarmourstuff.py @@ -401,7 +401,7 @@ def get_userid(access_token): return res def workout_ua_upload(user,w): - message = "" + message = "Uploading to MapMyFitness" uaid = 0 r = w.user @@ -438,7 +438,7 @@ def workout_ua_upload(user,w): uaid = getidfromresponse(response) w.uploadedtounderarmour = uaid w.save() - return '',uaid + return 'Successfully synchronized with MapMyFitness',uaid else: s = response message = "Something went wrong in workout_underarmour_upload_view: %s - %s" % (s.reason,s.text) diff --git a/rowers/views.py b/rowers/views.py index 4663ea85..b549e456 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5855,61 +5855,89 @@ def workout_upload_view(request,message="", # upload to C2 if (upload_to_c2): try: - c2message,c2id = c2stuff.workout_c2_upload(request.user,w) + message,id = c2stuff.workout_c2_upload(request.user,w) except C2NoTokenError: - pass + id = 0 + message = "Something went wrong with the Concept2 sync" + if id>1: + messages.info(request,message) + else: + messages.error(request,message) + if (upload_to_strava): try: - stravamessage,stravaid = stravastuff.workout_strava_upload( + message,id = stravastuff.workout_strava_upload( request.user,w ) except StravaNoTokenError: - pass - + id = 0 + message = "Please connect to Strava first" + if id>1: + messages.info(request,message) + else: + messages.error(request,message) + if (upload_to_st): try: - stmessage,stid = sporttracksstuff.workout_sporttracks_upload( + message,id = sporttracksstuff.workout_sporttracks_upload( request.user,w ) except SportTracksNoTokenError: - pass + message = "Please connect to SportTracks first" + id = 0 + if id>1: + messages.info(request,message) + else: + messages.error(request,message) if (upload_to_rk): try: - rkmessage,rkid = runkeeperstuff.workout_runkeeper_upload( + message,id = runkeeperstuff.workout_runkeeper_upload( request.user,w ) except RunKeeperNoTokenError: - pass + message = "Please connect to Runkeeper first" + id = 0 + + if id>1: + messages.info(request,message) + else: + messages.error(request,message) + if (upload_to_ua): try: - uamessage,uaid = underarmourstuff.workout_ua_upload( + message,id = underarmourstuff.workout_ua_upload( request.user,w ) except UnderArmourNoTokenError: - pass + message = "Please connect to MapMyFitness first" + id = 0 + + if id>1: + messages.info(request,message) + else: + messages.error(request,message) + if (upload_to_tp): try: - tpmessage,tpid = tpstuff.workout_tp_upload( + message,id = tpstuff.workout_tp_upload( request.user,w ) except TPNoTokenError: - pass - - if message: - url = reverse(workout_edit_view, - kwargs={ - 'message':message, - 'id':w.id, - }) + message = "Please connect to TrainingPeaks first" + id = 0 - else: - url = reverse(workout_edit_view, - kwargs = { - 'id':w.id, - }) + if id>1: + messages.info(request,message) + else: + messages.error(request,message) + + url = reverse(workout_edit_view, + kwargs = { + 'id':w.id, + }) return HttpResponseRedirect(url) else: response = render(request,