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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2023-08-22 22:26:38 +02:00
parent 6814473be7
commit 503b212acc
5 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rowers/datautils.py
View File

@@ -23,31 +23,6 @@ rpetotss = {
10: 140,
}
def rscore_approx(row):
if row['rscore'] > 0:
return row['rscore']
if row['rscore'] == 0:
if row['hrtss'] > 0:
return row['hrtss']
else:
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600
print(row['rpe'],dd,rpetotss[row['rpe']])
return rpetotss[row['rpe']]*dd
if row['rscore'] < 0:
w = Workout.objects.get(id=row['id'])
trimp, hrtss = dataprep.workout_trimp(w)
rscore, normp = dataprep.workout_rscore(w)
if row['rpe'] and row['rpe'] > 0:
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600
return rpetotss[row['rpe']]*dd
else: # pragma: no cover
minutes = row['duration'].hour*60+row['duration'].minute
return minutes
print('boer')
return 0
def updatecp(delta, cpvalues, r, workouttype='water'): # pragma: no cover
if workouttype in otwtypes: