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

added hrScore to stats and plannedsessions

Browse Source 
in plannedsessions, if rScore = 0, taking hrScore
This commit is contained in:
Sander Roosendaal
2018-04-09 10:30:55 +02:00
parent 3ec4494342
commit f3ecaab599
4 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/dataprep.py
View File

@@ -172,7 +172,7 @@ def workout_summary_to_df(
id=w.id
)
csv_links.append(csv_link)
trimps.append(workout_trimp(w))
trimps.append(workout_trimp(w)[0])
rscore = workout_rscore(w)
rscores.append(int(rscore[0]))
@@ -2302,17 +2302,20 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
engine.dispose()
return data
def workout_trimp(workout):
r = workout.user
hrftp = (r.an+r.tr)/2.
df,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df,workstrokesonly=False)
if df.empty:
df,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df,workstrokesonly=False)
trimp = calc_trimp(df,r.sex,r.max,r.rest)
trimp,hrtss = calc_trimp(df,r.sex,r.max,r.rest,hrftp)
trimp = int(trimp)
hrtss = int(hrtss)
return trimp
return trimp,hrtss
def workout_rscore(w):
r = w.user