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: allow multiple nationalities

Browse Source 
Resolves #108
This commit is contained in:
James Graham
2021-03-19 15:57:32 +00:00
parent 81598ea624
commit 27b16c2212
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
people/models/person.py
View File

@@ -147,7 +147,7 @@ class PersonAnswerSet(AnswerSet):
##################
# Static questions
nationality = CountryField(blank=True, null=True)
nationality = CountryField(multiple=True, blank=True)
country_of_residence = CountryField(blank=True, null=True)

7
people/models/question.py
View File

@@ -176,8 +176,11 @@ class AnswerSet(models.Model):
try:
for question in questions:
if question.hardcoded_field:
question_answers[question.text] = getattr(
self, question.hardcoded_field)
answer = getattr(self, question.hardcoded_field)
if isinstance(answer, list):
answer = ', '.join(map(str, answer))
question_answers[question.text] = answer
else:
answers = self.question_answers.filter(