Merge branch 'release/1.7.0'

akvo · Jul 15, 2014 · efe7a01 · efe7a01
2 parents c07c8b5 + 006ae0d
commit efe7a01
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java b/GAE/src/org/waterforpeople/mapping/app/web/RawDataRestServlet.java
@@ -325,6 +325,8 @@ private SurveyInstance createInstance(RawDataImportRequest importReq) {
         inst.setUuid(UUID.randomUUID().toString());
         inst.setSurveyedLocaleId(importReq.getSurveyedLocaleId());
         inst.setUuid(UUID.randomUUID().toString());
+        inst.setSubmitterName(importReq.getSubmitter());
+        inst.setSurveyalTime(importReq.getSurveyDuration());
         SurveyInstanceDAO instDao = new SurveyInstanceDAO();
         inst = instDao.save(inst);
         // set the key so the subsequent logic can populate it in the

diff --git a/GAE/src/org/waterforpeople/mapping/app/web/dto/RawDataImportRequest.java b/GAE/src/org/waterforpeople/mapping/app/web/dto/RawDataImportRequest.java
@@ -216,8 +216,11 @@ protected void populateFields(HttpServletRequest req) throws Exception {
                     req.getParameter(SUBMITTER_PARAM), "UTF-8"));
         }
         if (req.getParameter(DURATION_PARAM) != null) {
-            Double duration = Double.valueOf(req.getParameter(DURATION_PARAM));
-            setSurveyDuration(duration.longValue());
+            try {
+                setSurveyDuration(Long.valueOf(req.getParameter(DURATION_PARAM)));
+            } catch (NumberFormatException e) {
+                setSurveyDuration(0L);
+            }
         }
     }
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,6 +5,13 @@ Read more about the [Akvo Platform](http://www.akvo.org/blog/?p=4822).
 
 Akvo FLOW Dashboard release notes
 ----
+#1.7.0.3
+
+## Resolved issues
+
+* Submitter name missing when importing RAW DATA spreadsheet [#662]
+
+
 #1.7.0.2
 
 ## Resolved issues