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

Merge branch 'release/v18.5.4'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-05-10 21:55:48 +02:00
parent 381c286538 a29e5f6fe7
commit 4925a8504e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/management/commands/processemail.py
View File

@@ -110,7 +110,9 @@ class Command(BaseCommand):
try: try:
rowers = Rower.objects.filter(nk_auto_import=True) rowers = Rower.objects.filter(nk_auto_import=True)
for r in rowers: # pragma: no cover for r in rowers: # pragma: no cover
dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id))
if user_is_not_basic(r.user): if user_is_not_basic(r.user):
dologging("nklog.log","User is not basic")
_ = nkstuff.get_nk_workouts(r) _ = nkstuff.get_nk_workouts(r)
except: # pragma: no cover except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()

1
rowers/nkstuff.py
View File

@@ -93,6 +93,7 @@ def get_nk_workouts(rower, do_async=True, before=0, after=0):
try: try:
_ = nk_open(rower.user) _ = nk_open(rower.user)
except NoTokenError: # pragma: no cover except NoTokenError: # pragma: no cover
dologging("nklog.log","NK Token error for user {id}".format(id=rower.user.id))
return 0 return 0
res = get_nk_workout_list(rower.user, before=before, after=after) res = get_nk_workout_list(rower.user, before=before, after=after)

4
rowers/tasks.py
View File

@@ -2978,8 +2978,8 @@ def handle_nk_async_workout(alldata, userid, nktoken, nkid, delaysec, defaulttim
jsonData = response.json() jsonData = response.json()
strokeData = jsonData[str(nkid)] strokeData = jsonData[str(nkid)]
dologging('nklog.log', json.dumps(data)) #dologging('nklog.log', json.dumps(data))
dologging('nklog.log', json.dumps(strokeData)) #dologging('nklog.log', json.dumps(strokeData))
df = strokeDataToDf(strokeData) df = strokeDataToDf(strokeData)