me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 11:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: allow question prefix on dynamic forms

Browse Source 
Setup to support multiple network filters
See #54
This commit is contained in:
James Graham
2021-03-26 11:36:19 +00:00
parent 9f067249de
commit 2664ff6e83
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
people/views/network.py
View File

@@ -20,7 +20,7 @@ class NetworkView(LoginRequiredMixin, FormView):
View to display relationship network.
"""
template_name = 'people/network.html'
form_class = forms.NetworkFilterForm
form_class = forms.NetworkRelationshipFilterForm
def get_form_kwargs(self):
"""
@@ -42,7 +42,7 @@ class NetworkView(LoginRequiredMixin, FormView):
Add filtered QuerySets of :class:`Person` and :class:`Relationship` to the context.
"""
context = super().get_context_data(**kwargs)
form: forms.NetworkFilterForm = context['form']
form: forms.NetworkRelationshipFilterForm = context['form']
if not form.is_valid():
return context
@@ -65,7 +65,7 @@ class NetworkView(LoginRequiredMixin, FormView):
# Filter answers to relationship questions
for field, values in form.cleaned_data.items():
if field.startswith('question_') and values:
if field.startswith(f'{form.question_prefix}question_') and values:
relationship_answerset_set = relationship_answerset_set.filter(
question_answers__in=values)