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

take personId into account in all relevant places

Browse source
This commit is contained in:
Helmut Merz 2015-08-13 16:12:53 +02:00
parent f2cf265d0c
commit 0cec511a9f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
knowledge/survey/browser.py
View file

@ -52,7 +52,7 @@ class SurveyView(InstitutionMixin, ConceptView):
template = template template = template
adminMaySelectAllInstitutions = False #adminMaySelectAllInstitutions = False
@Lazy @Lazy
def macro(self): def macro(self):
@ -190,7 +190,7 @@ class SurveyView(InstitutionMixin, ConceptView):
data = respManager.load(uid, instUid) data = respManager.load(uid, instUid)
if data: if data:
resp = Response(self.adapted, self.personId) resp = Response(self.adapted, self.personId)
for qu in self.adapted.questions: for qu in self.adapted.getQuestions(self.personId):
if qu.questionType in (None, 'value_selection'): if qu.questionType in (None, 'value_selection'):
if qu.uid in data: if qu.uid in data:
value = data[qu.uid] value = data[qu.uid]
@ -331,7 +331,7 @@ class SurveyView(InstitutionMixin, ConceptView):
def check(self, response): def check(self, response):
errors = [] errors = []
values = response.values values = response.values
for qu in self.adapted.questions: for qu in self.adapted.getQuestions(self.personId):
if qu.required and qu not in values: if qu.required and qu not in values:
errors.append(dict(uid=qu.uid, errors.append(dict(uid=qu.uid,
text='Please answer the obligatory questions.')) text='Please answer the obligatory questions.'))