sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

data fusion now working ...

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-09 17:56:48 +01:00
parent ba8c9dfddb
commit 39b80b6716
4 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/forms.py
View File

@@ -259,7 +259,8 @@ class WorkoutMultipleCompareForm(forms.Form):
from rowers.interactiveplots import axlabels
axlabels.pop('None')
formaxlabels = axlabels.copy()
formaxlabels.pop('None')
parchoices = list(sorted(axlabels.items(), key = lambda x:x[1]))
@@ -273,10 +274,16 @@ class ChartParamChoiceForm(forms.Form):
plottype = forms.ChoiceField(choices=plotchoices,initial='scatter')
teamid = forms.IntegerField(widget=forms.HiddenInput())
axlabels.pop('time')
formaxlabels.pop('time')
metricchoices = list(sorted(axlabels.items(), key = lambda x:x[1]))
class FusionMetricChoiceForm(forms.Form):
posneg = (
('pos','Workout 2 starts after Workout 1'),
('neg','Workout 2 starts before Workout 1'),
)
columns = forms.MultipleChoiceField(choices=metricchoices,
initial=[],
widget=forms.CheckboxSelectMultiple())
posneg = forms.ChoiceField(choices=posneg,initial='pos')
offset = forms.DurationField(label='Time Offset',initial=datetime.timedelta())