From 4b5d350d49ab3f9eb71b9669c1a69e27682f9841 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 7 Jul 2020 14:19:06 +0200 Subject: [PATCH] fix #563 --- rowers/interactiveplots.py | 1 + rowers/views/analysisviews.py | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 0ea08a8b..be22200f 100644 --- a/rowers/interactiveplots.py +++ b/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 diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index b02a7cb9..15de14d7 100644 --- a/rowers/views/analysisviews.py +++ b/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,