From 55049532e40ae9d1042c5645276825457be3137b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 15 Sep 2017 15:34:30 +0200 Subject: [PATCH] bugfix --- rowers/dataprep.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 3e8687cf..93d26206 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1180,13 +1180,13 @@ def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True): # convert newtons if 'peakforce' in columns: - funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) + funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids)) for id,u in funits: if u=='lbs': mask = data['workoutid']==id data.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN if 'averageforce' in columns: - funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) + funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids)) for id,u in funits: if u=='lbs': mask = data['workoutid']==id @@ -1294,13 +1294,13 @@ def read_cols_df_sql(ids,columns,convertnewtons=True): df = df.fillna(value=0) if 'peakforce' in columns: - funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) + funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids)) for id,u in funits: if u=='lbs': mask = data['workoutid']==id df.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN if 'averageforce' in columns: - funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) + funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids)) for id,u in funits: if u=='lbs': mask = data['workoutid']==id