fixing reststrokes on compare plot

rowers/forms.py

@@ -1104,10 +1104,6 @@ class AnalysisChoiceForm(forms.Form):
     workmax = forms.FloatField(initial=1500,
                               required=False,label = 'Max Work per Stroke')
 
-    includereststrokes = forms.BooleanField(initial=False,
-                                            required=False,
-                                            label='Include Rest Strokes')
-
     cpfitchoices = (
         ('data','Fit to Selected Workouts'),
         ('automatic','Critical Power Rolling Data')
@@ -1119,6 +1115,12 @@ class AnalysisChoiceForm(forms.Form):
     piece = forms.IntegerField(initial=4,label='Ranking Piece (minutes)',
                                          required=False)
 
+    includereststrokes = forms.BooleanField(initial=False,
+                                            required=False,
+                                            label='Include Rest Strokes')
+
+
+
 class BoxPlotChoiceForm(forms.Form):
     yparam = forms.ChoiceField(choices=parchoices,initial='spm',
                                label='Metric')