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

fixing waterpower bug

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-03 12:12:29 +01:00
parent 7432b66d34
commit fa3ebc2ac8
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/templates/embedded_video.html
View File

@@ -462,14 +462,14 @@ function copyText() {
poweroptions.redTo = {{ workout.user.pw_an|add:100|round100 }};
poweroptions.majorTicks = {{ workout.user.pw_an|add:100|round100|majorticks }};
{% if workout.workouttype == 'water' %}
poweroptions.max = {{ workout.user.pw_an|waterpower:rower|add:100|round100 }}
poweroptions.greenFrom = {{ workout.user.pw_ut2|waterpower:rower }};
poweroptions.greenTo = {{ workout.user.pw_at|waterpower:rower }};
poweroptions.yellowFrom = {{ workout.user.pw_at|waterpower:rower }};
poweroptions.yellowTo = {{ workout.user.pw_an|waterpower:rower }};
poweroptions.redFrom = {{ workout.user.pw_an|waterpower:rower }};
poweroptions.redTo = {{ workout.user.pw_an|waterpower:rower|add:100|round100 }};
poweroptions.majorTicks = {{ workout.user.pw_an|waterpower:rower|add:100|round100|majorticks }};
poweroptions.max = {{ workout.user.pw_an|waterpower:workout.user|add:100|round100 }}
poweroptions.greenFrom = {{ workout.user.pw_ut2|waterpower:workout.user }};
poweroptions.greenTo = {{ workout.user.pw_at|waterpower:workout.user }};
poweroptions.yellowFrom = {{ workout.user.pw_at|waterpower:workout.user }};
poweroptions.yellowTo = {{ workout.user.pw_an|waterpower:workout.user }};
poweroptions.redFrom = {{ workout.user.pw_an|waterpower:workout.user }};
poweroptions.redTo = {{ workout.user.pw_an|waterpower:workout.user|add:100|round100 }};
poweroptions.majorTicks = {{ workout.user.pw_an|waterpower:workout.user|add:100|round100|majorticks }};
{% endif %}
power_now = power_values[0];
set_forcepower();

4
rowers/templatetags/rowerfilters.py
View File

@@ -123,7 +123,9 @@ def is_coach(rower,rowers):
@register.filter
def waterpower(x,rower):
return int(x*(100-rower.otwslack)/100.)
if rower is not None:
return int(x*(100-rower.otwslack)/100.)
return int(x)
@register.filter
def round20(x):