From e9f1fe7a2163949e2a1fb761a14a6d859a800429 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 21:09:25 +0200
Subject: [PATCH 1/5] history post to get plus predefined links

---
 rowers/templates/history.html | 29 +++++++++++------
 rowers/views/analysisviews.py | 59 ++++++++++++++++++++++-------------
 rowers/views/statements.py    |  2 ++
 3 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 303ec369..df5ca327 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -5,20 +5,31 @@
 {% block title %}Rowsandall {% endblock %}
 
 {% block main %}
-  <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
+
 <ul class="main-content">
   <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
-    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
+  <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
   <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
+  <li class="grid_2">
+    <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
+  </li>
+  <li class="grid_2">
+    <a href="/rowers/history/?enddate={{ today|date:"Y-m-d" }}&startdate={{ lastseven|date:"Y-m-d" }}&workouttype={{ workouttype }}">Past 7 days</a>
+    &nbsp;
+    <a href="/rowers/history/?enddate={{ today|date:"Y-m-d" }}&startdate={{ lastfourteen|date:"Y-m-d" }}&workouttype={{ workouttype }}">Past 14 days</a>
+    &nbsp;
+    <a href="/rowers/history/?enddate={{ today|date:"Y-m-d" }}&startdate={{ last28|date:"Y-m-d" }}&workouttype={{ workouttype }}">Past 28 days</a>
+    &nbsp;
+    <a href="/rowers/history/?enddate={{ today|date:"Y-m-d" }}&startdate={{ firstmay|date:"Y-m-d" }}&workouttype={{ workouttype }}">Current Concept2 Season</a>
+  </li>
   <li class="grid_2">
     <p>
-    <form enctype="multipart/form-data"  method="post">
-    {% csrf_token %}
-    <table>
-      {{ form.as_table }}
-    </table>
-    <input type="submit" value="Submit">
-    </form>
+      <form enctype="multipart/form-data"  method="get">
+        <table>
+          {{ form.as_table }}
+        </table>
+        <input type="submit" value="Submit"/>
+      </form>
     </p>
     <h2>All workouts</h2>
 
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 51e873d0..6f6c17b7 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4658,32 +4658,32 @@ class AlertDelete(DeleteView):
 def history_view(request,userid=0):
     r = getrequestrower(request,userid=userid)
 
-    form = HistorySelectForm()
-
     usertimezone = pytz.timezone(r.defaulttimezone)
 
-    activity_enddate = timezone.now()
-    activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
-    activity_startdate = activity_enddate-datetime.timedelta(days=15)
-    activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+    if request.GET.get('startdate'):
+        startdate,enddate = get_dates_timeperiod(request)
+        activity_startdate = datetime.datetime(
+            startdate.year,startdate.month,startdate.day
+            ).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+        activity_enddate = datetime.datetime(
+            enddate.year,enddate.month,enddate.day
+            ).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+    else:
+        activity_enddate = timezone.now()
+        activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+        activity_startdate = activity_enddate-datetime.timedelta(days=15)
+        activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+
     typeselect = 'All'
+    if request.GET.get('workouttype'):
+        typeselect = request.GET.get('workouttype')
 
-    if request.method=='POST':
-        form = HistorySelectForm(request.POST)
-        if form.is_valid():
-            startdate = form.cleaned_data['startdate']
-            enddate = form.cleaned_data['enddate']
-            typeselect = form.cleaned_data['workouttype']
-            activity_startdate = datetime.datetime(
-                startdate.year,startdate.month,startdate.day
-                ).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
-            activity_enddate = datetime.datetime(
-                enddate.year,enddate.month,enddate.day
-                ).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
-
-
-
+    if typeselect not in mytypes.checktypes:
+        typeselect = 'All'
 
+    form = HistorySelectForm(initial={'startdate':activity_startdate,
+                                      'enddate':activity_enddate,
+                                      'workouttype':typeselect})
 
     g_workouts = Workout.objects.filter(
         user=r,
@@ -4795,6 +4795,15 @@ def history_view(request,userid=0):
         },
         ]
 
+    lastseven = timezone.now()-datetime.timedelta(days=7)
+    lastfourteen = timezone.now()-datetime.timedelta(days=14)
+    last28 = timezone.now()-datetime.timedelta(days=28)
+    today = timezone.now()
+
+    firstmay = datetime.datetime(year=today.year,month=5,day=1).astimezone(usertimezone)
+    if firstmay>today:
+        firstmay = datetime.datetime(year=today.year-1,month=5,day=1)
+
     return render(request,'history.html',
                   {
                       'rower':r,
@@ -4805,4 +4814,12 @@ def history_view(request,userid=0):
                       'totalscript':totalscript,
                       'totaldiv':totaldiv,
                       'form':form,
+                      'startdate':activity_startdate,
+                      'enddate':activity_enddate,
+                      'lastseven':lastseven,
+                      'lastfourteen':lastfourteen,
+                      'last28':last28,
+                      'today':today,
+                      'workouttype':typeselect,
+                      'firstmay':firstmay,
                   })
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 87da8851..08c5fbab 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -467,6 +467,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
         raise Http404("Rower doesn't exist")
 
     if r.user == request.user:
+        request.session['rowerid'] = r.id
         return r
 
     if userid != 0 and not is_rower_team_member(request.user,u.rower):
@@ -476,6 +477,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
     if notpermanent == False:
         request.session['rowerid'] = r.id
 
+    request.session['rowerid'] = r.id
     return r
 
 def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False):

From 3e8753e557eed62aaba0cb828d360717051b9e80 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 21:15:18 +0200
Subject: [PATCH 2/5] history data

---
 rowers/urls.py                |  2 +
 rowers/views/analysisviews.py | 69 +++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/rowers/urls.py b/rowers/urls.py
index f091bcdd..5df0f9ba 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -755,6 +755,8 @@ urlpatterns = [
     re_path(r'^access/(?P<key>\w+)/$', views.sharedPage, name="sharedPage"),
     re_path(r'^history/user/(?P<userid>\d+)/$',views.history_view,name="history_view"),
     re_path(r'^history/$',views.history_view,name="history_view"),
+    re_path(r'^history/user/(?P<userid>\d+)/data/$',views.history_view_data,name="history_view_data"),
+    re_path(r'^history/data/$',views.history_view_data,name="history_view_data"),
     ]
 
 if settings.DEBUG:
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 6f6c17b7..eb065ac4 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4823,3 +4823,72 @@ def history_view(request,userid=0):
                       'workouttype':typeselect,
                       'firstmay':firstmay,
                   })
+
+@login_required()
+def history_view_data(request,userid=0):
+    r = getrequestrower(request,userid=userid)
+
+    usertimezone = pytz.timezone(r.defaulttimezone)
+
+    if request.GET.get('startdate'):
+        startdate,enddate = get_dates_timeperiod(request)
+        activity_startdate = datetime.datetime(
+            startdate.year,startdate.month,startdate.day
+            ).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+        activity_enddate = datetime.datetime(
+            enddate.year,enddate.month,enddate.day
+            ).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+    else:
+        activity_enddate = timezone.now()
+        activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
+        activity_startdate = activity_enddate-datetime.timedelta(days=15)
+        activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
+
+    typeselect = 'All'
+    if request.GET.get('workouttype'):
+        typeselect = request.GET.get('workouttype')
+
+    if typeselect not in mytypes.checktypes:
+        typeselect = 'All'
+
+    g_workouts = Workout.objects.filter(
+        user=r,
+        startdatetime__gte=activity_startdate,
+        startdatetime__lte=activity_enddate,
+        duplicate=False,
+        privacy='visible'
+    ).order_by("-startdatetime")
+
+    ids = [w.id for w in g_workouts]
+
+    columns = ['hr','power','time']
+
+    df = getsmallrowdata_db(columns,ids=ids)
+    try:
+        df['deltat'] = df['time'].diff()
+    except KeyError:
+        pass
+    df = dataprep.clean_df_stats(df,workstrokesonly=True,
+                                     ignoreadvanced=True)
+
+
+
+
+    # interactive hr pie chart
+    if typeselect == 'All':
+        totalscript,totaldiv = interactive_hr_piechart(df,r,'All Workouts')
+    else:
+        a_workouts = g_workouts.filter(workouttype=typeselect)
+        ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
+        try:
+            ddf['deltat'] = ddf['time'].diff()
+        except KeyError:
+            pass
+        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
+                                         ignoreadvanced=True)
+        totalscript, totaldiv = interactive_hr_piechart(ddf,r,mytypes.workouttypes_ordered[typeselect])
+
+    return JSONResponse({
+        'script':totalscript,
+        'div':totaldiv,
+    })

From cf47afe53839d3ffce18c765680eab2f9a21ab9f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 21:41:10 +0200
Subject: [PATCH 3/5] ajax call for history chart

---
 rowers/templates/history.html | 46 ++++++++++++++++++++++++++++++++---
 rowers/views/analysisviews.py |  7 ++++--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index df5ca327..8f84dcfd 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -5,11 +5,23 @@
 {% block title %}Rowsandall {% endblock %}
 
 {% block main %}
+<div id="id_css_res">
+    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
+    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
+</div>
+<div id="id_js_res">
+  <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
+  <script src="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.js"></script>
+</div>
+
+<script async="true" type="text/javascript">
+  Bokeh.set_log_level("info");
+</script>
+
+<div id="id_script">
+</div>
 
 <ul class="main-content">
-  <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
-  <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
-  <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
   <li class="grid_2">
     <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
   </li>
@@ -62,7 +74,9 @@
     </p>
   </li>
   <li class="grid_2">
-    <div>{{ totalscript|safe }}{{ totaldiv|safe }}</div>
+    <div id="id_chart">
+      {{ totaldiv|safe }}
+    </div>
   </li>
 
   {% for ddict in typedicts %}
@@ -103,6 +117,30 @@
 
 {% endblock %}
 
+{% block scripts %}
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+
+<script>
+  $(function($) {
+  console.log('loading script for chart');
+  
+  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/', function(json) {
+
+  var script = json.script;
+  var div = json.div;
+  $("#id_sitready").remove();
+  $("#id_chart").append(div);
+  console.log(div);
+//  $("#id_script").append("<s"+"cript>"+script+"</s"+"cript>");
+  $("#id_script").append(script);
+
+  });
+  });
+  </script>
+{% endblock %}
+
 
 
 {% block sidebar %}
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index eb065ac4..84e18a4f 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4747,8 +4747,11 @@ def history_view(request,userid=0):
 
 
     # interactive hr pie chart
+    totalscript = ''
+    totaldiv = get_call()
     if typeselect == 'All':
-        totalscript,totaldiv = interactive_hr_piechart(df,r,'All Workouts')
+        pass
+        #totalscript,totaldiv = interactive_hr_piechart(df,r,'All Workouts')
     else:
         a_workouts = g_workouts.filter(workouttype=typeselect)
         ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
@@ -4758,7 +4761,7 @@ def history_view(request,userid=0):
             pass
         ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
                                          ignoreadvanced=True)
-        totalscript, totaldiv = interactive_hr_piechart(ddf,r,mytypes.workouttypes_ordered[typeselect])
+        #totalscript, totaldiv = interactive_hr_piechart(ddf,r,mytypes.workouttypes_ordered[typeselect])
 
     # interactive power pie chart
 

From 4711a9f8602f4317126cdba51c34761bd2f994d8 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 21:56:19 +0200
Subject: [PATCH 4/5] totaldisct in ajax call

---
 rowers/templates/history.html | 18 +++++---
 rowers/views/analysisviews.py | 82 ++++++++++++++++++++++++++---------
 2 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 8f84dcfd..0b775cdb 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -58,16 +58,16 @@
               <td>Number of workouts</td><td>{{ totalsdict|lookup:"nrworkouts"}}</td>
             </tr>
             <tr>
-              <td>Average heart rate</td><td>{{ totalsdict|lookup:"hrmean"}} bpm</td>
+              <td>Average heart rate</td><td><span id="total_hr"></span> bpm</td>
             </tr>
             <tr>
-              <td>Maximum heart rate</td><td>{{ totalsdict|lookup:"hrmax"}} bpm</td>
+              <td>Maximum heart rate</td><td><span id="total_maxhr"></span> bpm</td>
             </tr>
             <tr>
-              <td>Average power</td><td>{{ totalsdict|lookup:"powermean"}} W</td>
+              <td>Average power</td><td><span id="total_power"></span> W</td>
             </tr>
             <tr>
-              <td>Maximum power</td><td>{{ totalsdict|lookup:"powermax"}} W</td>
+              <td>Maximum power</td><td><span id="total_maxpower"></span> W</td>
             </tr>
           </tbody>
       </table>
@@ -125,17 +125,21 @@
 <script>
   $(function($) {
   console.log('loading script for chart');
-  
-  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/', function(json) {
+
+  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ startdate|date:"Y-m-d" }}&{{ enddate|date:"Y-m-d" }}&workouttype={{ workouttype }}', function(json) {
 
   var script = json.script;
   var div = json.div;
+  var totalsdict = json.totalsdict
   $("#id_sitready").remove();
   $("#id_chart").append(div);
   console.log(div);
 //  $("#id_script").append("<s"+"cript>"+script+"</s"+"cript>");
   $("#id_script").append(script);
-
+  $("#total_hr").append(totalsdict.hrmean);
+  $("#total_maxhr").append(totalsdict.hrmax);
+  $("#total_power").append(totalsdict.powermean);
+  $("#total_maxpower").append(totalsdict.powermax);
   });
   });
   </script>
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 84e18a4f..98f4d145 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4697,14 +4697,6 @@ def history_view(request,userid=0):
 
     columns = ['hr','power','time']
 
-    df = getsmallrowdata_db(columns,ids=ids)
-    try:
-        df['deltat'] = df['time'].diff()
-    except KeyError:
-        pass
-    df = dataprep.clean_df_stats(df,workstrokesonly=True,
-                                     ignoreadvanced=True)
-
 
     totalmeters,totalhours, totalminutes = get_totals(g_workouts)
     totalminutes = "{totalminutes:02d}".format(totalminutes=totalminutes)
@@ -4740,7 +4732,7 @@ def history_view(request,userid=0):
 
         ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
         ddict['hrmax'] = ddf['hr'].max().astype(int)
-        ddict['powermean'] = int(wavg(df,'power','deltat'))
+        ddict['powermean'] = int(wavg(ddf,'power','deltat'))
         ddict['powermax'] = ddf['power'].max().astype(int)
         ddict['nrworkouts'] = a_workouts.count()
         listofdicts.append(ddict)
@@ -4772,18 +4764,7 @@ def history_view(request,userid=0):
     )
 
     totalsdict['distance'] = totalmeters
-    try:
-        totalsdict['powermean'] = int(wavg(df,'power','deltat'))
-        totalsdict['powermax'] = df['power'].max().astype(int)
-    except KeyError:
-        totalsdict['powermean'] = 0
-        totalsdict['powermax'] = 0
-    try:
-        totalsdict['hrmean'] = int(wavg(df,'hr','deltat'))
-        totalsdict['hrmax'] = df['hr'].max().astype(int)
-    except KeyError:
-        totalsdict['hrmean'] = 0
-        totalsdict['hrmax'] = 0
+
 
     totalsdict['nrworkouts'] =  g_workouts.count()
 
@@ -4874,7 +4855,64 @@ def history_view_data(request,userid=0):
     df = dataprep.clean_df_stats(df,workstrokesonly=True,
                                      ignoreadvanced=True)
 
+    totalmeters,totalhours, totalminutes = get_totals(g_workouts)
+    totalminutes = "{totalminutes:02d}".format(totalminutes=totalminutes)
 
+    # meters, duration per workout type
+    wtypes = list(set([w.workouttype for w in g_workouts]))
+
+    typechoices = [("All","All")]
+    for wtype in wtypes:
+        typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
+
+    listofdicts = []
+
+    for wtype in wtypes:
+        a_workouts = g_workouts.filter(workouttype=wtype)
+        wmeters, whours, wminutes = get_totals(a_workouts)
+        ddict = {}
+        ddict['wtype'] = mytypes.workouttypes_ordered[wtype]
+        ddict['distance'] = wmeters
+        ddict['duration'] = "{whours}:{wminutes:02d}".format(
+            whours=whours,
+            wminutes=wminutes
+        )
+        ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
+        try:
+            ddf['deltat'] = ddf['time'].diff()
+        except KeyError:
+            pass
+        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
+                                         ignoreadvanced=True)
+
+        ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
+        ddict['hrmax'] = ddf['hr'].max().astype(int)
+        ddict['powermean'] = int(wavg(df,'power','deltat'))
+        ddict['powermax'] = ddf['power'].max().astype(int)
+        ddict['nrworkouts'] = a_workouts.count()
+        listofdicts.append(ddict)
+
+    totalsdict = {}
+    totalsdict['duration'] = "{totalhours}:{totalminutes}".format(
+        totalhours=totalhours,
+        totalminutes=totalminutes
+    )
+
+    totalsdict['distance'] = totalmeters
+    try:
+        totalsdict['powermean'] = int(wavg(df,'power','deltat'))
+        totalsdict['powermax'] = df['power'].max().astype(int)
+    except KeyError:
+        totalsdict['powermean'] = 0
+        totalsdict['powermax'] = 0
+    try:
+        totalsdict['hrmean'] = int(wavg(df,'hr','deltat'))
+        totalsdict['hrmax'] = df['hr'].max().astype(int)
+    except KeyError:
+        totalsdict['hrmean'] = 0
+        totalsdict['hrmax'] = 0
+
+    totalsdict['nrworkouts'] =  g_workouts.count()
 
 
     # interactive hr pie chart
@@ -4894,4 +4932,6 @@ def history_view_data(request,userid=0):
     return JSONResponse({
         'script':totalscript,
         'div':totaldiv,
+        'totalsdict':totalsdict,
+        'listofdicts':listofdicts,
     })

From 6c1d176c40289044614453a23f9655ddfc633629 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 22:13:30 +0200
Subject: [PATCH 5/5] all dicts through ajax

---
 rowers/templates/history.html | 19 +++++++++++++++----
 rowers/views/analysisviews.py | 31 +++----------------------------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 0b775cdb..c7507a58 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -96,16 +96,16 @@
               <td>Number of workouts</td><td>{{ ddict|lookup:"nrworkouts"}}</td>
             </tr>
             <tr>
-              <td>Average heart rate</td><td>{{ ddict|lookup:"hrmean"}} bpm</td>
+              <td>Average heart rate</td><td><span id="{{ ddict|lookup:'id'}}_hr"></span> bpm</td>
             </tr>
             <tr>
-              <td>Maximum heart rate</td><td>{{ ddict|lookup:"hrmax"}} bpm</td>
+              <td>Maximum heart rate</td><td><span id="{{ ddict|lookup:'id' }}_hrmax"></span> bpm</td>
             </tr>
             <tr>
-              <td>Average power</td><td>{{ ddict|lookup:"powermean"}} W</td>
+              <td>Average power</td><td><span id="{{ ddict|lookup:'id'}}_power"></span>  W</td>
             </tr>
             <tr>
-              <td>Maximum power</td><td>{{ ddict|lookup:"powermax"}} W</td>
+              <td>Maximum power</td><td><span id="{{ ddict|lookup:'id'}}_powermax"></span>  W</td>
             </tr>
           </tbody>
       </table>
@@ -131,6 +131,7 @@
   var script = json.script;
   var div = json.div;
   var totalsdict = json.totalsdict
+  var listofdicts = json.listofdicts
   $("#id_sitready").remove();
   $("#id_chart").append(div);
   console.log(div);
@@ -140,6 +141,16 @@
   $("#total_maxhr").append(totalsdict.hrmax);
   $("#total_power").append(totalsdict.powermean);
   $("#total_maxpower").append(totalsdict.powermax);
+  listofdicts.forEach(function(item){
+    var id = "#"+item.id+"_hr";
+    $(id).append(item.hrmean);
+    id = "#"+item.id+"_hrmax";
+    $(id).append(item.hrmax);
+    id = "#"+item.id+"_power";
+    $(id).append(item.powermean);
+    id = "#"+item.id+"_powermax";
+    $(id).append(item.powermax);
+  })
   });
   });
   </script>
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 98f4d145..d2293e28 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4716,24 +4716,13 @@ def history_view(request,userid=0):
         a_workouts = g_workouts.filter(workouttype=wtype)
         wmeters, whours, wminutes = get_totals(a_workouts)
         ddict = {}
+        ddict['id'] = wtype
         ddict['wtype'] = mytypes.workouttypes_ordered[wtype]
         ddict['distance'] = wmeters
         ddict['duration'] = "{whours}:{wminutes:02d}".format(
             whours=whours,
             wminutes=wminutes
         )
-        ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
-        try:
-            ddf['deltat'] = ddf['time'].diff()
-        except KeyError:
-            pass
-        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
-                                         ignoreadvanced=True)
-
-        ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
-        ddict['hrmax'] = ddf['hr'].max().astype(int)
-        ddict['powermean'] = int(wavg(ddf,'power','deltat'))
-        ddict['powermax'] = ddf['power'].max().astype(int)
         ddict['nrworkouts'] = a_workouts.count()
         listofdicts.append(ddict)
 
@@ -4741,22 +4730,7 @@ def history_view(request,userid=0):
     # interactive hr pie chart
     totalscript = ''
     totaldiv = get_call()
-    if typeselect == 'All':
-        pass
-        #totalscript,totaldiv = interactive_hr_piechart(df,r,'All Workouts')
-    else:
-        a_workouts = g_workouts.filter(workouttype=typeselect)
-        ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
-        try:
-            ddf['deltat'] = ddf['time'].diff()
-        except KeyError:
-            pass
-        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
-                                         ignoreadvanced=True)
-        #totalscript, totaldiv = interactive_hr_piechart(ddf,r,mytypes.workouttypes_ordered[typeselect])
-
-    # interactive power pie chart
-
+    
     totalsdict = {}
     totalsdict['duration'] = "{totalhours}:{totalminutes}".format(
         totalhours=totalhours,
@@ -4872,6 +4846,7 @@ def history_view_data(request,userid=0):
         wmeters, whours, wminutes = get_totals(a_workouts)
         ddict = {}
         ddict['wtype'] = mytypes.workouttypes_ordered[wtype]
+        ddict['id'] = wtype
         ddict['distance'] = wmeters
         ddict['duration'] = "{whours}:{wminutes:02d}".format(
             whours=whours,