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

[Graeme Foster]

Added extra metadata to a location so it can hold parent and alternative data to improve the chances of linking up with gis_location

Added the answer to the default template location question to the completed form so that it can be displayed when the completed forms are listed

=== modified file 'controllers/survey.py'
--- controllers/survey.py	2011-11-20 14:33:48 +0000
+++ controllers/survey.py	2011-11-21 16:13:35 +0000
@@ -27,6 +27,8 @@
 import math
 
 from gluon.contenttype import contenttype
+from gluon.serializers import json
+
 from s3survey import S3AnalysisPriority, \
                      survey_question_type, \
                      survey_analysis_type, \
@@ -311,19 +313,7 @@
     def prep(r):
         if r.interactive:
             if r.id and (r.method == "update"):
-                if "post_vars" in current.request and len(current.request.post_vars) > 0:
-                    series_id = r.id
-                    complete_id = r.component_id
-                    id = response.s3.survey_save_answers_for_series(series_id,
-                                                                    complete_id, # Update
-                                                                    current.request.post_vars)
-                    session.flash = T("Record updated")
-                    redirect(URL(c="survey",
-                                 f="series",
-                                 args=[r.id,"update"],
-                                 vars = {}))
-
-
+                table.template_id.writable = False
         return True
 
     def postp(r, output):
@@ -331,11 +321,6 @@
             response.s3.survey_serieslist_dataTable_post(r)
         elif r.component_name == "complete":
             response.s3.survey_answerlist_dataTable_post(r)
-        if r.id and (r.method == "update"):
-            series_id = r.id
-            complete_id = r.component_id
-            form = response.s3.survey_buildQuestionnaireFromSeries(series_id, complete_id)
-            output["form"] = form
         if current.request.ajax == True:
             return output["item"]
         return output
@@ -831,8 +816,10 @@
 
     def postp(r, output):
         if r.interactive:
-            if "vars" in current.request and len(current.request.vars) > 0:
+            if "viewing" in current.request.vars:
                 dummy, series_id = current.request.vars.viewing.split(".")
+            elif "series" in current.request.vars:
+                series_id = current.request.vars.series 
             else:
                 series_id = r.id
             form = response.s3.survey_build_series_summary(series_id)
@@ -840,6 +827,7 @@
             output["sortby"] = [[0,"asc"]]
             output["title"] = crud_strings.title_analysis_summary
             output["subtitle"] = crud_strings.subtitle_analysis_summary
+            output["help"] = crud_strings.help_analysis_summary
             return output
 
     # remove CRUD generated buttons in the tabs
@@ -855,6 +843,8 @@
                                 rheader=response.s3.survey_series_rheader
                                )
     response.s3.actions = None
+    response.s3.dataTableSubmitLabelPosn = "top"
+    response.view = "survey/series_summary.html"
     return output
 
 def series_graph():
@@ -885,9 +875,14 @@
             return tr
 
         if r.interactive:
+            # if the user is logged in then CRUD will set up a next
+            # Unfortunately this kills the display of the chart so...
+            r.next = None
             # Draw the chart
-            if "vars" in current.request and len(current.request.vars) > 0:
+            if "viewing" in current.request.vars:
                 dummy, series_id = current.request.vars.viewing.split(".")
+            elif "series" in current.request.vars:
+                series_id = current.request.vars.series
             else:
                 series_id = r.id
             debug = "Series ID %s<br />" % series_id
@@ -951,6 +946,8 @@
                         image = IMG(_src="data:image/png;base64,%s" % base64Img)
                         output["chart"] = image
                         debug += "base64Img  Size: %s<br />Image: %s<br />base64Img %s" % (len(base64Img), image, base64Img)
+                    if current.request.ajax == True:
+                        return output
             #output["debug"] = debug
 
             # Build the form
@@ -969,7 +966,7 @@
                 lblQstns.append(question["name"])
             numericTypeList = ("Numeric")
 
-            form = FORM()
+            form = FORM(_id="mapGraphForm")
             table = TABLE()
 
             labelQstn = SELECT(lblQstns, _name="labelQuestion", value=labelQuestion)
@@ -993,15 +990,39 @@
             table.append(innerTable)
             form.append(table)
 
-            button = INPUT(_type="submit", _name="Chart", _value=T("Draw Chart"))
+            series = INPUT(_type="hidden",
+                           _id="selectSeriesID",
+                           _name="series",
+                           _value="%s" % series_id
+                          )
+            button = INPUT(_type="button", _id="chart_btn", _name="Chart", _value=T("Select the Question"))
+            form.append(series)
             form.append(button)
-
+            # Set up the javascript code for ajax interaction
+            jurl = URL(r=request, c=r.prefix, f=r.function, args=request.args)
+            response.s3.jquery_ready=["""
+$("#survey_chart").hide();
+$("#survey_show").hide();
+$("#chart_btn").click(function(){
+    $.post('%s',
+           $("#mapGraphForm").serialize(),
+           function(data) {
+                            $("#survey_chart").empty();
+                            $("#survey_chart").append(data);
+                            $("#survey_chart").show();
+                            $("#survey_show").show();
+                            $("#mapGraphForm").hide();
+                          }
+          );
+});
+$("#survey_chart").click(function(){
+    $("#mapGraphForm").toggle();
+});
+""" % jurl]
+            output["showForm"] = P(T("Click on the chart to show/hide the form."))
             output["form"] = form
             output["title"] = crud_strings.title_analysis_chart
             output["subtitle"] = crud_strings.subtitle_analysis_chart
-            # if the user is logged in then CRUD will set up a next
-            # Unfortunately this kills the display of the chart so...
-            r.next = None 
             return output
 
     # remove CRUD generated buttons in the tabs
@@ -1018,6 +1039,8 @@
                                )
     response.s3.has_required = False
     response.view = "survey/series_analysis.html"
+    if current.request.ajax == True:
+        return output["chart"].xml()
     return output
 
 def series_map():
@@ -1048,8 +1071,10 @@
 
     def postp(r, output):
         if r.interactive:
-            if "vars" in current.request and len(current.request.vars) > 0:
+            if "viewing" in current.request.vars:
                 dummy, series_id = current.request.vars.viewing.split(".")
+            elif "series" in current.request.vars:
+                series_id = current.request.vars.series
             else:
                 series_id = r.id
             if series_id == None:
@@ -1159,15 +1184,39 @@
             for question in numericQuestions:
                 numQstns.append(question["name"])
 
-            form = FORM()
+            form = FORM(_id="mapQstnForm")
             table = TABLE()
 
             priorityQstn = SELECT(numQstns, _name="pqstn_name", value=pqstn_name)
+            series = INPUT(_type="hidden",
+                           _id="selectSeriesID",
+                           _name="series",
+                           _value="%s" % series_id
+                          )
             table.append(TR(TH(T("Question to set the Marker Levels:")), _class="survey_question"))
             table.append(priorityQstn)
+            table.append(series)
             form.append(table)
 
             button = INPUT(_type="submit", _name="Chart", _value=T("Select the Question"))
+# REMOVED until we have dynamic loading of maps.
+#            button = INPUT(_type="button", _id="map_btn", _name="Map_Btn", _value=T("Select the Question"))
+#            jurl = URL(r=request, c=r.prefix, f=r.function, args=request.args)
+#            response.s3.jquery_ready=["""
+#$("#map_btn").click(function(){
+#    $.post('%s',
+#           $("#mapQstnForm").serialize(),
+#           function(data) {
+#                            obj = jQuery.parseJSON(data);
+#                            $("#survey_map-legend").empty();
+#                            $("#survey_map-legend").append(obj.legend);
+#                            alert (obj.map);
+#                            $("#survey_map-container").empty();
+#                            $("#survey_map-container").append(obj.map);
+#                          }
+#          );
+#});
+#""" % jurl]
             form.append(button)
 
             output["title"] = crud_strings.title_map
@@ -1187,6 +1236,10 @@
                                )
 
     response.view = "survey/series_map.html"
+# REMOVED until we have dynamic loading of maps.
+#    if current.request.ajax == True:
+#        return json({"legend": output["legend"].xml(),
+#                     "map" : output["map"].xml()})
     return output
 
 def completed_chart():
@@ -1315,9 +1368,13 @@
 
     def prep(r):
         if r.interactive:
-            if "vars" in current.request and len(current.request.vars) > 0:
+            if "viewing" in current.request.vars:
                 dummy, series_id = current.request.vars.viewing.split(".")
+            elif "series" in current.request.vars:
+                series_id = current.request.vars.series 
             else:
+                series_id = r.id
+            if series_id == None:
                 # The URL is bad, without a series id we're lost so list all series
                 redirect(URL(c="survey",
                              f="series",
@@ -1332,8 +1389,12 @@
 
     def postp(r, output):
         if r.interactive:
-            if "vars" in current.request and len(current.request.vars) > 0:
-                tablename, series_id = current.request.vars.viewing.split(".")
+            if "viewing" in current.request.vars:
+                dummy, series_id = current.request.vars.viewing.split(".")
+            elif "series" in current.request.vars:
+                series_id = current.request.vars.series 
+            else:
+                series_id = r.id
             if output["form"] == None:
                 # The user is not authorised to create so switch to read
                 redirect(URL(c="survey",
@@ -1474,7 +1535,7 @@
     s3mgr.load(tablename)
     table = db[tablename]
     crud_strings = response.s3.crud_strings[tablename]
-
+    
     def postp(r, output):
         if r.interactive:
             question_ids = []
@@ -1504,6 +1565,8 @@
                 form = response.s3.survey_build_completed_list(series_id, question_ids)
                 output["items"] = form
                 output["sortby"] = [[0,"asc"]]
+            else:
+                output["items"] = None
             output["title"] = crud_strings.title_selected
             output["subtitle"] = crud_strings.subtitle_selected
             return output
@@ -1518,7 +1581,7 @@
     output = s3_rest_controller(prefix,
                                 "complete", 
                                 method = "list",
-                                rheader=response.s3.survey_complete_rheader
+                                rheader = response.s3.survey_series_rheader
                                )
     response.s3.actions = None
     return output

=== modified file 'models/survey.py'
--- models/survey.py	2011-11-20 14:33:48 +0000
+++ models/survey.py	2011-11-21 16:13:35 +0000
@@ -285,6 +285,8 @@
                 else:
                     query = (qtable.code == question)
                     qstn = db(query).select(qtable.name, limitby=(0, 1)).first()
+                    if qstn == None:
+                        continue
                     questions[question] = qstn.name
                     question =  qstn.name
                 answer = answer.strip("\" ")
@@ -597,6 +599,7 @@
             subtitle_create = T("Add a new Assessment Series"),
             subtitle_list = T("Assessment Series"),
             subtitle_analysis_summary = T("Summary of Responses within Series"),
+            help_analysis_summary = T("Click on a question to highlight once highlighted that question has been selected. Click a second time to de-select the question. All selected questions will be displayed in a summary in a new tab, by pressing the 'Show Selected Answers' button."),
             subtitle_analysis_chart = T("Select a label question and at least one numeric question to draw the graph."),
             subtitle_map = T("Click on a marker to see the assessment details"),
             label_list_button = T("List all Assessment Series"),
@@ -662,6 +665,11 @@
                                        "text",
                                        represent = answer_list_represent
                                        ),
+                                Field("location",
+                                       "text",
+                                       readable=False,
+                                       writable=False
+                                       ),
                                  *s3_meta_fields())
 
         # CRUD Strings
@@ -690,7 +698,30 @@
                 format "code","answer"
                 They will then be inserted into the survey_answer table
                 each item will be a record on that table.
+                
+                This will also extract the default location question as
+                defined by the template and store this in the location field
+                
+                 
             """
+            def extractAnswerFromAnswerList(answerList, qstnCode):
+                """
+                    function to extract the answer for the question code 
+                    passed in from the list of answers. This is in a CSV
+                    format created by the XSL stylesheet or by the function
+                    saveAnswers()
+                """
+                start = answerList.find(qstnCode)
+                if start == -1:
+                    return None
+                start = start+len(qstnCode)+3
+                end = answerList.find('"',start)
+                answer = answerList[start:end]
+                return answer
+
+            ##################################################################
+            # Get the basic data that is needed
+            ##################################################################
             rtable = db.survey_complete
             atable = db.survey_answer
 
@@ -699,10 +730,101 @@
             else:
                 return
 
-            data = Storage()
             id = record.id
+            series_id = record.series_id
+            ##################################################################
+            # Save all the answers from answerList in the survey_answer table
+            ##################################################################
             answerList = record.answer_list
             importAnswers(id, answerList)
+            ##################################################################
+            # Extract the default template location question and save the 
+            # answer in the location field
+            ##################################################################
+            templateRec = getTemplateFromSeries(series_id)
+            locQstn = templateRec["location_qstn"]
+            loc = extractAnswerFromAnswerList(answerList, locQstn)
+            db(rtable.id == id).update(location = loc)
+            ##################################################################
+            # Add additional data (if we have it) to the default location
+            # From related questions as defined in the metadata:
+            # Alternate Name
+            # Parent
+            # Latitude and Longitude
+            ##################################################################
+            # Parent
+            ##################################################################
+            question = getQuestionFromCode(locQstn, series_id)
+            answer = loc
+            widgetObj = survey_question_type["Location"](question["qstn_id"])
+            parentQstn = widgetObj.get("Parent")
+            locationDict = {}
+            if parentQstn != None:
+                parentAnswer = extractAnswerFromAnswerList(answerList, parentQstn)
+                if parentAnswer != None:
+                    locationDict["parent"] = parentAnswer
+
+            ##################################################################
+            # Alternate Name
+            ##################################################################
+            if locationDict != {}:
+                locationDict["raw"] = loc
+                answer = json.dumps(locationDict)
+            locRec = widgetObj.getLocationRecord(id, answer)
+            if locRec != None:
+                if len(locRec.result) == 0:
+                    # if the raw location is unknown see if we can find an alternative
+                    # 1. Does the location contain parenthesis? Such as: "name (local name)"
+                    altFound = False
+                    start = loc.find("(")
+                    if start != -1:
+                        end = loc.find(")")
+                        if end == -1:
+                            end = len(loc)
+                        loc1 = loc[:start]
+                        loc2 = loc[start+1:end]
+                        loc3 = loc[end+1:]
+                        if loc1 != "":
+                            loc1Rec = widgetObj.getLocationRecord(id, loc1)
+                            if len(loc1Rec.result) != 0:
+                                locationDict["alternative"] = loc1
+                                altFound = True
+                        elif loc2 != "" and not altFound:
+                            loc2Rec = widgetObj.getLocationRecord(id, loc2)
+                            if len(loc2Rec.result) != 0:
+                                locationDict["alternative"] = loc2
+                                altFound = True
+                        elif loc3 != "" and not altFound:
+                            loc3Rec = widgetObj.getLocationRecord(id, loc3)
+                            if len(loc3Rec.result) != 0:
+                                locationDict["alternative"] = loc3
+                                altFound = True
+                    if altFound == False:
+                        # strip all none alphabetics from the loc
+                        max = len(loc)
+                        i = 0
+                        while(i < max and not loc[i].isalpha()):
+                            i += 1
+                        start = i
+                        i = max-1
+                        while(i > start and not loc[i].isalpha()):
+                            i -= 1
+                        end = i +1
+                        altLoc = loc[start:end]
+                        if altLoc != "" \
+                           and  widgetObj.getLocationRecord(id, altLoc) != altLoc:
+                            locationDict["alternative"] = altLoc
+                            altFound = True
+            ##################################################################
+            # Update the table if anything has gone into locationDict
+            ##################################################################
+            if locationDict != {}:
+                locationDict["raw"] = loc
+                query = (atable.question_id == question["qstn_id"]) & \
+                        (atable.complete_id == id) 
+                db(query).update(value = locationDict)
+
+            
 
         s3mgr.configure(tablename,
                         onaccept = complete_onaccept,
@@ -749,6 +871,7 @@
             msg_record_deleted = T("Assessment Answer deleted"),
             msg_list_empty = T("No Assessment Answers currently registered"))
 
+
         #**********************************************************************
         # Translate
         #**********************************************************************
@@ -1047,10 +1170,10 @@
         #**********************************************************************
         # Functions that generate some HTML from the data model
         #**********************************************************************
-        """
-            The template rheader
-        """
-        def survey_template_rheader(r, tabs=[]):
+        def template_rheader(r, tabs=[]):
+            """
+                The template rheader
+            """
             if r.representation == "html":
 
                 tablename, record = s3_rheader_resource(r)
@@ -1117,6 +1240,64 @@
                     return rheader
             return None
 
+        def series_rheader(r, tabs=[]):
+            """
+                The series rheader
+            """
+            if r.representation == "html":
+
+                tablename, record = s3_rheader_resource(r)
+                if not record:
+                    series_id = current.request.vars.series
+                    record = getSeries(series_id)
+                if record != None:
+                    # Tabs
+                    if auth.s3_has_permission("create", "survey_series"):
+                        tabs = [(T("Series Details"), "read"),
+                                (T("New Assessment"), "newAssessment/"),
+                                (T("Completed Assessments"), "complete"),
+                                (T("Series Summary"),"series_summary/"),
+                                (T("Summary Details"),"complete_summary/"),
+                                (T("Series Graph"),"series_graph/"),
+                                (T("Series Map"),"series_map/"),
+                                ]
+                    else:
+                        tabs = [(T("Series Details"), "read"),
+                                (T("Series Summary"),"series_summary/"),
+                                (T("Summary Details"),"complete_summary/"),
+                                (T("Series Graph"),"series_graph/"),
+                                (T("Series Map"),"series_map/"),
+                               ]
+
+                    rheader_tabs = s3_rheader_tabs(r, tabs)
+
+                    completeTable = db["survey_complete"]
+                    query = (completeTable.series_id == record.id)
+                    row = db(query).count()
+                    tsection = TABLE(_class="survey-complete-list")
+                    lblSection = T("Completed surveys of this Series:")
+                    if (row == 0):
+                        rsection = SPAN(T("As of yet, no completed surveys have been added to this series."))
+                    else:
+                        rsection = TR(TH(lblSection), TD(row))
+                    tsection.append(rsection)
+
+
+                    rheader = DIV(TABLE(
+                                  TR(
+                                     TH("%s: " % T("Name")),
+                                     record.name,
+                                     TH("%s: " % T("Status")),
+                                     survey_series_status[record.status],
+                                     ),
+                                      ),
+                                  tsection,
+                                  rheader_tabs)
+                    return rheader
+            return None
+
+
+
         def buildQuestionsForm(questions, complete_id=None, readOnly=False):
             # Create the form, hard-coded table layout :(
             form = FORM()
@@ -1222,7 +1403,7 @@
 
 
 
-        def survey_getQuestionFromCode(code, series_id):
+        def getQuestionFromCode(code, series_id):
             """
                 function to return the question for the given series
                 with the code that matches the one passed in
@@ -1299,13 +1480,11 @@
             if complete_id == None:
                 # Insert into database
                 id = db.survey_complete.insert(series_id = series_id, answer_list = text)
-                importAnswers(id, text)
                 return id
             else:
                 # Update the complete_id record
                 table = db.survey_complete
                 db(table.id == complete_id).update(answer_list = text)
-                importAnswers(complete_id, text)
                 return complete_id
 
         def survey_get_series_questions(series_id):
@@ -1330,56 +1509,6 @@
 
 
 
-        def survey_series_rheader(r, tabs=[]):
-            if r.representation == "html":
-
-                tablename, record = s3_rheader_resource(r)
-                if tablename == "survey_series" and record:
-
-                    # Tabs
-                    if auth.s3_has_permission("create", "survey_series"):
-                        tabs = [(T("New Assessment"), "newAssessment/"),
-                                (T("Completed Assessments"), "complete"),
-                                (T("Series Details"), "read"),
-                                (T("Series Summary"),"series_summary/"),
-                                (T("Series Graph"),"series_graph/"),
-                                (T("Series Map"),"series_map/"),
-                                ]
-                    else:
-                        tabs = [(T("Series Details"), "read"),
-                                (T("Series Summary"),"series_summary/"),
-                                (T("Series Graph"),"series_graph/"),
-                                (T("Series Map"),"series_map/"),
-                               ]
-
-                    rheader_tabs = s3_rheader_tabs(r, tabs)
-
-                    completeTable = db["survey_complete"]
-                    query = (completeTable.series_id == record.id)
-                    row = db(query).count()
-                    tsection = TABLE(_class="survey-complete-list")
-                    lblSection = T("Completed surveys of this Series:")
-                    if (row == 0):
-                        rsection = SPAN(T("As of yet, no completed surveys have been added to this series."))
-                    else:
-                        rsection = TR(TH(lblSection), TD(row))
-                    tsection.append(rsection)
-
-
-                    rheader = DIV(TABLE(
-                                  TR(
-                                     TH("%s: " % T("Name")),
-                                     record.name,
-                                     TH("%s: " % T("Status")),
-                                     survey_series_status[record.status],
-                                     ),
-                                      ),
-                                  tsection,
-                                  rheader_tabs)
-                    return rheader
-            return None
-
-
 
         # Response
 
@@ -1390,7 +1519,6 @@
                     TH(T("Code")),
                     TH(T("Question")),
                     TH(T("Type")),
-# removed upon request                    TH(T("Completed")),
                     TH(T("Summary"))
                    )
             header = THEAD(hr)
@@ -1416,7 +1544,6 @@
                 if chart:
                     cell.append(chart)
                 br.append(cell)
-# removed upon request                br.append(analysisTool.count())
                 analysisTool.count()
                 br.append(analysisTool.summary())
 
@@ -1451,6 +1578,13 @@
             """
             ctable = db.survey_complete
             atable = db.survey_answer
+            qtable = db.survey_question
+            # Get the type - so that the widget can be built
+            query = (qtable.id == question_id)
+            question = db(query).select(qtable.type,
+                                        limitby=(0, 1)).first()
+            qstnType = question.type
+            widgetObj = survey_question_type[qstnType](question_id)
             query = db((atable.question_id == question_id) & \
                        (atable.complete_id == ctable.id) & \
                        (ctable.series_id == series_id)
@@ -1463,7 +1597,7 @@
             for row in rows:
                 answer = {}
                 answer["answer_id"] = row.id
-                answer["value"] = row.value
+                answer["value"] = widgetObj.repr(row.value)
                 answer["complete_id"] = row.complete_id
                 answers.append(answer)
             return answers
@@ -1479,20 +1613,6 @@
                 value.key = key
                 value.complete_id = analysisTool.complete_id[key]
                 response_locations.append(value)
-#            ctable = db.survey_complete
-#            atable = db.survey_answer
-#            gtable = db.gis_location
-#
-#            question_id = getLocationQuestion(series_id)
-#            query = (atable.question_id == question_id) & \
-#                    (ctable.series_id == series_id) & \
-#                    (atable.complete_id == ctable.id ) & \
-#                    (atable.value == gtable.name)
-#            response_locations =  db(query).select(atable.complete_id,
-#                                                   gtable.name,
-#                                                   gtable.lat,
-#                                                   gtable.lon,
-#                                                  )
             return response_locations
 
 
@@ -1500,7 +1620,7 @@
             templateRec = getTemplateFromSeries(series_id)
             if templateRec != None:
                 locationQstnCode = templateRec["location_qstn"]
-                question = survey_getQuestionFromCode(locationQstnCode, series_id)
+                question = getQuestionFromCode(locationQstnCode, series_id)
                 return question["qstn_id"]
             else:
                 return None
@@ -1509,7 +1629,7 @@
             templateRec = getTemplateFromSeries(series_id)
             if templateRec != None:
                 priorityQstnCode = templateRec["priority_qstn"]
-                question = survey_getQuestionFromCode(priorityQstnCode, series_id)
+                question = getQuestionFromCode(priorityQstnCode, series_id)
                 return question
             else:
                 return None
@@ -1519,21 +1639,15 @@
             # The answer list has been removed for the moment. Currently it
             # displays all answers for a summary it would be better to
             # be able to display just a few select answers
-            list_fields = ["created_on", "series_id", ]#"answer_list"]
+            list_fields = ["created_on", "series_id", "location"]#"answer_list"]
             s3mgr.configure("survey_complete", list_fields=list_fields)
 
         def survey_serieslist_dataTable_post(r):
             s3_action_buttons(r)
-            if auth.s3_has_permission("create", tablename):
-                url = URL(c=module,
-                          f="newAssessment",
-                          vars={"viewing":"survey_series.[id]"}
-                         )
-            else:
-                url = URL(c=module,
-                          f="series",
-                          args=["[id]/read"]
-                         )
+            url = URL(c=module,
+                      f="series_summary",
+                      vars={"viewing":"survey_series.[id]"}
+                     )
             response.s3.actions = [
                                    dict(label=str(T("Open")),
                                         _class="action-btn",
@@ -1615,30 +1729,6 @@
             response.s3.dataTableID = "completed_list"
             return table
 
-        def complete_rheader(r, tabs=[]):
-            # This doesn't work because it loses the series id details
-#            if r.representation == "html":
-#                # Tabs
-#                if auth.s3_has_permission("create", "survey_series"):
-#                    tabs = [(T("New Assessment"), "newAssessment/"),
-#                            (T("Completed Assessments"), "complete"),
-#                            (T("Series Details"), "read"),
-#                            (T("Series Summary"),"series_summary/"),
-#                            (T("Series Graph"),"series_analysis/"),
-#                            (T("Series Map"),"series_map/"),
-#                            ]
-#                else:
-#                    tabs = [(T("Series Details"), "read"),
-#                            (T("Series Summary"),"series_summary/"),
-#                            (T("Series Graph"),"series_analysis/"),
-#                            (T("Series Map"),"series_map/"),
-#                           ]
-#
-#                rheader_tabs = s3_rheader_tabs(r, tabs)
-#                rheader = DIV(rheader_tabs)
-#                return rheader
-            return None
-
         def importAnswers(id, list):
             """
                 private function used to save the answer_list stored in
@@ -1840,14 +1930,13 @@
             survey_buildQuestionnaireFromTemplate = buildQuestionnaireFromTemplate,
             survey_buildQuestionnaireFromSeries = buildQuestionnaireFromSeries,
             survey_buildQuestionnaire = buildQuestionnaire,
+            survey_template_rheader = template_rheader,
+            survey_series_rheader = series_rheader,
 
-            survey_template_rheader = survey_template_rheader,
             survey_build_template_summary = survey_build_template_summary,
             survey_section_rheader = survey_section_rheader,
-            survey_series_rheader = survey_series_rheader,
             survey_build_series_summary = survey_build_series_summary,
             survey_section_select_widget = survey_section_select_widget,
-            survey_complete_rheader = complete_rheader,
             survey_answerlist_dataTable_pre = survey_answerlist_dataTable_pre,
             survey_answerlist_dataTable_post = survey_answerlist_dataTable_post,
             survey_serieslist_dataTable_post = survey_serieslist_dataTable_post,
@@ -1859,7 +1948,7 @@
             survey_getPriorityQuestionForSeries = getPriorityQuestionForSeries,
             survey_get_series_questions = survey_get_series_questions,
             survey_get_series_questions_of_type = survey_get_series_questions_of_type,
-            survey_getQuestionFromCode = survey_getQuestionFromCode,
+            survey_getQuestionFromCode = getQuestionFromCode,
             survey_getQuestionFromName = survey_getQuestionFromName,
             )
 

=== modified file 'modules/s3/s3survey.py'
--- modules/s3/s3survey.py	2011-11-20 14:33:48 +0000
+++ modules/s3/s3survey.py	2011-11-21 16:13:35 +0000
@@ -41,7 +41,7 @@
     import sys
     print >> sys.stderr, "WARNING: xlwt module needed for XLS export"
 
-DEBUG = False
+DEBUG = True
 if DEBUG:
     print >> sys.stderr, "S3Survey: DEBUG MODE"
     def _debug(m):
@@ -412,6 +412,14 @@
             answer = ""
         return answer
 
+    def repr(self, value=None):
+        """
+            function to format the answer, which can be passed in
+        """
+        if value == None:
+            value = getAnswer()
+        return value
+
     def loadAnswer(self, complete_id, question_id, forceDB=False):
         """
             This will return a value held by the widget
@@ -1063,11 +1071,13 @@
             If it is plain text then this is the location as entered, and is
             the value that needs to be returned.
             
-            If it is a JSON value then it may include any of the following
-            properties.
+            If it is a JSON value then it should include the raw value and
+            any other of the following properties.
             {'raw':'original value',
-             'id':numerical value referencing a record on gis_location table, 
+             'id':numerical value referencing a record on gis_location table,
              'alternative':'alternative name for location',
+             'parent':'name of the parent location'
+             'lat_lon': [lat,lon],
             }
         """
         if "answer" in self.question:
@@ -1081,6 +1091,18 @@
         else:
             return ""
 
+    def repr(self, value=None):
+        """
+            function to format the answer, which can be passed in
+        """
+        if value == None:
+            return getAnswer()
+        try:
+            rowList = self.getAnswerListFromJSON(value)
+            return rowList["raw"]
+        except:
+            return value
+
     def getLocationRecord(self, complete_id, answer):
         """
             Return the location record from the database
@@ -1091,18 +1113,15 @@
             # if it is JSON then ensure all quotes are converted to double
             try:
                 rowList = self.getAnswerListFromJSON(answer)
+            except:
+                query = (gtable.name == answer)
+                record.key = answer
+            else:
                 if "id" in rowList:
                     query = (gtable.id == rowList["id"])
                     record.key = rowList["id"]
-                elif "alternative" in rowList:
-                    query = (gtable.name == rowList["alternative"])
-                    record.key = rowList["alternative"]
                 else:
-                    query = (gtable.name == rowList["raw"])
-                    record.key = rowList["raw"]
-            except:
-                query = (gtable.name == answer)
-                record.key = answer
+                    (query, record) = self.buildQuery(rowList)
             record.result = current.db(query).select(gtable.name,
                                              gtable.lat,
                                              gtable.lon,
@@ -1112,6 +1131,21 @@
         else:
             return None
 
+    def buildQuery(self, rowList):
+        record = Storage()
+        gtable = current.db.gis_location
+        if "alternative" in rowList:
+            query = (gtable.name == rowList["alternative"])
+            record.key = rowList["alternative"]
+        else:
+            query = (gtable.name == rowList["raw"])
+            record.key = rowList["raw"]
+        if "parent" in rowList:
+            parent_query = current.db(gtable.name == rowList["parent"]).select(gtable.id)
+            query = query & (gtable.parent.belongs(parent_query))
+            record.key += rowList["parent"]
+        return (query, record)
+
     def getAnswerListFromJSON(self, answer):
         """
             If the answer is stored as a JSON value return the data as a map
@@ -1629,8 +1663,12 @@
         for answer in self.answerList:
             if self.valid(answer):
                 try:
-                    self.valueList.append(self.castRawAnswer(answer["complete_id"], answer["value"]))
+                    cast = self.castRawAnswer(answer["complete_id"], answer["value"])
+                    if cast != None:
+                        self.valueList.append(cast)
                 except:
+                    if DEBUG:
+                        raise
                     pass
         
         self.basicResults()
@@ -1725,7 +1763,7 @@
 
     def uniqueCount(self):
         """
-            Calculate the number of occurances the same value occurs
+            Calculate the number of occurances of each value
         """
         map = {}
         for answer in self.valueList:
@@ -1817,7 +1855,10 @@
         self.histCutoff = 10
 
     def castRawAnswer(self, complete_id, answer):
-        return float(answer)
+        try:
+            return float(answer)
+        except:
+            return None
 
     def summary(self):
         T = current.T
@@ -1870,7 +1911,8 @@
                 value = self.castRawAnswer(complete_id, answer["value"])
             except:
                 continue
-            self.zscore[complete_id] = (value - self.mean)/self.std
+            if value != None:
+                self.zscore[complete_id] = (value - self.mean)/self.std
 
     def priority(self, complete_id, priorityObj):
         priorityList = priorityObj.range
@@ -2142,7 +2184,10 @@
         self.complete_id = {}
         for answer in self.valueList:
             if answer != None:
-                key = answer.key
+                if isinstance(answer, dict):
+                    key = answer.key
+                else:
+                    key = answer
                 if key in self.locationList:
                     self.locationList[key] += 1
                 else:
@@ -2173,6 +2218,17 @@
         """
         return None
 
+    def uniqueCount(self):
+        """
+            Calculate the number of occurances of each value
+        """
+        map = {}
+        for answer in self.valueList:
+            if answer.key in map:
+                map[answer.key] += 1
+            else:
+                map[answer.key] = 1
+        return map
 
 class S3LinkAnalysis(S3AbstractAnalysis):
     def __init__(self,
@@ -2213,6 +2269,7 @@
     def drawChart(self, response, data = None, label = None, xLabel = None, yLabel = None):
         return self.widget.drawChart(response, data, label, xLabel, yLabel)
 
+
 class S3GridAnalysis(S3AbstractAnalysis):
     pass
 

=== modified file 'private/prepopulate/demo/ADAT/questionnaire24H.csv'
--- private/prepopulate/demo/ADAT/questionnaire24H.csv	2011-11-04 05:47:13 +0000
+++ private/prepopulate/demo/ADAT/questionnaire24H.csv	2011-11-21 16:13:35 +0000
@@ -6,7 +6,7 @@
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Geographic area","Location",,5,"24H-BI-5","{'Length': '80'}"
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Geographic area approximate number of inhabitants","Link",,6,"24H-BI-6","{'Parent': '24H-BI-5', 'Type': 'Numeric', 'Relation': 'groupby'}"
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Geographic area approximate number of inhabitants","Link",,6,"24H-BI-6","{'Format': 'n'}"
-"24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Community assessed","Location",,7,"24H-BI-7","{'Length': '80'}"
+"24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Community assessed","Location",,7,"24H-BI-7","{'Length': '80', 'Parent':'24H-BI-5'}"
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Community assessed approximate number of inhabitants","Link",,8,"24H-BI-8","{'Parent': '24H-BI-7','Type': 'Numeric','Relation': 'groupby'}"
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Community assessed approximate number of inhabitants","Link",,8,"24H-BI-8","{'Format': 'n'}"
 "24 Hour B","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","24H-BI-9","24H-BI-12","24H-BI-13","24H-BI-7","24H-S-1","Background Info",1,"Name of assessment team leader","String",,9,"24H-BI-9","{'Length': '80'}"

=== removed file 'static/formats/s3csv/hrm/person.csv'
--- static/formats/s3csv/hrm/person.csv	2011-08-11 13:59:56 +0000
+++ static/formats/s3csv/hrm/person.csv	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Type,Sex,First Name,Last Name,Title,Email,Mobile Phone,Organisation,Office Phone,Skype,Office,Department,Country,Office City,Office Street address,Office Post code,Office Lat,Office Lon,Exact Coord?

=== removed file 'static/formats/s3csv/hrm/skill.csv'
--- static/formats/s3csv/hrm/skill.csv	2011-11-17 09:58:51 +0000
+++ static/formats/s3csv/hrm/skill.csv	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Type,Name,Comments

=== removed file 'static/formats/s3csv/survey/24H_Rapid_response.xsl'
--- static/formats/s3csv/survey/24H_Rapid_response.xsl	2011-11-11 00:02:42 +0000
+++ static/formats/s3csv/survey/24H_Rapid_response.xsl	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- **********************************************************************
-         survey-Response - CSV Import Stylesheet
-
-         2011-Jun-28 / Graeme Foster <graeme AT acm DOT org>
-
-         - Specialist transform file for the 24H rapid assessment form
-
-         - use for import to survey/question_response resource
-
-         - example raw URL usage:
-           Let URLpath be the URL to Sahana Eden appliation
-           Let Resource be survey/question_response/create
-           Let Type be s3csv
-           Let CSVPath be the path on the server to the CSV file to be imported
-           Let XSLPath be the path on the server to the XSL transform file
-           Then in the browser type:
-
-           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
-
-           You can add a third argument &ignore_errors
-
-         CSV fields:
-         Template..............survey_template.name
-         Series................survey_series.name
-         24H-X-Y...............survey_response.question_list (question code)
-
-    *********************************************************************** -->
-    <xsl:output method="xml"/>
-    <xsl:include href="../../xml/commons.xsl"/>
-
-    <!-- ****************************************************************** -->
-    <!-- List of question codes -->
-
-    <xsl:variable name="question_list">
-        24H-BI-1,
-        24H-BI-2,
-        24H-BI-3,
-        24H-BI-4,
-        24H-BI-5,
-        24H-BI-6,
-        24H-BI-7,
-        24H-BI-8,
-        24H-BI-9,
-        24H-BI-10,
-        24H-BI-11,
-        24H-BI-12,
-        24H-BI-13,
-        24H-H-1,
-        24H-H-2,
-        24H-H-3,
-        24H-H-4,
-        24H-H-5,
-        24H-H-6,
-        24H-H-7,
-        24H-I-1,
-        24H-I-2,
-        24H-I-3,
-        24H-I-4,
-        24H-I-5,
-        24H-I-6,
-        24H-I-7,
-        24H-I-8,
-        24H-I-9,
-        24H-I-10,
-        24H-I-11,
-        24H-I-12,
-        24H-I-13,
-        24H-I-14,
-        24H-I-15,
-        24H-L-1,
-        24H-L-2,
-        24H-L-3,
-        24H-L-4,
-        24H-L-5,
-        24H-L-6,
-        24H-L-7,
-        24H-Re-1,
-        24H-Re-2,
-        24H-Re-3,
-        24H-Re-4,
-        24H-Re-5,
-        24H-Ri-1,
-        24H-Ri-2,
-        24H-Ri-3,
-        24H-Ri-4,
-        24H-S-1,
-        24H-S-2,
-        24H-S-3,
-        24H-S-4,
-        24H-S-5,
-        24H-S-6,
-        24H-S-7,
-        24H-S-8,
-        24H-S-9
-    </xsl:variable>
-
-    <!-- ****************************************************************** -->
-
-    <xsl:template match="/">
-        <s3xml>
-            <xsl:apply-templates select="table/row"/>
-        </s3xml>
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-    <xsl:template match="row">
-
-        <!-- Create the survey template -->
-        <resource name="survey_template">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='Template']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='Template']"/></data>
-            <data field="description"><xsl:value-of select="col[@field='Template Description']"/></data>
-            <data field="status"><xsl:value-of select="1"/></data>
-        </resource>
-
-        <resource name="survey_series">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='Series']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='Series']"/></data>
-            <!-- Link to Template -->
-            <reference field="template_id" resource="survey_template">
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="col[@field='Template']"/>
-                </xsl:attribute>
-            </reference>
-        </resource>
-
-        <resource name="survey_complete">
-
-            <data field="answer_list">
-                <xsl:call-template name="splitList">
-                    <xsl:with-param name="list" select="$question_list"/>
-                </xsl:call-template>
-            </data>
-
-            <!-- Link to Series -->
-            <reference field="series_id" resource="survey_series">
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="col[@field='Series']"/>
-                </xsl:attribute>
-            </reference>
-        </resource>
-
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-    <!-- Helper template to insert a single answer as quoted tuple
-         called by splitList of the answer_list
-    -->
-    <xsl:template name="resource">
-
-        <xsl:param name="item"/>
-        <xsl:if test="col[@field=$item]!=''">
-            <xsl:value-of select="concat('&quot;', $item, '&quot;,&quot;', col[@field=$item], '&quot;', $newline)"/>
-        </xsl:if>
-
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-
-</xsl:stylesheet>

=== modified file 'static/formats/s3csv/survey/answer.xsl'
--- static/formats/s3csv/survey/answer.xsl	2011-11-11 00:02:42 +0000
+++ static/formats/s3csv/survey/answer.xsl	2011-11-21 16:13:35 +0000
@@ -9,17 +9,8 @@
 
          - use for import to survey/answer resource
 
-         - example raw URL usage:
-           Let URLpath be the URL to Sahana Eden appliation
-           Let Resource be survey/answer/create
-           Let Type be s3csv
-           Let CSVPath be the path on the server to the CSV file to be imported
-           Let XSLPath be the path on the server to the XSL transform file
-           Then in the browser type:
-
-           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
-
-           You can add a third argument &ignore_errors
+         - this is used in the survey model, by the function importAnswers
+           which is why it uses the id's directly
 
          CSV fields:
          complete_id.......survey_answer.complete_id

=== removed file 'static/formats/s3csv/survey/question_metadata.xsl'
--- static/formats/s3csv/survey/question_metadata.xsl	2011-11-11 00:02:42 +0000
+++ static/formats/s3csv/survey/question_metadata.xsl	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- **********************************************************************
-         survey-Template - CSV Import Stylesheet
-
-         2011-Jun-16 / Graeme Foster <graeme AT acm DOT org>
-
-         - use for import to survey/question_metadata resource
-
-         - example raw URL usage:
-           Let URLpath be the URL to Sahana Eden appliation
-           Let Resource be survey/question_metadata/create
-           Let Type be s3csv
-           Let CSVPath be the path on the server to the CSV file to be imported
-           Let XSLPath be the path on the server to the XSL transform file
-           Then in the browser type:
-
-           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
-
-           You can add a third argument &ignore_errors
-
-         CSV fields:
-         Question..............survey_question.name
-         Question Type.........survey_question.type
-         Question Notes........survey_question.notes
-         Question Code.........survey_question.code
-         metaD1................survey_question_metadata.descriptor
-         metaV1................survey_question_metadata.value
-         metaD2................survey_question_metadata.descriptor
-         metaV2................survey_question_metadata.value
-         metaD3................survey_question_metadata.descriptor
-         metaV3................survey_question_metadata.value
-
-
-    *********************************************************************** -->
-    <xsl:output method="xml"/>
-
-    <!-- ****************************************************************** -->
-
-    <xsl:template match="/">
-        <s3xml>
-            <xsl:apply-templates select="table/row"/>
-        </s3xml>
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-    <xsl:template match="row">
-
-        <resource name="survey_question">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='Question']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='Question']"/></data>
-            <data field="type"><xsl:value-of select="col[@field='Question Type']"/></data>
-            <data field="code"><xsl:value-of select="col[@field='Question Code']"/></data>
-            <data field="notes"><xsl:value-of select="col[@field='Question Notes']"/></data>
-        </resource>
-
-        <xsl:if test="col[@field='metaD1']!=''">
-            <resource name="survey_question_metadata">
-                <data field="descriptor"><xsl:value-of select="col[@field='metaD1']"/></data>
-                <xsl:choose>
-                    <xsl:when test="col[@field='metaV1']=''">
-                        <data field="value">None</data>
-                    </xsl:when>
-                    <xsl:otherwise test="col[@field='metaV1']=''">
-                        <data field="value"><xsl:value-of select="col[@field='metaV1']"/></data>
-                    </xsl:otherwise>
-                </xsl:choose>
-                <!-- Link to Questions -->
-                <reference field="question_id" resource="survey_question">
-                    <xsl:attribute name="tuid">
-                        <xsl:value-of select="col[@field='Question']"/>
-                    </xsl:attribute>
-                </reference>
-            </resource>
-        </xsl:if>
-
-        <xsl:if test="col[@field='metaD2']!=''">
-            <resource name="survey_question_metadata">
-                <data field="descriptor"><xsl:value-of select="col[@field='metaD2']"/></data>
-                <xsl:choose>
-                    <xsl:when test="col[@field='metaV2']=''">
-                        <data field="value">None</data>
-                    </xsl:when>
-                    <xsl:otherwise test="col[@field='metaV2']=''">
-                        <data field="value"><xsl:value-of select="col[@field='metaV2']"/></data>
-                    </xsl:otherwise>
-                </xsl:choose>
-                <!-- Link to Questions -->
-                <reference field="question_id" resource="survey_question">
-                    <xsl:attribute name="tuid">
-                        <xsl:value-of select="col[@field='Question']"/>
-                    </xsl:attribute>
-                </reference>
-            </resource>
-        </xsl:if>
-
-        <xsl:if test="col[@field='metaD3']!=''">
-            <resource name="survey_question_metadata">
-                <data field="descriptor"><xsl:value-of select="col[@field='metaD3']"/></data>
-                <xsl:choose>
-                    <xsl:when test="col[@field='metaV3']=''">
-                        <data field="value">None</data>
-                    </xsl:when>
-                    <xsl:otherwise test="col[@field='metaV3']=''">
-                        <data field="value"><xsl:value-of select="col[@field='metaV3']"/></data>
-                    </xsl:otherwise>
-                </xsl:choose>
-                <!-- Link to Questions -->
-                <reference field="question_id" resource="survey_question">
-                    <xsl:attribute name="tuid">
-                        <xsl:value-of select="col[@field='Question']"/>
-                    </xsl:attribute>
-                </reference>
-            </resource>
-        </xsl:if>
-
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-
-</xsl:stylesheet>

=== removed file 'static/formats/s3csv/survey/section.xsl'
--- static/formats/s3csv/survey/section.xsl	2011-11-11 00:02:42 +0000
+++ static/formats/s3csv/survey/section.xsl	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- **********************************************************************
-         survey-section - CSV Import Stylesheet
-
-         2011-Jun-16 / Graeme Foster <graeme AT acm DOT org>
-
-         - use for import to survey/series resource
-
-         - example raw URL usage:
-           Let URLpath be the URL to Sahana Eden appliation
-           Let Resource be survey/section/create
-           Let Type be s3csv
-           Let CSVPath be the path on the server to the CSV file to be imported
-           Let XSLPath be the path on the server to the XSL transform file
-           Then in the browser type:
-
-           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
-
-           You can add a third argument &ignore_errors
-
-         CSV fields:
-         name..............survey_series
-         description.......survey_series
-         position..........survey_series
-         template..........survey_template
-
-    *********************************************************************** -->
-    <xsl:output method="xml"/>
-
-    <!-- ****************************************************************** -->
-
-    <xsl:template match="/">
-        <s3xml>
-            <xsl:apply-templates select="table/row"/>
-        </s3xml>
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-    <xsl:template match="row">
-
-        <!-- Lookup table survey_template -->
-        <resource name="survey_template">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='template']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='template']"/></data>
-        </resource>
-
-        <!-- Create the Survey -->
-        <resource name="survey_section">
-            <data field="name"><xsl:value-of select="col[@field='name']"/></data>
-            <data field="description"><xsl:value-of select="col[@field='description']"/></data>
-            <data field="position"><xsl:value-of select="col[@field='position']"/></data>
-            <!-- Link to Template -->
-            <reference field="template_id" resource="survey_template">
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="col[@field='template']"/>
-                </xsl:attribute>
-            </reference>
-        </resource>
-
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-
-</xsl:stylesheet>

=== removed file 'static/formats/s3csv/survey/series.xsl'
--- static/formats/s3csv/survey/series.xsl	2011-11-11 00:02:42 +0000
+++ static/formats/s3csv/survey/series.xsl	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-    <!-- **********************************************************************
-         survey-Template - CSV Import Stylesheet
-
-         2011-Jun-16 / Graeme Foster <graeme AT acm DOT org>
-
-         - use for import to survey/series resource
-
-         - example raw URL usage:
-           Let URLpath be the URL to Sahana Eden appliation
-           Let Resource be survey/series/create
-           Let Type be s3csv
-           Let CSVPath be the path on the server to the CSV file to be imported
-           Let XSLPath be the path on the server to the XSL transform file
-           Then in the browser type:
-
-           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
-
-           You can add a third argument &ignore_errors
-
-         CSV fields:
-         name..............survey_series
-         description.......survey_series
-         template..........survey_template
-         organisation......org_organisation
-         person_fname......pr_person
-         person_lname......pr_person
-         person_email......pr_person
-         logo..............survey_series
-         language..........survey_series
-         start_date........survey_series
-         end_date..........survey_series
-
-    *********************************************************************** -->
-    <xsl:output method="xml"/>
-
-    <!-- ****************************************************************** -->
-
-    <xsl:template match="/">
-        <s3xml>
-            <xsl:apply-templates select="table/row"/>
-        </s3xml>
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-    <xsl:template match="row">
-
-        <!-- Lookup table survey_template -->
-        <resource name="survey_template">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='template']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='template']"/></data>
-        </resource>
-
-        <!-- Lookup table Organisation -->
-        <resource name="org_organisation">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="col[@field='organisation']"/>
-            </xsl:attribute>
-            <data field="name"><xsl:value-of select="col[@field='organisation']"/></data>
-        </resource>
-
-        <!-- Lookup table person -->
-        <xsl:variable name="person" select="col[@field='person_email']"/>
-        <resource name="pr_person">
-            <xsl:attribute name="tuid">
-                <xsl:value-of select="$person"/>
-            </xsl:attribute>
-            <data field="first_name"><xsl:value-of select="col[@field='person_fname']"/></data>
-            <data field="last_name"><xsl:value-of select="col[@field='person_lname']"/></data>
-            <!-- Contact Information -->
-            <resource name="pr_contact">
-                <data field="contact_method" value="1"/>
-                <data field="value"><xsl:value-of select="$person"/></data>
-            </resource>
-        </resource>
-
-        <!-- Create the Survey -->
-        <resource name="survey_series">
-            <data field="name"><xsl:value-of select="col[@field='name']"/></data>
-            <data field="description"><xsl:value-of select="col[@field='description']"/></data>
-            <data field="logo"><xsl:value-of select="col[@field='logo']"/></data>
-            <data field="language"><xsl:value-of select="col[@field='language']"/></data>
-            <data field="start_date"><xsl:value-of select="col[@field='start_date']"/></data>
-            <data field="end_date"><xsl:value-of select="col[@field='end_date']"/></data>
-            <!-- Link to Template -->
-            <reference field="template_id" resource="survey_template">
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="col[@field='template']"/>
-                </xsl:attribute>
-            </reference>
-            <!-- Link to Organisation -->
-            <reference field="organisation_id" resource="org_organisation">
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="col[@field='organisation']"/>
-                </xsl:attribute>
-            </reference>
-            <!-- Create the User -->
-            <reference field="person_id" resource="pr_person">
-                <!-- Person record -->
-                <xsl:attribute name="tuid">
-                    <xsl:value-of select="$person"/>
-                </xsl:attribute>
-            </reference>
-        </resource>
-
-    </xsl:template>
-
-    <!-- ****************************************************************** -->
-
-</xsl:stylesheet>

=== modified file 'static/scripts/S3/s3.dataTables.js'
--- static/scripts/S3/s3.dataTables.js	2011-10-09 20:17:36 +0000
+++ static/scripts/S3/s3.dataTables.js	2011-11-21 16:13:35 +0000
@@ -263,10 +263,14 @@
         		paginateBtns = '#' + S3.dataTables.id + '_paginate';
         	else
         		paginateBtns = '#list_paginate';
+    		if (S3.dataTables.PostSubmitPosn == 'top')
+    			place = "#series_summary_filter";
+    		else
+    			place = paginateBtns;
         	if (S3.dataTables.UsePostMethod){
         		$('#importMode').val(selectionMode)
         		$('#importSelected').val(selected.join(','))
-        		$('<div class="actionButton"><input type="submit" class="action-btn" id="submitSelection" value="'+S3.dataTables.PostSubmitLabel+'"></div>').insertBefore(paginateBtns);
+        		$('<div class="actionButton"><input type="submit" class="action-btn" id="submitSelection" value="'+S3.dataTables.PostSubmitLabel+'"></div>').insertBefore(place);
         	} else {
 	            URL = S3.dataTables.SelectURL
 	            	+ 'mode='
@@ -274,7 +278,7 @@
 	            	+ '&selected='
 	            	+ selected.join(',')
 	            	+ '&post';
-	            $('<div class="actionButton"><a class="action-btn" id="submitSelection" href='+URL+'>Submit</a></div>').insertBefore(paginateBtns);
+	            $('<div class="actionButton"><a class="action-btn" id="submitSelection" href='+URL+'>Submit</a></div>').insertBefore(place);
         }
     }
     

=== modified file 'views/dataTables.html'
--- views/dataTables.html	2011-10-10 09:44:01 +0000
+++ views/dataTables.html	2011-11-21 16:13:35 +0000
@@ -14,9 +14,18 @@
 {{if response.s3.dataTablePostMethod:}}
   S3.dataTables.UsePostMethod = true;{{else:}}
   S3.dataTables.UsePostMethod = false;{{pass}}
+
 {{if response.s3.dataTableSubmitLabel:}}
-  S3.dataTables.PostSubmitLabel = '{{=response.s3.dataTableSubmitLabel}}';{{else:}}
-  S3.dataTables.PostSubmitLabel = '{{=T("Submit")}}';{{pass}}
+  S3.dataTables.PostSubmitLabel = '{{=response.s3.dataTableSubmitLabel}}';
+  {{if response.s3.dataTableSubmitLabelPosn:}}
+    S3.dataTables.PostSubmitPosn = '{{=response.s3.dataTableSubmitLabelPosn}}';
+  {{else:}}
+    S3.dataTables.PostSubmitPosn = 'bottom';
+  {{pass}}
+{{else:}}
+  S3.dataTables.PostSubmitLabel = '{{=T("Submit")}}';
+{{pass}}
+
 {{if response.s3.dataTableSelectSubmitURL:}}
   S3.dataTables.SelectURL = '{{=XML(response.s3.dataTableSelectSubmitURL)}}';{{else:}}
   S3.dataTables.SelectURL = "?";{{pass}}

=== modified file 'views/survey/series_analysis.html'
--- views/survey/series_analysis.html	2011-11-20 14:33:48 +0000
+++ views/survey/series_analysis.html	2011-11-21 16:13:35 +0000
@@ -1,14 +1,21 @@
 {{extend "layout.html"}}
 {{try:}}
-  {{=chart}}
-{{except:}}
-{{pass}}
-{{try:}}
+  <DIV id="survey_analysis_form"/>
   {{=sform}}
+  </DIV>
 {{except:}}
-{{pass}}
+  {{pass}}
+{{try:}}
 {{include "_create.html"}}
+  <DIV id="survey_show"/>
+  {{=XML(showForm)}}
+  </DIV>
+  <DIV id="survey_chart"/>
+  {{=chart}}
+  </DIV>
+{{except:}}
+  {{pass}}
 {{try:}}
   {{=XML(debug)}}
 {{except:}}
-{{pass}}
+  {{pass}}

=== modified file 'views/survey/series_map.html'
--- views/survey/series_map.html	2011-09-30 09:44:14 +0000
+++ views/survey/series_map.html	2011-11-21 16:13:35 +0000
@@ -15,14 +15,16 @@
   {{=H3(subtitle)}}
  {{except:}}
   {{pass}}
- <div class='survey_map-legend'>
+ <div id='survey_map-form' class='survey_map-form'>
   <table>
    <tr>
     <td>
-     {{try:}}
-      {{=legend}}
-     {{except:}}
-      {{pass}}
+     <div id='survey_map-legend' class='survey_map-legend'>
+       {{try:}}
+         {{=legend}}
+       {{except:}}
+         {{pass}}
+     </div>
     </td>
     <td>
      <div class='survey_map-priority-selector'>
@@ -35,7 +37,7 @@
    </tr>
   </table>
  </div>
- <div class='survey_map-container'>
+ <div id='survey_map-container' class='survey_map-container'>
   {{try:}}
    {{=map}}
   {{except:}}

=== added file 'views/survey/series_summary.html'
--- views/survey/series_summary.html	1970-01-01 00:00:00 +0000
+++ views/survey/series_summary.html	2011-11-21 16:13:35 +0000
@@ -0,0 +1,40 @@
+{{extend "layout.html"}}{{try:}}
+ {{=H2(title)}}
+{{except:}}
+{{pass}}
+<div id='rheader'>
+{{try:}}
+ {{=XML(rheader)}}
+ </div>
+ <div id='component'>
+{{except:}}
+</div>
+{{pass}}
+<div id='list-btn-add'>
+{{try:}}
+ {{=add_btn}}
+{{except:}}
+{{pass}}
+</div>
+{{try:}}
+ {{=H3(subtitle)}}
+{{except:}}
+{{pass}}
+{{try:}}
+ {{=P(help)}}
+{{except:}}
+{{pass}}
+<div id='map'></div>
+<div id='table-container'>
+{{include "formats.html"}}
+{{try:}}
+ {{=items}}
+{{except:}}
+{{pass}}
+</div>
+{{if response.s3.rfooter:}}
+<div id='rfooter'>
+ {{=XML(response.s3.rfooter)}}
+</div>
+{{pass}}
+{{include "dataTables.html"}}