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

more progress on gauges (loading, initializing)

Browse Source
This commit is contained in:
Sander Roosendaal
2019-12-11 00:21:57 +01:00
parent 557a7fa6e2
commit 93bf91beb5
4 changed files with 122 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rowers/templates/embedded_video.html
View File

@@ -389,6 +389,11 @@ function copyText() {
<div id="forcepower_power"></div>
</li>
{% endif %}
{% if 'athlete' in metricsgroups %}
<li class="grid_1">
<div id="athlete_hr"></div>
</li>
{% endif %}
</ul>
</li>
<li class="grid_2">
@@ -404,12 +409,29 @@ function copyText() {
<script>
$(document).ready( function() {
$(window).load(function() {
// initialize data fields
{% for id, metric in metrics.items %}
{{ id }}_now = {{ id }}_values[0];
document.getElementById("{{ id }}").innerHTML = {{ id }}_now;
document.getElementById("{{ id }}").className = 'bold';
{% endfor %}
document.getElementById("time").innerHTML = Math.round(videotime);
var slider = document.getElementById("myRange");
document.getElementById("datatime").innerHTML = slider.value;
// gauge settings
{% if workout.workouttype != 'water' %}
speedoptions.max = 7;
speedoptions.redTo = 7;
speedoptions.majorTicks = ['0','1','2','3','4','5','6','7'];
{% endif %}
{% if 'basic' in metricsgroups %}
spm_now = spm_values[0];
boatspeed_now = boatspeed_values[0];
set_basic();
{% endif %}
{% if 'forcepower' in metricsgroups %}
poweroptions.max = {{ rower.pw_an|add:100|round100 }};
poweroptions.greenFrom = {{ rower.pw_ut2 }};
@@ -417,7 +439,32 @@ function copyText() {
poweroptions.yellowFrom = {{ rower.pw_at }};
poweroptions.yellowTo = {{ rower.pw_an }};
poweroptions.redFrom = {{ rower.pw_an }};
poweroptions.redTo = {{ rower.pw_an|add:200|round100 }};
poweroptions.redTo = {{ rower.pw_an|add:100|round100 }};
poweroptions.majorTicks = {{ rower.pw_an|add:100|round100|majorticks }};
{% if workout.workouttype == 'water' %}
poweroptions.max = {{ rower.pw_an|waterpower:rower|add:100|round100 }}
poweroptions.greenFrom = {{ rower.pw_ut2|waterpower:rower }};
poweroptions.greenTo = {{ rower.pw_at|waterpower:rower }};
poweroptions.yellowFrom = {{ rower.pw_at|waterpower:rower }};
poweroptions.yellowTo = {{ rower.pw_an|waterpower:rower }};
poweroptions.redFrom = {{ rower.pw_an|waterpower:rower }};
poweroptions.redTo = {{ rower.pw_an|waterpower:rower|add:100|round100 }};
poweroptions.majorTicks = {{ rower.pw_an|waterpower:rower|add:100|round100|majorticks }};
{% endif %}
power_now = power_values[0];
set_forcepower();
{% endif %}
{% if 'athlete' in metricsgroups %}
hroptions.max = {{ rower.max|round20 }}
hroptions.greenFrom = {{ rower.ut2 }}
hroptions.greenTo = {{ rower.at }}
hroptions.yellowFrom = {{ rower.at }}
hroptions.yellowTo = {{ rower.an }}
hroptions.redFrom = {{ rower.an }}
hroptions.redTo = {{ rower.max }}
hroptions.majorTicks = {{ rower.max|round20|majorticks }}
hr_now = hr_values[0];
set_athlete();
{% endif %}
// cookie reader
@@ -724,6 +771,7 @@ dataplay.onclick = function() {
// }
});
});
</script>
{% endlanguage %}

19
rowers/templatetags/rowerfilters.py
View File

@@ -121,7 +121,26 @@ def is_coach(rower,rowers):
return True
@register.filter
def waterpower(x,rower):
return int(x*(100-rower.otwslack)/100.)
@register.filter
def round20(x):
return int(20.*(1+int(int(x)/20)))
@register.filter
def round100(x):
return int(100.*(1+int(int(x)/100)))
@register.filter
def majorticks(maxval):
ticks = range(1+int(maxval/100.))
newticks =[]
for t in ticks:
newticks.append(t*100)
return newticks
def strfdeltah(tdelta):
hours, rest = divmod(tdelta.seconds,3600)