fix #563

rowers/interactiveplots.py

@@ -193,6 +193,7 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0):
     qry = 'hr < {ut2}'.format(ut2=rower.ut2)
     frac_lut2 = totalseconds*df.query(qry)['deltat'].sum()/sumtimehr
 
+
     qry = '{ut2} <= hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
     frac_ut2 = totalseconds*df.query(qry)['deltat'].sum()/sumtimehr
 

rowers/views/analysisviews.py

@@ -4721,7 +4721,6 @@ def history_view(request,userid=0):
 
     totalmeters,totalhours, totalminutes, totalseconds = get_totals(g_workouts)
 
-
     # meters, duration per workout type
     wtypes = list(set([w.workouttype for w in g_workouts]))
 
@@ -4860,14 +4859,13 @@ def history_view_data(request,userid=0):
 
     df = getsmallrowdata_db(columns,ids=ids)
     try:
-        df['deltat'] = df['time'].diff()
+        df['deltat'] = df['time'].diff().clip(lower=0)
     except KeyError:
         pass
     df = dataprep.clean_df_stats(df,workstrokesonly=True,
                                      ignoreadvanced=True,ignorehr=False)
 
     totalmeters,totalhours, totalminutes,totalseconds = get_totals(g_workouts)
-
     # meters, duration per workout type
     wtypes = list(set([w.workouttype for w in g_workouts]))
 
@@ -4895,7 +4893,7 @@ def history_view_data(request,userid=0):
         )
         ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
         try:
-            ddf['deltat'] = ddf['time'].diff()
+            ddf['deltat'] = ddf['time'].diff().clip(lower=0)
         except KeyError:
             pass
         ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
@@ -4944,7 +4942,7 @@ def history_view_data(request,userid=0):
         totalseconds = 3600*hours+60*minutes+seconds
         ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
         try:
-            ddf['deltat'] = ddf['time'].diff()
+            ddf['deltat'] = ddf['time'].diff().clip(lower=0)
         except KeyError:
             pass
         ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,