From ae789e117b689b003d4da84e425a089764602cf7 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 21 Apr 2015 13:42:48 +0200 Subject: [PATCH] take reversed polarity into account, normalize to 100% --- knowledge/survey/browser.py | 7 +++++-- locales/de/LC_MESSAGES/loops.mo | Bin 27487 -> 27548 bytes locales/de/LC_MESSAGES/loops.po | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py index 1e82432..ec580e6 100644 --- a/knowledge/survey/browser.py +++ b/knowledge/survey/browser.py @@ -266,8 +266,11 @@ class SurveyView(InstitutionMixin, ConceptView): values = [r.values.get(question) for r in self.teamData] values = [v for v in values if v is not None] if values: - average = round(float(sum(values)) / len(values), 2) - result['average'] = average + average = float(sum(values)) / len(values) + if question.revertAnswerOptions: + average = question.answerRange - average - 1 + average = average * 100 / (question.answerRange - 1) + result['average'] = int(round(average)) texts = [r.texts.get(question) for r in self.teamData] result['texts'] = '
'.join([unicode(t) for t in texts if t]) return result diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 04847d38826974ab19106eeab77bbb886bcbe2a9..1e9869ae698151828c41f823f3f42902345f7a44 100644 GIT binary patch delta 9898 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 delta 9813 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 n