From e1c5c72b1b00201c91ae216bf94effccc7cec965 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Mon, 12 Jun 2017 15:40:38 +0530 Subject: [PATCH] Adding geo fence exit alerts ui --- .../cdmf.unit.geo-dashboard/geo-dashboard.hbs | 4 +- .../html_templates/modal/exit_alert.html | 47 +++++++++++++++++++ .../public/js/geo_exit_fence.js | 43 +++++++++++++++++ .../public/js/geo_fencing.js | 12 +++++ 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js 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 3a6e22e5e5..1697936404 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 @@ -715,7 +715,9 @@ createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html', 'Add Stationary Alert', 'glyphicon glyphicon-link', geoToolsMenu); createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html', - 'Add Geo Fence Alert', 'glyphicon glyphicon-edit', geoToolsMenu); + 'Add Geo Fence Enter Alert', 'glyphicon glyphicon-edit', geoToolsMenu); + createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html', + 'Add Geo Fence Exit Alert', 'glyphicon glyphicon-edit', geoToolsMenu); {{/if}} } }); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html new file mode 100644 index 0000000000..a10d767be2 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html @@ -0,0 +1,47 @@ +
+ +

+
+

+ Set 'Exit Fence' alerts +
+

+
+

+
+
+
+
+
+ + + + + + + + + + + + + +
Fence NameQuery NameCreated On
+
+
+ + +
+
+
+
+
+
+ + \ 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.geo-dashboard/public/js/geo_exit_fence.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_exit_fence.js new file mode 100644 index 0000000000..9f257c0cfd --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_exit_fence.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +function initializeExit() { + $(".removeGeoFence").tooltip(); + var serverUrl = "/api/device-mgt/v1.0/geo-services/alerts/Exit/" + deviceType + "/" + deviceId; + invokerUtil.get(serverUrl, function (response) { + if (response) { + $(".fence-not-exist").hide(); + response = JSON.parse(response); + for (var index in response) { + var alertBean = response[index]; + $("#exit-alert > tbody").append( + "" + alertBean.areaName + "" + + "" + alertBean.queryName + "" + alertBean.createdTime + "" + + ""); + } + } else{ + $(".fence-not-exist").show(); + } + $('.viewGeoFenceRow td:not(:last-child)').click(function () { + viewFence(this.parentElement,'Exit'); + }); + }); +} +initializeExit(); \ 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.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 91296f1793..7a67e92765 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 @@ -366,6 +366,18 @@ function viewFence(geoFenceElement,id) { // 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('#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('#viewQueryName').html(queryName); + geometryShape.bindPopup(popupTemplate.html(), {closeButton: false}).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();