Changes to geo dashboard ui in /devicemgt

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs

@@ -40,7 +40,7 @@
 {{/zone}}
 
 <span id="geo-charts" data-ws-endpoint="{{wsEndpoint}}" data-ws-token="{{wsToken}}" data-geo-public-uri="{{@unit.publicUri}}"
-data-device-location="{{lastLocation}}"></span>
+      data-device-location="{{lastLocation}}"></span>
 
 <div class="map-wrapper">
     {{#unless @unit.params.hideSearch}}
@@ -704,8 +704,12 @@ data-device-location="{{lastLocation}}"></span>
                 });
                 {{#if showGeoFencingTools}}
                     var locationItems = geoLocationLink.closest('li');
-                    var geoToolsMenu = $("<ul/>", {class: 'collapse list-group geo-tools'}).appendTo(locationItems);
+                    var geoToolsMenu = $("<ul/>", {class: 'collapse list-group geo-tools active'}).appendTo(locationItems);
                     geoPublicUri = $("#geo-charts").data("geo-public-uri");
+                    var realtTime = createGeoToolListItem('javascript:enableRealTime()',
+                                                          'Return to Real Time View', 'fw fw-undo', geoToolsMenu);
+                    realtTime.css("display", "none");
+                    realtTime.attr("id", "realTimeShow");
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/speed_alert.html',
                                           'Set Speed Alert', 'glyphicon glyphicon-dashboard', geoToolsMenu);
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html',

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js

@@ -297,7 +297,8 @@ function focusOnSpatialObject(objectId) {
         return true;
     }
 
-    map.setView(spatialObject.marker.getLatLng(), zoomLevel, {animate: true}); // TODO: check the map._layersMaxZoom and set the zoom level accordingly
+    map.setView(spatialObject.marker.getLatLng(), zoomLevel, {animate: true});
+    // TODO: check the map._layersMaxZoom and set the zoom level accordingly
 
     $('#objectInfo').find('#objectInfoId').html(selectedSpatialObject);
     spatialObject.marker.openPopup();
@@ -305,7 +306,7 @@ function focusOnSpatialObject(objectId) {
         $('#objectInfo').animate({width: 'toggle'}, 100);
         toggled = true;
     }
-    getAlertsHistory(objectId);
+    getAlertsHistory(deviceType, deviceId, new Date($('#timeFrom').val()).getTime(), new Date($('#timeTo').val()).getTime());
     spatialObject.drawPath();
     setTimeout(function () {
         createChart();
@@ -470,7 +471,7 @@ function focusOnHistorySpatialObject(objectId, timeFrom, timeTo) {
         clearMap();
         var fromDate = new Date(timeFrom);
         var toDate = new Date(timeTo);
-        var tableData = getProviderData(fromDate.valueOf() / 1000, toDate.valueOf() / 1000);
+        var tableData = getProviderData(fromDate.valueOf(), toDate.valueOf());
         for (var i = 0; i < tableData.length; i++) {
             var data = tableData[i];
             var geoMessage = {
@@ -507,7 +508,8 @@ function focusOnHistorySpatialObject(objectId, timeFrom, timeTo) {
             return true;
         }
 
-        map.setView(spatialObject.marker.getLatLng(), zoomLevel, {animate: true}); // TODO: check the map._layersMaxZoom and set the zoom level accordingly
+        map.setView(spatialObject.marker.getLatLng(), zoomLevel, {animate: true});
+        // TODO: check the map._layersMaxZoom and set the zoom level accordingly
 
         $('#objectInfo').find('#objectInfoId').html(selectedSpatialObject);
         spatialObject.marker.openPopup();
@@ -515,7 +517,7 @@ function focusOnHistorySpatialObject(objectId, timeFrom, timeTo) {
             $('#objectInfo').animate({width: 'toggle'}, 100);
             toggled = true;
         }
-        getAlertsHistory(objectId);
+        getAlertsHistory(deviceType, deviceId, new Date($('#timeFrom').val()).getTime(), new Date($('#timeTo').val()).getTime());
         spatialObject.drawPath();
         setTimeout(function () {
             createChart();
@@ -539,4 +541,5 @@ function createGeoToolListItem(link, text, icon, menuRoot) {
     anchor.attr('data-toggle', 'modal');
     anchor.attr('data-target', '#commonModal');
     $("<i/>", {class: icon}).prependTo(anchor);
+    return listItem;
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/application_options.js

@@ -29,7 +29,7 @@ var ApplicationOptions = {
         }
     },
     constance:{
-        CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'org.wso2.geo.FusedSpatialEvent',
+        CEP_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'iot.per.device.stream.geo.FusedSpatialEvent',
         CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'org.wso2.geo.AlertsNotifications',
         CEP_Traffic_STREAM_WEB_SOCKET_OUTPUT_ADAPTOR_NAME: 'DefaultWebsocketOutputAdaptorOnTrafficStream',
         CEP_WEB_SOCKET_OUTPUT_ADAPTOR_WEBAPP_NAME: 'secured-websocket',

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js

@@ -487,13 +487,21 @@ function removeGeoFence(geoFenceElement, id) {
                        });
 }
 
-function getAlertsHistory(objectId) {
+function getAlertsHistory(deviceType, deviceId, timeFrom, timeTo) {
-
+    var timeRange = '';
-    $.getJSON("/portal/store/carbon.super/fs/gadget/geo-dashboard/controllers/get_alerts_history.jag?objectId=" + objectId, function (data) {
+    if (timeFrom && timeTo) {
+        timeRange = '?from=' + timeFrom + '&to=' + timeTo;
+    }
+    var serviceUrl = '/api/device-mgt/v1.0/geo-services/alerts/history/' + deviceType + '/' + deviceId + timeRange;
+    invokerUtil.get(serviceUrl,
+                    function (data) {
                         var alertsContainer = $('#showAlertsArea').empty();
-        $.each(data, function (key, val) {
+                        var alerts = JSON.parse(data);
-            var alertDOMElement = document.createElement('a'); // Reason for using document.createElement (performance issue) http://stackoverflow.com/questions/268490/jquery-document-createelement-equivalent
+                        $.each(alerts, function (key, val) {
-
+                            var alertDOMElement = document.createElement('a'); // Reason for using
+                                                                               // document.createElement
+                                                                               // (performance issue)
+                                                                               // http://stackoverflow.com/questions/268490/jquery-document-createelement-equivalent
                             switch (val.STATE) {
                                 case "NORMAL":
 //                                       $(alertDOMElement).addClass("list-group-item list-group-item-info");
@@ -521,6 +529,8 @@ function getAlertsHistory(objectId) {
 
                             alertsContainer.append(alertDOMElement);
                         });
+                    }, function (message) {
+            console.log(message);
         });
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js

@@ -650,7 +650,7 @@ function initializeGeoLocation() {
         var wsEndPoint = geoCharts.data("ws-endpoint");
         wsToken = geoCharts.data("ws-token");
         geoPublicUri = geoCharts.data("geo-public-uri");
-        webSocketURL = wsEndPoint + userDomain + "/org.wso2.geo.FusedSpatialEvent/1.0.0?"
+        webSocketURL = wsEndPoint + userDomain + "/iot.per.device.stream.geo.FusedSpatialEvent/1.0.0?"
                        + "deviceId=" + deviceId + "&deviceType=" + deviceType + "&websocketToken=" + wsToken;
         alertWebSocketURL = wsEndPoint + userDomain + "/org.wso2.geo.AlertsNotifications/1.0.0?"
                             + "deviceId=" + deviceId + "&deviceType=" + deviceType + "&websocketToken=" + wsToken;