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

Fusion Metrics form only shows metrics that are available

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-12 10:54:19 +01:00
parent d9f59011b3
commit b2ce05f348
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rowers/forms.py
View File

@@ -298,12 +298,19 @@ class FusionMetricChoiceForm(ModelForm):
super(FusionMetricChoiceForm, self).__init__(*args, **kwargs) super(FusionMetricChoiceForm, self).__init__(*args, **kwargs)
# need to add code to remove "empty" fields # need to add code to remove "empty" fields
id = self.instance.id if self.instance.id is not None:
df = dataprep.getrowdata_db(id=id) id = self.instance.id
df = dataprep.getrowdata_db(id=id)[0]
labeldict = {key:value for key,value in metricchoices} labeldict = {key:value for key,value in self.fields['columns'].choices}
for label in labeldict: for label in labeldict:
if df[label].std() == 0: if df.ix[:,label].std() == 0:
self.fields['columns'].choices.remove((label, labeldict[label])) try:
formaxlabels.pop(label)
except KeyError:
pass
metricchoices = list(sorted(formaxlabels.items(), key = lambda x:x[1]))
self.fields['columns'].choices = metricchoices

4
rowers/views.py
View File

@@ -5079,7 +5079,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
) )
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
# Fuse two workouts # Fuse two workouts
@user_passes_test(ispromember,login_url="/",redirect_field_name=None) @user_passes_test(ispromember,login_url="/",redirect_field_name=None)
def workout_fusion_view(request,id1=0,id2=1): def workout_fusion_view(request,id1=0,id2=1):
try: try:
@@ -5092,7 +5092,7 @@ def workout_fusion_view(request,id1=0,id2=1):
except Workout.DoesNotExist: except Workout.DoesNotExist:
raise Http404("One of the workouts doesn't exist") raise Http404("One of the workouts doesn't exist")
if request.method == 'POST': if request.method == 'POST':
form = FusionMetricChoiceForm(request.POST,instance=w2) form = FusionMetricChoiceForm(request.POST,instance=w2)
if form.is_valid(): if form.is_valid():
cd = form.cleaned_data cd = form.cleaned_data