Merge branch 'release/v12.16'

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

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

rowers/templates/plannedsessions_print.html

@@ -42,7 +42,7 @@
 <p>
 <form enctype="multipart/form-data" action="/rowers/access/share/" method="post">
   {% csrf_token %}
-  <input name="url" value="{{ request.path }}{{ timeperiod }}/" type="hidden">
+  <input name="url" value="/rowers/sessions/print/user/{{ rower.user.id }}/{{ timeperiod }}/" type="hidden">
   <label for="id_ndays">Number of days link is valid:</label>
   <input name="ndays" id="id_ndays" type="number" step="1" value="7">
   <input type="submit" value="create shareable link">

rowers/templates/virtualevent.html

@@ -453,16 +453,19 @@
         competitive element to training and as a quick way to set
         up and manage small regattas.
       </p>
+      {% if race.sessiontype == 'race' %}
       <p>
         On the water races are rowed on the course shown.
         You cannot submit results rowed
         on other bodies of water.
       </p>
+      {% else %}
       <p>
         Indoor races are open for all, wherever you live.
         However, be aware of the
         time zone for the race window.
       </p>
+      {% endif %}
         <p>
           As a rowsandall.com user, you can
           register to take part in this event. Please note the registration
@@ -473,9 +476,11 @@
         <p>
           After the start of the race window and before the submission deadline,
           you can submit results by linking the race to one of your uploaded
-          workouts. The workout start time must be within the race window
+          workouts. The workout start time must be within the race window.
-          and your course must pass through the blue polygons on the course
+          {% if race.sessiontype == 'race' %}
+          Your course must pass through the blue polygons on the course
           map (in the right order), for your result to be valid.
+          {% endif %}
         </p>
       <p>
         The results table has a link to a page where details of your workout