sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

adding workout name to cp chart hover

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-18 12:12:21 +02:00
parent ee4ee05f33
commit 6ec0f669bd
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/dataprep.py
View File

@@ -1023,14 +1023,17 @@ def fetchcp_new(rower,workouts):
cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
try:
df = pd.read_parquet(cpfile)
df['workout'] = str(workout)
data.append(df)
except OSError:
# CP data file doesn't exist yet. has to be created
data.append(setcp(workout)[0])
df, delta, cpvalues = setcp(workout)
df['workout'] = str(workout)
data.append(df)
if len(data) == 0:
return pd.Series(),pd.Series(),0
return pd.Series(),pd.Series(),0,pd.Series()
if len(data)>1:
df = pd.concat(data,axis=0)
@@ -1039,7 +1042,7 @@ def fetchcp_new(rower,workouts):
df = df.sort_values(['delta']).reset_index()
return df['delta'],df['cp'],0
return df['delta'],df['cp'],0,df['workout']
def setcp(workout):
strokesdf = getsmallrowdata_db(['power','workoutid','time'],ids = [workout.id])