From d834ec2e16d6d98635065358fb3e9a2e1c67b951 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 20 Jul 2015 08:28:45 +0200 Subject: [PATCH] allow selection of question groups by person also in ungrouped presentation --- knowledge/survey/base.py | 5 ++++- knowledge/survey/browser.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/knowledge/survey/base.py b/knowledge/survey/base.py index 467cdff..3d0bc28 100644 --- a/knowledge/survey/base.py +++ b/knowledge/survey/base.py @@ -53,7 +53,10 @@ class Questionnaire(AdapterBase, Questionnaire): @property def questions(self): - for qug in self.questionGroups: + return self.getQuestions() + + def getQuestions(self, personId=None): + for qug in self.getQuestionGroups(personId): for qu in qug.questions: #qu.questionnaire = self yield qu diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py index 888051e..011c6b9 100644 --- a/knowledge/survey/browser.py +++ b/knowledge/survey/browser.py @@ -122,7 +122,7 @@ class SurveyView(InstitutionMixin, ConceptView): questions=questions[idx:idx+3])) return [g for g in result if len(g['questions']) == 3] if self.adapted.noGrouping: - questions = list(self.adapted.questions) + questions = list(self.adapted.getQuestions(self.personId)) questions.sort(key=lambda x: x.title) size = len(questions) bs = self.batchSize