diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 049e238d..4560905c 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -907,7 +907,7 @@ def interactive_flex_chart2(id=0,promember=0, return "","CSV Data File Not Found" else: rowdata.sort_values(by='time',ascending=True,inplace=True) - + workoutstateswork = [1,4,5,8,9,6,7] workoutstatesrest = [3] workoutstatetransition = [0,2,10,11,12,13] @@ -983,7 +983,7 @@ def interactive_flex_chart2(id=0,promember=0, source2 = ColumnDataSource( rowdata.copy() ) - + # Add hover to this comma-separated string and see what changes if (promember==1): TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair' @@ -996,7 +996,7 @@ def interactive_flex_chart2(id=0,promember=0, plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type, tools=TOOLS, - toolbar_sticky=False, + toolbar_sticky=False ) x1means = Span(location=x1mean,dimension='height',line_color='green', @@ -1235,8 +1235,6 @@ def interactive_flex_chart2(id=0,promember=0, js_resources = INLINE.render_js() css_resources = INLINE.render_css() - - return [script,div,js_resources,css_resources] diff --git a/rowers/views.py b/rowers/views.py index b179a94f..20e235cf 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2683,14 +2683,14 @@ def workout_flexchart3_view(request,*args,**kwargs): workstrokesonly = False # create interactive plot - res = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1, + script,div,js_resources,css_resources = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1, yparam2=yparam2, promember=promember,plottype=plottype, workstrokesonly=workstrokesonly) - script = res[0] - div = res[1] - js_resources = res[2] - css_resources = res[3] + # script = res[0] + # div = res[1] + # js_resources = res[2] + # css_resources = res[3] if row.workouttype == 'water': return render(request, diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 1e78bec2..89c356ab 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -60,6 +60,9 @@ AUTHENTICATION_BACKENDS = ( ) MIDDLEWARE_CLASSES = [ + 'django.middleware.gzip.GZipMiddleware', + 'htmlmin.middleware.HtmlMinifyMiddleware', + 'htmlmin.middleware.MarkRequestMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',