Merge pull request #562 from Kamidu/release-2.0.x

improvements for location view
8 years ago · 212cc52eb2
parent fb1f7771c4 eb17093747
commit 212cc52eb2
1 changed files with 5 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@ -89,7 +89,11 @@ deviceModule = function () {
            var gpsReadingTimes = {};
            gpsReading.lat = locationDataSet[i].latitude;
            gpsReading.lng = locationDataSet[i].longitude;
-            gpsReadingTimes.time = locationDataSet[i].timeStamp;
+            if (deviceType == "android") {
+                gpsReadingTimes.time = locationDataSet[i].timeStamp;
+            } else {
+                gpsReadingTimes.time = locationDataSet[i].meta_timestamp;
+            }
            locationData.push(gpsReading);
            locationTimeData.push(gpsReadingTimes);
        }