From 38aedc02ca044385d50a38d34bcacd7fa57457e2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 25 Feb 2018 09:18:13 +0100 Subject: [PATCH] bug fix --- rowers/courses.py | 4 +++- rowers/views.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rowers/courses.py b/rowers/courses.py index 138cdffa..8a2b07df 100644 --- a/rowers/courses.py +++ b/rowers/courses.py @@ -72,6 +72,7 @@ def time_in_path(df,p,maxmin='max'): else: b = (~df['inpolygon']).shift(1)+df['inpolygon'] + if len(df[b==2]): return df[b==2]['time'].min(),df[b==2]['cum_dist'].min() @@ -247,9 +248,10 @@ def get_time_course(ws,course): rowdata = dataprep.getsmallrowdata_db( columns, ids = [w.id], - doclean=True, + doclean=False, workstrokesonly=False ) + rowdata.rename(columns = { ' latitude':'latitude', ' longitude':'longitude', diff --git a/rowers/views.py b/rowers/views.py index 294c65ed..409ac0d5 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12688,7 +12688,7 @@ def plannedsession_view(request,id=0,rowerid=0, coursetimeseconds, coursemeters, coursecompleted - ) = courses.get_time_course(ws,ps.course) + ) = courses.get_time_course([w],ps.course) intsecs = int(coursetimeseconds) microsecs = int(1.e6*(coursetimeseconds-intsecs))