Merge branch 'feature/trendline' into develop

rowers/views/analysisviews.py

@@ -21,6 +21,7 @@ defaultoptions = {
     'waterboattype': mytypes.waterboattype,
     'function': 'boxplot',
     'ranking': False,
+    'trendline': False,
 }
 
 
@@ -307,6 +308,7 @@ def trendflexdata(workouts, options, userid=0):
     ids = options['ids']
     workstrokesonly = not includereststrokes
 
+
     fieldlist, fielddict = dataprep.getstatsfields()
     fieldlist = [xparam, yparam, groupby,
                  'workoutid', 'spm', 'driveenergy',
@@ -477,6 +479,7 @@ def flexalldata(workouts, options):
     xparam = options['xaxis']
     yparam1 = options['yaxis1']
     yparam2 = options['yaxis2']
+    trendline = options['trendline']
     promember = True
 
     workstrokesonly = not includereststrokes
@@ -486,6 +489,7 @@ def flexalldata(workouts, options):
                                       yparam2=yparam2,
                                       promember=promember,
                                       workstrokesonly=workstrokesonly,
+                                      trendline=trendline,
                                       )
     script = res[0]
     div = res[1]