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

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> <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
</td> </td>
</tr> </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 %} {% endif %}
</table> </table>
</div> </div>
@@ -146,6 +155,17 @@
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
</td> </td>
</tr> </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 %}
{% endif %} {% endif %}
</table> </table>
@@ -208,6 +228,17 @@
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
</td> </td>
</tr> </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 %}
{% endif %} {% endif %}
</table> </table>

19
rowers/templates/workoutstats.html
View File

@@ -44,14 +44,7 @@
</div> </div>
</div> </div>
<div class="grid_12 alpha tooltip"> <div class="grid_12">
<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>
{% if otherstats %} {% if otherstats %}
<div class="grid_6 alpha"> <div class="grid_6 alpha">
<h2>Workout Metrics</h2> <h2>Workout Metrics</h2>
@@ -74,6 +67,14 @@
</tbody> </tbody>
</table> </table>
</div> </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 %} {% endif %}
</div> </div>
@@ -153,6 +154,6 @@
{% endif %} {% endif %}
</div> </div>
</div>
{% endblock %} {% 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> <p>&nbsp;</p>
{% endif %} {% endif %}
</div> </div>
<div class="grid_2 tooltip"> <div class="grid_2 tooltip dropdown">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p> {% include "analysismenu.html" %}
<a class="button gray small" href="/rowers/analysis">Analysis</a>
</p>
<span class="tooltiptext">Analysis of workouts over a period of time</span>
{% else %} {% else %}
<p>&nbsp;</p> <p>&nbsp;</p>
{% endif %} {% endif %}