Merge branch 'release/v10.04'

requirements.txt

@@ -157,7 +157,7 @@ ratelim==0.1.6
 redis==3.2.1
 requests==2.21.0
 requests-oauthlib==1.2.0
-rowingdata==2.4.4
+rowingdata==2.4.9
 rowingphysics==0.5.0
 rq==1.0
 rq-dashboard==0.4.0

rowers/mytypes.py

@@ -46,6 +46,7 @@ stravamapping = collections.OrderedDict({
     'rower':'Rowing',
     'skierg':'NordicSki',
     'bike':'Ride',
+    'bikeerg':'Ride',
     'dynamic':'Rowing',
     'slides':'Rowing',
     'paddle':'StandUpPaddling',
@@ -77,6 +78,7 @@ stmapping = collections.OrderedDict({
     'rower':'Rowing',
     'skierg':'Skiing:Nordic',
     'bike':'Cycling',
+    'bikeerg':'Cycling',
     'dynamic':'Rowing',
     'slides':'Rowing',
     'paddle':'Other:Paddling',
@@ -109,6 +111,7 @@ rkmapping = collections.OrderedDict({
     'rower':'Rowing',
     'skierg':'Cross-Country Skiing',
     'bike':'Cycling',
+    'bikeerg':'Cycling',
     'dynamic':'Rowing',
     'slides':'Rowing',
     'paddle':'Other:Paddling',
@@ -139,6 +142,7 @@ polarmapping = collections.OrderedDict({
     'rower':'Rowing',
     'skierg':'Skiing',
     'bike':'Cycling',
+    'bikeerg':'Cycling',
     'dynamic':'Rowing',
     'slides':'Rowing',
     'paddle':'Other Outdoor',
@@ -169,6 +173,7 @@ tpmapping = collections.OrderedDict({
     'rower':'rowing',
     'skierg':'xc-ski',
     'bike':'bike',
+    'bikeerg':'bike',
     'dynamic':'rowing',
     'slides':'rowing',
     'paddle':'other',
@@ -199,6 +204,7 @@ c2mapping = collections.OrderedDict({
     'rower':'rower',
     'skierg':'skierg',
     'bike':'bike',
+    'bikeerg':'bike',
     'dynamic':'dynamic',
     'slides':'slides',
     'paddle':'paddle',

rowers/templates/monitorjobs.html

@@ -24,7 +24,7 @@
   };
   previous = current;
   });
-  setTimeout(checkJobs, 15000);
+  setTimeout(checkJobs, 5000);
   }());
   
 </script>

rowers/templates/plannedsessionview.html

@@ -80,12 +80,9 @@
         <tr>
           <td> {{ workout.date|date:"Y-m-d" }} </td>
           <td>
-            <div class="tooltip">
-              <a href="{% url manager.defaultlandingpage id=workout.id|encode %}">
-                {{ workout.name }}
-              </a>
-              <span class="tooltiptext">{{ workout.notes }}</span>
-            </div>
+            <a href="{% url manager.defaultlandingpage id=workout.id|encode %}">
+              {{ workout.name }}
+            </a>
           </td>
           <td> {{ workout.distance }}m</td>
           <td> {{ workout.duration |durationprint:"%H:%M:%S.%f" }} </td>

static/css/rowsandall2.css

@@ -216,6 +216,11 @@ th.rotate > div > span {
 .tooltip {
     position: relative;
     display: inline-block;
+    color: #000;
+}
+
+.tooltip a {
+    color: black;
 }
 
 .tooltip .tooltiptext {