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

Merge branch 'feature/analysis' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-17 15:59:33 +02:00
parent 9bac16d6e2 a21a81204d
commit cf7b0eb893
5 changed files with 105 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rowers/templates/analysis.html
View File

@@ -13,27 +13,27 @@
<div class="grid_12 alpha">
<div class="grid_6 alpha">
<h2>Basic</h2>
<div class="grid_2 alpha">
<p>
<a class="button blue small" href="/rowers/ote-bests">Ranking Pieces</a></p>
<p>Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.</p>
</div>
<div class="grid_2">
<p>
<a class="button blue small" href="/rowers/flexall">Stroke Analysis</a>
</p>
<p>
Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate).
</p>
</div>
<div class="grid_2 omega">
<p class="button white small">
Analysis Feature 3
</p>
<p>
Reserved for future functionality.
</p>
</div>
<div class="grid_2 alpha">
<p>
<a class="button blue small" href="/rowers/ote-bests">Ranking Pieces</a></p>
<p>Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.</p>
</div>
<div class="grid_2">
<p>
<a class="button blue small" href="/rowers/flexall">Stroke Analysis</a>
</p>
<p>
Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate).
</p>
</div>
<div class="grid_2 omega">
<p class="button white small">
Analysis Feature 3
</p>
<p>
Reserved for future functionality.
</p>
</div>
</div>

31
rowers/templates/trainingplan.html
View File

@@ -83,6 +83,15 @@
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
</td>
</tr>
{% else %}
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td colspan="4">
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
</td>
</tr>
{% endif %}
</table>
</div>
@@ -147,6 +156,17 @@
</td>
</tr>
{% endif %}
{% else %}
{% if mesocycle.0.plan.type == 'userdefined' %}
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td colspan="4">
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
</td>
</tr>
{% endif %}
{% endif %}
</table>
</div>
@@ -209,6 +229,17 @@
</td>
</tr>
{% endif %}
{% else %}
{% if microcycle.plan.type == 'userdefined' %}
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td colspan="4">
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
</td>
</tr>
{% endif %}
{% endif %}
</table>
</div>

29
rowers/templates/workoutstats.html
View File

@@ -44,14 +44,7 @@
</div>
</div>
<div class="grid_12 alpha tooltip">
<span class="tooltiptext">
<p>rPower: Equivalent steady state power for the duration of the workout.</p>
<p>Heart Rate Drift: Comparing heart rate normalized for average power for the first and second half of the workout</p>
<p>TRIMP: TRaining IMPact. A way to combine duration and heart rate into a single number.</p>
<p>rScore: Score based on rPower and workout duration to estimate training effect</p>
<p>rScore (HR): Score based on heart rate, designed to give values comparable to rScore. Used instead of rScore for workouts without power data.</p>
</span>
<div class="grid_12">
{% if otherstats %}
<div class="grid_6 alpha">
<h2>Workout Metrics</h2>
@@ -74,6 +67,14 @@
</tbody>
</table>
</div>
<div class="grid_6 omega">
<p>rPower: Equivalent steady state power for the duration of the workout.</p>
<p>Heart Rate Drift: Comparing heart rate normalized for average power for the first and second half of the workout</p>
<p>TRIMP: TRaining IMPact. A way to combine duration and heart rate into a single number.</p>
<p>rScore: Score based on rPower and workout duration to estimate training effect</p>
<p>rScore (HR): Score based on heart rate, designed to give values comparable to rScore. Used instead of rScore for workouts without power data.</p>
</div>
{% endif %}
</div>
@@ -113,7 +114,7 @@
{% endif %}
</div>
<div class="grid_12 alpha">
<div class="grid_12 alpha">
{% if cordict %}
<h2> Correlation matrix</h2>
<p>This matrix indicates a positive (+) or negative (-) correlation between two parameters. The Spearman correlation coefficient has values between +1 and -1. Positive correlation between two metrics means that if one metric increases, the other value is also likely to increase. Negative is the opposite. The further from zero, the higher the likelyhood.
@@ -138,12 +139,12 @@
{% elif value > 0.1 %}
<div class="weakposcor">{{ value|floatformat:-1 }}</div>
{% elif value < -0.5 %}
<div class="negcor">{{ value|floatformat:-1 }}</div>
<div class="negcor">{{ value|floatformat:-1 }}</div>
{% elif value < -0.1 %}
<div class="weaknegcor">{{ value|floatformat:-1 }}</div>
{% else %}
&nbsp;
{% endif %}
{% else %}
&nbsp;
{% endif %}
</td>
{% endfor %}
</tr>
@@ -152,7 +153,7 @@
</table>
{% endif %}
</div>
</div>
{% endblock %}

36
templates/analysismenu.html Normal file
View File

@@ -0,0 +1,36 @@
{% load staticfiles %}
{% load rowerfilters %}
<span class="tooltiptext">Analysis of workouts over a period of time</span>
<button class="button gray grid_2 small dropbtn">Analysis</button>
<div class="dropdown-content">
<a class="button gray small alpha" href="/rowers/analysis">Analysis</a>
<a class="button gray small alpha" href="/rowers/ote-bests">Ranking Pieces</a>
<a class="button gray small alpha" href="/rowers/ote-bests2">Ranking Pieces 2.0</a>
<a class="button gray small alpha" href="/rowres/flexall">Stroke Analysis</a>
{% if user|is_promember %}
<a class="button gray small alpha" href="/rowers/histo">Power Histogram</a>
<a class="button gray small alpha" href="/rowers/cumstats">Statistics</a>
<a class="button gray small alpha" href="/rowers/user-boxplot-select">Box Chart</a>
<a class="button gray small alpha" href="/rowers/otw-bests">OTW Critical Power</a>
<a class="button gray small alpha" href="/rowers/ote-ranking">OTE Critical Power</a>
<a class="button gray small alpha" href="/rowers/team-compare-select/team/0/">Multi Compare</a>
<a class="button gray small alpha" href="/rowers/user-multiflex-select">Trend Flex</a>
<a class="button gray small alpha" href="/rowers/fitness-progress">Power Progress</a>
{% else %}
<a class="button gray small alpha" href="/rowers/promembership">Power Histogram</a>
<a class="button gray small alpha" href="/rowers/promembership">Statistics</a>
<a class="button gray small alpha" href="/rowers/promembership">Box Chart</a>
<a class="button gray small alpha" href="/rowers/promembership">OTW Critical Power</a>
<a class="button gray small alpha" href="/rowers/promembership">OTE Critical Power</a>
<a class="button gray small alpha" href="/rowers/promembership">Multi Compare</a>
<a class="button gray small alpha" href="/rowers/promembership">Trend Flex</a>
<a class="button gray small alpha" href="/rowers/promembership">Power Progress</a>
{% endif %}
{% if user|is_planmember %}
<a class="button gray small alpha" href="/rowers/laboratory">The Labs</a>
{% else %}
<a class="button gray small alpha" href="/rowers/promembership">The Labs</a>
{% endif %}
</div>

7
templates/basebase.html
View File

@@ -216,12 +216,9 @@
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_2 tooltip">
<div class="grid_2 tooltip dropdown">
{% if user.is_authenticated %}
<p>
<a class="button gray small" href="/rowers/analysis">Analysis</a>
</p>
<span class="tooltiptext">Analysis of workouts over a period of time</span>
{% include "analysismenu.html" %}
{% else %}
<p>&nbsp;</p>
{% endif %}