Merge lp:~graeme-acm/sahana-eden/RMS into lp:sahana-eden

[Graeme Foster]

Fixed some tickets identified by Michael...

=== modified file 'models/survey.py'
--- models/survey.py	2011-08-29 15:16:07 +0000
+++ models/survey.py	2011-09-11 14:43:25 +0000
@@ -592,7 +592,7 @@
                                        _colspan="2"),
                                     _class="survey_section"))
                     sectionTitle = question["section"]
-                widgetObj = survey_question_type[question["type"]]()
+                widgetObj = survey_question_type[question["type"]](question_id = question["qstn_id"])
                 if readOnly:
                     table.append(TR(TD(widgetObj.type_represent()),
                                     TD(question["name"])

=== modified file 'modules/s3/s3survey.py'
--- modules/s3/s3survey.py	2011-08-29 15:16:07 +0000
+++ modules/s3/s3survey.py	2011-09-11 14:43:25 +0000
@@ -58,26 +58,26 @@
         savefig(response.body)
 
 # Question Types
-def survey_stringType():
-    return S3QuestionTypeStringWidget()
-def survey_textType():
-    return S3QuestionTypeTextWidget()
-def survey_numericType():
-    return S3QuestionTypeNumericWidget()
-def survey_dateType():
-    return S3QuestionTypeDateWidget()
-def survey_optionType():
-    return S3QuestionTypeOptionWidget()
-def survey_ynType():
-    return S3QuestionTypeOptionYNWidget()
-def survey_yndType():
-    return S3QuestionTypeOptionYNDWidget()
-def survey_locationType():
-    return S3QuestionTypeLocationWidget()
-def survey_linkType():
-    return S3QuestionTypeLinkWidget()
-def survey_ratingType():
-    return S3QuestionTypeStringWidget()
+def survey_stringType(question_id = None):
+    return S3QuestionTypeStringWidget(question_id)
+def survey_textType(question_id = None):
+    return S3QuestionTypeTextWidget(question_id)
+def survey_numericType(question_id = None):
+    return S3QuestionTypeNumericWidget(question_id)
+def survey_dateType(question_id = None):
+    return S3QuestionTypeDateWidget(question_id)
+def survey_optionType(question_id = None):
+    return S3QuestionTypeOptionWidget(question_id)
+def survey_ynType(question_id = None):
+    return S3QuestionTypeOptionYNWidget(question_id)
+def survey_yndType(question_id = None):
+    return S3QuestionTypeOptionYNDWidget(question_id)
+def survey_locationType(question_id = None):
+    return S3QuestionTypeLocationWidget(question_id)
+def survey_linkType(question_id = None):
+    return S3QuestionTypeLinkWidget(question_id)
+def survey_ratingType(question_id = None):
+    return S3QuestionTypeStringWidget(question_id)
     pass
 
 survey_question_type = {
@@ -102,6 +102,7 @@
     """
 
     def __init__(self,
+                 question_id
                 ):
         self.ANSWER_VALID = 0
         self.ANSWER_MISSING = 1
@@ -124,6 +125,7 @@
         self.field = self.mtable.value
         # the list of metadata objects used to describe a question type
         self.metalist = [T("Help message")]
+        self.id = question_id
         self.question = None
         # the list of metadata values held on the database
         self.qstn_metadata = {}
@@ -131,21 +133,23 @@
     def __call__(self, todo, **attributes):
         return self.action[todo](**attributes)
 
-    def _store_metadata(self, qstn_id, update=False):
+    def _store_metadata(self, qstn_id=None, update=False):
         """
             Only get the data from the db if it hasn't already been collected
             Store the question data in self.question
             Store the metadata held by the widget in self.qstn_metadata
         """
+        if qstn_id != None:
+            self.id = qstn_id
         if self.question == None or update:
             db = current.db
             # Get the question from the database
-            query = (self.qtable.id == qstn_id)
+            query = (self.qtable.id == self.id)
             self.question = db(query).select(limitby=(0, 1)).first()
             if self.question == None:
-                raise Exception("no question with id %s in database" % qstn_id)
+                raise Exception("no question with id %s in database" % self.id)
             # Get the metadata from the database and store in qstn_metadata
-            query = (self.mtable.question_id == qstn_id)
+            query = (self.mtable.question_id == self.id)
             self.rows = db(query).select()
             for row in self.rows:
                 self.qstn_metadata[row.descriptor] = row.value
@@ -207,9 +211,11 @@
             Create the display fields for the question type.
             It uses the metadata to define the look of the field
         """
-        if "question_id" not in attr:
+        if "question_id" in attr:
+            self.id = attr["question_id"]
+        if self.id == None:
             raise Exception("Need to specify the question_id for this QuestionType")
-        qstn_id = attr["question_id"]
+        qstn_id = self.id
         self._store_metadata(qstn_id)
         attr["_name"] = self.question.code
         self.attr = attr
@@ -262,8 +268,9 @@
     """
 
     def __init__(self,
+                 question_id = None
                 ):
-        S3QuestionTypeTextWidget.__init__(self)
+        S3QuestionTypeTextWidget.__init__(self, question_id)
         T = current.T
         self.metalist.append(T("Length"))
 
@@ -300,8 +307,9 @@
     """
 
     def __init__(self,
+                 question_id = None
                 ):
-        S3QuestionTypeAbstractWidget.__init__(self)
+        S3QuestionTypeAbstractWidget.__init__(self, question_id)
         T = current.T
         self.metalist.append(T("Length"))
         self.metalist.append(T("Format"))
@@ -490,8 +498,9 @@
     """
 
     def __init__(self,
+                 question_id = None
                 ):
-        S3QuestionTypeAbstractWidget.__init__(self)
+        S3QuestionTypeAbstractWidget.__init__(self, question_id)
         T = current.T
         self.metalist.append(T("Length"))
 
@@ -672,11 +681,12 @@
         return realWidget.validate(valueList, qstn_id)
 
     def type_represent(self):
-        if "type" in self._store_metadata:
-            type = self.get("Yype")
+        try:
+            self._store_metadata()
+            type = self.get("Type")
             parent = self.get("Parent")
             return DIV("%s linked to %s" % (type, parent), _class="surveyLinkWidget")
-        else:
+        except:
             return DIV("Link", _class="surveyLinkWidget")
 
     def getParentQstnID(self):
@@ -955,6 +965,7 @@
 
 
     def summary(self):
+        T = current.T
         details = TABLE()
         for (key, value) in self.listp.items():
             details.append(TR(TD(B(T(key)), TD(value))))
@@ -1047,7 +1058,7 @@
                  answerList
                 ):
         S3AbstractAnalysis.__init__(self, question_id, answerList)
-        linkWidget = S3QuestionTypeLinkWidget()
+        linkWidget = S3QuestionTypeLinkWidget(question_id)
         linkWidget.metadata(question_id = question_id)
         parent = linkWidget.get("Parent")
         relation = linkWidget.get("Relation")