force curve with lines

rowers/views/workoutviews.py

@@ -26,15 +26,24 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
     if not promember:
         return HttpResponseRedirect("/rowers/about/")
 
-    if request.method == 'POST' and 'workstrokesonly' in request.POST:
-        workstrokesonly = request.POST['workstrokesonly']
-        if workstrokesonly == 'True':
-            workstrokesonly = True
+    if request.method == 'POST':
+        form = ForceCurveOptionsForm(request.POST)
+        if form.is_valid():
+            includereststrokes = form.cleaned_data['includereststrokes']
+            plottype = form.cleaned_data['plottype']
+            workstrokesonly = not includereststrokes
         else:
-            workstrokesonly = False
+            workstrokesonly = True
+            plottype = 'line'
+    else:
+        form = ForceCurveOptionsForm()
+        plottype = 'line'
 
-    script,div,js_resources,css_resources = interactive_forcecurve([row],
-                                                                   workstrokesonly=workstrokesonly)
+    script,div,js_resources,css_resources = interactive_forcecurve(
+        [row],
+        workstrokesonly=workstrokesonly,
+        plottype=plottype,
+    )
 
     breadcrumbs = [
             {
@@ -53,12 +62,13 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
             ]
 
     r = getrower(request.user)
-    
+
     return render(request,
                   'forcecurve_single.html',
                   {
                       'the_script':script,
                       'rower':r,
+                      'form':form,
                       'workout':row,
                       'breadcrumbs':breadcrumbs,
                       'active':'nav-workouts',
@@ -67,7 +77,6 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
                       'css_res':css_resources,
                       'id':id,
                       'mayedit':mayedit,
-                      'workstrokesonly': not workstrokesonly,
                       'teams':get_my_teams(request.user),
                   })