From 5f683d1e2ecc64b5533c77f4e74c9605a6076600 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 25 Nov 2020 11:24:06 +0100 Subject: [PATCH] adding --- rowers/interactiveplots.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 58bf3174..c95c88c6 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1579,17 +1579,19 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None, ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=kfitness), date__lte=w.date)] - powerdf = df[df['workout'].isin(ids)] + try: + powerdf = df[df['workout'].isin(ids)] - powerdf = powerdf[powerdf['cp'] == powerdf.groupby(['delta'])['cp'].transform('max')] - powerdf = powerdf.sort_values(['delta']).reset_index() + powerdf = powerdf[powerdf['cp'] == powerdf.groupby(['delta'])['cp'].transform('max')] + powerdf = powerdf.sort_values(['delta']).reset_index() - powerdf = powerdf[powerdf['cp']>0] - powerdf.dropna(axis=0,inplace=True) - powerdf.sort_values(['delta','cp'],ascending=[1,0],inplace=True) - powerdf.drop_duplicates(subset='delta',keep='first',inplace=True) - + powerdf = powerdf[powerdf['cp']>0] + powerdf.dropna(axis=0,inplace=True) + powerdf.sort_values(['delta','cp'],ascending=[1,0],inplace=True) + powerdf.drop_duplicates(subset='delta',keep='first',inplace=True) + except KeyError: + powerdf = pd.DataFrame() # p1,fitt,fitpower,ratio = datautils.cpfit(powerdf) if len(powerdf['delta'])>= 4: