Merge branch 'release/v14.62'

rowers/interactiveplots.py

@@ -24,6 +24,12 @@ import itertools
 from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc
 from bokeh.models import CustomJS,Slider, TextInput,BoxAnnotation
 
+from rowers.utils import myqueue
+import django_rq
+queue = django_rq.get_queue('default')
+queuelow = django_rq.get_queue('low')
+queuehigh = django_rq.get_queue('low')
+
 from bokeh.resources import CDN,INLINE
 from bokeh.embed import components
 from bokeh.layouts import layout,widgetbox
@@ -1544,6 +1550,7 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
     data = []
 
     fitnesstestsecs = fitnesstest*60
+    df = pd.DataFrame()
 
     # create CP data
     for w in workouts:
@@ -1554,8 +1561,11 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
             df['workoutdate'] = w.date.strftime('%d-%m-%Y')
             data.append(df)
         except:
-            pass
-
+            strokesdf = getsmallrowdata_db(['power','workoutid','time'],ids=[w.id])
+            res = myqueue(queuelow,
+                          handle_setcp,
+                          strokesdf,
+                          cpfile,w.id)
 
     if len(data)>1:
         df = pd.concat(data,axis=0)
@@ -1777,7 +1787,10 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
 
     hover.tooltips = OrderedDict([
         ('Power {fitnesstest} minutes'.format(fitnesstest=fitnesstest),'@testpower'),
-        ('Date','@fdate')
+        ('Date','@fdate'),
+        (fitlabel,'@fitness'),
+        (fatiguelabel,'@fatigue'),
+        (formlabel,'@form')
     ])
 
     try: