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

CP chart data points are now clickable

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-09 12:14:34 +01:00
parent 4c9b6b687b
commit 8c02df6307
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -1243,28 +1243,30 @@ def fetchcp_new(rower,workouts):
try:
df = pd.read_parquet(cpfile)
df['workout'] = str(workout)
df['url'] = workout.url()
data.append(df)
except:
# CP data file doesn't exist yet. has to be created
df, delta, cpvalues = setcp(workout)
df['workout'] = str(workout)
df['url'] = workout.url()
data.append(df)
if len(data) == 0:
return pd.Series(),pd.Series(),0,pd.Series()
return pd.Series(),pd.Series(),0,pd.Series(),pd.Series()
if len(data)>1:
df = pd.concat(data,axis=0)
try:
df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
except KeyError:
pd.Series(),pd.Series(),0,pd.DataFrame()
pd.Series(),pd.Series(),0,pd.Series(),pd.Series()
df = df.sort_values(['delta']).reset_index()
return df['delta'],df['cp'],0,df['workout']
return df['delta'],df['cp'],0,df['workout'],df['url']
def setcp(workout,background=False,recurrance=True):
filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)