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

feat: add person and org filters to network

Browse Source 
Resolves #54
This commit is contained in:
James Graham
2021-04-22 21:16:39 +01:00
parent 5a2890ece1
commit 20812dfc40
4 changed files with 162 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
people/forms.py
View File

@@ -53,8 +53,9 @@ class DynamicAnswerSetBase(forms.Form):
continue
# Placeholder question for sorting hardcoded questions
if question.is_hardcoded and (question.hardcoded_field
in self.Meta.fields):
if (question.is_hardcoded
and (as_filters or
(question.hardcoded_field in self.Meta.fields))):
field_order.append(question.hardcoded_field)
continue
@@ -83,7 +84,7 @@ class DynamicAnswerSetBase(forms.Form):
self.fields[field_name] = field
field_order.append(field_name)
if question.allow_free_text:
if question.allow_free_text and not as_filters:
free_field = forms.CharField(label=f'{question} free text',
required=False)
self.fields[f'{field_name}_free'] = free_field
@@ -347,3 +348,22 @@ class NetworkPersonFilterForm(DynamicAnswerSetBase):
required=False,
widget=DatePickerInput(format='%Y-%m-%d'),
help_text='Show relationships as they were on this date')
class NetworkOrganisationFilterForm(DynamicAnswerSetBase):
"""Form to provide filtering on the network view."""
field_class = forms.ModelMultipleChoiceField
field_widget = Select2MultipleWidget
field_required = False
question_model = models.OrganisationQuestion
answer_model = models.OrganisationQuestionChoice
question_prefix = 'organisation_'
def __init__(self, *args, **kwargs):
super().__init__(*args, as_filters=True, **kwargs)
# Add date field to select relationships at a particular point in time
self.fields['date'] = forms.DateField(
required=False,
widget=DatePickerInput(format='%Y-%m-%d'),
help_text='Show relationships as they were on this date')