Merge branch 'release/1.9.8'

Author: muloem

Dashboard/app/js/lib/router/router.js

@@ -70,7 +70,6 @@ FLOW.Router = Ember.Router.extend({
       connectOutlets: function (router, event) {
         router.get('applicationController').connectOutlet('navSurveys');
         router.set('navigationController.selected', 'navSurveys');
-        FLOW.cascadeResourceControl.populate();
       },
 
       doNewSurvey: function (router, event) {
@@ -105,8 +104,8 @@ FLOW.Router = Ember.Router.extend({
           FLOW.selectedControl.set('selectedSurvey', null);
           FLOW.selectedControl.set('selectedQuestion', null);
           FLOW.questionControl.set('OPTIONcontent', null);
+          FLOW.cascadeResourceControl.populate();
           FLOW.attributeControl.populate();
-
         }
       }),
 
@@ -137,7 +136,6 @@ FLOW.Router = Ember.Router.extend({
           });
           // all questions should be closed when we enter
           FLOW.selectedControl.set('selectedQuestion', null);
-          FLOW.attributeControl.populate();
         },
 
         doEditQuestions: function (router, event) {

Dashboard/app/js/lib/views/maps/map-views-common.js

@@ -217,28 +217,30 @@ FLOW.NavMapsView = FLOW.View.extend({
         var keyId = $(this).val();
         //if a survey is selected, load forms to form selector element.
         if($(this).find("option:selected").data('type') === 'PROJECT'){
-          $.get('/rest/cartodb/forms?surveyId='+keyId, function(data, status) {
-            var rows = [];
-            if(data['forms'] && data['forms'].length > 0) {
-              rows = data['forms'];
-              rows.sort(function(el1, el2) {
-                return self.compare(el1, el2, 'name')
-              });
-
-              var hierarchyObject = self.hierarchyObject;
-
-              //create folder and/or survey select element
-              var form_selector = $("<select></select>").attr("data-survey-id", keyId).attr("class", "form_selector");
-              form_selector.append('<option value="">--' + Ember.String.loc('_choose_a_form') + '--</option>');
-
-              for(var i=0; i<rows.length; i++) {
-                //append returned forms list to the firm selector element
-                form_selector.append(
-                  $('<option></option>').val(rows[i]["id"]).html(rows[i]["name"]));
+          $.get(
+            '/rest/surveys?surveyGroupId='+keyId,
+            function(data, status) {
+              var rows = [];
+              if(data['surveys'] && data['surveys'].length > 0) {
+                rows = data['surveys'];
+                rows.sort(function(el1, el2) {
+                  return self.compare(el1, el2, 'name')
+                });
+
+                var hierarchyObject = self.hierarchyObject;
+
+                //create folder and/or survey select element
+                var form_selector = $("<select></select>").attr("data-survey-id", keyId).attr("class", "form_selector");
+                form_selector.append('<option value="">--' + Ember.String.loc('_choose_a_form') + '--</option>');
+
+                for(var i=0; i<rows.length; i++) {
+                  //append returned forms list to the firm selector element
+                  form_selector.append(
+                    $('<option></option>').val(rows[i]["keyId"]).html(rows[i]["name"]));
+                }
+                $("#survey_hierarchy").append(form_selector);
               }
-              $("#survey_hierarchy").append(form_selector);
-            }
-          });
+            });
 
           var namedMapObject = {};
           namedMapObject['mapObject'] = map;
@@ -679,7 +681,11 @@ FLOW.NavMapsView = FLOW.View.extend({
                           } else {
                             videoString = questionAnswer;
                           }
-                          clickedPointContent += videoString;
+
+                          var videoFileUrl = FLOW.Env.photo_url_root+videoString.substring(videoString.lastIndexOf("/")+1);
+                          var videoContent = videoFileUrl+' <a href="'+videoFileUrl+'" target="_blank">'+Ember.String.loc('_open_video')+'</a>';
+
+                          clickedPointContent += videoContent;
                           break;
                         case "CASCADE":
                         case "OPTION":
@@ -760,13 +766,14 @@ FLOW.NavMapsView = FLOW.View.extend({
     if(self.hierarchyObject.length > 0){
       self.manageHierarchy(parentFolderId);
     }else{
-      $.get('/rest/survey_groups'/*place survey_groups endpoint here*/
-      , function(data, status){
-        if(data['survey_groups'].length > 0){
-          self.hierarchyObject = data['survey_groups'];
-          self.manageHierarchy(parentFolderId);
-        }
-      });
+      $.get(
+        '/rest/survey_groups', /*place survey_groups endpoint here*/
+        function(data, status){
+          if(data['survey_groups'].length > 0){
+            self.hierarchyObject = data['survey_groups'];
+            self.manageHierarchy(parentFolderId);
+          }
+        });
     }
   },
 

GAE/src/com/gallatinsystems/device/dao/DeviceDAO.java

@@ -39,34 +39,39 @@ public class DeviceDAO extends BaseDAO<Device> {
     public DeviceDAO() {
         super(Device.class);
     }
-
+    
     /**
-     * gets a single device by phoneNumber. If phone number is not unique (this shouldn't happen),
-     * it returns the first instance found.
+     * Get a single device based on available attributes. The priority
+     * given to these fields is: androidId, imei, phoneNumber.
+     * If the device is not found using the most reliable fields, we'll
+     * fall back to the next attr.
      * 
-     * @param phoneNumber
-     * @return
+     * @param androidId unique identifier. Reported from app v2.1.2 onwards
+     * @param imei ESN number. Devices without a SIM card may not have this attr.
+     * @param phoneNumber phone number or device MAC address
+     * @return device matching this criteria, if found
      */
-    public Device get(String phoneNumber) {
-        return super.findByProperty("phoneNumber", phoneNumber, STRING_TYPE);
-    }
-
-    /**
-     * gets a single device by imei/esn. If phone number is not unique (this shouldn't happen), it
-     * returns the first instance found.
-     * 
-     * @param imei
-     * @return
-     */
-    public Device getByImei(String imei) {
-        if (Device.NO_IMEI.equals(imei)) {
+    public Device getDevice(String androidId, String imei, String phoneNumber) {
+        Device device = null;
+        
+        if (StringUtils.isNotEmpty(androidId)) {
+            // Devices registered with Flow app version > 2.1.2 will have reported
+            // this attribute, which is the most reliable for identifying a device
+            device = super.findByProperty("androidId", androidId, STRING_TYPE);
+        }
+        if (device == null && StringUtils.isNotEmpty(imei) && !"NO_IMEI".equals(imei)) {
             // WiFi only devices could have "NO_IMEI" as value
             // We want to fall back to search by `phoneNumber` (MAC address)
-            return null;
+            device = super.findByProperty("esn", imei, STRING_TYPE);
         }
-        return super.findByProperty("esn", imei, STRING_TYPE);
+        
+        if (device == null && StringUtils.isNotEmpty(phoneNumber)) {
+            device = super.findByProperty("phoneNumber", phoneNumber, STRING_TYPE);
+        }
+        return device;
     }
 
+
     /**
      * Create or update device
      * 
@@ -78,28 +83,25 @@ public Device getByImei(String imei) {
      * @param deviceIdentifier
      * @param imei
      */
-    public void updateDevice(String phoneNumber, Double lat,
-            Double lon, Double accuracy, String version,
-            String deviceIdentifier, String imei, String osVersion) {
+    public void updateDevice(String phoneNumber, Double lat, Double lon, 
+            Double accuracy, String version, String deviceIdentifier, 
+            String imei, String osVersion, String androidId) {
         if (StringUtils.isEmpty(imei) && StringUtils.isEmpty(phoneNumber)) {
             return;
         }
 
-        Device d = null;
-        if (imei != null) { // New Apps from 1.10.0 and on provide IMEI/ESN
-            d = getByImei(imei);
-        }
-
-        if (d == null) {
-            d = get(phoneNumber); // Fall back to less-stable ID
-        }
+        Device d = getDevice(androidId, imei, phoneNumber);
         if (d == null) {
             // if device is null, we have to create it
             d = new Device();
             d.setCreatedDateTime(new Date());
             d.setDeviceType(DeviceType.CELL_PHONE_ANDROID);
-            d.setPhoneNumber(phoneNumber);
         }
+        // Update device properties
+        d.setPhoneNumber(phoneNumber);
+        d.setAndroidId(androidId);
+        d.setLastLocationBeaconTime(new Date());
+        d.setGallatinSoftwareManifest(version);
         if (lat != null && lon != null) {
             d.setLastKnownLat(lat);
             d.setLastKnownLon(lon);
@@ -114,8 +116,6 @@ public void updateDevice(String phoneNumber, Double lat,
         if (osVersion != null) {
             d.setOsVersion(osVersion);
         }
-        d.setLastLocationBeaconTime(new Date());
-        d.setGallatinSoftwareManifest(version);
         save(d);
     }
 }

GAE/src/com/gallatinsystems/device/domain/Device.java

@@ -33,6 +33,7 @@ public class Device extends BaseDomain {
     public static final String NO_IMEI = "NO_IMEI";
 
     private DeviceType deviceType;
+    private String androidId;
     private String phoneNumber;
     private String esn;
     private String deviceIdentifier;
@@ -46,6 +47,14 @@ public class Device extends BaseDomain {
     private Double lastKnownAccuracy;
     private Date lastLocationBeaconTime;
     private String deviceGroup;
+    
+    public String getAndroidId() {
+        return androidId;
+    }
+    
+    public void setAndroidId(String androidId) {
+        this.androidId = androidId;
+    }
 
     public String getDeviceIdentifier() {
         return deviceIdentifier;

GAE/src/com/gallatinsystems/device/domain/DeviceFiles.java

@@ -50,6 +50,7 @@ public class DeviceFiles extends BaseDomain {
     private Text processingMessageText = null;
     private Long surveyInstanceId = null;
 
+    private String androidId;
     private String phoneNumber;
     private String checksum;
     private String imei;
@@ -117,6 +118,14 @@ public Status getStatus() {
     public void setStatus(Status status) {
         this.status = status;
     }
+    
+    public String getAndroidId() {
+        return androidId;
+    }
+    
+    public void setAndroidId(String androidId) {
+        this.androidId = androidId;
+    }
 
     public String toString() {
         StringBuilder sb = new StringBuilder();

GAE/src/com/gallatinsystems/device/domain/DeviceSurveyJobQueue.java

@@ -33,6 +33,7 @@ public class DeviceSurveyJobQueue {
 
     private String devicePhoneNumber;
     private String imei;
+    private String androidId;
     private Long surveyID;
     private Date effectiveStartDate;
     private Date effectiveEndDate;
@@ -71,6 +72,14 @@ public void setAssignmentId(Long assignmentId) {
         this.assignmentId = assignmentId;
     }
 
+    public String getAndroidId() {
+        return androidId;
+    }
+
+    public void setAndroidId(String androidId) {
+        this.androidId = androidId;
+    }
+
     public String getDevicePhoneNumber() {
         return devicePhoneNumber;
     }

GAE/src/com/gallatinsystems/survey/dao/DeviceSurveyJobQueueDAO.java

@@ -16,8 +16,11 @@
 
 package com.gallatinsystems.survey.dao;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.jdo.PersistenceManager;
 
@@ -31,31 +34,45 @@
 public class DeviceSurveyJobQueueDAO {
 
     /**
-     * lists all objects for a given imei or phoneNumber
-     * 
-     * @param devicePhoneNumber
-     * @param imei
-     * @return
+     * lists all objects for a given device
      */
     @SuppressWarnings("unchecked")
-    public List<DeviceSurveyJobQueue> get(String devicePhoneNumber, String imei) {
+    public List<DeviceSurveyJobQueue> get(String devicePhoneNumber, String imei, String androidId) {
         PersistenceManager pm = PersistenceFilter.getManager();
-        javax.jdo.Query query = pm.newQuery(DeviceSurveyJobQueue.class);
-
-        List<DeviceSurveyJobQueue> results = null;
-        // lookup by imei first and filter out NO_IMEI ones
+        
+        Set<DeviceSurveyJobQueue> set = new HashSet<>();
+        javax.jdo.Query query;
+        
+        // Query entities based on Android ID. This is the most reliable ID
+        // and should be used whenever possible
+        if (androidId != null) {
+            query = pm.newQuery(DeviceSurveyJobQueue.class);
+            query.setFilter("androidId == androidIdParam");
+            query.declareParameters("String androidIdParam");
+            set.addAll((List<DeviceSurveyJobQueue>) query.execute(androidId));
+        }
+        
+        // For legacy reasons, some assignments may only be identified by 
+        // IMEI or phone number
+        List<DeviceSurveyJobQueue> legacy = null;
         if (imei != null && !Device.NO_IMEI.equals(imei)) {
+            query = pm.newQuery(DeviceSurveyJobQueue.class);
             query.setFilter("imei == imeiParam");
             query.declareParameters("String imeiParam");
-            results = (List<DeviceSurveyJobQueue>) query.execute(imei);
+            legacy = (List<DeviceSurveyJobQueue>) query.execute(imei);
         }
-        if (results == null || results.size() == 0) {
-            // fall back to phonenumber
+        if ((legacy == null || legacy.isEmpty()) && devicePhoneNumber != null) {
+            // Fall back to phone number
+            query = pm.newQuery(DeviceSurveyJobQueue.class);
             query.setFilter("devicePhoneNumber == devicePhoneNumberParam");
             query.declareParameters("String devicePhoneNumberParam");
-            results = (List<DeviceSurveyJobQueue>) query.execute(devicePhoneNumber);
+            legacy = (List<DeviceSurveyJobQueue>) query.execute(devicePhoneNumber);
         }
-        return results;
+        if (legacy != null) {
+            set.addAll(legacy);
+        }
+        
+        return new ArrayList<>(set);
     }
 
     /**
@@ -94,32 +111,6 @@ public List<DeviceSurveyJobQueue> listAllJobsInQueue() {
         return results;
     }
 
-    /**
-     * delete a job with the phone number and survey id passed in
-     * 
-     * @param phoneNumbers
-     * @param surveyId
-     */
-    @SuppressWarnings("unchecked")
-    public void deleteJob(String phone, Long surveyId) {
-        PersistenceManager pm = PersistenceFilter.getManager();
-        if (phone != null && surveyId != null) {
-
-            javax.jdo.Query query = pm.newQuery(DeviceSurveyJobQueue.class);
-            String filterString = "devicePhoneNumber == devicePhoneParam && surveyID == surveyIdParam";
-            String paramString = "String devicePhoneParam, Long surveyIdParam";
-
-            query.setFilter(filterString);
-            query.declareParameters(paramString);
-            List<DeviceSurveyJobQueue> results = (List<DeviceSurveyJobQueue>) query
-                    .execute(phone, surveyId);
-            if (results != null) {
-                pm.deletePersistentAll(results);
-            }
-
-        }
-    }
-
     /**
      * deletes all jobs for a given assignment
      *