Merge branch 'release/v9.60'

rowers/interactiveplots.py

@@ -2745,7 +2745,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
                    line_dash=[6,6],line_width=2)
     y2means = y1means
 
-    xlabel = Label(x=100,y=130,x_units='screen',y_units='screen',
+    xlabel = Label(x=50,y=80,x_units='screen',y_units='screen',
                    text=axlabels[xparam]+": {x1mean:6.2f}".format(x1mean=x1mean),
                    background_fill_alpha=.7,
                    background_fill_color='white',
@@ -2758,7 +2758,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
     plot.add_layout(y1means)
 
-    y1label = Label(x=100,y=100,x_units='screen',y_units='screen',
+    y1label = Label(x=50,y=50,x_units='screen',y_units='screen',
                     text=axlabels[yparam1]+": {y1mean:6.2f}".format(y1mean=y1mean),
                     background_fill_alpha=.7,
                     background_fill_color='white',
@@ -2805,7 +2805,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
 
         plot.add_layout(y2means)
-        y2label = Label(x=100,y=70,x_units='screen',y_units='screen',
+        y2label = Label(x=50,y=20,x_units='screen',y_units='screen',
                         text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean),
                         background_fill_alpha=.7,
                         background_fill_color='white',
@@ -3214,14 +3214,14 @@ def interactive_flex_chart2(id=0,promember=0,
     except KeyError:
         xlabeltext = xparam+": {x1mean:6.2f}".format(x1mean=x1mean)
         
-    xlabel = Label(x=100,y=130,x_units='screen',y_units='screen',
+    xlabel = Label(x=50,y=80,x_units='screen',y_units='screen',
                    text=xlabeltext,
                    background_fill_alpha=.7,
                    background_fill_color='white',
                    text_color='green',
     )
 
-    annolabel = Label(x=100,y=500,x_units='screen',y_units='screen',
+    annolabel = Label(x=50,y=450,x_units='screen',y_units='screen',
                       text='',
                       background_fill_alpha=0.7,
                       background_fill_color='white',
@@ -3247,7 +3247,7 @@ def interactive_flex_chart2(id=0,promember=0,
     except KeyError:
         xaxlabel = xparam
 
-    y1label = Label(x=100,y=100,x_units='screen',y_units='screen',
+    y1label = Label(x=50,y=50,x_units='screen',y_units='screen',
                     text=yaxlabel+": {y1mean:6.2f}".format(y1mean=y1mean),
                     background_fill_alpha=.7,
                     background_fill_color='white',
@@ -3350,7 +3350,7 @@ def interactive_flex_chart2(id=0,promember=0,
 
 
         plot.add_layout(y2means)
-        y2label = Label(x=100,y=70,x_units='screen',y_units='screen',
+        y2label = Label(x=50,y=20,x_units='screen',y_units='screen',
                         text=axlegend+": {y2mean:6.2f}".format(y2mean=y2mean),
                         background_fill_alpha=.7,
                         background_fill_color='white',
@@ -3494,8 +3494,8 @@ def interactive_flex_chart2(id=0,promember=0,
        source2.change.emit();
        """)
 
-    annotation = TextInput(title="Type your plot notes here", value="",
+    annotation = TextInput(title="Type your plot notes here", value="", 
-                           callback=callback)
+                               callback=callback)
     callback.args["annotation"] = annotation
     
     slider_spm_min = Slider(start=15.0, end=55,value=15.0, step=.1,
@@ -3530,14 +3530,15 @@ def interactive_flex_chart2(id=0,promember=0,
                              title="Max Distance",callback=callback)
     callback.args["maxdist"] = slider_dist_max
 
-    thesliders = layoutcolumn([annotation,
+    thesliders = layoutcolumn([
-                                      slider_spm_min,
+        annotation,
-                                      slider_spm_max,
+        slider_spm_min,
-                                      slider_dist_min,
+        slider_spm_max,
-                                      slider_dist_max,
+        slider_dist_min,
-                                      slider_work_min,
+        slider_dist_max,
-                                      slider_work_max,
+        slider_work_min,
-                               ])
+        slider_work_max,
+    ])
 
     thesliders.sizing_mode = 'scale_width'
 

rowers/polarstuff.py

@@ -124,7 +124,8 @@ def get_polar_notifications():
     try:
         headers = { 'Authorization': 'Basic %s' % base64.b64encode(auth_string) }
     except TypeError:
-        headers = { 'Authorization': 'Basic %s' % base64.b64encode(bytes(auth_string,'utf-8')) }
+        headers = { 'Authorization': 'Basic %s' % base64.b64encode(
+            bytes(auth_string,'utf-8')).decode('utf-8') }
 
     response = requests.get(url, headers=headers)
 

rowers/templates/analysis.html

@@ -23,6 +23,22 @@
       Analyze your Concept2 ranking pieces over a date range and predict your pace on other pieces.
     </p>
   </li>
+  <li class="rounder">
+    <h2>Compare Workouts</h2>
+    {% if team %}
+    <a href="/rowers/team-compare-select/team/{{ team.id }}/">
+      {% else %}
+      <a href="/rowers/team-compare-select/team/0/">
+	{% endif %}
+	<div class="vignet">
+	<img src="/static/img/workoutcompare.png"
+	     alt="Compare Workouts">
+	</div>
+      </a>
+      <p>
+	Compare two or more of your workouts
+      </p>
+  </li>
   <li class="rounder">
     <h2>Stroke Analysis</h2>
     <a href="/rowers/flexall/">

rowers/templates/menu_analytics.html

@@ -12,6 +12,13 @@
           <i class="fas fa-star fa-fw"></i>&nbsp;Ranking Pieces
         </a>
       </li>
+      <li id="compare">
+	{% if team %}
+	<a href="/rowers/team-compare-select/team/{{ team.id }}/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+	{% else %}
+	<a href="/rowers/team-compare-select/team/0/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+	{% endif %}
+      </li>  
       <li id="fitness-otecp">
         <a href="/rowers/ote-ranking/">
           <i class="fas fa-user-chart fa-fw"></i>&nbsp;CP Chart OTE

rowers/templates/menu_workouts.html

@@ -10,9 +10,11 @@
   </li>
   <li id="compare">
     {% if team %}
-    <a href="/rowers/team-compare-select/team/{{ team.id }}/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    <a href="/rowers/team-compare-select/team/{{ team.id }}/">
+      <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
     {% else %}
-    <a href="/rowers/team-compare-select/team/0/"><i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
+    <a href="/rowers/team-compare-select/team/0/">
+      <i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare</a>
     {% endif %}
   </li>  
   <li>