Merge lp:~graeme-acm/sahana-eden/trunk into lp:sahana-eden
- trunk
- Merge into trunk
Proposed by
Graeme Foster
Status: | Merged |
---|---|
Merged at revision: | 3063 |
Proposed branch: | lp:~graeme-acm/sahana-eden/trunk |
Merge into: | lp:sahana-eden |
Diff against target: |
222 lines (+53/-37) 5 files modified
controllers/survey.py (+13/-8) modules/s3/s3survey.py (+21/-10) private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv (+11/-11) private/prepopulate/demo/ADAT/questionnaire24H.csv (+5/-5) private/prepopulate/demo/ADAT/questionnaire72H.csv (+3/-3) |
To merge this branch: | bzr merge lp:~graeme-acm/sahana-eden/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fran Boon | Pending | ||
Review via email: mp+86137@code.launchpad.net |
Commit message
Description of the change
ADAT fixes to various project logs
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'controllers/survey.py' |
2 | --- controllers/survey.py 2011-12-17 09:27:10 +0000 |
3 | +++ controllers/survey.py 2011-12-17 11:02:25 +0000 |
4 | @@ -600,9 +600,9 @@ |
5 | text = unicode(cell.text) |
6 | except: |
7 | text = cell.text |
8 | - width = 15.0 |
9 | + width = 16 |
10 | # Wrap text and calculate the row width and height |
11 | - characters_in_cell = float(width) |
12 | + characters_in_cell = float(width-2) |
13 | twips_per_row = 255 #default row height for 10 point font |
14 | if cell.merged(): |
15 | sheet.write_merge(cell.row, |
16 | @@ -613,10 +613,6 @@ |
17 | style |
18 | ) |
19 | rows = math.ceil((len(text) / characters_in_cell) / (1 + cell.mergeH)) |
20 | - new_row_height = int(rows * twips_per_row) |
21 | - new_col_width = characters_in_cell * COL_WIDTH_MULTIPLIER |
22 | - sheet.row(row).height = new_row_height |
23 | - sheet.col(col).width = new_col_width |
24 | else: |
25 | sheet.write(cell.row, |
26 | cell.col, |
27 | @@ -624,9 +620,11 @@ |
28 | style |
29 | ) |
30 | rows = math.ceil(len(text) / characters_in_cell) |
31 | - new_row_height = int(rows * twips_per_row) |
32 | - new_col_width = characters_in_cell * COL_WIDTH_MULTIPLIER |
33 | + new_row_height = int(rows * twips_per_row) |
34 | + new_col_width = width * COL_WIDTH_MULTIPLIER |
35 | + if sheet.row(row).height < new_row_height: |
36 | sheet.row(row).height = new_row_height |
37 | + if sheet.col(col).width < new_col_width: |
38 | sheet.col(col).width = new_col_width |
39 | |
40 | def mergeStyles(listTemplate, styleList): |
41 | @@ -735,6 +733,12 @@ |
42 | styleText = xlwt.XFStyle() |
43 | styleText.protection = protection |
44 | styleText.alignment = alignWrap |
45 | + styleInstructions = xlwt.XFStyle() |
46 | + styleInstructions.font.height = 0x00B4 # 180 twips, 9 points |
47 | + styleInstructions.font.italic = True |
48 | + styleInstructions.protection = protection |
49 | + styleInstructions.alignment = alignWrap |
50 | + styleInstructions.alignment = alignBase |
51 | styleBox = xlwt.XFStyle() |
52 | styleBox.borders = borders |
53 | styleBox.protection = noProtection |
54 | @@ -755,6 +759,7 @@ |
55 | styleList["styleHeader"] = styleHeader |
56 | styleList["styleSubHeader"] = styleSubHeader |
57 | styleList["styleText"] = styleText |
58 | + styleList["styleInstructions"] = styleInstructions |
59 | styleList["styleInput"] = styleInput |
60 | styleList["boxL"] = boxL |
61 | styleList["boxT"] = boxT |
62 | |
63 | === modified file 'modules/s3/s3survey.py' |
64 | --- modules/s3/s3survey.py 2011-12-17 09:27:10 +0000 |
65 | +++ modules/s3/s3survey.py 2011-12-17 11:02:25 +0000 |
66 | @@ -721,10 +721,16 @@ |
67 | self.typeDescription = T("Date") |
68 | |
69 | def display(self, **attr): |
70 | - length = 30 |
71 | - attr["_size"] = length |
72 | - attr["_maxlength"] = length |
73 | - return S3QuestionTypeAbstractWidget.display(self, **attr) |
74 | + from s3widgets import S3DateWidget |
75 | + value = self.getAnswer() |
76 | + widget = S3DateWidget() |
77 | +# self.field.name = self.question.code |
78 | + input = widget(self.field, value, **self.attr) |
79 | + return self.layout(self.question.name, input, **attr) |
80 | +# length = 30 |
81 | +# attr["_size"] = length |
82 | +# attr["_maxlength"] = length |
83 | +# return S3QuestionTypeAbstractWidget.display(self, **attr) |
84 | |
85 | def formattedAnswer(self, data): |
86 | """ |
87 | @@ -850,7 +856,7 @@ |
88 | ): |
89 | S3QuestionTypeAbstractWidget.__init__(self, question_id) |
90 | T = current.T |
91 | - self.selectionInstructions = "Select just one option" |
92 | + self.selectionInstructions = "Type x to mark box. Select just one option" |
93 | self.metalist.append("Length") |
94 | self.webwidget = RadioWidget |
95 | self.typeDescription = T("Option") |
96 | @@ -893,7 +899,12 @@ |
97 | if "LabelLeft" in style and style["LabelLeft"]: |
98 | col += 1 |
99 | if self.selectionInstructions != None: |
100 | - cell = MatrixElement(row,col,survey_T(self.selectionInstructions, langDict), style="styleText") |
101 | + cell = MatrixElement(row |
102 | + ,col |
103 | + ,survey_T(self.selectionInstructions |
104 | + ,langDict) |
105 | + ,style="styleInstructions" |
106 | + ) |
107 | matrix.addElement(cell) |
108 | col += 1 |
109 | else: |
110 | @@ -903,7 +914,7 @@ |
111 | cell = MatrixElement(row, col, |
112 | survey_T(self.selectionInstructions, |
113 | langDict), |
114 | - style="styleText") |
115 | + style="styleInstructions") |
116 | matrix.addElement(cell) |
117 | cell.merge(horizontal=1) |
118 | row += 1 |
119 | @@ -974,7 +985,7 @@ |
120 | ): |
121 | T = current.T |
122 | S3QuestionTypeOptionWidget.__init__(self, question_id) |
123 | - self.selectionInstructions = None |
124 | + self.selectionInstructions = "Type x to mark box." |
125 | self.typeDescription = T("Yes, No") |
126 | self.qstn_metadata["Length"] = 2 |
127 | |
128 | @@ -1004,7 +1015,7 @@ |
129 | ): |
130 | T = current.T |
131 | S3QuestionTypeOptionWidget.__init__(self, question_id) |
132 | - self.selectionInstructions = None |
133 | + self.selectionInstructions = "Type x to mark box." |
134 | self.typeDescription = T("Yes, No, Don't Know") |
135 | self.qstn_metadata["Length"] = 3 |
136 | |
137 | @@ -1065,7 +1076,7 @@ |
138 | ): |
139 | T = current.T |
140 | S3QuestionTypeOptionWidget.__init__(self, question_id) |
141 | - self.selectionInstructions = "Select all applicable options" |
142 | + self.selectionInstructions = "Type x to mark box. Select all applicable options" |
143 | self.typeDescription = T("Multi-Option") |
144 | |
145 | def display(self, **attr): |
146 | |
147 | === modified file 'private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv' |
148 | --- private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv 2011-12-03 15:12:45 +0000 |
149 | +++ private/prepopulate/demo/ADAT/72Hr-B.xls.Layout.csv 2011-12-17 11:02:25 +0000 |
150 | @@ -1,11 +1,11 @@ |
151 | -Template,Section,Posn,Method,Rules |
152 | -72 Hour B,Background Info,1,1,"[['72Bd.1', '72Bd.2'], ['72B1.1', '72B1.2'], ['72B2.1', '72B2.2'], ['72B3'], ['72B4', '72B4.1'], ['72B5', '72B6'], ['72B7.1', '72B7.2', '72B7.3'], ['72B8.1', '72B8.2', '72B8.3', '72B8.4'], ['72B9.1', '72B9.2', '72B9.3', '72B9.4'], ['72B10']]" |
153 | -72 Hour B,Relief,2,1,"[['72B11.1', '72B11.2'], ['72B11.3', '72B11.4'], [{'columns': [['72B11.5', '72B11.6', '72B11.7'], ['72B11.8']]}], ['72B11.9']]" |
154 | -72 Hour B,Food and Nutrition,3,1,"[[{'columns': [['72B12.1', '72B12.1.1'], ['72B12.2', '72B12.2.1']]}], ['72B12.4'], [{'columns': [['72B12.5', '72B12.5.1', '72B12.5.2', '72B12.5.3', '72B12.5.4'], ['72B12.6', '72B12.6.1']]}], ['72B12.7'], ['72B12.8', '72B12.8.1']]" |
155 | -72 Hour B,Health,4,1,"[[{'columns': [['72B13.1'], ['72B13.2', '72B13.2.1', '72B13.2.2']]}], ['72B13.3', '72B13.4'], ['72B13.5'], ['72B13.5.1'], ['72B13.5.2'], ['72B13.5.3'], ['72B13.5.4'], ['72B13.5.5'], ['72B13.6', '72B13.7']]" |
156 | -72 Hour B,"Safety, security and protection",5,1,"[[{'columns': [['72B14.2', '72B14.2.1', '72B14.3', '72B14.3.1'], ['72B14.1']]}], [{'columns': [['72B14.4', '72B14.4.1', '72B14.4.2', '72B14.4.3', '72B14.4.4']]}], ['72B14.5'], [{'columns': [['72B14.6.1', '72B14.6.2', '72B14.6.3', '72B14.6.4', '72B14.6.5']]}]]" |
157 | -72 Hour B,Water and Sanitation,6,1,"[['72B14.7'], [{'columns': [['72B15.1.1', '72B15.1.2', '72B15.1.3'], ['72B15.2', '72B15.2.1'], ['72B15.3'], ['72B15.4.1', '72B15.4.2', '72B15.4.3']]}], ['72B15.5', '72B15.6'], ['72B15.7', '72B15.8']]" |
158 | -72 Hour B,Shelter,7,1,"[[{'columns': [['72B16.1.1', '72B16.1.2', '72B16.1.3', '72B16.1.4', '72B16.1.5', '72B16.1.6'], [{'heading': 'If homes have been severely damaged or destroyed, where are people living?'}, '72B16.2.1', '72B16.2.1.1', '72B16.2.2', '72B16.2.2.1', '72B16.2.3', '72B16.2.3.1']]}], [{'columns': [['72B16.3.1', '72B16.3.2'], ['72B16.4.1', '72B16.4.2', '72B16.4.3', '72B16.4.4', '72B16.4.5']]}], [{'columns': [['72B16.5.1', '72B16.5.2', '72B16.5.3', '72B16.5.4'], ['72B16.6']]}]]" |
159 | -72 Hour B,Livelihoods,8,1,"[['72B17.1', '72B17.1.1'], [{'columns': [['72B17.2', '72B17.3'], ['72B17.3.1']]}], ['72B17.4', '72B17.4.1'], ['72B17.5'], ['72B17.6']]" |
160 | -72 Hour B,Infrastructure,9,1,"[['72B18.1'], [{'columns': [['72B18.2.1', '72B18.2.2', '72B18.2.3', '72B18.2.4', '72B18.2.5', '72B18.2.6', '72B18.2.7', '72B18.2.8', '72B18.2.9', '72B18.2.10'], ['72B18.3.1', '72B18.3.2', '72B18.3.3', '72B18.3.4', '72B18.3.5']]}]]" |
161 | -72 Hour B,Response,10,1,"[['72B19.1'], ['72B19.2'], ['72B19.3'], ['72B19.3.1'], ['72B-Re-5']]" |
162 | +"Template","Section","Posn","Method","Rules" |
163 | +"72 Hour B","Background Info",1,1,"[['72Bd.1', '72Bd.2'], ['72B1.1', '72B1.2'], ['72B2.1', '72B2.2'], ['72B3'], ['72B4', '72B4.1'], ['72B5', '72B6'], ['72B7.1', '72B7.2', '72B7.3'], ['72B8.1', '72B8.2', '72B8.3', '72B8.4'], ['72B9.1', '72B9.2', '72B9.3', '72B9.4', '72B9.5'], ['72B10']]" |
164 | +"72 Hour B","Relief",2,1,"[['72B11.1', '72B11.2'], ['72B11.3', '72B11.4'], [{'columns': [['72B11.5', '72B11.6', '72B11.7'], ['72B11.8']]}], ['72B11.9']]" |
165 | +"72 Hour B","Food and Nutrition",3,1,"[[{'columns': [['72B12.1', '72B12.1.1'], ['72B12.2', '72B12.2.1']]}], ['72B12.4'], [{'columns': [['72B12.5', '72B12.5.1', '72B12.5.2', '72B12.5.3', '72B12.5.4'], ['72B12.6', '72B12.6.1']]}], ['72B12.7'], ['72B12.8', '72B12.8.1']]" |
166 | +"72 Hour B","Health",4,1,"[[{'columns': [['72B13.1'], ['72B13.2', '72B13.2.1', '72B13.2.2']]}], ['72B13.3', '72B13.4'], ['72B13.5'], ['72B13.5.1'], ['72B13.5.2'], ['72B13.5.3'], ['72B13.5.4'], ['72B13.5.5'], ['72B13.6', '72B13.7']]" |
167 | +"72 Hour B","Safety, security and protection",5,1,"[[{'columns': [['72B14.2', '72B14.2.1', '72B14.3', '72B14.3.1'], ['72B14.1']]}], [{'columns': [['72B14.4', '72B14.4.1', '72B14.4.2', '72B14.4.3', '72B14.4.4']]}], ['72B14.5'], [{'columns': [['72B14.6.1', '72B14.6.2', '72B14.6.3', '72B14.6.4', '72B14.6.5']]}]]" |
168 | +"72 Hour B","Water and Sanitation",6,1,"[['72B14.7'], [{'columns': [['72B15.1.1', '72B15.1.2', '72B15.1.3'], ['72B15.2', '72B15.2.1'], ['72B15.3'], ['72B15.4.1', '72B15.4.2', '72B15.4.3']]}], ['72B15.5', '72B15.6'], ['72B15.7', '72B15.8']]" |
169 | +"72 Hour B","Shelter",7,1,"[[{'columns': [['72B16.1.1', '72B16.1.2', '72B16.1.3', '72B16.1.4', '72B16.1.5', '72B16.1.6'], [{'heading': 'If homes have been severely damaged or destroyed, where are people living?'}, '72B16.2.1', '72B16.2.1.1', '72B16.2.2', '72B16.2.2.1', '72B16.2.3', '72B16.2.3.1']]}], [{'columns': [['72B16.3.1', '72B16.3.2'], ['72B16.4.1', '72B16.4.2', '72B16.4.3', '72B16.4.4', '72B16.4.5']]}], [{'columns': [['72B16.5.1', '72B16.5.2', '72B16.5.3', '72B16.5.4'], ['72B16.6']]}]]" |
170 | +"72 Hour B","Livelihoods",8,1,"[['72B17.1', '72B17.1.1'], [{'columns': [['72B17.2', '72B17.3'], ['72B17.3.1']]}], ['72B17.4', '72B17.4.1'], ['72B17.5'], ['72B17.6']]" |
171 | +"72 Hour B","Infrastructure",9,1,"[['72B18.1'], [{'columns': [['72B18.2.1', '72B18.2.2', '72B18.2.3', '72B18.2.4', '72B18.2.5', '72B18.2.6', '72B18.2.7', '72B18.2.8', '72B18.2.9', '72B18.2.10'], ['72B18.3.1', '72B18.3.2', '72B18.3.3', '72B18.3.4', '72B18.3.5']]}]]" |
172 | +"72 Hour B","Response",10,1,"[['72B19.1'], ['72B19.2'], ['72B19.3'], ['72B19.3.1'], ['72B-Re-5']]" |
173 | |
174 | === modified file 'private/prepopulate/demo/ADAT/questionnaire24H.csv' |
175 | --- private/prepopulate/demo/ADAT/questionnaire24H.csv 2011-12-16 18:03:50 +0000 |
176 | +++ private/prepopulate/demo/ADAT/questionnaire24H.csv 2011-12-17 11:02:25 +0000 |
177 | @@ -1,16 +1,16 @@ |
178 | "Template","Template Description","Complete Question","Date Question","Time Question","Location Question","Priority Question","Section","Section Position","Question","Question Type","Question Notes","Question Position","Question Code","Meta Data" |
179 | "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-6","24H-S-1","Background Info",1,"Capacity to respond quickly","YesNo",,1,"24H-BI-1", |
180 | "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-6","24H-S-1","Background Info",1,"Type of disaster","String",,2,"24H-BI-2","{'Length': '80'}" |
181 | -"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-6","24H-S-1","Background Info",1,"GPS coordinates","Numeric",,3,"24H-BI-3", |
182 | +"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-6","24H-S-1","Background Info",1,"GPS coordinates","String",,3,"24H-BI-3", |
183 | "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-6","24H-S-1","Background Info",1,"Geographic area","Location",,4,"24H-BI-4","{'Length': '80'}" |
184 | -"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-6","24H-S-1","Background Info",1,"Geographic area approximate number of inhabitants","Link",,5,"24H-BI-5","{'Parent': '24H-BI-5', 'Type': 'Numeric', 'Relation': 'groupby','Format': 'n'}" |
185 | -"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-6","24H-S-1","Background Info",1,"Community assessed","Location",,6,"24H-BI-6","{'Length': '80', 'Parent':'24H-BI-5'}" |
186 | -"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-6","24H-S-1","Background Info",1,"Community assessed approximate number of inhabitants","Link",,7,"24H-BI-7","{'Parent': '24H-BI-7','Type': 'Numeric','Relation': 'groupby','Format': 'n'}" |
187 | +"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-6","24H-S-1","Background Info",1,"Geographic area approximate number of inhabitants","Link",,5,"24H-BI-5","{'Parent': '24H-BI-4', 'Type': 'Numeric', 'Relation': 'groupby','Format': 'n'}" |
188 | +"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-6","24H-S-1","Background Info",1,"Community assessed","Location",,6,"24H-BI-6","{'Length': '80', 'Parent':'24H-BI-4'}" |
189 | +"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-6","24H-S-1","Background Info",1,"Community assessed approximate number of inhabitants","Link",,7,"24H-BI-7","{'Parent': '24H-BI-6','Type': 'Numeric','Relation': 'groupby','Format': 'n'}" |
190 | "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-6","24H-S-1","Background Info",1,"Name of assessment team leader","String",,8,"24H-BI-8","{'Length': '80'}" |
191 | "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-6","24H-S-1","Background Info",1,"Name of contact person in the community","String",,9,"24H-BI-9","{'Length': '80'}" |
192 | "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-6","24H-S-1","Background Info",1,"Contact Person contact Info","String",,10,"24H-BI-10","{'Length': '80'}" |
193 | "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-6","24H-S-1","Background Info",1,"Date","Date",,11,"24H-BI-11", |
194 | -"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-6","24H-S-1","Background Info",1,"Time","Numeric",,12,"24H-BI-12", |
195 | +"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-6","24H-S-1","Background Info",1,"Time","String",,12,"24H-BI-12", |
196 | "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-6","24H-S-1","Human",2,"Persons # Injured","Numeric",,13,"24H-H-1","{'Format': 'n'}" |
197 | "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-6","24H-S-1","Human",2,"Persons # Dead","Numeric",,14,"24H-H-2","{'Format': 'n'}" |
198 | "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-6","24H-S-1","Human",2,"Persons # Missing","Numeric",,15,"24H-H-3","{'Format': 'n'}" |
199 | |
200 | === modified file 'private/prepopulate/demo/ADAT/questionnaire72H.csv' (properties changed: -x to +x) |
201 | --- private/prepopulate/demo/ADAT/questionnaire72H.csv 2011-12-16 09:17:40 +0000 |
202 | +++ private/prepopulate/demo/ADAT/questionnaire72H.csv 2011-12-17 11:02:25 +0000 |
203 | @@ -6,8 +6,8 @@ |
204 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Community assessed","Location",,5,"72B2.1", |
205 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Community assessed approximate number of inhabitants","Numeric",,6,"72B2.2", |
206 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Name of assessment team leader","String",,7,"72B3", |
207 | -"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Name of contact person in the community and contact info:","String",,8,"72B4", |
208 | -"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Contact person contact info","Numeric",,9,"72B4.1", |
209 | +"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Name of contact person in the community","String",,8,"72B4", |
210 | +"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Contact person contact info","String",,9,"72B4.1", |
211 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Date","Date",,10,"72B5", |
212 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Time","Numeric",,11,"72B6", |
213 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Background Info",1,"Persons # Injured","Numeric",,12,"72B7.1","{'Format': 'n'}" |
214 | @@ -97,7 +97,7 @@ |
215 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"Impact on people’s homes and key services: Electricity","Option",,96,"72B16.1.4","{'Length': '3', '1': 'Low', '2': 'Medium', '3': 'High'}" |
216 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"Impact on people’s homes and key services: Health","Option",,97,"72B16.1.5","{'Length': '3', '1': 'Low', '2': 'Medium', '3': 'High'}" |
217 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"Impact on people’s homes and key services: Community Centre","Option",,98,"72B16.1.6","{'Length': '3', '1': 'Low', '2': 'Medium', '3': 'High'}" |
218 | -"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"If homes have been severely damaged or destroyed, are people living: On the site of their former homes?","YesNo",,99,"72B16.2.1", |
219 | +"72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"On the site of their former homes?","YesNo",,99,"72B16.2.1", |
220 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"Approximate numbers","Numeric",,100,"72B16.2.1.1","{'Format': 'n'}" |
221 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"With friends or family? ","YesNo",,101,"72B16.2.2", |
222 | "72 Hour B","Rapid onset disaster. First 72 hours, rapid field assessment form (B)","72B3","72B5","72B6","72B2.1","72B9.1","Shelter",7,"Approximate numbers","Numeric",,102,"72B16.2.2.1","{'Format': 'n'}" |