From 92ebe1f3195561c04cd64001d0cbf2277a40215a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 4 Jan 2021 19:29:46 +0100 Subject: [PATCH] fixed error --- rowers/interactiveplots.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index d8b0dc06..d50e3462 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -171,7 +171,7 @@ def build_goldmedalstandards(workouts,kfitness): else: goldmedalstandards.append(0) goldmedaldurations.append(0) - workoutdt.append(arrow.get(w.startdatetime).datetime) + workoutdt.append(arrow.get(w.date).datetime) df = pd.DataFrame({ 'workout':ids, @@ -180,8 +180,6 @@ def build_goldmedalstandards(workouts,kfitness): 'goldmedalduration':goldmedaldurations, }) - - df.sort_values(['workoutdt'],inplace=True) #for id, row in df.iterrows(): @@ -200,7 +198,10 @@ def build_goldmedalstandards(workouts,kfitness): # fitnesses.append(np.nan) for w in workouts: - ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=90), + #ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=90), + # date__lte=w.date)] + + ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=10), date__lte=w.date)] powerdf = df[df['workout'].isin(ids)] @@ -1837,6 +1838,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None): mask = df['testpower'].isnull() dates = df.mask(mask)['date'].dropna().values testpower = df.mask(mask)['testpower'].dropna().values + ids = df.mask(mask)['id'].dropna().values outids = df.mask(mask)['id'].dropna().unique() @@ -1854,8 +1856,11 @@ def goldmedalscorechart(user,startdate=None,enddate=None): previous = 0 for i in range(len(dates)): + id = ids[i] + w = Workout.objects.get(id=id) dd = str(dates[i]) - td.append(arrow.get(dd).datetime) + #td.append(arrow.get(dd).datetime) + td.append(arrow.get(w.date).datetime) markerscore.append(testpower[i]) markerduration.append(testduration[i]) score.append(np.nan)