From 3b39a55acb203e558ed88399f079a38898cba747 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 6 Jul 2020 17:14:18 +0200 Subject: [PATCH] fix --- rowers/garmin_stuff.py | 11 +++++++++-- rowers/views/importviews.py | 4 ---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index a7d688e2..2479d2bf 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -177,7 +177,14 @@ def garmin_getworkout(garminid,r,activity): def garmin_workouts_from_details(activities): for activity in activities: - garmintoken = activity['userAccessToken'] + try: + garmintoken = activity['userAccessToken'] + except KeyError: + print(activity) + return 0 + except TypeError: + print(activity) + return 0 try: r = Rower.objects.get(garmintoken=garmintoken) garminid = activity['summaryId'][:-7] @@ -205,7 +212,7 @@ def garmin_workouts_from_details(activities): df[' DriveLength (meters)'] = 0 df[' PeakDriveForce (lbs)'] = 1 df[' DriveTime (ms)'] = 0 - + rowdata = rowingdata(df=df) rowdata.write_csv(w.csvfilename,gzip=True) data = dataprep.dataprep(rowdata.df,id=w.id) diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 7c2ba2d5..60ad36a0 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1053,10 +1053,6 @@ def garmin_details_view(request): data = json.loads(request.body) result = garmin_stuff.garmin_workouts_from_details(data) - - if result: - return HttpResponse(status=200) - return HttpResponse(status=200)