From 9361203e59c10f9268f1459a845f18c0c40953ef Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Fri, 23 Jun 2017 16:37:21 +0530 Subject: [PATCH] Fixing android geo fencing ui --- .../device-view.hbs | 12 +- .../public/js/load-map.js | 127 ------------------ 2 files changed, 11 insertions(+), 128 deletions(-) delete mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs index a9cb25acba..836505a2db 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs @@ -74,7 +74,12 @@ {{/zone}} {{#zone "device-details-tab-injected"}} -
  • Location
    • +
  • + Location +
  • Applications
  • Policy Compliance
    • {{/zone}} @@ -82,6 +87,11 @@ {{#zone "device-view-tab-injected-conents"}}
    {{#if device.location}} +
    +
    +
    +
    +
    {{unit "cdmf.unit.geo-dashboard" device=device noGeoFencing=false hideSearch=true}} {{else}}
    diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js deleted file mode 100644 index 49318af68b..0000000000 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2015, 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. - */ - -var map; -var isAnalitics = false; -var marker; - -function loadLeafletMap(refresh) { - - var deviceLocationID = "#device-location", - locations = $(deviceLocationID).data("locations"), - location_lat = $(deviceLocationID).data("lat"), - location_long = $(deviceLocationID).data("long"), - container = "device-location", - zoomLevel = 13, - tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", - attribution = "© OpenStreetMap contributors"; - - if (refresh && !isAnalitics) { - - $("#map-spinner").removeClass("hidden"); - var applicationsList = $("#applications-list"); - var deviceId = applicationsList.data("device-id"); - var deviceType = applicationsList.data("device-type"); - invokerUtil.get( - "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/location", - // success-callback - function (data, textStatus, jqXHR) { - if (jqXHR.status == 200 && data) { - data = JSON.parse(data); - if (data.latitude && data.longitude) { - map.removeLayer(marker); - // marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here"); - marker = L.marker([data.latitude, data.longitude], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here"); - map.panTo(new L.LatLng(data.latitude, data.longitude)); - // map.panTo(new L.LatLng(40.737, -73.923)); - marker.on('mouseover', function (e) { - this.openPopup(); - }); - marker.on('mouseout', function (e) { - this.closePopup(); - }); - } - $("#map-spinner").addClass("hidden"); - } else { - $("#map-spinner").adddClass("hidden"); - $("#device-location").hide(); - $("#map-error").show(); - } - }, - // error-callback - function () { - $("#map-spinner").addClass("hidden"); - $("#device-location").hide(); - $("#map-error").show(); - }); - - } else if (locations && locations.locations.length > 0) { - isAnalitics = true; - var locationSets = locations.locations; - map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel); - L.tileLayer(tileSet, {attribution: attribution}).addTo(map); - - var initTime = locations.times[0].time, lastTime = locations.times[locationSets.length - 1].time; - var totalTime = lastTime - initTime; - for (var i = 0; i < locationSets.length; i++) { - var opacVal = (locations.times[i].time - initTime) / totalTime; - var m = L.marker(locationSets[i], {"opacity": opacVal}).addTo(map).bindPopup(new Date(locations.times[i].time).toISOString()); - m.on('mouseover', function (e) { - this.openPopup(); - }); - m.on('mouseout', function (e) { - this.closePopup(); - }); - } - $("#map-error").hide(); - $("#device-location").show(); - setTimeout(function () { - map.invalidateSize() - }, 400); - - } else if (location_long && location_lat) { - map = L.map(container).setView([location_lat, location_long], zoomLevel); - L.tileLayer(tileSet, {attribution: attribution}).addTo(map); - - marker = L.marker([location_lat, location_long], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here"); - marker.on('mouseover', function (e) { - this.openPopup(); - }); - marker.on('mouseout', function (e) { - this.closePopup(); - }); - $("#map-error").hide(); - $("#device-location").show(); - setTimeout(function () { - map.invalidateSize() - }, 400); - } else { - $("#device-location").hide(); - $("#map-error").show(); - } -} - -$(document).ready(function () { - $(".location_tab").on("click", function () { - loadLeafletMap(false); - }); - - $("#refresh-location").on("click", function () { - loadLeafletMap(true); - }); -});