cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow selection of question groups by person also in ungrouped presentation

Browse source
This commit is contained in:
Helmut Merz 2015-07-20 08:28:45 +02:00
parent 8256a4efea
commit d834ec2e16
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
knowledge/survey/base.py
View file

@ -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

2
knowledge/survey/browser.py
View file

@ -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