diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 4d098659..9cdaa889 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1669,26 +1669,14 @@ def workout_getc2workout_all(request,page=1,message=""): except NoTokenError: return HttpResponseRedirect("/rowers/me/c2authorize/") - res = c2stuff.get_c2_workout_list(request.user,page=page) + r = getrequestrower(request) - if (res.status_code != 200): - message = "Something went wrong in workout_c2import_view (C2 token refresh)" - messages.error(request,message) + result = c2stuff.get_c2_workouts(r,do_async=True) + + if result: + messages.info(request,'Your C2 workouts will be imported in the coming few minutes') else: - r = getrower(request.user) - c2ids = [item['id'] for item in res.json()['data']] - alldata = {} - for item in res.json()['data']: - alldata[item['id']] = item - - knownc2ids = uniqify([ - w.uploadedtoc2 for w in Workout.objects.filter(user=r) - ]) - newids = [c2id for c2id in c2ids if not c2id in knownc2ids] - - for c2id in newids: - workoutid = c2stuff.create_async_workout(alldata, - request.user,c2id) + messages.error(request,'Your C2 workouts import failed') url = reverse('workouts_view') return HttpResponseRedirect(url)