Merge branch 'release/v12.26'

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.
 

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':

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,