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

Merge tag 'v2.43' into develop

Browse Source 
hotfix TP sync
This commit is contained in:
Sander Roosendaal
2017-05-07 07:08:39 +02:00
parent 177c3cad74 5e5cd625c8
commit 0fa374e9e7
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprep.py
View File

@@ -423,7 +423,8 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
except KeyError: except KeyError:
pass pass
if np.isnan(totaltime):
totaltime = 0
hours = int(totaltime/3600.) hours = int(totaltime/3600.)
if hours>23: if hours>23:

2
rowers/tpstuff.py
View File

@@ -152,6 +152,8 @@ def get_token(code):
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
thetoken = 0 thetoken = 0
expires_in = 0
refresh_token = 0
return thetoken,expires_in,refresh_token return thetoken,expires_in,refresh_token

8
rowers/views.py
View File

@@ -1230,10 +1230,10 @@ def workout_tp_upload_view(request,id=0):
message = "" message = ""
r = Rower.objects.get(user=request.user) r = Rower.objects.get(user=request.user)
res = -1 res = -1
# try: try:
thetoken = tp_open(r.user) thetoken = tp_open(r.user)
# except TPNoTokenError: except TPNoTokenError:
# return HttpResponseRedirect("/rowers/me/tpauthorize/") return HttpResponseRedirect("/rowers/me/tpauthorize/")
# ready to upload. Hurray # ready to upload. Hurray
try: try: