From fa3ebc2ac8d5cdf68455f86d7f8911b27009f3cc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 3 Jan 2020 12:12:29 +0100 Subject: [PATCH] fixing waterpower bug --- rowers/templates/embedded_video.html | 16 ++++++++-------- rowers/templatetags/rowerfilters.py | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html index 8bd24edf..6bd67499 100644 --- a/rowers/templates/embedded_video.html +++ b/rowers/templates/embedded_video.html @@ -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(); diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 48b5afde..b3b7b5d5 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -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):