From 96103b28c44e8e506ee3642bfdf64cc42e3ad348 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 18 Mar 2013 17:14:19 +0100 Subject: [PATCH] do not show questionnaire together with result; store data entered as track --- knowledge/survey/base.py | 1 - knowledge/survey/browser.py | 8 ++- knowledge/survey/configure.zcml | 9 +++ knowledge/survey/response.py | 37 ++++++++---- knowledge/survey/view_macros.pt | 99 +++++++++++++++++--------------- locales/de/LC_MESSAGES/loops.mo | Bin 23318 -> 23379 bytes locales/de/LC_MESSAGES/loops.po | 3 + organize/tracking/base.py | 8 ++- 8 files changed, 101 insertions(+), 64 deletions(-) diff --git a/knowledge/survey/base.py b/knowledge/survey/base.py index 7dc0a19..cacdcc7 100644 --- a/knowledge/survey/base.py +++ b/knowledge/survey/base.py @@ -122,4 +122,3 @@ class FeedbackItem(AdapterBase, FeedbackItem): @property def text(self): return self.context.description - diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py index 829b340..7fb5631 100644 --- a/knowledge/survey/browser.py +++ b/knowledge/survey/browser.py @@ -28,6 +28,7 @@ from zope.i18n import translate from cybertools.knowledge.survey.questionnaire import Response from loops.browser.concept import ConceptView from loops.common import adapted +from loops.knowledge.survey.response import Responses from loops.organize.party import getPersonForUser from loops.util import _ @@ -62,7 +63,7 @@ class SurveyView(ConceptView): self.errors = self.check(response) if self.errors: return [] - # TODO: store self.data in track + Responses(self.context).save(self.data) if response is not None: result = response.getGroupedResult() return [dict(category=r[0].title, text=r[1].text, @@ -106,8 +107,9 @@ class SurveyView(ConceptView): def getValues(self, question): setting = None - # TODO: get response from track - if self.data is not None: + if self.data is None: + self.data = Responses(self.context).load() + if self.data: setting = self.data.get(question.uid) noAnswer = [dict(value='none', checked=(setting == None), radio=(not question.required))] diff --git a/knowledge/survey/configure.zcml b/knowledge/survey/configure.zcml index 81c33d3..7475adc 100644 --- a/knowledge/survey/configure.zcml +++ b/knowledge/survey/configure.zcml @@ -21,6 +21,15 @@ factory="loops.knowledge.survey.base.FeedbackItem" provides="loops.knowledge.survey.interfaces.IFeedbackItem" /> + + + + + + + -
+ + +
+

Questionnaire

+
+ + + + + + + + + + + + + +
 
+ +
+ +
  +
+
No answerFully appliesDoes not apply
+ + + *** + +
+ +
-

Questionnaire

-
- - - - - - - - - - - - - -
 
- -
- -
  -
-
No answerFully appliesDoes not apply
- - - *** - -
-
- -
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index 39dbbd7b78c9f2902fb16249adcdb9abb4e40d65..84d9df9db4bc64c2e78c6b38714a8caf7af56b16 100644 GIT binary patch delta 8624 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 n8{$^t24V~0