sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix #563

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-07 14:19:06 +02:00
parent 5513020ea3
commit 4b5d350d49
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/interactiveplots.py
View File

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

8
rowers/views/analysisviews.py
View File

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