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

Merge branch 'bugfix/videobug' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-03 10:57:52 +01:00
parent e49cfd837a ec135d98d2
commit 74a28a364f
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -1,9 +1,9 @@
FROM debian FROM debian
RUN apt-get update RUN apt-get update
RUN apt-get install -y default-libmysqlclient-dev RUN apt-get install -y default-libmysqlclient-dev gcc
RUN apt-get install -y postgresql postgresql-contrib RUN apt-get install -y postgresql postgresql-contrib libpq-dev python-psycopg2
RUN apt-get update && apt-get install \ RUN apt-get update && apt-get install \
-y --no-install-recommends python3 python3-virtualenv -y --no-install-recommends python3 python3-virtualenv python3-dev
RUN apt-get update && apt-get install libssl-dev RUN apt-get update && apt-get install libssl-dev
RUN python3 -m virtualenv --python=/usr/bin/python3 /opt/venv RUN python3 -m virtualenv --python=/usr/bin/python3 /opt/venv
COPY ./requirements.txt /usr/src/app/ COPY ./requirements.txt /usr/src/app/

48
rowers/templates/embedded_video.html
View File

@@ -453,36 +453,36 @@ function copyText() {
set_basic(); set_basic();
{% endif %} {% endif %}
{% if 'forcepower' in metricsgroups %} {% if 'forcepower' in metricsgroups %}
poweroptions.max = {{ rower.pw_an|add:100|round100 }}; poweroptions.max = {{ workout.user.pw_an|add:100|round100 }};
poweroptions.greenFrom = {{ rower.pw_ut2 }}; poweroptions.greenFrom = {{ workout.user.pw_ut2 }};
poweroptions.greenTo = {{ rower.pw_at }}; poweroptions.greenTo = {{ workout.user.pw_at }};
poweroptions.yellowFrom = {{ rower.pw_at }}; poweroptions.yellowFrom = {{ workout.user.pw_at }};
poweroptions.yellowTo = {{ rower.pw_an }}; poweroptions.yellowTo = {{ workout.user.pw_an }};
poweroptions.redFrom = {{ rower.pw_an }}; poweroptions.redFrom = {{ workout.user.pw_an }};
poweroptions.redTo = {{ rower.pw_an|add:100|round100 }}; poweroptions.redTo = {{ workout.user.pw_an|add:100|round100 }};
poweroptions.majorTicks = {{ rower.pw_an|add:100|round100|majorticks }}; poweroptions.majorTicks = {{ workout.user.pw_an|add:100|round100|majorticks }};
{% if workout.workouttype == 'water' %} {% if workout.workouttype == 'water' %}
poweroptions.max = {{ rower.pw_an|waterpower:rower|add:100|round100 }} poweroptions.max = {{ workout.user.pw_an|waterpower:rower|add:100|round100 }}
poweroptions.greenFrom = {{ rower.pw_ut2|waterpower:rower }}; poweroptions.greenFrom = {{ workout.user.pw_ut2|waterpower:rower }};
poweroptions.greenTo = {{ rower.pw_at|waterpower:rower }}; poweroptions.greenTo = {{ workout.user.pw_at|waterpower:rower }};
poweroptions.yellowFrom = {{ rower.pw_at|waterpower:rower }}; poweroptions.yellowFrom = {{ workout.user.pw_at|waterpower:rower }};
poweroptions.yellowTo = {{ rower.pw_an|waterpower:rower }}; poweroptions.yellowTo = {{ workout.user.pw_an|waterpower:rower }};
poweroptions.redFrom = {{ rower.pw_an|waterpower:rower }}; poweroptions.redFrom = {{ workout.user.pw_an|waterpower:rower }};
poweroptions.redTo = {{ rower.pw_an|waterpower:rower|add:100|round100 }}; poweroptions.redTo = {{ workout.user.pw_an|waterpower:rower|add:100|round100 }};
poweroptions.majorTicks = {{ rower.pw_an|waterpower:rower|add:100|round100|majorticks }}; poweroptions.majorTicks = {{ workout.user.pw_an|waterpower:rower|add:100|round100|majorticks }};
{% endif %} {% endif %}
power_now = power_values[0]; power_now = power_values[0];
set_forcepower(); set_forcepower();
{% endif %} {% endif %}
{% if 'athlete' in metricsgroups %} {% if 'athlete' in metricsgroups %}
hroptions.max = {{ rower.max|round20 }} hroptions.max = {{ workout.user.max|round20 }}
hroptions.greenFrom = {{ rower.ut2 }} hroptions.greenFrom = {{ workout.user.ut2 }}
hroptions.greenTo = {{ rower.at }} hroptions.greenTo = {{ workout.user.at }}
hroptions.yellowFrom = {{ rower.at }} hroptions.yellowFrom = {{ workout.user.at }}
hroptions.yellowTo = {{ rower.an }} hroptions.yellowTo = {{ workout.user.an }}
hroptions.redFrom = {{ rower.an }} hroptions.redFrom = {{ workout.user.an }}
hroptions.redTo = {{ rower.max }} hroptions.redTo = {{ workout.user.max }}
hroptions.majorTicks = {{ rower.max|round20|hrmajorticks:rower.rest }} hroptions.majorTicks = {{ workout.user.max|round20|hrmajorticks:workout.user.rest }}
hr_now = hr_values[0]; hr_now = hr_values[0];
set_athlete(); set_athlete();
{% endif %} {% endif %}

10
rowers/templatetags/rowerfilters.py
View File

@@ -127,11 +127,17 @@ def waterpower(x,rower):
@register.filter @register.filter
def round20(x): def round20(x):
return int(20.*(1+int(int(x)/20))) try:
return int(20.*(1+int(int(x)/20)))
except ValueError:
return 20
@register.filter @register.filter
def round100(x): def round100(x):
return int(100.*(1+int(int(x)/100))) try:
return int(100.*(1+int(int(x)/100)))
except ValueError:
return 100
@register.filter @register.filter
def majorticks(maxval): def majorticks(maxval):