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

Merge pull request #825 from rasika/geo-fence-issues

Browse Source 
Fixing Geo fencing UI issues
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
parent 7079fea83b f8fa314359
commit 2c502386b8
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File

8
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

@ -526,7 +526,7 @@
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="areaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Fence name" type="text"> <input class="form-control" id="areaName" placeholder="Fence name" type="text">
<span class="help-block">Name of the selected area(i.e colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
<div class="btn-group btn-group-sm btn-group-justified"> <div class="btn-group btn-group-sm btn-group-justified">
@ -557,7 +557,7 @@
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="areaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Fence name" type="text"> <input class="form-control" id="areaName" placeholder="Fence name" type="text">
<span class="help-block">Name of the selected area(i.e colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
<div class="btn-group btn-group-sm btn-group-justified"> <div class="btn-group btn-group-sm btn-group-justified">
@ -589,7 +589,7 @@
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="areaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Stationery name" type="text"> <input class="form-control" id="areaName" placeholder="Stationery name" type="text">
<span class="help-block">Name of the selected area(i.e 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>
<input class="form-control" id="fRadius" onblur="reformatRadius(this.form.fRadius.value);" placeholder="m" type="text"> <input class="form-control" id="fRadius" onblur="reformatRadius(this.form.fRadius.value);" placeholder="m" type="text">
@ -626,7 +626,7 @@
<div class="form-group"> <div class="form-group">
<label class="text-primary" for="areaName">Fence name</label> <label class="text-primary" for="areaName">Fence name</label>
<input class="form-control" id="areaName" placeholder="Area Name" type="text"> <input class="form-control" id="areaName" placeholder="Area Name" type="text">
<span class="help-block">Name of the selected area(i.e colombo)</span> <span class="help-block">Name of the selected area(e.g. colombo)</span>
</div> </div>
<div> <div>
<div class="btn-group btn-group-sm btn-group-justified"> <div class="btn-group btn-group-sm btn-group-justified">

6
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/stationery_alert.html
Unescape View File

@ -34,7 +34,7 @@
<button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
<div class="col-lg-5 col-md-6 col-centered"> <div class="col-lg-5 col-md-6 col-centered">
<h4> <h4>
Set 'Stationery' alerts Set 'Stationary' alerts
<br> <br>
</h4> </h4>
</div> </div>
@ -46,8 +46,8 @@
<table class="table table-hover" id="stationary-alert-table"> <table class="table table-hover" id="stationary-alert-table">
<thead> <thead>
<tr> <tr>
<th>Stationery Name</th> <th>Stationary Name</th>
<th>Stationery Time</th> <th>Stationary Time</th>
<th>Fluctuation Radius</th> <th>Fluctuation Radius</th>
<th>Query Name</th> <th>Query Name</th>
<th>Created On</th> <th>Created On</th>

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

@ -34,6 +34,7 @@ function initializeExit() {
} }
} else{ } else{
$(".fence-not-exist").show(); $(".fence-not-exist").show();
$("#exit-alert").hide();
} }
$('.viewGeoFenceRow td:not(:last-child)').click(function () { $('.viewGeoFenceRow td:not(:last-child)').click(function () {
viewFence(this.parentElement,'Exit'); viewFence(this.parentElement,'Exit');

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

@ -38,6 +38,7 @@ function initStationaryAlert() {
} }
} else{ } else{
$(".fence-not-exist").show(); $(".fence-not-exist").show();
$("#stationary-alert-table").hide();
} }
$('.viewGeoFenceRow td:not(:last-child)').click(function () { $('.viewGeoFenceRow td:not(:last-child)').click(function () {
viewFence(this.parentElement,'Stationery'); viewFence(this.parentElement,'Stationery');

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

@ -34,6 +34,7 @@ function initializeWithin() {
} }
} else{ } else{
$(".fence-not-exist").show(); $(".fence-not-exist").show();
$("#within-alert").hide();
} }
$('.viewGeoFenceRow td:not(:last-child)').click(function () { $('.viewGeoFenceRow td:not(:last-child)').click(function () {
viewFence(this.parentElement,'WithIn'); viewFence(this.parentElement,'WithIn');

Write Preview
Loading…
Cancel
Save