waruni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed geo alerts notifications

Browse Source
revert-70aa11f8
Rasika Perera 7 years ago
parent 73ab6f28c1
commit 4796f5934f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

17
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
Unescape View File

@ -542,11 +542,14 @@ function getAlertsHistory(deviceType, deviceId, timeFrom, timeTo) {
var alertsContainer = $('#showAlertsArea').empty(); var alertsContainer = $('#showAlertsArea').empty();
var alerts = JSON.parse(data); var alerts = JSON.parse(data);
$.each(alerts, function (key, val) { $.each(alerts, function (key, val) {
if(val.values){
val = val.values;
}
var alertDOMElement = document.createElement('a'); // Reason for using var alertDOMElement = document.createElement('a'); // Reason for using
// document.createElement // document.createElement
// (performance issue) // (performance issue)
// http://stackoverflow.com/questions/268490/jquery-document-createelement-equivalent // http://stackoverflow.com/questions/268490/jquery-document-createelement-equivalent
switch (val.STATE) { switch (val.state) {
case "NORMAL": case "NORMAL":
// $(alertDOMElement).addClass("list-group-item list-group-item-info"); // $(alertDOMElement).addClass("list-group-item list-group-item-info");
return; return;
@ -560,16 +563,16 @@ function getAlertsHistory(deviceType, deviceId, timeFrom, timeTo) {
$(alertDOMElement).addClass("list-group-item list-group-item-success"); $(alertDOMElement).addClass("list-group-item list-group-item-success");
break; break;
} }
$(alertDOMElement).html(val.INFORMATION); $(alertDOMElement).html(val.information);
$(alertDOMElement).css({marginTop: "5px"}); $(alertDOMElement).css({marginTop: "5px"});
$(alertDOMElement).attr('onClick', 'showAlertInMap(this)'); $(alertDOMElement).attr('onClick', 'showAlertInMap(this)');
// Set HTML5 data attributes for later use // Set HTML5 data attributes for later use
$(alertDOMElement).attr('data-id', val.ID); $(alertDOMElement).attr('data-id', val.id);
$(alertDOMElement).attr('data-latitude', val.LATITUDE); $(alertDOMElement).attr('data-latitude', val.latitude);
$(alertDOMElement).attr('data-longitude', val.LONGITUDE); $(alertDOMElement).attr('data-longitude', val.longitude);
$(alertDOMElement).attr('data-state', val.STATE); $(alertDOMElement).attr('data-state', val.state);
$(alertDOMElement).attr('data-information', val.INFORMATION); $(alertDOMElement).attr('data-information', val.information);
alertsContainer.append(alertDOMElement); alertsContainer.append(alertDOMElement);
}); });

Write Preview
Loading…
Cancel
Save