From fea71febb34d62de45f55c8bfc6fa9a3e46b3981 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 11:18:47 +0200
Subject: [PATCH 1/3] trying to make start/end dates the same

---
 rowers/views/analysisviews.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 9751d81f..51e873d0 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4665,7 +4665,7 @@ def history_view(request,userid=0):
     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)
+    activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
     typeselect = 'All'
 
     if request.method=='POST':

From 42ae036488f7191e2ec253421531e609af55497a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 11:20:55 +0200
Subject: [PATCH 2/3] adding iform

---
 rowers/views/workoutviews.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 2c7ecf62..fa984049 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -744,6 +744,7 @@ def addmanual_view(request,raceid=0):
                               )
                 return HttpResponseRedirect(url)
         else:
+            iform = ImageForm()
             return render(request,'manualadd.html',
                           {'form':form,
                            'iform':iform,

From bf5f76e2eaf51fa809eb5860dacd35443b433d6f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 May 2020 13:18:06 +0200
Subject: [PATCH 3/3] better time sum in pie chart

---
 rowers/interactiveplots.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 7fe3049e..e1a1f0eb 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -176,20 +176,24 @@ def interactive_hr_piechart(df,rower,title):
         return "","Not enough data to make a chart"
 
     df.sort_values(by='hr',inplace=True)
+    df['timehr'] = df['deltat']*df['hr']
+
+    sumtimehr = df['deltat'].sum()
+
     qry = 'hr < {ut2}'.format(ut2=rower.ut2)
-    frac_lut2 = len(df.query(qry))/len(df)
+    frac_lut2 = df.query(qry)['deltat'].sum()/sumtimehr
 
     qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
-    frac_ut2 = len(df.query(qry))/len(df)
+    frac_ut2 = df.query(qry)['deltat'].sum()/sumtimehr
 
     qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at)
-    frac_ut1 = len(df.query(qry))/len(df)
+    frac_ut1 = df.query(qry)['deltat'].sum()/sumtimehr
 
     qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr)
-    frac_at = len(df.query(qry))/len(df)
+    frac_at = df.query(qry)['deltat'].sum()/sumtimehr
 
     qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an)
-    frac_tr = len(df.query(qry))/len(df)
+    frac_tr = df.query(qry)['deltat'].sum()/sumtimehr
 
     frac_an = 1.