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

Merge branch 'release/v18.9.2'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-12-19 08:02:31 +01:00
parent 81db7e29d9 9db40cb8e8
commit 2a6c959f97
2 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/models.py
View File

@@ -4222,7 +4222,7 @@ class RowerExportForm(ModelForm):
# Simple form to set rower's Functional Threshold Power
class SimpleRowerPowerForm(ModelForm):
otwftp = forms.IntegerField(initial=0,required=False, label='FTP on water')
otwftp = forms.IntegerField(initial=0,required=True, label='FTP on water')
class Meta:
model = Rower
fields = ['ftp']

55
rowers/templates/rower_simplepreferences.html
View File

@@ -25,10 +25,59 @@
</p>
<p>
If you do not row with a power meter on the water, the FTP on
water is irrelevant. If you do not know your 20 minute or full
hour full out power value on the water, take 85% of your indoor
rowing value.
water is irrelevant. In that case, please use the same value as
your FTP. If you do not know your 20 minute or full hour full
out power value on the water, take 85% of your indoor rowing
value.
</p>
<p>
Detailed setting of zones is not necessary but can be done on
<a href="/rowers/me/preferences/">this page</a> (Zones &
Fitness, detailed in the left menu).
</p>
</li>
<li class="grid_2">
<table class="listtable shortpadded" width=100%>
<thead>
<tr>
<th>ID&nbsp;</th><th>Zone Name</th><th>Lower Boundary (Watt)&nbsp;</th><th>Lower Boundary (Watt)</th>
</tr>
<tr>
<th></th><th></th><th>Indoor</th><th>OTW</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td><td>{{ user.rower.powerzones.0 }}</td>
<td></td>
</tr>
<tr>
<td>2</td><td>{{ user.rower.powerzones.1 }}</td>
<td>{{ user.rower.pw_ut2 }}</td>
<td>{{ user.rower.pw_ut2|otwslack:user }}</td>
</tr>
<tr>
<td>3</td><td>{{ user.rower.powerzones.2 }}</td>
<td>{{ user.rower.pw_ut1 }}</td>
<td>{{ user.rower.pw_ut1|otwslack:user }}</td>
</tr>
<tr>
<td>4</td><td>{{ user.rower.powerzones.3 }}</td>
<td>{{ user.rower.pw_at }}</td>
<td>{{ user.rower.pw_at|otwslack:user }}</td>
</tr>
<tr>
<td>5</td><td>{{ user.rower.powerzones.4 }}</td>
<td>{{ user.rower.pw_tr }}</td>
<td>{{ user.rower.pw_tr|otwslack:user }}</td>
</tr>
<tr>
<td>6</td><td>{{ user.rower.powerzones.5 }}</td>
<td>{{ user.rower.pw_an }}</td>
<td>{{ user.rower.pw_an|otwslack:user }}</td>
</tr>
</tbody>
</table>
</li>
</ul>