community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

enabling loading for location refrsh

Browse Source
This commit is contained in:
kamidu 2017-04-05 16:35:35 +05:30
parent 1d663e1b68
commit 9d3949ea37
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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
View File

@ -337,6 +337,9 @@
<i class="fw fw-refresh"></i> <i class="fw fw-refresh"></i>
</a> </a>
</span> </span>
<div id="map-spinner" class="wr-advance-operations-init hidden">
<i class="fw fw-settings fw-spin fw-2x"></i> Fetching the latest location...
</div>
</div> </div>
<div id="collapseThree" class="panel-collapse collapse in" role="tabpanel" <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
aria-labelledby="device_location"> aria-labelledby="device_location">

12
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
View File

@ -32,6 +32,8 @@ function loadLeafletMap(refresh) {
attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors"; attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
if (refresh && !isAnalitics) { if (refresh && !isAnalitics) {
console.log("holaaaa");
$("#map-spinner").removeClass("hidden");
var applicationsList = $("#applications-list"); var applicationsList = $("#applications-list");
var deviceId = applicationsList.data("device-id"); var deviceId = applicationsList.data("device-id");
var deviceType = applicationsList.data("device-type"); var deviceType = applicationsList.data("device-type");
@ -43,8 +45,10 @@ function loadLeafletMap(refresh) {
data = JSON.parse(data); data = JSON.parse(data);
if (data.latitude && data.longitude) { if (data.latitude && data.longitude) {
map.removeLayer(marker); map.removeLayer(marker);
marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here"); // 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"); 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) { marker.on('mouseover', function (e) {
this.openPopup(); this.openPopup();
}); });
@ -52,14 +56,16 @@ function loadLeafletMap(refresh) {
this.closePopup(); this.closePopup();
}); });
} }
$("#map-spinner").addClass("hidden");
} else { } else {
$("#map-spinner").adddClass("hidden");
$("#device-location").hide(); $("#device-location").hide();
$("#map-error").show(); $("#map-error").show();
} }
}, },
// error-callback // error-callback
function () { function () {
$("#map-spinner").addClass("hidden");
$("#device-location").hide(); $("#device-location").hide();
$("#map-error").show(); $("#map-error").show();
}); });