From b798a161721aaf02b184b7200e19e97ea0ff4c82 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 15 Dec 2020 08:28:08 +0100
Subject: [PATCH] fix mean power in history

---
 rowers/templates/history.html |  1 +
 rowers/views/analysisviews.py | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 52e2eabf..e66e58ca 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -148,6 +148,7 @@
   console.log(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}')
   $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}', function(json) {
 
+
   var script = json.script;
   var div = json.div;
   var totalsdict = json.totalsdict
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 477d7147..0ad27124 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -5226,16 +5226,19 @@ def history_view_data(request,userid=0):
             ddf['deltat'] = ddf['time'].diff().clip(lower=0)
         except KeyError:
             pass
-        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
+
+
+        ddf = dataprep.clean_df_stats(ddf,workstrokesonly=False,
                                          ignoreadvanced=True)
 
+
         ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
         try:
             ddict['hrmax'] = ddf['hr'].max().astype(int)
         except ValueError:
             ddict['hrmax'] = 0
 
-        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)
@@ -5275,12 +5278,17 @@ def history_view_data(request,userid=0):
         meters, hours,minutes,seconds = get_totals(a_workouts)
         totalseconds = 3600*hours+60*minutes+seconds
         ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
+
         try:
             ddf['deltat'] = ddf['time'].diff().clip(lower=0)
         except KeyError:
             pass
+
+
         ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
                                          ignoreadvanced=True)
+
+
         totalscript, totaldiv = interactive_hr_piechart(
             ddf,r,mytypes.workouttypes_ordered[typeselect],
             totalseconds=totalseconds)