chandrasegar
/
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 #851 from rasika/geo-fence-issues

Browse Source 
Fixing geofence issues
revert-70aa11f8
Madhawa Perera 7 years ago committed by GitHub
parent 731d88d96e c31461d278
commit efde7df025
5 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File

38
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

@ -478,6 +478,40 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal" id="editExitGeoJSON" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">
</h4>
<div class="col-lg-5 col-md-6 col-centered">
<h4>
Adding GeoJson
<br>
</h4>
</div>
</div>
<div class="modal-body">
<div class="col-lg-8 col-md-8 col-centered">
<div>
<label for="importGeoJsonFile">Import GeoJson</label>
<input id="importGeoJsonFile" type="file">
<hr />
<label for="enterGeoJson">Enter GeoJson</label>
<textarea id="enterGeoJson" class="form-control" rows="10"></textarea>
</div>
<div class="pull-right">
<button id="updateGeoJson" class="btn btn-primary" onclick="importGeoJson()">Import</button>
<button type="button" class="btn btn-default" onclick="closeAll()">Cancel</button>
<br />
<br />
</div>
</div>
</div>
</div>
</div>
</div>
<div style="display: none"> <div style="display: none">
<div id="markerPopup" class="popover top"> <div id="markerPopup" class="popover top">
<div class="arrow"></div> <div class="arrow"></div>
@ -710,9 +744,9 @@
createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html', createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html',
'Add Stationary Alert', 'glyphicon glyphicon-link', geoToolsMenu); 'Add Stationary Alert', 'glyphicon glyphicon-link', geoToolsMenu);
createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html', createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html',
'Add Geo Fence Enter Alert', 'glyphicon glyphicon-log-in', geoToolsMenu); 'Add Geofence Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html', createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html',
'Add Geo Fence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu); 'Add Geofence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu);
{{/if}} {{/if}}
} }
}); });

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

@ -24,7 +24,7 @@
</thead> </thead>
<tbody> <tbody>
<div class="alert alert-info fence-not-exist" role="alert"> <div class="alert alert-info fence-not-exist" role="alert">
<strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again. <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
</div> </div>
</tbody> </tbody>
@ -35,7 +35,7 @@
onclick="openTools('Exit')">Draw area onclick="openTools('Exit')">Draw area
</button> </button>
<button style="background-color: #f4f4f4;" type="button" class="btn btn-default" <button style="background-color: #f4f4f4;" type="button" class="btn btn-default"
onclick="$('#editExitinGeoJSON').modal('toggle')">Enter area onclick="$('#editExitGeoJSON').modal('toggle')">Enter area
</button> </button>
<br/> <br/>
<br/> <br/>

2
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

@ -56,7 +56,7 @@
</thead> </thead>
<tbody> <tbody>
<div class="alert alert-info fence-not-exist" role="alert"> <div class="alert alert-info fence-not-exist" role="alert">
<strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again. <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
</div> </div>
</tbody> </tbody>
</table> </table>

2
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/traffic_point.html
Unescape View File

@ -75,7 +75,7 @@
else{ else{
%> %>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again. <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
</div> </div>
<% <%
} }

2
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/within_alert.html
Unescape View File

@ -24,7 +24,7 @@
</thead> </thead>
<tbody> <tbody>
<div class="alert alert-info fence-not-exist" role="alert"> <div class="alert alert-info fence-not-exist" role="alert">
<strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again. <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
</div> </div>
</tbody> </tbody>

Write Preview
Loading…
Cancel
Save