From 9f6a9f1350ceb5e8d0c172a99fb72b51bf12b8ef Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 16 Sep 2018 21:56:55 +0200 Subject: [PATCH 1/3] removed tooltip text in workout stats --- rowers/templates/workoutstats.html | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/rowers/templates/workoutstats.html b/rowers/templates/workoutstats.html index 4c5f8644..ac867eff 100644 --- a/rowers/templates/workoutstats.html +++ b/rowers/templates/workoutstats.html @@ -44,14 +44,7 @@ -
- -

rPower: Equivalent steady state power for the duration of the workout.

-

Heart Rate Drift: Comparing heart rate normalized for average power for the first and second half of the workout

-

TRIMP: TRaining IMPact. A way to combine duration and heart rate into a single number.

-

rScore: Score based on rPower and workout duration to estimate training effect

-

rScore (HR): Score based on heart rate, designed to give values comparable to rScore. Used instead of rScore for workouts without power data.

- +
{% if otherstats %}

Workout Metrics

@@ -74,6 +67,14 @@
+
+

rPower: Equivalent steady state power for the duration of the workout.

+

Heart Rate Drift: Comparing heart rate normalized for average power for the first and second half of the workout

+

TRIMP: TRaining IMPact. A way to combine duration and heart rate into a single number.

+

rScore: Score based on rPower and workout duration to estimate training effect

+

rScore (HR): Score based on heart rate, designed to give values comparable to rScore. Used instead of rScore for workouts without power data.

+
+ {% endif %}
@@ -113,7 +114,7 @@ {% endif %}
-
+
{% if cordict %}

Correlation matrix

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 %}

{{ value|floatformat:-1 }}
{% elif value < -0.5 %} -
{{ value|floatformat:-1 }}
+
{{ value|floatformat:-1 }}
{% elif value < -0.1 %}
{{ value|floatformat:-1 }}
- {% else %} -   - {% endif %} + {% else %} +   + {% endif %} {% endfor %} @@ -152,7 +153,7 @@ {% endif %} -
+ {% endblock %} From b0f42ef0cdec66d04e83ffb6dc817245e4bc6d20 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 17 Sep 2018 12:47:54 +0200 Subject: [PATCH 2/3] sessions link for past cycles --- rowers/templates/trainingplan.html | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/rowers/templates/trainingplan.html b/rowers/templates/trainingplan.html index 4142f116..cc17460f 100644 --- a/rowers/templates/trainingplan.html +++ b/rowers/templates/trainingplan.html @@ -83,6 +83,15 @@ sessions + {% else %} + +   + + + + sessions + + {% endif %} @@ -147,6 +156,17 @@ {% endif %} + {% else %} + {% if mesocycle.0.plan.type == 'userdefined' %} + +   + + + + sessions + + + {% endif %} {% endif %} @@ -209,6 +229,17 @@ {% endif %} + {% else %} + {% if microcycle.plan.type == 'userdefined' %} + +   + + + + sessions + + + {% endif %} {% endif %} From a21a81204ddf6d0ff2659d3c9541ffc615ef2945 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 17 Sep 2018 15:57:32 +0200 Subject: [PATCH 3/3] new analysis menu --- rowers/templates/analysis.html | 42 +++++++++++++++++----------------- templates/analysismenu.html | 36 +++++++++++++++++++++++++++++ templates/basebase.html | 7 ++---- 3 files changed, 59 insertions(+), 26 deletions(-) create mode 100644 templates/analysismenu.html diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index 56eb39e2..f91d3a64 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -13,27 +13,27 @@

Basic

-
-

- Ranking Pieces

-

Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.

-
-
-

- Stroke Analysis -

-

- Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate). -

-
-
-

- Analysis Feature 3 -

-

- Reserved for future functionality. -

-
+
+

+ Ranking Pieces

+

Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.

+
+
+

+ Stroke Analysis +

+

+ Plot all strokes in a date range and analyze several parameters (Power, Pace, SPM, Heart Rate). +

+
+
+

+ Analysis Feature 3 +

+

+ Reserved for future functionality. +

+
diff --git a/templates/analysismenu.html b/templates/analysismenu.html new file mode 100644 index 00000000..becf84f7 --- /dev/null +++ b/templates/analysismenu.html @@ -0,0 +1,36 @@ +{% load staticfiles %} +{% load rowerfilters %} +Analysis of workouts over a period of time + +
+ Analysis + Ranking Pieces + Ranking Pieces 2.0 + Stroke Analysis + {% if user|is_promember %} + Power Histogram + Statistics + Box Chart + OTW Critical Power + OTE Critical Power + Multi Compare + Trend Flex + Power Progress + {% else %} + Power Histogram + Statistics + Box Chart + OTW Critical Power + OTE Critical Power + Multi Compare + Trend Flex + Power Progress + {% endif %} + {% if user|is_planmember %} + The Labs + {% else %} + The Labs + {% endif %} +
+ + diff --git a/templates/basebase.html b/templates/basebase.html index e3a1b755..b8d24da6 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -216,12 +216,9 @@

 

{% endif %}
-
+
{% if user.is_authenticated %} -

- Analysis -

- Analysis of workouts over a period of time + {% include "analysismenu.html" %} {% else %}

 

{% endif %}