marker workouts

rowers/interactiveplots.py

@@ -284,7 +284,7 @@ def interactive_hr_piechart(df, rower, title, totalseconds=0):
     frac_an = totalseconds*df.query(qry)['deltat'].sum()/sumtimehr
 
     datadict = {
-        '<{ut2}'.format(ut2=hrzones[1]): frac_lut2,
+        '<{ut2}'.format(ut2=hrzones[1]): frac_lut2,
         '{ut2}'.format(ut2=hrzones[1]): frac_ut2,
         '{ut1}'.format(ut1=hrzones[2]): frac_ut1,
         '{at}'.format(at=hrzones[3]): frac_at,
@@ -299,7 +299,7 @@ def interactive_hr_piechart(df, rower, title, totalseconds=0):
     data['angle'] = data['value']/data['value'].sum() * 2*pi
     data['color'] = colors
     data['zone'] = [
-        '&lt;{ut2}'.format(ut2=hrzones[1]),
+        '<{ut2}'.format(ut2=hrzones[1]),
         '{ut2}'.format(ut2=hrzones[1]),
         '{ut1}'.format(ut1=hrzones[2]),
         '{at}'.format(at=hrzones[3]),
@@ -1573,7 +1573,6 @@ def goldmedalscorechart(user, startdate=None, enddate=None):
     enddate = arrow.get(enddate).datetime.replace(
         hour=0, minute=0, second=0, microsecond=0)
 
-    TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
 
     # marker workouts
     workouts = Workout.objects.filter(user=user.rower, date__gte=startdate,
@@ -1664,6 +1663,30 @@ def goldmedalscorechart(user, startdate=None, enddate=None):
     idx = df.groupby(['date'])['score'].transform(max) == df['score']
     df = df[idx]
 
+    df.fillna(value=0, inplace=True)
+    df['dat1'] = df['date'].map(lambda x: x.to_pydatetime(x).strftime("%Y-%m-%d"))
+
+    df2 = pd.DataFrame({
+        'markerscore': df['markerscore'],
+        'score': df['score'],
+        'markerduration':df['markerduration'].apply(
+                lambda x: totaltime_sec_to_string(x, shorten=True)),
+        'duration': df['duration'].apply(
+            lambda x: totaltime_sec_to_string(x, shorten=True)),
+        'date': df['dat1'],
+        'url':df['url'],
+        'workout':df['workout']
+    })
+
+    data_dicts = df2.to_dict("records")
+    chart_data = {
+        'data': data_dicts
+    }
+
+    script, div = get_chart("/markerworkouts", chart_data)
+    return script, div, outids
+
+    TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
     source = ColumnDataSource(
         data=dict(
             markerscore=df['markerscore'],

rowers/templates/goldmedalscores.html

@@ -65,9 +65,6 @@
   Bokeh.set_log_level("info");
 </script>
 
-<div id="id_script">
-  {{ chartscript |safe }}
-</div>
 
 
 
@@ -136,6 +133,11 @@
   </li>
 </ul>
 
+<script src="https://d3js.org/d3.v7.min.js"></script>
+
+<div id="id_script">
+  {{ chartscript |safe }}
+</div>
 
 
 {% endblock %}