dataprep updated

rowers/dataprep.py

@@ -2203,7 +2203,6 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
     if compute and len(df):
         data = df.copy()
         if doclean:
-            print('aap')
             data = clean_df_stats(data, ignorehr=True,
                                 workstrokesonly=workstrokesonly)
         data.dropna(axis=1,how='all',inplace=True)

rowers/interactiveplots.py

@@ -4413,7 +4413,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
 
 
-def interactive_flex_chart2(id=0,promember=0,
+def interactive_flex_chart2(id,r,promember=0,
                            xparam='time',
                            yparam1='pace',
                            yparam2='hr',

rowers/views/workoutviews.py

@@ -3832,35 +3832,15 @@ def workout_flexchart3_view(request,*args,**kwargs):
 #    xparam = xparam.replace('_slsh_','/')
 
     # create interactive plot
-    try:
     (
-            script,
+        script, div, js_resources, css_resources, workstrokesonly
-            div,
-            js_resources,
-            css_resources,
-            workstrokesonly
     ) = interactive_flex_chart2(
-            encoder.decode_hex(id),xparam=xparam,yparam1=yparam1,
+            encoder.decode_hex(id),request.user.rower,
+            xparam=xparam,yparam1=yparam1,
             yparam2=yparam2,
             promember=promember,plottype=plottype,
             workstrokesonly=workstrokesonly
         )
-    except ValueError:
-        (
-            script,
-            div,
-            js_resources,
-            css_resources,
-            workstrokesonly
-        ) = interactive_flex_chart2(
-            encoder.decode_hex(id),xparam=xparam,yparam1=yparam1,
-            yparam2=yparam2,
-            promember=promember,plottype=plottype,
-            workstrokesonly=workstrokesonly
-        )
-        js_resources = ""
-        css_resources = ""
-
 
     axchoicesbasic = {ax[0]:ax[1] for ax in axes if ax[4]=='basic'}
     axchoicespro = {ax[0]:ax[1] for ax in axes if ax[4]=='pro'}