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

fix: update exports for static answerset fields

Browse Source 
Resolves #99
This commit is contained in:
James Graham
2021-05-17 18:26:52 +01:00
parent 479ef038d4
commit f37d7c77c4
5 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
people/models/question.py
View File

@@ -166,27 +166,34 @@ class AnswerSet(models.Model):
def is_current(self) -> bool:
return self.replaced_timestamp is None
def build_question_answers(self, show_all: bool = False) -> typing.Dict[str, str]:
def build_question_answers(self,
show_all: bool = False,
use_slugs: bool = False) -> typing.Dict[str, str]:
"""Collect answers to dynamic questions and join with commas."""
questions = self.question_model.objects.all()
if not show_all:
questions = questions.filter(answer_is_public=True)
question_answers = {}
try:
answerset_answers = list(self.question_answers.order_by().values('text', 'question_id'))
for question in questions:
key = question.slug if use_slugs else question.text
if 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(
question=question)
question_answers[question.text] = ', '.join(
map(str, answers))
answer = ', '.join(
answer['text'] for answer in answerset_answers
if answer['question_id'] == question.id
)
question_answers[key] = answer
except AttributeError:
# No AnswerSet yet