';
+ var activityStatus = payload.activityStatus;
+ var responseMsg = null;
+
+ if (activityStatus['0'].status == "ERROR") {
+ responseMsg = activityStatus['0'].responses['0'].response;
+ }
- Object.entries(payload.activityStatus).forEach(
+ Object.entries(activityStatus).forEach(
([key, entry]) => {
logStream += '
' +
'
' +
'' +
'
' +
'' +
- '' + entry.status + '
' +
+ '' + ((responseMsg == null) ? entry.status : responseMsg) + '' +
'
");
+ });
+ });
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index eb788c4a81..49f4e02bad 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -764,7 +764,7 @@
stationaryAlert.addClass("geo-alert");
var withinAlert = createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html',
- 'Add Geofence Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
+ 'Add Geofence Enter Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
withinAlert.addClass("geo-alert");
var exitAlert = createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html',
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
index f35db76fee..f18b117259 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
@@ -17,30 +17,38 @@
*/
function onRequest(context) {
+
var log = new Log("geo-dashboard.js");
var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
var viewModel = {};
-
var carbonServer = require("carbon").server;
var device = context.unit.params.device;
-
var constants = require("/app/modules/constants.js");
- var wsEndpoint = devicemgtProps["wssURL"].replace("https", "wss") + "/secured-websocket/t/";
- var spatialWSEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
- var alertsWSEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-
+ var wsEndpoint = null;
var jwtService = carbonServer.osgiService(
'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
var jwtClient = jwtService.getJWTClient();
var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
+ var tokenPair = null;
var token = "";
if (encodedClientKeys) {
var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
var resp = tokenUtil.decode(encodedClientKeys).split(":");
- var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username, "default", {});
- if (tokenPair) {
- token = tokenPair.accessToken;
+ if (context.user.domain == "carbon.super") {
+ tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+ if (tokenPair) {
+ token = tokenPair.accessToken;
+ wsEndpoint = devicemgtProps["wssURL"].replace("https", "wss") + "/secured-websocket/";
+ }
+ } else {
+ tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username + "@" + context.user.domain,"default", {});
+ if (tokenPair) {
+ token = tokenPair.accessToken;
+ wsEndpoint = devicemgtProps["wssURL"].replace("https", "wss") + "/secured-websocket/t/"+context.user.domain+"/";
+ }
+
}
+
}
viewModel.device = device;
viewModel.wsToken = token;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
index 6aaac5dc09..3ef341187c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
@@ -431,3 +431,76 @@ function viewFence(geoFenceElement,id) {
}
closeAll();
}
+
+function viewFenceByData(geoJson, queryName, areaName, stationeryTime, id) {
+ var matchResults = /(?:"geoFenceGeoJSON"):"{(.*)}"/g.exec(geoJson);
+ if (matchResults && matchResults.length > 1) {
+ geoJson = "{" + matchResults[1] + "}";
+ }
+ geoJson = JSON.parse(geoJson.replace(/'/g, '"'));
+ var geometryShape;
+
+ if(geoJson.type=="Point"){
+
+ var circleOptions = {
+ color: '#ff0043'
+ };
+ geometryShape= new L.circle([geoJson.coordinates[1],geoJson.coordinates[0]], geoJson.radius,circleOptions);
+ // var marker=new L.marker([geoJson.coordinates[1],geoJson.coordinates[0]]);
+ map.addLayer(geometryShape);
+ // map.addLayer(marker);
+ } else if(geoJson.type=="Polygon"){
+ geoJson.coordinates[0].pop(); // popout the last coordinate set(lat,lng pair) due to circular chain
+ var leafletLatLngs = [];
+ $.each(geoJson.coordinates[0], function (idx, pItem) {
+ leafletLatLngs.push({lat: pItem[1], lng: pItem[0]});
+ });
+ geometryShape = new L.Polygon(leafletLatLngs);
+ map.addLayer(geometryShape);
+ }
+
+ var geoPublicUri = $("#geo-charts").data("geo-public-uri");
+
+ if(id=="Stationery"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewStationeryAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewStationeryAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaTime').html(stationeryTime);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+
+ });
+ } else if(id=="WithIn"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewWithinAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewWithinAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaName').html(areaName);
+ popupTemplate.find('#withinAlertForm').attr('area-name', areaName);
+ popupTemplate.find('#withinAlertForm').attr('query-name', queryName);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+ });
+ } else if(id=="Exit"){
+
+ $('#templateLoader').load(geoPublicUri + "/assets/html_templates/view_fence_popup.html #viewExitAlert", function () {
+ var popupTemplate = $('#templateLoader').find('#viewExitAlert');
+ popupTemplate.find('#exportGeoJson').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#hideViewFence').attr('leaflet_id', geometryShape._leaflet_id);
+ popupTemplate.find('#viewAreaName').html(areaName);
+ popupTemplate.find('#exitAlertForm').attr('area-name', areaName);
+ popupTemplate.find('#exitAlertForm').attr('query-name', queryName);
+ geometryShape.bindPopup(popupTemplate.html(), {closeButton: true}).openPopup();
+ // transparent the layer .leaflet-popup-content-wrapper
+ $(geometryShape._popup._container.childNodes[0]).css("background", "rgba(255,255,255,0.8)");
+ });
+ } else if(id=="Traffic"){
+ }
+ closeAll();
+}
+
diff --git a/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 b/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
index 05f78606c5..a0d755f2a8 100644
--- a/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
+++ b/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
@@ -264,6 +264,7 @@ function setWithinAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -277,6 +278,7 @@ function setWithinAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedAreaGeoJson, queryName, areaName, null, 'Within');
}
}
@@ -320,6 +322,7 @@ function setExitAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -333,6 +336,7 @@ function setExitAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedAreaGeoJson, queryName, areaName, null, 'Exit');
}
}
@@ -391,6 +395,7 @@ function setStationeryAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -404,6 +409,7 @@ function setStationeryAlert(leafletId) {
responseHandler, function (xhr) {
responseHandler(xhr.responseText, xhr.statusText, xhr);
});
+ viewFenceByData(selectedProcessedAreaGeoJson, queryName, areaName, time, 'Stationery');
}
@@ -499,6 +505,7 @@ function setTrafficAlert(leafletId) {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
@@ -603,6 +610,7 @@ function setProximityAlert() {
} else {
var ptrn = /(?:)(.*)(?:<\/am\:description>)/g;
var errorTxt;
+ var result = (ptrn.exec(data));
if (result) {
errorTxt = result.length > 1 ? result[1] : data;
} else {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
index ffa49ac0e2..fbecf66217 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/websocket.js
@@ -46,6 +46,65 @@ function processPointMessage(geoJsonFeature) {
}
}
+window.onbeforeunload = function () {
+ disconnect();
+};
+
+function initializeSpatialStreamWebSocket() {
+ spatialWebsocket = new WebSocket(webSocketURL);
+ spatialWebsocket.onopen = webSocketSpatialOnOpen;
+ spatialWebsocket.onmessage = webSocketSpatialOnMessage;
+ spatialWebsocket.onclose = webSocketSpatialOnClose;
+ spatialWebsocket.onerror = webSocketSpatialOnError;
+}
+
+function initializeOnAlertWebSocket() {
+ onAlertWebsocket = new WebSocket(alertWebSocketURL);
+ onAlertWebsocket.onmessage = webSocketOnAlertMessage;
+ onAlertWebsocket.onclose = webSocketOnAlertClose;
+ onAlertWebsocket.onerror = webSocketOnAlertError;
+ onAlertWebsocket.onopen = webSocketOnAlertOpen;
+}
+
+function initializeGeoLocation(geoFencingEnabled) {
+ var deviceDetails = $(".device-id");
+ deviceId = deviceDetails.data("deviceid");
+ deviceType = deviceDetails.data("type");
+ if (deviceId && deviceType) {
+ var geoCharts = $("#geo-charts");
+ var wsEndPoint = geoCharts.data("ws-endpoint");
+ wsToken = geoCharts.data("ws-token");
+ geoPublicUri = geoCharts.data("geo-public-uri");
+ geoPublicUri = geoCharts.data("geo-public-uri");
+ webSocketURL = wsEndPoint + "iot.per.device.stream.geo.FusedSpatialEvent/1.0.0?"
+ + "deviceId=" + deviceId + "&deviceType=" + deviceType + "&websocketToken=" + wsToken;
+ alertWebSocketURL = wsEndPoint + "iot.per.device.stream.geo.AlertsNotifications/1.0.0?"
+ + "deviceId=" + deviceId + "&deviceType=" + deviceType + "&websocketToken=" + wsToken;
+ $("#proximity_alert").hide();
+
+ if (geoFencingEnabled) {
+ disconnect();
+ initializeSpatialStreamWebSocket();
+ initializeOnAlertWebSocket();
+ }
+ initialLoad(geoFencingEnabled);
+ InitSpatialObject(geoFencingEnabled);
+
+ } else {
+ noty({text: 'Invalid Access! No device information provided to track!', type: 'error'});
+ }
+}
+
+function disconnect(){
+ if (spatialWebsocket && spatialWebsocket.readyState == spatialWebsocket.OPEN){
+ spatialWebsocket.close();
+ }
+
+ if (onAlertWebsocket && onAlertWebsocket.readyState == onAlertWebsocket.OPEN){
+ onAlertWebsocket.close();
+ }
+}
+
function SpatialObject(json) {
this.id = json.id;
this.type = json.properties.type;
@@ -175,7 +234,6 @@ SpatialObject.prototype.removeFromMap = function () {
function clearMap() {
for (var spacialObject in currentSpatialObjects) {
- console.log(spacialObject);
currentSpatialObjects[spacialObject].removePath();
currentSpatialObjects[spacialObject].removeFromMap();
}
@@ -199,7 +257,6 @@ SpatialObject.prototype.createLineStringFeature = function (state, information,
SpatialObject.prototype.setSpeed = function (speed) {
this.speed = speed;
this.speedHistory.push(speed);
-// console.log("DEBUG: this.speedHistory.length = "+this.speedHistory.length+" ApplicationOptions.constance.SPEED_HISTORY_COUNT = "+ApplicationOptions.constance.SPEED_HISTORY_COUNT);
if (this.speedHistory.length > ApplicationOptions.constance.SPEED_HISTORY_COUNT) {
this.speedHistory.splice(1, 1);
}
@@ -227,7 +284,6 @@ SpatialObject.prototype.drawPath = function () {
var currentSection = new L.polyline(this.pathGeoJsons[lineString].geometry.coordinates, this.getSectionStyles(currentSectionState)); // Create path object when and only drawing the path (save memory) TODO: if need directly draw line from geojson
var currentSectionFirstPoint = this.pathGeoJsons[lineString].geometry.coordinates[0];
- console.log("DEBUG: previousSectionLastPoint = " + previousSectionLastPoint + " currentSectionFirstPoint = " + currentSectionFirstPoint);
previousSectionLastPoint.push(currentSectionFirstPoint);
var sectionJoin = new L.polyline(previousSectionLastPoint, this.getSectionStyles());
sectionJoin.setStyle({className: "sectionJointStyle"});// Make doted line for section join , this class is currently defined in map.jag as a inner css
@@ -235,7 +291,6 @@ SpatialObject.prototype.drawPath = function () {
previousSectionLastPoint = [this.pathGeoJsons[lineString].geometry.coordinates[this.pathGeoJsons[lineString].geometry.coordinates.length - 1]];
sectionJoin.addTo(map);
this.path.push(sectionJoin);
- console.log("DEBUG: Alert Information: " + this.pathGeoJsons[lineString].properties.information);
currentSection.bindPopup("Alert Information: " + this.pathGeoJsons[lineString].properties.information);
currentSection.addTo(map);
this.path.push(currentSection);
@@ -278,7 +333,6 @@ function processTrafficMessage(json) {
if (json.id in currentSpatialObjects) {
var existingObject = currentSpatialObjects[json.id];
existingObject.update(json);
- console.log("existing area");
}
else {
var receivedObject = new GeoAreaObject(json);
@@ -289,7 +343,6 @@ function processTrafficMessage(json) {
function processAlertMessage(json) {
if (json.state != "NORMAL" && json.state != "MINIMAL") {
- console.log(json);
notifyAlert("Object ID: " + json.id + " change state to: " + json.state + " Info : " + json.information);
}
}
@@ -302,9 +355,7 @@ function processAlertMessage(json) {
var type = typeof o;
return type === 'object' || type === 'function';
}
-
if (!isObject(obj)) return;
-
var prop;
for (var i=1; i < arguments.length-1; i++)
{
@@ -312,13 +363,11 @@ function processAlertMessage(json) {
if (!isObject(obj[prop])) obj[prop] = {};
if (i < arguments.length-2) obj = obj[prop];
}
-
obj[prop] = arguments[i];
}*/
function processPredictionMessage(json) {
setPropertySafe(currentPredictions, json.day, json.hour, json.longitude, json.latitude, json.traffic - 1);
- //console.log(json);
}
WebSocket.prototype.set_opened = function () {
@@ -334,9 +383,7 @@ WebSocket.prototype.get_opened = function () {
var _longitudeStart = -0.0925
var _latitudeStart = 51.4985
var _unit = 0.005;
-
function requestPredictions(longitude, latitude, d) {
-
var serverUrl = "http://localhost:9763/endpoints/GpsDataOverHttp/predictionInput";
function loop(i) {
setTimeout(function() {
@@ -362,7 +409,6 @@ WebSocket.prototype.get_opened = function () {
}
var d= new Date();
//requestPredictions(-0.09,51.5,d);
-
function getPredictions(longitude, latitude, d) {
var longitude = Math.round((longitude - _longitudeStart)/_unit);
var latitude = Math.round((latitude - _latitudeStart)/_unit);
@@ -379,7 +425,6 @@ WebSocket.prototype.get_opened = function () {
traffic[0][i+1] = hour;
traffic[1][i+1] = currentPredictions[day][hour][longitude][latitude];
} catch(e) {
- console.log(i);
}
}
return traffic;
@@ -440,7 +485,6 @@ GeoAreaObject.prototype.update = function (geoJSON) {
this.marker.setIconAngle(this.heading);
this.marker.setIcon(this.stateIcon());
- console.log("update called");
// TODO: use general popup DOM
this.popupTemplate.find('#objectId').html(this.id);
this.popupTemplate.find('#information').html(this.information);
@@ -509,7 +553,6 @@ function LocalStorageArray(id) {
var initLoading = true;
var webSocketOnAlertOpen = function () {
- onAlertWebsocket.set_opened();
$('#ws-alert-stream').removeClass('text-muted text-danger text-success').addClass('text-success');
};
@@ -518,26 +561,20 @@ var webSocketOnAlertMessage = function processMessage(message) {
var json = $.parseJSON(message.data);
if (json.messageType == "Alert") {
processAlertMessage(json);
- } else {
+ }else {
console.log("Message type not supported.");
}
}
};
var webSocketOnAlertClose = function (e) {
- if (onAlertWebsocket.get_opened()) {
- $('#ws-alert-stream').removeClass('text-muted text-danger text-success').addClass('text-danger');
- }
- waitForSocketConnection(onAlertWebsocket, initializeOnAlertWebSocket);
};
var webSocketOnAlertError = function (e) {
- if (!onAlertWebsocket.get_opened()) return;
noty({text: 'Something went wrong when trying to connect to ' + alertWebSocketURL + '', type: 'error'});
};
var webSocketSpatialOnOpen = function () {
- spatialWebsocket.set_opened();
if (initLoading) {
initLoading = false;
}
@@ -558,94 +595,13 @@ var webSocketSpatialOnMessage = function (message) {
};
var webSocketSpatialOnClose = function (e) {
- if (spatialWebsocket.get_opened()) {
- $('#ws-spatial-stream').removeClass('text-muted text-danger text-success').addClass('text-danger');
- }
- waitForSocketConnection(spatialWebsocket, initializeSpatialStreamWebSocket);
};
var webSocketSpatialOnError = function (err) {
- if (!spatialWebsocket.get_opened()) return;
noty({text: 'Something went wrong when trying to connect to ' + webSocketURL + '', type: 'error'});
};
-var waitTime = 1000;
-var waitQueue = {};
-function waitForSocketConnection(socket, callback) {
- if(waitQueue[socket.url]) return;
- setTimeout(
- function () {
- if (socket.readyState === 1) {
- //connectToSource();
- console.log("Connection is made");
- if (callback != null) {
- callback();
- }
- return;
- } else {
- ws = new WebSocket(socket.url);
- if(socket)socket.close();
- waitTime += 400;
- waitForSocketConnection(ws, callback);
- }
- }, waitTime); // wait 5 milisecond for the connection...
- waitQueue[socket.url] = true;
-}
-
-
-function initializeSpatialStreamWebSocket() {
- if(spatialWebsocket) spatialWebsocket.close();
- spatialWebsocket = new WebSocket(webSocketURL);
- spatialWebsocket.onopen = webSocketSpatialOnOpen;
- spatialWebsocket.onmessage = webSocketSpatialOnMessage;
- spatialWebsocket.onclose = webSocketSpatialOnClose;
- spatialWebsocket.onerror = webSocketSpatialOnError;
-}
-
-function initializeOnAlertWebSocket() {
- if(onAlertWebsocket) onAlertWebsocket.close();
- onAlertWebsocket = new WebSocket(alertWebSocketURL);
- onAlertWebsocket.onmessage = webSocketOnAlertMessage;
- onAlertWebsocket.onclose = webSocketOnAlertClose;
- onAlertWebsocket.onerror = webSocketOnAlertError;
- onAlertWebsocket.onopen = webSocketOnAlertOpen;
-}
-
-function initializeGeoLocation(geoFencingEnabled) {
- var deviceDetails = $(".device-id");
- deviceId = deviceDetails.data("deviceid");
- deviceType = deviceDetails.data("type");
- var loggedInUser = $("#logged-in-user");
- var username = loggedInUser.data("username");
- var userDomain = loggedInUser.data("domain");
- if (deviceId && deviceType) {
- var geoCharts = $("#geo-charts");
- var wsEndPoint = geoCharts.data("ws-endpoint");
- wsToken = geoCharts.data("ws-token");
- geoPublicUri = geoCharts.data("geo-public-uri");
- 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;
- $("#proximity_alert").hide();
-
- initialLoad(geoFencingEnabled);
- InitSpatialObject(geoFencingEnabled);
-
- if (geoFencingEnabled) {
- initializeSpatialStreamWebSocket();
- initializeOnAlertWebSocket();
- window.onbeforeunload = function () {
- spatialWebsocket.close();
- onAlertWebsocket.close();
- }
- }
- } else {
- noty({text: 'Invalid Access! No device information provided to track!', type: 'error'});
- }
-}
-
SpatialObject.prototype.stateIcon = function () {
//TODO : Need to add separate icons for each device type
var iconUrl = geoPublicUri + "/img/markers/object-types/default";
@@ -656,19 +612,18 @@ SpatialObject.prototype.stateIcon = function () {
}
return L.icon({
- iconUrl: iconUrl + ".png",
- shadowUrl: false,
- iconSize: [24, 24],
- iconAnchor: [+12, +12],
- popupAnchor: [-2, -5]
- });
+ iconUrl: iconUrl + ".png",
+ shadowUrl: false,
+ iconSize: [24, 24],
+ iconAnchor: [+12, +12],
+ popupAnchor: [-2, -5]
+ });
};
-
var normalMovingIcon = L.icon({
- iconUrl: ApplicationOptions.leaflet.iconUrls.normalMovingIcon,
- shadowUrl: false,
- iconSize: [24, 24],
- iconAnchor: [+12, +12],
- popupAnchor: [-2, -5]
- });
\ No newline at end of file
+ iconUrl: ApplicationOptions.leaflet.iconUrls.normalMovingIcon,
+ shadowUrl: false,
+ iconSize: [24, 24],
+ iconAnchor: [+12, +12],
+ popupAnchor: [-2, -5]
+});
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
index 051fb23592..c53f32cce9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
@@ -27,26 +27,37 @@
Platform Configurations
- General and Platform Specific Server Settings for the Tenant + {{#if isCloud}} + iOS Mobile Management Specific Server Settings for the Tenant + {{else}} + General and Platform Specific Server Settings for the Tenant + {{/if}} +
' + entry.updatedTimestamp + '
' +
@@ -166,11 +189,11 @@ function loadOperationsLog(update) {
function getLogStatusIcon(entry) {
switch (entry) {
case 'COMPLETED':
- return 'fw-success'
- break;
+ return 'fw-success';
case 'PENDING':
- return 'fw-pending'
- break;
+ return 'fw-pending';
+ case 'ERROR':
+ return 'fw-error';
default:
return 'fw-info'
}
@@ -254,3 +277,47 @@ function loadPolicyCompliance() {
}
);
}
+
+function loadApplicationsList() {
+ var applicationsList = $("#applications-list");
+ var applicationListingTemplate = applicationsList.attr("src");
+ var deviceId = applicationsList.data("device-id");
+ var deviceType = applicationsList.data("device-type");
+
+ $.template("application-list", applicationListingTemplate, function (template) {
+ var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/applications";
+ invokerUtil.get(
+ serviceURL,
+ // success-callback
+ function (data, textStatus, jqXHR) {
+ if (jqXHR.status == 200 && data) {
+ data = JSON.parse(data);
+ $("#apps-spinner").addClass("hidden");
+ if (data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ data[i]["name"] = decodeURIComponent(data[i]["name"]);
+ data[i]["platform"] = deviceType;
+ }
+
+ var viewModel = {};
+ viewModel["applications"] = data;
+ viewModel["deviceType"] = deviceType;
+ viewModel["deviceId"] = deviceId;
+ viewModel["appContext"] = context;
+ var content = template(viewModel);
+ $("#applications-list-container").html(content);
+ var iconSource = $("#applications-list-container").data("public-uri") + "/img/android_app_icon.png";
+ $("#applications-list-container img").attr("src",iconSource);
+ } else {
+ $("#applications-list-container").html("");
+ }
+ }
+ },
+ // error-callback
+ function () {
+ $("#applications-list-container").html("Loading application list " + + "was not successful. please try refreshing the list in a while.
- General and Platform Specific Server Settings for the Tenant + {{#if isCloud}} + iOS Mobile Management Specific Server Settings for the Tenant + {{else}} + General and Platform Specific Server Settings for the Tenant + {{/if}} +