quiske v2 improvements

rowers/dataprep.py

@@ -986,7 +986,8 @@ def checkbreakthrough(w, r):
                         coach.user.email,
                         r.user.first_name,
                         r.user.last_name,
-                        btvalues=btvalues.to_json())
+                        btvalues=btvalues.to_json(),
+                        surname=True)
 
     # submit email task to send email about breakthrough workout
     if ishard:  # pragma: no cover

rowers/interactiveplots.py

@@ -4081,6 +4081,7 @@ def interactive_streamchart(id=0, promember=0):
 def instroke_multi_interactive_chart(selected):
     df_plot = pd.DataFrame()
     ids = [analysis.id for analysis in selected]
+    metrics = list(set([analysis.metric for analysis in selected]))
     for analysis in selected:
         #start_second, end_second, spm_min, spm_max, name
         activeminutesmin = int(analysis.start_second/60.)
@@ -4094,6 +4095,8 @@ def instroke_multi_interactive_chart(selected):
             activeminutesmax=activeminutesmax,
         )
         mean_vals = data.mean()
+        if len(metrics)>1:
+            mean_vals = mean_vals/mean_vals.max()
         xvals = np.arange(len(mean_vals))
         xname = 'x_'+str(analysis.id)
         yname = 'y_'+str(analysis.id)
@@ -4124,6 +4127,11 @@ def instroke_multi_interactive_chart(selected):
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
+    if len(metrics)>1:
+        plot.yaxis.axis_label = 'Scaled'
+    else:
+        plot.yaxis.axis_label = metrics[0]
+
     plot.image_url([watermarkurl], watermarkx, watermarky,
                    watermarkw, watermarkh,
                    global_alpha=watermarkalpha,
@@ -4146,7 +4154,13 @@ def instroke_multi_interactive_chart(selected):
         xname = 'x_'+str(id)
         yname = 'y_'+str(id)
         analysis = InStrokeAnalysis.objects.get(id=id)
-        plot.line(xname,yname,source=source,legend_label=analysis.name,
+        legendlabel = '{name} - {metric} - {workout}'.format(
+            name = analysis.name,
+            metric = analysis.metric,
+            date = analysis.date,
+            workout = str(analysis.workout)
+        )
+        plot.line(xname,yname,source=source,legend_label=legendlabel,
               line_width=2, color=color)
 
     script, div = components(plot)

rowers/tasks.py

@@ -1709,11 +1709,17 @@ def handle_sendemail_expired(useremail, userfirstname, userlastname, expireddate
 def handle_sendemail_breakthrough(workoutid, useremail,
                                   userfirstname, userlastname,
                                   btvalues=pd.DataFrame().to_json(),
+                                  surname=False,
                                   **kwargs):
 
     btvalues = pd.read_json(btvalues)
     btvalues.sort_values('delta', axis=0, inplace=True)
 
+    lastname = ''
+
+    if surname:
+        lastname = userlastname
+
     tablevalues = [
         {'delta': t.delta,
          'time': str(timedelta(seconds=t.delta)),
@@ -1728,6 +1734,7 @@ def handle_sendemail_breakthrough(workoutid, useremail,
 
     d = {
         'first_name': userfirstname,
+        'last_name': lastname,
         'siteurl': siteurl,
         'workoutid': encoder.encode_hex(workoutid),
         'btvalues': tablevalues,
@@ -1749,6 +1756,7 @@ def handle_sendemail_breakthrough(workoutid, useremail,
 def handle_sendemail_hard(workoutid, useremail,
                           userfirstname, userlastname,
                           btvalues=pd.DataFrame().to_json(),
+                          surname=False,
                           debug=False, **kwargs):
 
     btvalues = pd.read_json(btvalues)
@@ -1761,12 +1769,17 @@ def handle_sendemail_hard(workoutid, useremail,
          } for t in btvalues.itertuples()
     ]
 
+    lastname = ''
+    if surname:
+        lastname = userlastname
+
     # send email with attachment
     subject = "That was a pretty hard workout on rowsandall.com"
     from_email = 'Rowsandall <info@rowsandall.com>'
 
     d = {
         'first_name': userfirstname,
+        'last_name': lastname,
         'siteurl': siteurl,
         'workoutid': encoder.encode_hex(workoutid),
         'btvalues': tablevalues,

rowers/templates/breakthroughemail.html

@@ -1,7 +1,11 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
+{% if last_name %}
+<p>Dear <strong>{{ first_name }} {{ last_name }}</strong>,</p>
+{% else %}
 <p>Dear <strong>{{ first_name }}</strong>,</p>
+{% endif %}
 
 <p>
   Congratulations! Your recent workout has been analyzed

rowers/templates/hardemail.html

@@ -1,7 +1,11 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
+  {% if last_name %}
+  <p>Dear <strong>{{ first_name }} {{ last_name }}</strong>,</p>
+  {% else %}
   <p>Dear <strong>{{ first_name }}</strong>,</p>
+  {% endif %}
 
 <p>
   Congratulations! Your recent workout has been analyzed

rowers/templates/instroke_analysis.html

@@ -35,7 +35,11 @@
     <div><h3>{{ analysis.name }}</h3></div>
     <div class="analysiscontainer">
       <div class="workoutelement">
+        {% if analysis in selected %}
+        <input type="checkbox" name="analyses" value="{{ analysis.id }}" id="analyses_{{ analysis.id }}" checked>
+        {% else %}
         <input type="checkbox" name="analyses" value="{{ analysis.id }}" id="analyses_{{ analysis.id }}">
+        {% endif %}
         </div>
       <div class="workoutelement">
         <a class="small" href="/rowers/workout/{{ analysis.workout.id|encode }}/instroke/interactive/{{ analysis.id }}/"

rowers/views/analysisviews.py

@@ -1886,6 +1886,7 @@ def instrokeanalysis_view(request, userid=0):
                       'rower': r,
                       'the_script': script,
                       'the_div': div,
+                      'selected': selected,
                   })
 
 #instroke analysis delete view