Merge branch 'release/1.6.4'

akvo · Sep 17, 2013 · f83686e · f83686e
2 parents c53c24c + 82dbd60
commit f83686e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/GAE/src/org/waterforpeople/mapping/dataexport/RawDataExporter.java b/GAE/src/org/waterforpeople/mapping/dataexport/RawDataExporter.java
@@ -32,7 +32,6 @@
 import org.waterforpeople.mapping.app.gwt.client.surveyinstance.SurveyInstanceDto;
 import org.waterforpeople.mapping.dataexport.service.BulkDataServiceClient;
 
-import com.gallatinsystems.common.util.PropertyUtil;
 import com.gallatinsystems.framework.dataexport.applet.AbstractDataExporter;
 
 /**
@@ -113,7 +112,7 @@ public void export(String serverBase, Long surveyIdentifier, Writer pw) {
 
 	private void writeHeader(Writer pw, Map<String, QuestionDto> questions)
 			throws Exception {
-		pw.write("Instance\tSubmission Date\tSubmitter");
+		pw.write("Instance\tSubmission Date\tSubmitter\tDuration");
 		if (keyList != null) {
 			for (String key : keyList) {
 				pw.write("\t");
@@ -169,6 +168,11 @@ private void exportInstances(Writer pw, List<String> idList)
 											.replaceAll("\n", " ")
 											.replaceAll("\t", " ").trim());
 								}
+								pw.write("\t");
+								Long duration = dto.getSurveyalTime();
+								if (duration != null) {
+									pw.write(duration.toString());
+								}
 							}
 							for (String key : idList) {
 								String val = responses.get(key);