Merge branch 'release/v5.09'

rowers/dataprep.py

@@ -769,6 +769,10 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 timezone=timezone_str,
                 privacy=privacy)
 
+    try:
+        w.save()
+    except ValidationError:
+        w.startdatetime = timezone.now()
         w.save()
 
     isbreakthrough = False

rowers/templates/c2_list_import2.html

@@ -46,14 +46,23 @@
     {% for workout in workouts %}
     <tr>
       <td>
+        {% if workout|lookup:'source' != 'Web' %}
         <a href="/rowers/workout/c2import/{{ workout|lookup:'id' }}/">Import</a></td>
+      {% else %}
+      &nbsp;
+      {% endif %}
       <td>{{ workout|lookup:'starttime' }}</td>
       <td>{{ workout|lookup:'duration' }}</td>
       <td>{{ workout|lookup:'distance' }}</td>
       <td>{{ workout|lookup:'rowtype' }}</td>
       <td>{{ workout|lookup:'source' }}</td>
       <td>{{ workout|lookup:'comment' }}</td>
-      <td>{{ workout|lookup:'new' }}</td>
+      <td>
+        {% if workout|lookup:'source' != 'Web' %}
+        {{ workout|lookup:'new' }}
+        {% else %}
+        &nbsp;
+      {% endif %}</td>
     </tr>
     
     {% endfor %}

rowers/templates/workoutstats.html

@@ -78,7 +78,12 @@
   <div class="grid_4 alpha">
     &nbsp;
   </div>
-  <div class="grid_4 omega">
+  <div class="grid_4 omega tooltip">
+    <span class="tooltiptext">
+      <p>rPower: Equivalent steady state power for the duration of the workout.</p>
+      <p>Heart Rate Drift: Comparing heart rate normalized for average power for the first and second half of the workout</p>
+      <p>rScore: Score based on rPower and workout duration to estimate training effect</p>
+    </span>
   <h2>Other Stats</h2>
   <table width="100%" class="listtable">
     <thead>

rowers/views.py

@@ -8057,7 +8057,7 @@ def workout_getc2workout_all(request,page=1,message=""):
         messages.error(request,message)
     else:
         r = getrower(request.user)
-        c2ids = [item['id'] for item in res.json()['data']]
+        c2ids = [item['id'] for item in res.json()['data'] if item['source'] != 'Web']
         knownc2ids = uniqify([
             w.uploadedtoc2 for w in Workout.objects.filter(user=r)
         ])