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 admin config of static questions

Browse Source 
Text and visibility set in admin panel are now respected everywhere
This commit is contained in:
James Graham
2021-03-19 15:36:09 +00:00
parent 74fffb0cac
commit 81598ea624
15 changed files with 184 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
people/views/organisation.py
View File

@@ -117,42 +117,25 @@ class OrganisationDetailView(LoginRequiredMixin, DetailView):
context_object_name = 'organisation'
template_name = 'people/organisation/detail.html'
def build_question_answers(
self,
answer_set: models.OrganisationAnswerSet) -> typing.Dict[str, str]:
"""Collect answers to dynamic questions and join with commas."""
show_all = self.request.user.is_superuser
questions = models.OrganisationQuestion.objects.filter(
is_hardcoded=False)
if not show_all:
questions = questions.filter(answer_is_public=True)
question_answers = {}
try:
for question in questions:
answers = answer_set.question_answers.filter(question=question)
question_answers[str(question)] = ', '.join(map(str, answers))
except AttributeError:
# No AnswerSet yet
pass
return question_answers
def get_context_data(self,
**kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
"""Add map marker to context."""
context = super().get_context_data(**kwargs)
answerset = self.object.current_answers
context['answer_set'] = answerset
context['question_answers'] = self.build_question_answers(answerset)
answer_set = self.object.current_answers
context['answer_set'] = answer_set
context['map_markers'] = [{
'name': self.object.name,
'lat': getattr(answerset, 'latitude', None),
'lng': getattr(answerset, 'longitude', None),
'lat': getattr(answer_set, 'latitude', None),
'lng': getattr(answer_set, 'longitude', None),
}]
context['question_answers'] = {}
if answer_set is not None:
show_all = self.request.user.is_superuser
context['question_answers'] = answer_set.build_question_answers(
show_all)
context['relationship'] = None
try:
relationship = models.OrganisationRelationship.objects.get(