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

[Graeme Foster]

Crud strings added
Removed Crud buttons where not required
Improved work flow by using a fake component

[lp:~graeme-acm/sahana-eden/RMS]

1994. By Fran Boon on 2011-08-21

merge Trunk: ADAT progress

1995. By Fran Boon on 2011-08-28

merge Trunk: ADAT progress

1996. By Fran Boon on 2011-08-28

merge Trunk: Fix HRM site_orgs check

1997. By Fran Boon on 2011-08-28

Fix DateWidget in HRM - display 100 years in dropdown

1998. By Fran Boon on 2011-09-12

merge Trunk: ADAT progress

1999. By Fran Boon on 2011-09-23

pre-merge commit: Survey permissions

2000. By Fran Boon on 2011-09-23

merge Trunk: Survey debug

2001. By Fran Boon on 2011-09-23

merge Trunk: survey diagnostics to try and workout why the import is not working on the server

2002. By Fran Boon on 2011-09-23

merge Trunk: change test for MatPlotLib imported to a try except

2003. By Fran Boon on 2011-09-24

merge Trunk: ADAT

2004. By Fran Boon on 2011-09-26

merge Trunk: Survey progress inc XLS

2005. By Fran Boon on 2011-09-26

merge Trunk: Survey debug

2006. By Fran Boon on 2011-09-27

merge Trunk: Survey Map

2007. By Fran Boon on 2011-09-27

merge Trunk: Fix Map bounds being clobbered

2008. By Fran Boon on 2011-10-02

en-gb as default language (Movement std)

2009. By Fran Boon on 2011-10-06

Change source of TRMM layers to the new IFRC Prod box

2010. By Fran Boon on 2011-10-06

merge Trunk: more en-gb: catalogue

2011. By Fran Boon on 2011-10-09

merge Trunk: Asset fixes, S3Search enhancements

2012. By Fran Boon on 2011-10-09

merge Trunk: S3Search - Disable the dataTables search box to avoid duplicate/confusion

2013. By Fran Boon on 2011-10-10

merge Trunk: Asset fixes, ADAT progress

2014. By Fran Boon on 2011-10-10

Merge Trunk: Asset tweaks - Import shouldn't have response.s3.actions clobbered, add to Index page

2015. By Fran Boon on 2011-10-10

merge Trunk: mail.server_tls deployment_setting (needs to be False for default Debian)

2016. By Fran Boon on 2011-10-10

merge Trunk: Fix to Add Item Category (colorbox) link

2017. By Fran Boon on 2011-10-10

merge Trunk: Fixes for Asset log site/location toggle; add Oxfam Hong Kong to prepop

2018. By Fran Boon on 2011-10-10

merge Trunk: Fix import of Assets - Rooms & Dedup

2019. By Fran Boon on 2011-10-10

merge Trunk: Bug fixes in Colorboxes

2020. By Fran Boon on 2011-10-11

merge Trunk: mandatory last_name as conditional validator instead of DB constraint

2021. By Fran Boon on 2011-10-11

merge Trunk: Tweak Python version test & clarify warning message

2022. By Fran Boon on 2011-10-11

Map: HRM Popup now has an Edit button

2023. By Fran Boon on 2011-10-11

merge Trunk: Don't cache options() as otherwise Colorbox 'Add XXX' can't refresh the dropdown reliably

2024. By Fran Boon on 2011-10-11

Map: Cluster Popups should show all records, not just 1st 10

2025. By Fran Boon on 2011-10-13

merger Trunk: ADAT fixes/enhancements

2026. By Fran Boon on 2011-10-17

Remove duplicate menu entry

2027. By Fran Boon on 2011-10-18

Catalogue in en-gb

2028. By Fran Boon on 2011-10-19

Office controller filters-out warehouses

2029. By Fran Boon on 2011-10-19

Filter is only when inv enabled

2030. By Fran Boon on 2011-10-29

merge Trunk

2031. By Fran Boon on 2011-10-30

New theme - 1st cut

2032. By Fran Boon on 2011-10-31

Theme progress

2033. By Fran Boon on 2011-10-31

build

2034. By Fran Boon on 2011-10-31

Org: Add Region, Prepopulate countries, style tweaks

2035. By Fran Boon on 2011-10-31

merge Trunk: Org import templates

2036. By Fran Boon on 2011-10-31

All offices on the starting Map, Tweak Org RHeader & theme

2037. By Fran Boon on 2011-11-01

merge Trunk (SUrvey & code2 for GADM import)

2038. By Fran Boon on 2011-11-02

Some more CSS updates

2039. By Fran Boon on 2011-11-02

Style/content tweaks

2040. By Fran Boon on 2011-11-02

merge trunk: S3Cube works with Python 2.6

2041. By Fran Boon on 2011-11-02

Tweak default Map settings

2042. By Fran Boon on 2011-11-02

merge Trunk: S3Cube tweaks

2043. By Fran Boon on 2011-11-03

GIS: Improve error reporting when layer loading fails

2044. By Fran Boon on 2011-11-03

merge Trunk: HRM report on expiring contracts

2045. By Fran Boon on 2011-11-03

Style/Menu/Label updates

2046. By Fran Boon on 2011-11-04

Custom Ext Theme (& also Tabs & Action buttons harmonised with the rest of the IFRC theme)

2047. By Fran Boon on 2011-11-04

Map: New Markers

2048. By Fran Boon on 2011-11-04

Tweak map legend

2049. By Fran Boon on 2011-11-04

Don't hide Map popup links!

2050. By Fran Boon on 2011-11-04

GIS: Deprecate Yahoo layers, Hide Assessments from the Map Legend as we have no way of showing these easily on the main map right now

2051. By Fran Boon on 2011-11-04

merge Trunk: Project, Cube & Prepop

2052. By Fran Boon on 2011-11-04

Fixes to MapConfig handling

2053. By Fran Boon on 2011-11-06

prepop of Courses

2054. By Fran Boon on 2011-11-07

Tweaks to Permissions, Menus, HRM

2055. By Fran Boon on 2011-11-07

Assets as components of (HR) persons

2056. By Fran Boon on 2011-11-07

Fix s3_asset_prep's hiding of fields

2057. By Fran Boon on 2011-11-08

merge Trunk: S3CSV common templates, ReplaceOption for upload form, HR de-duplicator

2058. By Fran Boon on 2011-11-08

Training Report: 1st cut

2059. By Fran Boon on 2011-11-08

merge nursix: Organisation ID in warehouse upload form defaults to current user's org.

2060. By Fran Boon on 2011-11-08

Fix GeoRSS Layers, merge Graeme: inv_item stylesheet enhancements, speed up inv_item search (don't include site in simple)

2061. By Fran Boon on 2011-11-08

Menu Entry for inv_item, hide uploaded files in Importer

2062. By Fran Boon on 2011-11-08

RemoveOption for Stock items

2063. By Fran Boon on 2011-11-08

Not that simple to disable the dataTable of uploaded Imports :/

2064. By Fran Boon on 2011-11-08

Remove Default for warehouse Data (preventing Imports)

2065. By Fran Boon on 2011-11-08

merge nursix: S3Cube fix represent, HR Training report: aggregate by month

2066. By graeme-acm on 2011-12-15

ifrc base

2067. By graeme-acm on 2011-12-15

merge with ifrc

2068. By graeme-acm on 2011-12-15

merge with ifrc

2069. By graeme-acm on 2011-12-15

fix map pop up and some css styling

2070. By graeme-acm on 2011-12-16

map legend issue

2071. By graeme-acm on 2011-12-16

merge trunk

Unmerged revisions

2071. By graeme-acm on 2011-12-16

merge trunk

2070. By graeme-acm on 2011-12-16

map legend issue

2069. By graeme-acm on 2011-12-15

fix map pop up and some css styling

2068. By graeme-acm on 2011-12-15

merge with ifrc

2067. By graeme-acm on 2011-12-15

merge with ifrc

2066. By graeme-acm on 2011-12-15

ifrc base

2065. By Fran Boon on 2011-11-08

merge nursix: S3Cube fix represent, HR Training report: aggregate by month

2064. By Fran Boon on 2011-11-08

Remove Default for warehouse Data (preventing Imports)

2063. By Fran Boon on 2011-11-08

Not that simple to disable the dataTable of uploaded Imports :/

2062. By Fran Boon on 2011-11-08

RemoveOption for Stock items

=== modified file 'controllers/survey.py'
--- controllers/survey.py	2011-08-20 09:29:54 +0000
+++ controllers/survey.py	2011-08-21 15:15:26 +0000
@@ -42,24 +42,8 @@
     tablename = "%s_%s" % (prefix, resourcename)
     s3mgr.load(tablename)
     table = db[tablename]
+
     
-    # CRUD Strings
-    s3.crud_strings[tablename] = Storage(
-        title_create = T("Add Survey Template"),
-        title_display = T("Survey Template Details"),
-        title_list = T("List Survey Templates"),
-        title_update = T("Edit Survey Template"),
-        subtitle_create = T("Add New Survey Template"),
-        subtitle_list = T("Survey Templates"),
-        label_list_button = T("List Survey Templates"),
-        label_create_button = T("Add Survey Template"),
-        label_delete_button = T("Delete Survey Template"),
-        msg_record_created = T("Survey Template added"),
-        msg_record_modified = T("Survey Template updated"),
-        msg_record_deleted = T("Survey Template deleted"),
-        msg_list_empty = T("No Survey Template currently registered"))
-
-        
     def prep(r):
         s3_action_buttons(r)
         query = (r.table.status == 1) # Status of Pending
@@ -158,7 +142,7 @@
 
     def prep(r):
         if r.interactive:
-            if r.id and (r.method == "update" or r.method == "create"):
+            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
@@ -175,8 +159,11 @@
         return True
 
     def postp(r, output):
-        response.s3.survey_answerlist_dataTable_post(r)
-        if r.id and (r.method == "update" or r.method == "create"):
+        if r.component_name == None:
+            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_build_series_questions(series_id, complete_id)
@@ -184,6 +171,8 @@
         return output
 
     # remove CRUD generate buttons in the tabs
+    s3mgr.configure("survey_series",
+                    deletable = False,)
     s3mgr.configure("survey_complete",
                     listadd=False,
                     deletable=False)
@@ -203,6 +192,7 @@
 
     def prep(r):
         s3mgr.configure(r.tablename,
+                        deletable = False,
                         orderby = r.tablename+".posn",
                         )
         return True
@@ -273,6 +263,40 @@
     output = s3_rest_controller(prefix, resourcename)
     return output
 
+def newAssessment():
+    # Load Model
+    prefix = "survey"
+    resourcename = "complete"
+    tablename = "%s_%s" % (prefix, resourcename)
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    def prep(r):
+        if r.interactive:
+            if "post_vars" in current.request and len(current.request.post_vars) > 0:
+                dummy, series_id = current.request.vars.viewing.split(".")
+                id = response.s3.survey_save_answers_for_series(series_id,
+                                                                None, # Insert
+                                                                current.request.post_vars)
+                response.flash = response.s3.crud_strings["survey_complete"].msg_record_created
+        return True
+
+    def postp(r, output):
+        response.s3.survey_answerlist_dataTable_post(r)
+        tablename, series_id = current.request.vars.viewing.split(".")
+        form = response.s3.survey_build_series_questions(series_id, None)
+        output["form"] = form
+        return output
+
+    response.s3.prep = prep
+    response.s3.postp = postp
+    output = s3_rest_controller(prefix,
+                                resourcename, 
+                                method = "create",
+                                rheader=response.s3.survey_series_rheader
+                               )
+    return output
+
 def complete():
     """ RESTful CRUD controller """
     # Load Model
@@ -304,6 +328,9 @@
             response.s3.survey_answerlist_dataTable_post(r)
         return output
 
+    s3mgr.configure("survey_complete",
+                    listadd=False,
+                    deletable=False)
     response.s3.prep = prep
     response.s3.postp = postp
     output = s3_rest_controller(prefix, resourcename)
@@ -329,5 +356,8 @@
         template_id = request.args[0]
     except:
         pass
+    s3mgr.configure("survey_complete",
+                    listadd=False,
+                    deletable=False)
     output = s3_rest_controller(prefix, "complete")
     return output
 
=== modified file 'models/01_menu.py'
--- models/01_menu.py	2011-08-20 22:11:46 +0000
+++ models/01_menu.py	2011-08-21 15:15:26 +0000
@@ -865,7 +865,7 @@
             ]],
             [T("Response"), False, aURL(f="complete"), [
 #                [T("New"), False, aURL(p="create", f="complete", args="create")],
-                [T("List All"), False, aURL(f="complete")],
+#                [T("List All"), False, aURL(f="complete")],
                 [T("Import Completed Responses"), False, aURL(f="complete", args="import.xml")]
             ]],
             ]
 
=== modified file 'models/survey.py'
--- models/survey.py	2011-08-20 13:25:04 +0000
+++ models/survey.py	2011-08-21 15:15:26 +0000
@@ -66,7 +66,24 @@
                                          readable=True,
                                          writable=False),
                                    *s3_meta_fields())
-    
+
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add Survey Template"),
+            title_display = T("Survey Template Details"),
+            title_list = T("List of Survey Templates"),
+            title_update = T("Edit Survey Template"),
+            subtitle_create = T("Add a new Survey Template"),
+            subtitle_list = T("Survey Templates"),
+            label_list_button = T("List all Survey Templates"),
+            label_create_button = T("Add a new Survey Template"),
+            label_delete_button = T("Delete this Survey Template"),
+            msg_record_created = T("Survey Template added"),
+            msg_record_modified = T("Survey Template updated"),
+            msg_record_deleted = T("Survey Template deleted"),
+            msg_list_empty = T("No Survey Template currently registered"))
+
+
         def survey_template_rheader(r, tabs=[]):
             if r.representation == "html":
     
@@ -80,8 +97,12 @@
                     rheader_tabs = s3_rheader_tabs(r, tabs)
     
                     sectionTable = db["survey_section"]
-                    query = (sectionTable.template_id == record.id)
-                    rows = db(query).select(orderby = sectionTable.posn)
+                    qlistTable = db["survey_question_list"]
+                    query = (qlistTable.template_id == r.id) & \
+                            (qlistTable.section_id == sectionTable.id)
+                    rows = db(query).select(sectionTable.id,
+                                            sectionTable.name,
+                                            orderby = qlistTable.posn)
                     tsection = TABLE(_class="survey-section-list")
                     lblSection = SPAN(T("Sections that are part of this template"),
                                       _style="font-weight:bold;")
@@ -90,11 +111,15 @@
                     else:
                         rsection = TR()
                         count = 0
+                        lastSection = ""
                         for section in rows:
+                            if section.name == lastSection:
+                                continue
                             rsection.append(TD(A(section.name,
                                                  _href=URL(c="survey",
                                                            f="section",
                                                            args="%s" % section.id))))
+                            lastSection = section.name
                             count += 1
                             if count % 4 == 0:
                                 tsection.append(rsection)
@@ -161,7 +186,24 @@
                                        ),
                                  template_id(),
                                  *s3_meta_fields())
-        
+
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add Template Section"),
+            title_display = T("Template Section Details"),
+            title_list = T("List of Template Sections"),
+            title_update = T("Edit Template Section"),
+            subtitle_create = T("Add a new Template Section"),
+            subtitle_list = T("Template Sections"),
+            label_list_button = T("List all Template Sections"),
+            label_create_button = T("Add a new Template Section"),
+            label_delete_button = T("Delete this Template Section"),
+            msg_record_created = T("Template Section added"),
+            msg_record_modified = T("Template Section updated"),
+            msg_record_deleted = T("Template Section deleted"),
+            msg_list_empty = T("No Template Section currently registered"))
+
+
         s3mgr.configure(tablename, orderby = tablename+".posn")
         
         # Section as component of Template
@@ -270,6 +312,23 @@
                                  *s3_meta_fields()
                                )
 
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add an Assessment Question"),
+            title_display = T("Assessment Question Details"),
+            title_list = T("List of Assessment Questions"),
+            title_update = T("Edit Assessment Question"),
+            subtitle_create = T("Add a new Assessment Question"),
+            subtitle_list = T("Survey Templates"),
+            label_list_button = T("List all Assessment Questions"),
+            label_create_button = T("Add a new Assessment Question"),
+            label_delete_button = T("Delete this Assessment Question"),
+            msg_record_created = T("Assessment Question added"),
+            msg_record_modified = T("Assessment Question updated"),
+            msg_record_deleted = T("Assessment Question deleted"),
+            msg_list_empty = T("No Assessment Question currently registered"))
+
+
     
         # Question Metadata
         """ This table is referenced by the questions table and is used to manage 
@@ -304,9 +363,25 @@
                                  *s3_meta_fields()
                                )
 
-
-    
-    
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add Question Meta-Data"),
+            title_display = T("Question Meta-Data Details"),
+            title_list = T("List of Question Meta-Data"),
+            title_update = T("Edit Question Meta-Data"),
+            subtitle_create = T("Add new Question Meta-Data"),
+            subtitle_list = T("Question Meta-Data"),
+            label_list_button = T("List all Question Meta-Data"),
+            label_create_button = T("Add new Question Meta-Data"),
+            label_delete_button = T("Delete this Question Meta-Data"),
+            msg_record_created = T("Question Meta-Data added"),
+            msg_record_modified = T("Question Meta-Data updated"),
+            msg_record_deleted = T("Question Meta-Data deleted"),
+            msg_list_empty = T("No Question Meta-Data currently registered"),
+            uploadTitle = T("Upload a Question List import file")
+            )
+
+
         # Question Types
         def survey_stringType():
             return S3QuestionTypeStringWidget()
@@ -366,6 +441,11 @@
                                  *s3_meta_fields()
                                )
 
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            uploadTitle = T("Upload a Survey Template import file")
+            )
+
         def getAllQuestionsForTemplate(template_id):
             """
                 function to return the list of questions for the given template
@@ -528,7 +608,24 @@
                                  Field("start_date", "date", default=None),
                                  Field("end_date", "date", default=None),
                                  *s3_meta_fields())
-    
+
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add Survey Series"),
+            title_display = T(" Survey Series Details"),
+            title_list = T("List of Survey Series"),
+            title_update = T("Edit Survey Series"),
+            subtitle_create = T("Add a new Survey Series"),
+            subtitle_list = T("Survey Series"),
+            label_list_button = T("List all Survey Series"),
+            label_create_button = T("Add a new Survey Series"),
+            label_delete_button = T("Delete this Survey Series"),
+            msg_record_created = T("Survey Series added"),
+            msg_record_modified = T("Survey Series updated"),
+            msg_record_deleted = T("Survey Series deleted"),
+            msg_list_empty = T("No Survey Series currently registered"))
+
+
         def survey_series_rheader(r, tabs=[]):
             if r.representation == "html":
     
@@ -536,9 +633,9 @@
                 if tablename == "survey_series" and record:
     
                     # Tabs
-                    tabs = [#(T("New Response"), "complete"),
+                    tabs = [(T("New Assessment"), "newAssessment/"),
+                            (T("Completed Assessments"), "complete"),
                             (T("Series Details"), None),
-                            (T("Completed Questionnaires"), "complete"),
                             ]
                     rheader_tabs = s3_rheader_tabs(r, tabs)
     
@@ -602,10 +699,32 @@
             list_fields = ["created_on", "series_id", "answer_list"]
             s3mgr.configure("survey_complete", list_fields=list_fields)
 
+        def survey_serieslist_dataTable_post(r):
+            s3_action_buttons(r)
+            response.s3.actions = [
+                                   dict(label=str(T("Open")),
+                                        _class="action-btn",
+                                        url=URL(c=module,
+                                                f="newAssessment",
+                                                vars={"viewing":"survey_series.[id]"})
+                                       ),
+                                   dict(label=str(T("Analysis")),
+                                        _class="action-btn",
+                                        url=URL(c=module,
+                                                f="analysis",
+                                                args=["[id]"])
+                                       ),
+                                  ]
+
         def survey_answerlist_dataTable_post(r):
             s3_action_buttons(r)
-            response.s3.actions = \
-            response.s3.actions + [
+            response.s3.actions = [
+                                   dict(label=str(T("Open")),
+                                        _class="action-btn",
+                                        url=URL(c=module,
+                                                f="series",
+                                                args=[r.id,"complete","[id]","update"])
+                                       ),
                                    dict(label=str(T("Analysis")),
                                         _class="action-btn",
                                         url=URL(c=module,
@@ -630,6 +749,24 @@
                                        ),
                                  *s3_meta_fields())
 
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Complete a new Assessment"),
+            title_display = T("Completed Assessment Details"),
+            title_list = T("List of Completed Assessments"),
+            title_update = T("Edit Completed Assessment"),
+            subtitle_create = T("Add a new Completed Assessment"),
+            subtitle_list = T("Completed Assessment"),
+            label_list_button = T("List all Completed Assessment"),
+            label_create_button = T("Add a new Completed Assessment"),
+            label_delete_button = T("Delete this Completed Assessment"),
+            msg_record_created = T("Completed Assessment added"),
+            msg_record_modified = T("Completed Assessment updated"),
+            msg_record_deleted = T("Completed Assessment deleted"),
+            msg_list_empty = T("No Completed Assessments currently registered"),
+            uploadTitle = T("Upload the Completed Assessments import file")
+            )
+
         def survey_complete_onaccept(form):
             """
                 All of the answers will be stored in the answer_list in the format
@@ -701,6 +838,22 @@
                                 *s3_meta_fields())
 
 
+        # CRUD Strings
+        s3.crud_strings[tablename] = Storage(
+            title_create = T("Add Assessment Answer"),
+            title_display = T("Assessment Answer Details"),
+            title_list = T("List of Assessment Answers"),
+            title_update = T("Edit Assessment Answer"),
+            subtitle_create = T("Add a new Assessment Answer"),
+            subtitle_list = T("Assessment Answer"),
+            label_list_button = T("List all Assessment Answer"),
+            label_create_button = T("Add a new Assessment Answer"),
+            label_delete_button = T("Delete this Assessment Answer"),
+            msg_record_created = T("Assessment Answer added"),
+            msg_record_modified = T("Assessment Answer updated"),
+            msg_record_deleted = T("Assessment Answer deleted"),
+            msg_list_empty = T("No Assessment Answers currently registered"))
+
     
     
     
@@ -816,6 +969,7 @@
             survey_answer_list_represent = survey_answer_list_represent,
             survey_answerlist_dataTable_pre = survey_answerlist_dataTable_pre,
             survey_answerlist_dataTable_post = survey_answerlist_dataTable_post,
+            survey_serieslist_dataTable_post = survey_serieslist_dataTable_post,
             survey_save_answers_for_series = survey_save_answers_for_series,
             survey_build_series_questions = survey_build_series_questions,
             survey_build_template_questions = survey_build_template_questions,
 
=== modified file 'modules/s3/s3import.py'
--- modules/s3/s3import.py	2011-08-20 13:47:18 +0000
+++ modules/s3/s3import.py	2011-08-21 15:15:26 +0000
@@ -197,7 +197,10 @@
         self.ErrorUploadFileMissing = T("The file to upload is missing")
         self.WarningNoRecords = T("No records to import")
         self.WarningNoJobToDelete = T("No job to delete, maybe it has already been deleted.")
-        self.uploadTitle = T("Upload a %s import file" % r.function)
+        if "uploadTitle" in current.response.s3.crud_strings[self.tablename]:
+            self.uploadTitle = current.response.s3.crud_strings[self.tablename].uploadTitle
+        else:
+            self.uploadTitle = T("Upload a %s import file" % r.function)
         self.displayJobTitle = T("Details of the selected import job")
         self.displayJobListTitle = T("List of import items")
         self.fileUploaded = T("Import file uploaded")
 
=== modified file 'private/prepopulate/demo/ADAT/questionnaire24H.csv'
--- private/prepopulate/demo/ADAT/questionnaire24H.csv	2011-08-20 09:29:54 +0000
+++ private/prepopulate/demo/ADAT/questionnaire24H.csv	2011-08-21 15:15:26 +0000
@@ -45,7 +45,7 @@
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Is the community responding to the disaster?","YesNoDontKnow",,44,"24H-Re-2",,,,,,
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Are NGOs responding in the disaster area?","YesNoDontKnow",,45,"24H-Re-3",,,,,,
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Which NGOs responding in the disaster area?","Text",,46,"24H-Re-4",,,,,,
-"24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Expected needs","Option",,47,"24H-Re-5","Length",3,1,"Rural",2,"Peri–Urban"
+"24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Expected needs","Option",,47,"24H-Re-5","Length",3,1,"Rural",2,"Peri-Urban"
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Response",7,"Expected needs","Option",,47,"24H-Re-5",3,"Urban ",,,,
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Risks",5,"Concerns for Toxic spills","YesNo",,48,"24H-Ri-1",,,,,,
 "24Hour","Rapid onset disaster. First 24 hours, rapid field assessment form (B)","Risks",5,"Concerns for Oil spills","YesNo",,49,"24H-Ri-2",,,,,,
 
=== modified file 'private/prepopulate/demo/ADAT/questionnaire72H.csv'
--- private/prepopulate/demo/ADAT/questionnaire72H.csv	2011-08-19 04:23:49 +0000
+++ private/prepopulate/demo/ADAT/questionnaire72H.csv	2011-08-21 15:15:26 +0000
@@ -39,11 +39,11 @@
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Explain","String",,38,"72B12.3.1",,,,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Is this food accessible to all the affected people, or do only a few have access?","String",,39,"72B12.4",,,,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Do people have access to cooking facilities? ","YesNo",,40,"72B12.5",,,,,,
-"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Utensils:","Option",,41,"72B12.5.1","Length",3,1,"“None”",2,"Few"
+"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Utensils:","Option",,41,"72B12.5.1","Length",3,1,"'None'",2,"Few"
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Utensils:","Option",,41,"72B12.5.1",3,"Many",,,,
-"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Fuel","Option",,42,"72B12.5.2","Length",3,1,"“None”",2,"Few"
+"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Fuel","Option",,42,"72B12.5.2","Length",3,1,"'None'",2,"Few"
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Fuel","Option",,42,"72B12.5.2",3,"Many",,,,
-"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Pots","Option",,43,"72B12.5.3","Length",3,1,"“None”",2,"Few"
+"72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Pots","Option",,43,"72B12.5.3","Length",3,1,"None",2,"Few"
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Pots","Option",,43,"72B12.5.3",3,"Many",,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Other","String",,44,"72B12.5.4",,,,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Nutrition",6,"Do people have access to a safe place to prepare food and eat it?","YesNo",,45,"72B12.6",,,,,,
@@ -155,5 +155,5 @@
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Response",12,"Is the community responding to the disaster?  ","YesNoDontKnow",,143,"72B19.2",,,,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Response",12,"Are NGOs responding in the disaster area?      ","YesNoDontKnow",,144,"72B19.3",,,,,,
 "72Hour","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","Response",12,"Which ones","String",,145,"72B19.3.1",,,,,,
-"24Hour",,"Response",7,"Expected needs","Option",,146,"72H-Re-5","Length",3,1,"Rural",2,"Peri–Urban"
+"24Hour",,"Response",7,"Expected needs","Option",,146,"72H-Re-5","Length",3,1,"Rural",2,"Peri-Urban"
 "24Hour",,"Response",7,"Expected needs","Option",,146,"72H-Re-5",3,"Urban ",,,,