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

private plan seems to be working

Browse Source
This commit is contained in:
Sander Roosendaal
2023-08-15 15:19:38 +02:00
parent 2db622fc3d
commit 32cf941d12
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

13
rowers/utils.py
View File

@@ -721,6 +721,8 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
else: else:
velomid = avgspeed velomid = avgspeed
distance = velomid*seconds
veloratio = (velomid/ftv)**(3.0) veloratio = (velomid/ftv)**(3.0)
rscoreperhour = 100.*veloratio rscoreperhour = 100.*veloratio
rscore = rscoreperhour*seconds/3600. rscore = rscoreperhour*seconds/3600.
@@ -744,7 +746,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
avgpower = targetpower avgpower = targetpower
if valuelow != 0 and valuehigh != 0: # pragma: no cover if valuelow != 0 and valuehigh != 0: # pragma: no cover
avgpower = (valuelow+valuehigh)/2. avgpower = (valuelow+valuehigh)/2.
avgspeed = ftv*(avgspeed/ftv)**(1./3.) avgspeed = ftv*(avgpower/ftp)**(1./3.)
distance = avgspeed*seconds distance = avgspeed*seconds
rscore = 100.*(avgpower/ftp)*seconds/3600. rscore = 100.*(avgpower/ftp)*seconds/3600.
@@ -760,6 +762,9 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
avgspm = (valuelow+valuehigh)/2. avgspm = (valuelow+valuehigh)/2.
avgpower = ftp*avgspm/ftspm avgpower = ftp*avgspm/ftspm
avgspeed = ftv*(avgpower/ftp)**(1./3.)
distance = avgspeed*seconds
rscore = 100*(avgpower/ftp)*seconds/3600. rscore = 100*(avgpower/ftp)*seconds/3600.
return seconds, distance, rscore return seconds, distance, rscore
@@ -784,6 +789,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
veloratio = (velomid/ftv)**(3.0) veloratio = (velomid/ftv)**(3.0)
rscoreperhour = 100.*veloratio rscoreperhour = 100.*veloratio
rscore = rscoreperhour*seconds/3600. rscore = rscoreperhour*seconds/3600.
seconds = distance/velomid
if targettype == 'Power': # pragma: no cover if targettype == 'Power': # pragma: no cover
value = step.get('targetValue', 0) value = step.get('targetValue', 0)
@@ -802,7 +808,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
avgpower = targetpower avgpower = targetpower
if valuelow != 0 and valuehigh != 0: if valuelow != 0 and valuehigh != 0:
avgpower = (valuelow+valuehigh)/2. avgpower = (valuelow+valuehigh)/2.
avgspeed = ftv*(avgspeed/ftv)**(1./3.) avgspeed = ftv*(avgpower/ftp)**(1./3.)
seconds = distance/avgspeed seconds = distance/avgspeed
rscore = 100.*(avgpower/ftp)*seconds/3600. rscore = 100.*(avgpower/ftp)*seconds/3600.
@@ -819,6 +825,8 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
avgpower = ftp*avgspm/ftspm avgpower = ftp*avgspm/ftspm
rscore = 100*(avgpower/ftp)*seconds/3600. rscore = 100*(avgpower/ftp)*seconds/3600.
avgspeed = ftv*(avgpower/ftp)**(1./3.)
seconds = distance/avgspeed
return seconds, distance, rscore return seconds, distance, rscore
elif durationtype in ['PowerLessThan', 'PowerGreaterThan', 'HrLessThan', 'HrGreaterThan']: # pragma: no cover elif durationtype in ['PowerLessThan', 'PowerGreaterThan', 'HrLessThan', 'HrGreaterThan']: # pragma: no cover
@@ -917,6 +925,7 @@ def ps_dict_order(d, short=False, rower=None, html=True):
sdict2 = collections.OrderedDict(reversed(list(sdict.items()))) sdict2 = collections.OrderedDict(reversed(list(sdict.items())))
for step in steps: for step in steps:
sstring, type, stepID, repeatID, repeatValue = step_to_string( sstring, type, stepID, repeatID, repeatValue = step_to_string(
step, short=short) step, short=short)

2
rowers/views/planviews.py
View File

@@ -2623,6 +2623,8 @@ def rower_view_instantplan(request, id='', userid=0):
nextday['week'] = (divmod(i, 7)[0])+1 nextday['week'] = (divmod(i, 7)[0])+1
trainingdays2.append(nextday) trainingdays2.append(nextday)
workouts = nextday['workouts']
try: try:
nextday = trainingdays.pop(0) nextday = trainingdays.pop(0)
except IndexError: except IndexError: