From 85a023ce5ce64ca474ca67e89c7599964c930004 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 15 Mar 2019 10:33:47 +0100 Subject: [PATCH] fix #433 --- rowers/dataprep.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 4f62e80d..ab3bdd13 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -83,7 +83,7 @@ queuelow = django_rq.get_queue('low') queuehigh = django_rq.get_queue('default') from rowsandall_app.settings import SITE_URL -from rowers.mytypes import otwtypes +from rowers.mytypes import otwtypes,otetypes from rowers.database import * from rowers.opaque import encoder @@ -998,6 +998,8 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', if dosummary: summary = row.allstats() + + timezone_str = 'UTC' try: workoutstartdatetime = timezone.make_aware(row.rowdatetime) @@ -1050,6 +1052,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', maxhr = np.nan_to_num(maxhr) averagehr = np.nan_to_num(averagehr) + dragfactor = 0 + if workouttype in otetypes: + dragfactor = row.dragfactor t = datetime.datetime.strptime(duration,"%H:%M:%S.%f") delta = datetime.timedelta(hours=t.hour, minutes=t.minute, seconds=t.second) @@ -1079,6 +1084,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', w = Workout(user=r, name=title, date=workoutdate, workouttype=workouttype, boattype=boattype, + dragfactor=dragfactor, duration=duration, distance=totaldist, weightcategory=weightcategory, adaptiveclass=adaptiveclass,