added flexall

rowers/forms.py

@@ -841,11 +841,39 @@ analysischoices = (
     ('boxplot','Box Chart'),
     ('trendflex','Trend Flex'),
     ('histo','Histogram'),
+    ('flexall','Cumulative Flex Chart')
     )
-    
+
+
+
 class AnalysisChoiceForm(forms.Form):
+    axchoices = list(
+        (ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','None']
+        )
+    axchoices = dict((x,y) for x,y in axchoices)
+    axchoices = list(sorted(axchoices.items(), key = lambda x:x[1]))
+    
+
+    yaxchoices = list((ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time'])
+    yaxchoices = dict((x,y) for x,y in yaxchoices)
+    yaxchoices = list(sorted(yaxchoices.items(), key = lambda x:x[1]))
+
+
+    yaxchoices2 = list(
+        (ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','distance','time']
+        )
+    yaxchoices2 = dict((x,y) for x,y in yaxchoices2)
+    yaxchoices2 = list(sorted(yaxchoices2.items(), key = lambda x:x[1]))
+
     function = forms.ChoiceField(choices=analysischoices,initial='boxplot',
                                  label='Analysis')
+    xaxis = forms.ChoiceField(
+        choices=axchoices,label='X-Axis',required=True,initial='spm')
+    yaxis1 = forms.ChoiceField(
+        choices=yaxchoices,label='Left Axis',required=True,initial='power')
+    yaxis2 = forms.ChoiceField(
+        choices=yaxchoices2,label='Right Axis',required=True,initial='None')
+
     plotfield = forms.ChoiceField(choices=parchoices,initial='spm',
                                label='Metric')
     xparam = forms.ChoiceField(choices=parchoicesmultiflex,
@@ -854,6 +882,7 @@ class AnalysisChoiceForm(forms.Form):
     yparam = forms.ChoiceField(choices=parchoicesmultiflex,
                                initial='pace',
                                label='Y axis')
+
     groupby = forms.ChoiceField(choices=groupchoices,initial='spm',
                                 label='Group By')
     binsize = forms.FloatField(initial=1,required=False,label = 'Bin Size')