From a83f80a1f9937553951b145db84f58b4fc9c0b67 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 6 May 2015 08:07:06 +0200
Subject: [PATCH] fix access from response to questionnaire to allow use of
 question groups in more than one questionnaire

---
 browser/icons/page_copy.png       | Bin 0 -> 663 bytes
 browser/icons/page_delete.png     | Bin 0 -> 740 bytes
 knowledge/survey/questionnaire.py |  17 ++++++++---------
 3 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 browser/icons/page_copy.png
 create mode 100644 browser/icons/page_delete.png

diff --git a/browser/icons/page_copy.png b/browser/icons/page_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..195dc6d6c365d298e466026b37c1959d96119ea7
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!DM>^@R5;6Z
z(>-WZK@^7J_sq=QY_e{46@P+~LNG}sRzZsxQHvCsN*h5ir6^j7pq-$xu$N#V1gx}9
zClV7;5)7zih-s3DB)G=7|99>ji@So7-P24n=VQ(@GctDX!^_@$bj%oviY6e4Dh;od
zooe%Wvs8LEKQ&&bL&@bwi=STIAI@!-gB2jC5+?y?VR~VkrNxam-`6*8&po|RZ5LpS
zNKdJ%c4bTX`XjKsnecf%W>1%6WT?pKNdLLq{=(f(Col?P1+oq@R>)W(n=x!|*BIIh
z6DJGw_w`)u6yN|vAhMteYK5#b%r5^v+VCFl1IGssaclZZMS{vs-LJ2$)n7DAr6==K
z<29#%AXsBsDoO}SBaXR#_Ap!JKx)(1)3O<uUf6!Hw74-mdSm8_Q-zRrA_S~J#u<`C
z`B_y~wiIKO*avoMo->2pj0_dYWz5By*X74fRT01$Fk%P_RzOMDtV?GU{nsYq#K8iy
zb6qzLYDj`_f5$BwC*WE(t0m#xYJ*=jC2|HQYHh=pf#QG7oowi`h!L!{DB$8|qY{~X
zu8@sU1tWq;n$XThR0%;45mdqXM892|{CJ@0DS*}>?ami06Q_^tvM~Y3K(_-`#m!8f
z8f!QIrH4y#61;0Ym0cCoLl8{IPombPHtnn7%SbTdI&G-d>ZQo!_wBMF9nzX!g8HVY
xYTJPGciz9XMh3w2fmZ(7v{)r*QZD48?mrio{~Iaoq<R1V002ovPDHLkV1mdbD24z4

literal 0
HcmV?d00001

diff --git a/browser/icons/page_delete.png b/browser/icons/page_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..3141467c678d2b53f79deb22086a9cb3a576a08d
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!c1c7*R2Ufr
z!ApphWf%b9=l%X~&fILgg)|a)q3lLMiinG-MM0^Xf{17nMvGFRf@l{mqIHW<SG5R&
zXq8}#Y9h4@K~zLaQ3eT?HkzX0c+Q;vdwZV9Opm;N;@RoB$!AK~hA9LHWRT6cwKG>P
z<w9J&{OZZWdqx0}nRdPT)yek`Y`d$JSe0}VfJ{h>|1Ep}yDQG09bP~E^Dk?@JiKQJ
z6-pO(3~IOP)IYisL6D6;oAEd;E%zR}{U$rMRNuD6nQV7nesKS>)yLo7JuDCrD>Abi
zbj3uW23?^GA}9jQ{M^8v?ejL?HaT7AX5WPZNkBmfN`w-jL?{tT7ykZt$%Yln?p_m~
z-?>&d(LD(jAd}h=LPltPQbO$*Wbyl@G-_k5jXbb<Qq(er3YjEo6e%U5gg`d3D-0+t
zwAM+5D4;^3A%YMRiEK=CfGDC5SyDqLP@#><q#=-*pcJ%FyCj1og}%`@ph9aYGf7ec
zkU$9i=SPed4p~0;n^Wu7+cEuEWv2>#qffHY03>M1jfEqoPJQ6Mr=Byp=^jfzePZV1
zLjCmNi31hdIJHa%e;5g=1(`u3BRzfeExY%=VCu{loOr{`%2hUR*x>tL^W_TTaj);0
zpPR6CUD1+0>4TQ6zVfH3TQ;%l6#(_%yspK@3gcmG<JNN2i*L^LTBH=9CF@ttyZ+-b
zvqxVvTsrSMu3hc)oxdt9-{>#Q4!WCPyLU93nMKk7E2pcA=l45({2jNho>sdF*A~bA
zxX?-cp~y_z_kFf+yqu3m#QiB}03?Z&9vvR5TNgj<)($Vm)xq5G>|o2sFMag&6aNF+
WAT1?sQBYt20000<MNUMnLSTZ8C{xG)

literal 0
HcmV?d00001

diff --git a/knowledge/survey/questionnaire.py b/knowledge/survey/questionnaire.py
index 4f28d4d..45efa0f 100644
--- a/knowledge/survey/questionnaire.py
+++ b/knowledge/survey/questionnaire.py
@@ -59,12 +59,7 @@ class Question(object):
         self.text = text
         self.revertAnswerOptions = False
         self.questionType = 'value_selection'
-
-    def getAnswerRange(self):
-        return self._answerRange or self.questionnaire.defaultAnswerRange
-    def setAnswerRange(self, value):
-        self._answerRange = value
-    answerRange = property(getAnswerRange, setAnswerRange)
+        self.answerRange = None
 
 
 class FeedbackItem(object):
@@ -92,7 +87,9 @@ class Response(object):
                 continue
             for fi, rf in question.feedbackItems.items():
                 if question.revertAnswerOptions:
-                    value = question.answerRange - value - 1
+                    answerRange = (question.answerRange or 
+                            self.questionnaire.defaultAnswerRange)
+                    value = answerRange - value - 1
                 result[fi] = result.get(fi, 0.0) + rf * value
         return sorted(result.items(), key=lambda x: -x[1])
 
@@ -106,10 +103,12 @@ class Response(object):
                 value = self.values.get(qu)
                 if value is None or isinstance(value, basestring):
                     continue
+                answerRange = (qu.answerRange or 
+                               self.questionnaire.defaultAnswerRange)
                 if qu.revertAnswerOptions:
-                    value = qu.answerRange - value - 1
+                    value = answerRange - value - 1
                 score += value 
-                scoreMax += qu.answerRange - 1
+                scoreMax += answerRange - 1
             if scoreMax > 0.0:
                 relScore = score / scoreMax
                 wScore = relScore * len(qugroup.feedbackItems) - 0.00001