From 545b01e823b7e1f59b2a5363b02fcb394b751eb8 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 8 Oct 2018 20:27:04 +0200
Subject: [PATCH] workout stats

---
 rowers/templates/workoutstats.html | 250 +++++++++++++++--------------
 rowers/views.py                    |  21 ++-
 2 files changed, 150 insertions(+), 121 deletions(-)

diff --git a/rowers/templates/workoutstats.html b/rowers/templates/workoutstats.html
index ac867eff..e89d3a79 100644
--- a/rowers/templates/workoutstats.html
+++ b/rowers/templates/workoutstats.html
@@ -1,52 +1,22 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
 {% block title %}Workout Statistics{% endblock %}
 
-{% block content %}
-<div class="grid_12 alpha">
-  <h1>Workout Statistics for {{ workout.name }}</h1>
-  <p>
-    This page lists a bunch of statistics for
-    your workout. The mean is of a metric is the mean with equal weight for
-    each stroke. The time weighted mean takes into account the stroke
-    duration.
-  </p>
-  <div class="grid_2 alpha">
+{% block main %}
+<h1>Workout Statistics for {{ workout.name }}</h1>
+<ul class="main-content">
+  <li class="grid_4">
     <p>
-      <a class="button gray small" href="/rowers/workout/{{ workout.id }}/edit">Edit Workout</a>
+      This page lists a bunch of statistics for
+      your workout. The mean is of a metric is the mean with equal weight for
+      each stroke. The time weighted mean takes into account the stroke
+      duration.
     </p>
-  </div>
-  <div class="grid_2">
-    <p>
-      <a class="button gray small" href="/rowers/workout/{{ workout.id }}/workflow">Workflow View</a>
-    </p>
-    
-  </div>
-  <div class="grid_2">
-    <p>
-      <a class="button gray small" href="/rowers/workout/{{ workout.id }}/advanced">Advanced</a>
-    </p>
-  </div>
-  <div class="grid_2 omega suffix_4 tooltip">
-    <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-      {% csrf_token %}
-      {% if workstrokesonly == True %}
-      <input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="False">
-      <input class="grid_2 alpha button blue small" value="Include Rest Strokes" type="Submit">
-      {% else %}
-      <input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="True">
-      <input class="grid_2 alpha button blue small" value="Remove Rest Strokes" type="Submit">
-      {% endif %}
-    </form>
-    <span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
-  </div>
-</div>
-
-<div class="grid_12">
+  </li>
   {% if otherstats %}
-  <div class="grid_6 alpha">
+  <li>
     <h2>Workout Metrics</h2>
     <table width="100%" class="listtable">
       <thead>
@@ -66,94 +36,134 @@
         {% endfor %}
       </tbody>
     </table>
-  </div>
-  <div class="grid_6 omega">
+  </li>
+  <li class="grid_2">
     <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>  
-
+  </li>
   {% endif %}
-</div>
+  <li>
+    <div class="grid_2 omega suffix_4 tooltip">
+      <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
+        {% csrf_token %}
+      {% if workstrokesonly == True %}
+        <input class="button blue small" type="hidden" name="workstrokesonly" value="False">
+        <input class="button blue small" value="Include Rest Strokes" type="Submit">
+        {% else %}
+        <input class="button blue small" type="hidden" name="workstrokesonly" value="True">
+        <input class="button blue small" value="Remove Rest Strokes" type="Submit">
+        {% endif %}
+      </form>
+      <span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
+    </div>
+  </li>
 
-<div class="grid_12 alpha">
-  {% if stats %}
-  <h2>Statistics</h2>
-  <table width="100%" class="listtable">
-    <thead>
-      <tr>
-        <th>Metric</th>
-        <th>Mean</th>
-        <th>Time Weighted Mean</th>
-        <th>Minimum</th>
-        <th>25&#37;</th>
-        <th>Median</th>
-        <th>75&#37;</th>
-        <th>Maximum</th>
-        <th>Standard Deviation</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for key, value in stats.items %}
-      <tr>
-        <td>{{ value.verbosename }}</td>
-        <td>{{ value.mean|floatformat:-2 }}</td>
-        <td> {{ value.wmean|floatformat:-2 }}</td>
-        <td>{{ value.min|floatformat:-2 }}</td>
-        <td>{{ value.firstq|floatformat:-2 }}</td>
-        <td>{{ value.median|floatformat:-2 }}</td>
-        <td>{{ value.thirdq|floatformat:-2 }}</td>
-        <td>{{ value.max|floatformat:-2 }}</td>
-        <td>{{ value.std|floatformat:-2 }}</td>
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>  
-  {% endif %}
-</div>
-
-<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.
-  </p>
-  <table width="90%" class="cortable">
-    <thead>
-      <tr>
-        <th>&nbsp;</th>
-        {% for key,value in cordict.items %}
-        <th class="rotate"><div><span>{{ key }}</span></div></th>
-        {% endfor %}
-      </tr>
-    </thead>
-    <tbody>
-      {% for key, thedict in cordict.items %}
-      <tr>
-        <th> {{ key }}</th>
-        {% for key2,value in thedict.items %}
-        <td>
-          {% if value > 0.5 %}
-          <div class="poscor">{{ value|floatformat:-1 }}</div>
-          {% elif value > 0.1 %}
-          <div class="weakposcor">{{ value|floatformat:-1 }}</div>
-          {% elif value < -0.5 %}
-          <div class="negcor">{{ value|floatformat:-1 }}</div>
-          {% elif value < -0.1 %}
-          <div class="weaknegcor">{{ value|floatformat:-1 }}</div>
-          {% else %}
-          &nbsp;
-          {% endif %}
-        </td>
-        {% endfor %}
-      </tr>
-      {% endfor %}
-    </tbody>
-  </table>  
   
+  {% if stats %}
+  <li class="grid_4">
+    <h2>Statistics</h2>
+    <table width="100%" class="listtable">
+      <thead>
+        <tr>
+          <th>Metric</th>
+          <th>Mean</th>
+          <th>Time Weighted Mean</th>
+          <th>Minimum</th>
+          <th>25&#37;</th>
+          <th>Median</th>
+          <th>75&#37;</th>
+          <th>Maximum</th>
+          <th>Standard Deviation</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for key, value in stats.items %}
+        <tr>
+          {% if value.std > 2 %}
+          <td>{{ value.verbosename }}</td>
+          <td>{{ value.mean|floatformat:0 }}</td>
+          <td> {{ value.wmean|floatformat:0 }}</td>
+          <td>{{ value.min|floatformat:0 }}</td>
+          <td>{{ value.firstq|floatformat:0 }}</td>
+          <td>{{ value.median|floatformat:0 }}</td>
+          <td>{{ value.thirdq|floatformat:0 }}</td>
+          <td>{{ value.max|floatformat:0 }}</td>
+          <td>{{ value.std|floatformat:0 }}</td>
+          {% elif value.std > 1 %}
+          <td>{{ value.verbosename }}</td>
+          <td>{{ value.mean|floatformat:-1 }}</td>
+          <td> {{ value.wmean|floatformat:-1 }}</td>
+          <td>{{ value.min|floatformat:-1 }}</td>
+          <td>{{ value.firstq|floatformat:-1 }}</td>
+          <td>{{ value.median|floatformat:-1 }}</td>
+          <td>{{ value.thirdq|floatformat:-1 }}</td>
+          <td>{{ value.max|floatformat:-1 }}</td>
+          <td>{{ value.std|floatformat:-1 }}</td>
+          {% else %}
+          <td>{{ value.verbosename }}</td>
+          <td>{{ value.mean|floatformat:-2 }}</td>
+          <td> {{ value.wmean|floatformat:-2 }}</td>
+          <td>{{ value.min|floatformat:-2 }}</td>
+          <td>{{ value.firstq|floatformat:-2 }}</td>
+          <td>{{ value.median|floatformat:-2 }}</td>
+          <td>{{ value.thirdq|floatformat:-2 }}</td>
+          <td>{{ value.max|floatformat:-2 }}</td>
+          <td>{{ value.std|floatformat:-2 }}</td>
+          {% endif %}
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </li>
   {% endif %}
-</div>
+
+  {% if cordict %}
+  <li class="grid_4">
+    <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.
+    </p>
+    <table width="90%" class="cortable">
+      <thead>
+        <tr>
+          <th>&nbsp;</th>
+          {% for key,value in cordict.items %}
+          <th class="rotate"><div><span>{{ key }}</span></div></th>
+          {% endfor %}
+        </tr>
+      </thead>
+      <tbody>
+        {% for key, thedict in cordict.items %}
+        <tr>
+          <th> {{ key }}</th>
+          {% for key2,value in thedict.items %}
+          <td>
+            {% if value > 0.5 %}
+            <div class="poscor">{{ value|floatformat:-1 }}</div>
+            {% elif value > 0.1 %}
+            <div class="weakposcor">{{ value|floatformat:-1 }}</div>
+            {% elif value < -0.5 %}
+                            <div class="negcor">{{ value|floatformat:-1 }}</div>
+                            {% elif value < -0.1 %}
+                                            <div class="weaknegcor">{{ value|floatformat:-1 }}</div>
+                                            {% else %}
+                                            &nbsp;
+                                            {% endif %}
+          </td>
+          {% endfor %}
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>  
+  </li>
+  {% endif %}
+</ul>
 
 
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_workout.html' %}
+{% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index 4c3f69c2..156702e1 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -7706,6 +7706,22 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
     r = getrower(request.user)
     w = get_workout(id)
 
+    breadcrumbs = [
+            {
+                'url':'/rowers/list-workouts',
+                'name':'Workouts'
+                },
+            {
+                'url':get_workout_default_page(request,id),
+                'name': str(w.id)
+                },
+            {
+                'url':reverse(workout_stats_view,kwargs={'id':id}),
+                'name': 'Stats'
+                }
+            
+            ]
+
     workstrokesonly = True
     if request.method == 'POST' and 'workstrokesonly' in request.POST:
         workstrokesonly = str2bool(request.POST['workstrokesonly'])
@@ -7838,7 +7854,10 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
 		  {
                       'stats':stats,
                       'teams':get_my_teams(request.user),
-                      'workout':row,
+                      'workout':w,
+                      'rower':r,
+                      'breadcrumbs':breadcrumbs,
+                      'active':'nav-workouts',
                       'workstrokesonly':workstrokesonly,
                       'cordict':cordict,
                       'otherstats':otherstats,