diff --git a/requirements.txt b/requirements.txt index 92fe0e6d..e6eda95f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,6 +47,7 @@ django-leaflet==0.24.0 django-mailbox==4.8.0 django-oauth-toolkit==1.2.0 django-oauth2-provider==0.2.6.1 +django-picklefield==2.1.1 django-redis==4.10.0 django-rest-framework==0.1.0 django-rest-swagger==2.2.0 @@ -174,11 +175,11 @@ ratelim==0.1.6 redis==3.2.1 requests==2.21.0 requests-oauthlib==1.2.0 -rowingdata==2.7.8 +rowingdata==2.8.3 rowingphysics==0.5.0 rq==0.13.0 rules==2.1 -scipy==1.2.1 +scipy==1.4.1 SecretStorage==3.1.1 Send2Trash==1.5.0 shell==1.0.1 diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index a90c2a2c..e5c0917a 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -1091,9 +1091,13 @@ def add_workout_from_data(user,importid,data,strokedata, workouttype=workouttype, title=title,notes=comments, workoutsource=workoutsource, - dosummary=True + dosummary=True,dosmooth=False, ) + w = Workout.objects.get(id=id) + w.duration = dataprep.totaltime_sec_to_string(totaltime) + w.distance = totaldist + w.save() return id,message diff --git a/rowers/templates/plannedsessions_print.html b/rowers/templates/plannedsessions_print.html index 2fa37771..63fba42d 100644 --- a/rowers/templates/plannedsessions_print.html +++ b/rowers/templates/plannedsessions_print.html @@ -42,7 +42,7 @@