From ddc17455bb08c2a52accf6407a836cb04c1decd2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 6 Oct 2019 09:03:37 +0200 Subject: [PATCH] excluded duplicate workouts from work load calc --- rowers/plannedsessions.py | 2 +- rowers/stravastuff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 7687540f..a3f8f1a7 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -192,7 +192,7 @@ def get_execution_report(rower,startdate,enddate,plan=None): unmatchedworkouts = Workout.objects.filter( user=rower, plannedsession=None, - date__gte=mm.startdate,date__lte=mm.enddate) + date__gte=mm.startdate,date__lte=mm.enddate).exclude(duplicate=True) for w in unmatchedworkouts: if w.rscore != 0: actualscore += w.rscore diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 0ea6ab5c..6c75da2c 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -441,7 +441,7 @@ def handle_stravaexport(f2,workoutname,stravatoken,description='', client = stravalib.Client(access_token=stravatoken) act = client.upload_activity(f2,'tcx.gz',name=workoutname) - + try: res = act.wait(poll_interval=5.0,timeout=30) message = 'Workout successfully synchronized to Strava'