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

Fixing https://github.com/wso2/product-iots/issues/1623

Browse Source
revert-70aa11f8
Rasika Perera 7 years ago
parent d8caf3baea
commit 68a5415e0b
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File

36
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
Unescape View File

@ -576,8 +576,8 @@
<div id="setWithinAlert"> <div id="setWithinAlert">
<form role="form" style="width: auto;"> <form role="form" style="width: auto;">
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="withinAlertAreaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Fence name" type="text"> <input class="form-control" id="withinAlertAreaName" placeholder="Fence name" type="text">
<span class="help-block">Name of the selected area(e.g. colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
@ -589,9 +589,8 @@
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="editGeoJson" <button onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')" type="button" class="btn btn-default btn-xs editGeoJson">Edit
type="button" class="btn btn-default btn-xs">Edit
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -607,8 +606,8 @@
<div id="setExitAlert"> <div id="setExitAlert">
<form role="form" style="width: auto;"> <form role="form" style="width: auto;">
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="exitAlertAreaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Fence name" type="text"> <input class="form-control" id="exitAlertAreaName" placeholder="Fence name" type="text">
<span class="help-block">Name of the selected area(e.g. colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
@ -620,9 +619,8 @@
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="editGeoJson" <button onclick="$('#editExitGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editExitGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editExitGeoJSON').modal('toggle')"
onclick="$('#editExitGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editExitGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editExitGeoJSON').modal('toggle')" type="button" class="btn btn-default btn-xs editGeoJson">Edit
type="button" class="btn btn-default btn-xs">Edit
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -639,8 +637,8 @@
<div id="setStationeryAlert"> <div id="setStationeryAlert">
<form role="form" style="width: auto;"> <form role="form" style="width: auto;">
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="stationaryAlertAreaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Stationery name" type="text"> <input class="form-control" id="stationaryAlertAreaName" placeholder="Stationery name" type="text">
<span class="help-block">Name of the selected area(e.g. colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
<label class="text-primary" for="fRadius">Fluctuation radius</label> <label class="text-primary" for="fRadius">Fluctuation radius</label>
@ -658,9 +656,8 @@
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="editGeoJson" <button onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')" type="button" class="btn btn-default btn-xs editGeoJson">Edit
type="button" class="btn btn-default btn-xs">Edit
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -676,8 +673,8 @@
<div id="setTrafficAlert"> <div id="setTrafficAlert">
<form role="form" style="width: auto;"> <form role="form" style="width: auto;">
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="trafficAlertAreaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Area Name" type="text"> <input class="form-control" id="trafficAlertAreaName" placeholder="Area Name" type="text">
<span class="help-block">Name of the selected area(e.g. colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
@ -689,9 +686,8 @@
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="editGeoJson" <button onclick="$('#editTrafficGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editTrafficGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editTrafficGeoJSON').modal('toggle')"
onclick="$('#editTrafficGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editTrafficGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editTrafficGeoJSON').modal('toggle')" type="button" class="btn btn-default btn-xs editGeoJson">Edit
type="button" class="btn btn-default btn-xs">Edit
</button> </button>
</div> </div>
<div class="btn-group"> <div class="btn-group">

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
Unescape View File

@ -60,6 +60,6 @@ function onRequest(context) {
} else { } else {
viewModel.lastLocation = stringify({}); viewModel.lastLocation = stringify({});
} }
viewModel.geoServicesEnabled = devicemgtProps.serverConfig.operationAnalyticsConfiguration.isEnabled; viewModel.geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
return viewModel; return viewModel;
} }

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

@ -271,8 +271,8 @@ function createPopup(layer,id) {
return; return;
} }
popupTemplate.find('#exportGeoJson').attr('leaflet_id', layer._leaflet_id); popupTemplate.find('.exportGeoJson').attr('leaflet_id', layer._leaflet_id);
popupTemplate.find('#editGeoJson').attr('leaflet_id', layer._leaflet_id); popupTemplate.find('.editGeoJson').attr('leaflet_id', layer._leaflet_id);
layer.bindPopup(popupTemplate.html(), {closeOnClick: false, closeButton: false}).openPopup(); layer.bindPopup(popupTemplate.html(), {closeOnClick: false, closeButton: false}).openPopup();
// transparent the layer .leaflet-popup-content-wrapper // transparent the layer .leaflet-popup-content-wrapper

8
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

@ -233,7 +233,7 @@ function setWithinAlert(leafletId) {
* (look in get_alerts for .replace() method) * (look in get_alerts for .replace() method)
* */ * */
var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'"); var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'");
var areaName = $("#areaName").val(); var areaName = $("#withinAlertAreaName").val();
var queryName = areaName; var queryName = areaName;
@ -292,7 +292,7 @@ function setExitAlert(leafletId) {
* (look in get_alerts for .replace() method) * (look in get_alerts for .replace() method)
* */ * */
var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'"); var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'");
var areaName = $("#areaName").val(); var areaName = $("#exitAlertAreaName").val();
var queryName = areaName; var queryName = areaName;
@ -357,7 +357,7 @@ function setStationeryAlert(leafletId) {
var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'"); var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'");
var stationeryName = $("#areaName").val(); var stationeryName = $("#stationaryAlertAreaName").val();
var queryName = stationeryName; var queryName = stationeryName;
var fluctuationRadius = $("#fRadius").val(); var fluctuationRadius = $("#fRadius").val();
var time = $("#time").val(); var time = $("#time").val();
@ -477,7 +477,7 @@ function setTrafficAlert(leafletId) {
var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'"); var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'");
var areaName = $("#areaName").val(); var areaName = $("#trafficAlertAreaName").val();
var queryName = areaName; var queryName = areaName;
//var time = $("#time").val(); //var time = $("#time").val();

Write Preview
Loading…
Cancel
Save