odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] survey: regressions introduced in forward-port fd4fd35e32

This commit is contained in:
Richard Mathot 2014-08-08 17:04:47 +02:00
parent dea05e6a84
commit 413bc62503
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/survey/survey.py
View File

@ -350,17 +350,14 @@ class survey_survey(osv.Model):
#Calculate and return statistics for choice
if question.type in ['simple_choice', 'multiple_choice']:
result_summary = []
for label in question.labels_ids:
count = 0
comments = []
for input_line in question.user_input_line_ids:
if input_line.answer_type == 'suggestion' and input_line.value_suggested.id == label.id and (not current_filters or input_line.user_input_id.id in current_filters):
count = count + 1
if input_line.answer_type == 'text' and (not current_filters or input_line.user_input_id.id in current_filters):
comments.append(input_line)
label_summary = {'text': label.value, 'count': count, 'answer_id': label.id, 'comments': comments}
result_summary = result_summary + [label_summary]
answers = {}
comments = []
[answers.update({label.id: {'text': label.value, 'count': 0, 'answer_id': label.id}}) for label in question.labels_ids]
for input_line in question.user_input_line_ids:
if input_line.answer_type == 'suggestion' and answers.get(input_line.value_suggested.id) and (not(current_filters) or input_line.user_input_id.id in current_filters):
answers[input_line.value_suggested.id]['count'] += 1
if input_line.answer_type == 'text' and (not(current_filters) or input_line.user_input_id.id in current_filters):
comments.append(input_line)
result_summary = {'answers': answers.values(), 'comments': comments}
#Calculate and return statistics for matrix