added flexall

rowers/views/analysisviews.py

@@ -415,6 +415,29 @@ def trendflexdata(workouts, options,userid=0):
 
     return(script,div)
 
+def flexalldata(workouts, options):
+    includereststrokes = options['includereststrokes']
+    xparam = options['xaxis']
+    yparam1 = options['yaxis1']
+    yparam2 = options['yaxis2']
+    promember=True
+
+    workstrokesonly = not includereststrokes
+
+    res = interactive_cum_flex_chart2(workouts, xparam=xparam,
+                                      yparam1=yparam1,
+                                      yparam2=yparam2,
+                                      promember=promember,
+                                      workstrokesonly=workstrokesonly,
+                                      )
+    script = res[0]
+    div = res[1]
+
+    scripta = script.split('\n')[2:-1]
+    script = ''.join(scripta)
+    
+    return(script,div)
+    
 def histodata(workouts, options):
     includereststrokes = options['includereststrokes']
     plotfield = options['plotfield']
@@ -545,6 +568,8 @@ def analysis_view_data(request,userid=0):
         script, div = trendflexdata(workouts, options,userid=userid)
     elif function == 'histo':
         script, div = histodata(workouts, options)
+    elif function == 'flexall':
+        script,div = flexalldata(workouts,options)
     else:
         script = ''
         div = 'Unknown analysis functions'