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

central rscore approx

Browse Source
This commit is contained in:
Sander Roosendaal
2023-08-22 16:50:53 +02:00
parent 107983ab34
commit 02d1dc273e
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rowers/plannedsessions.py
View File

@@ -257,13 +257,16 @@ def get_execution_report(rower, startdate, enddate, plan=None):
plannedsession=None,
date__gte=mm.startdate, date__lte=mm.enddate).exclude(duplicate=True)
for w in unmatchedworkouts:
if w.rscore != 0:
actualscore += w.rscore
elif w.hrtss != 0: # pragma: no cover
actualscore += w.hrtss
else: # pragma: no cover
minutes = w.duration.hour*60+w.duration.minute
actualscore += minutes
row = {
'rscore': w.rscore,
'hrtss': w.hrtss,
'rpe': w.rpe,
'duration': w.duration,
'id': w.id
}
rscore = datautils.rscore_approx(row)
actualscore += rscore
for ps in sps: # pragma: no cover
ratio, status, cdate = is_session_complete(rower, ps)
if ps.sessionmode == 'rScore':
@@ -576,11 +579,15 @@ def get_session_metrics(ps):
durationv += timefield_to_seconds_duration(w.duration)
thetrimp, hrtss = dataprep.workout_trimp(w)
trimpv += thetrimp
tss = dataprep.workout_rscore(w)[0]
if not np.isnan(tss) and tss != 0:
rscorev += tss
elif tss == 0: # pragma: no cover
rscorev += hrtss
row = {
'rscore': w.rscore,
'hrtss': w.hrtss,
'rpe': w.rpe,
'duration': w.duration,
'id': w.id
}
tss = datautils.rscore_approx(row)
rscorev += tss
ratio, statusv, completiondate = is_session_complete_ws(ws, ps)
try:
@@ -674,13 +681,15 @@ def is_session_complete_ws(ws, ps):
trimp, hrtss = dataprep.workout_trimp(w)
score += trimp
elif ps.sessionmode == 'rScore':
rscore = dataprep.workout_rscore(w)[0]
if not np.isnan(rscore) and rscore != 0:
score += rscore
elif rscore == 0: # pragma: no cover
trimp, hrtss = dataprep.workout_trimp(w)
score += hrtss
row = {
'rscore': w.rscore,
'hrtss': w.hrtss,
'rpe': w.rpe,
'duration': w.duration,
'id': w.id
}
rscore = datautils.rscore_approx(row)
score += rscore
if not completiondate and score >= cratiomin*value:
completiondate = w.date