Functionality to analyze multiple workouts.
-
-
-
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.
-
-
-
-
-
-
-
Pro
-
+
+ -
+
Ranking Pieces
+
+
+
+
- {% if user|is_promember %}
- Power Histogram
- {% else %}
- Power Histogram
- {% endif %}
+ 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).
+
+
+ -
+
Power Histogram
+ {% if user|is_promember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
Plot a power histogram of all your strokes over a date range.
-
-
-
-
- {% if user|is_promember %}
- Box Chart
- {% else %}
- Box Chart
- {% endif %}
+ Statistics of stroke metrics over a date range
+
+
+ Box Chart
+ {% if user|is_promember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
BETA: Box Chart Statistics of stroke metrics over a date range
-
-
+
+
+ OTW Critical Power
+ {% if user|is_promember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
+ Analyse power vs piece duration to make predictions. For On-The-Water rowing.
+
+
+
+ OTE Critical Power
+ {% if user|is_promember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
-
-
-
-
- Ranking Pieces 2.0
-
Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.
-
-
+
+ Analyse power vs piece duration to make predictions, for erg pieces.
+
+
+
+ Trend Flex
+ {% if user|is_promember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
-
-
- {% if user|is_promember %}
- OTW Critical Power
- {% else %}
- OTW Critical Power
- {% endif %}
-
-
- Analyse power vs piece duration to make predictions. For On-The-Water rowing.
-
-
-
-
-
- {% if user|is_promember %}
- Trend Flex
- {% else %}
- Trend Flex
- {% endif %}
-
-
- Select workouts and make X-Y charts of averages over various metrics
-
-
-
-
-
-
- {% if user|is_planmember %}
- Power Progress
- {% else %}
- Power Progress
- {% endif %}
-
-
- Monitoring power duration evidence from all your workouts. Feel free to explore.
-
-
-
-
- {% if user|is_planmember %}
- The Labs
- {% else %}
- The Labs
- {% endif %}
-
-
- Undisclosed new functionality. This is still experimental and
- may not make sense.
-
-
-
+ Select workouts and make X-Y charts of averages over various metrics
+
+
+
+ Power Progress
+ {% if user|is_planmember %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
+ Monitoring power duration evidence from all your workouts. Feel free to explore.
+
+
+
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_analytics.html' %}
{% endblock %}
diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html
index b7bdd26f..519b5856 100644
--- a/rowers/templates/menu_analytics.html
+++ b/rowers/templates/menu_analytics.html
@@ -63,7 +63,7 @@
-
+
Laboratory
diff --git a/rowers/urls.py b/rowers/urls.py
index 81548234..688f0242 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -389,9 +389,9 @@ urlpatterns = [
url(r'^brochure$',TemplateView.as_view(template_name='brochure.html'),
name='brochure'),
url(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'),
- url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'),
- url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'),
- url(r'^analysis', TemplateView.as_view(template_name='analysis.html'),name='analysis'),
+# url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'),
+# url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'),
+ url(r'^analysis', views.analysis_view,name='analysis'),
url(r'^laboratory', TemplateView.as_view(template_name='laboratory.html'),name='laboratory'),
url(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'),
url(r'^starttrial$',views.start_trial_view),
diff --git a/rowers/views.py b/rowers/views.py
index 9c2490bf..c7bf1f74 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1021,6 +1021,17 @@ def rower_register_view(request):
"registration_form.html",
{'form':form,})
+# Shows analysis page
+def analysis_view(request):
+ r = getrequestrower(request)
+ return render(request,
+ "analysis.html",
+ {
+ 'active':'nav-analysis',
+ 'rower':r,
+ }
+ )
+
# Shows email form and sends it if submitted
def sendmail(request):
if request.method == 'POST':
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index babefdd9..b4147b22 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -274,6 +274,26 @@ th.rotate > div > span {
margin: 2px;
}
+.vignet {
+ border-radius: 50%;
+ display: block;
+ overflow: hidden;
+ padding: 5px;
+ margin: 5px;
+ -webkit-box-shadow: inset 0px 0px 85px rgba(0,0,0,0.4);
+ -moz-box-shadow: inset 0px 0px 85px rgba(0,0,0,0.4);
+ box-shadow: inset 0px 0px 85px rgba(0,0,0,0.4);
+
+ line-height: 0; /* ensure no space between bottom */
+
+}
+
+.vignet img {
+ position: relative;
+ transform: scale(1.5);
+ z-index: -1;
+}
+
.button {
font: 1.1em/1.5em sans-serif;
text-decoration: none;
diff --git a/static/img/boxplot.png b/static/img/boxplot.png
new file mode 100644
index 00000000..b2ec02d4
Binary files /dev/null and b/static/img/boxplot.png differ
diff --git a/static/img/comparison.png b/static/img/comparison.png
new file mode 100644
index 00000000..348b76f3
Binary files /dev/null and b/static/img/comparison.png differ
diff --git a/static/img/histogram.png b/static/img/histogram.png
new file mode 100644
index 00000000..8154d5d5
Binary files /dev/null and b/static/img/histogram.png differ
diff --git a/static/img/otecp.png b/static/img/otecp.png
new file mode 100644
index 00000000..0b511187
Binary files /dev/null and b/static/img/otecp.png differ
diff --git a/static/img/otwcp.png b/static/img/otwcp.png
new file mode 100644
index 00000000..0bf1038f
Binary files /dev/null and b/static/img/otwcp.png differ
diff --git a/static/img/powerprogress.png b/static/img/powerprogress.png
new file mode 100644
index 00000000..818950f2
Binary files /dev/null and b/static/img/powerprogress.png differ
diff --git a/static/img/rankingpiece.png b/static/img/rankingpiece.png
new file mode 100644
index 00000000..7daf55cb
Binary files /dev/null and b/static/img/rankingpiece.png differ
diff --git a/static/img/statistics.PNG b/static/img/statistics.PNG
new file mode 100644
index 00000000..1bf5b6e7
Binary files /dev/null and b/static/img/statistics.PNG differ
diff --git a/static/img/statistics.xcf b/static/img/statistics.xcf
new file mode 100644
index 00000000..394dc511
Binary files /dev/null and b/static/img/statistics.xcf differ
diff --git a/static/img/strokeanalysis.png b/static/img/strokeanalysis.png
new file mode 100644
index 00000000..c0b02f7d
Binary files /dev/null and b/static/img/strokeanalysis.png differ
diff --git a/static/img/trendflex.png b/static/img/trendflex.png
new file mode 100644
index 00000000..be40047f
Binary files /dev/null and b/static/img/trendflex.png differ
+