Merge branch 'develop' into feature/workoutslist

rowers/forms.py

@@ -1286,6 +1286,15 @@ class AnalysisChoiceForm(forms.Form):
                                             label='Include Rest Strokes')
 
 
+    def __init__(self, *args, **kwargs):
+        super(AnalysisChoiceForm, self).__init__(*args, **kwargs)
+
+        if 'initial' in kwargs and kwargs['initial']['function'] == 'compare':
+            self.fields['xaxis'].initial = 'time'
+            self.fields['yaxis1'].initial = 'hr'
+            self.fields['plottype'].initial = 'line'
+
+
 
 class BoxPlotChoiceForm(forms.Form):
     yparam = forms.ChoiceField(choices=parchoices,initial='spm',