vedas
Clone or download
Modified Files
--- 'a/src/main/resources/static/customol/js/LayersGroup/satelliteGroup.js'
+++ b/src/main/resources/static/customol/js/LayersGroup/satelliteGroup.js
@@ -44,7 +44,7 @@ var satelliteGroup = new ol.layer.Group(
name : 'Satellite_data2',
visible:true
}),
- new ol.layer.Tile({
+ /* new ol.layer.Tile({
source : new ol.source.TileWMS({
url :'http://localhost:8999/geoserver/cite/wms',//'http://10.247.102.63:8080/geoserver/cite/wms',
//crossOrigin: 'anonymous',
@@ -79,7 +79,7 @@ var satelliteGroup = new ol.layer.Group(
//maxResolution : 256,
name : 'Satellite_data2',
visible:true
- }),
+ }), */
new ol.layer.Tile({
source : new ol.source.TileWMS({
url :wmsurl162,//'http://10.247.102.63:8080/geoserver/cite/wms',
--- 'a/src/main/resources/static/customol/js/main.js'
+++ b/src/main/resources/static/customol/js/main.js
@@ -100,10 +100,10 @@ navigation(map);
switchlayers(map);
getMousePosition(map);
scaleline(map);
-exportpdf(map);
+//exportpdf(map);
identify(map);
addGeom(map);
-geocoder(map);
+//geocoder(map);
--- 'a/src/main/resources/static/mis/js/customscripts/tables.js'
+++ b/src/main/resources/static/mis/js/customscripts/tables.js
@@ -1,59 +1,5 @@
-$('#filter').click(function(e){
- e.preventDefault();
-
-
- var code={};
- code.localIdFrom=document.getElementById('localIdFrom').value;
- code.localIdTo=document.getElementById('localIdTo').value;
- code.satelite=document.getElementById('satelite').value;
- code.sensors=document.getElementById('sensors').value;
- /* alert(document.getElementById('dateOfPassFrom').value + "datefrom"); */
-
- if(document.getElementById('dateOfPassFrom').value=='')
- {
- code.dateOfPassFrom=null;
- alert(code.dateOfPassFrom);
- }else{
- code.dateOfPassFrom=document.getElementById('dateOfPassFrom').value;
- }
- if(document.getElementById('dateOfPassTo').value==''){
-
- code.dateOfPassTo=null;
- }else{
- code.dateOfPassTo=document.getElementById('dateOfPassTo').value;
- }
- code.pathFrom=document.getElementById('pathFrom').value;
- code.pathTo=document.getElementById('pathTo').value;
- code.rowFrom=document.getElementById('rowFrom').value;
- code.rowTo=document.getElementById('rowTo').value;
- var codobject=JSON.stringify(code);
- //alert(codobject);
-
-
-
- console.log(codobject)
- $.ajax({
-
- url:"getData",
- type:"POST",
- data:codobject,
- contentType:"application/json;charset=utf-8",
- dataType: 'json',
- success: function(data) {
- loadtable(data);
-
- },
- error : function(request, status, error) {
- alert(error.toString)
- }
-
- })
-
- })
- //close filter code
-
@@ -156,5 +102,61 @@ function defaultTable()
}
//close datatable
+$('#filter').click(function(e){
+ e.preventDefault();
+
+
+ var code={};
+ code.localIdFrom=document.getElementById('localIdFrom').value;
+ code.localIdTo=document.getElementById('localIdTo').value;
+ code.satelite=document.getElementById('satelite').value;
+ code.sensors=document.getElementById('sensors').value;
+ /* alert(document.getElementById('dateOfPassFrom').value + "datefrom"); */
+
+ if(document.getElementById('dateOfPassFrom').value=='')
+ {
+ code.dateOfPassFrom=null;
+ alert(code.dateOfPassFrom);
+ }else{
+ code.dateOfPassFrom=document.getElementById('dateOfPassFrom').value;
+ }
+ if(document.getElementById('dateOfPassTo').value==''){
+
+ code.dateOfPassTo=null;
+ }else{
+ code.dateOfPassTo=document.getElementById('dateOfPassTo').value;
+ }
+
+
+ code.pathFrom=document.getElementById('pathFrom').value;
+ code.pathTo=document.getElementById('pathTo').value;
+ code.rowFrom=document.getElementById('rowFrom').value;
+ code.rowTo=document.getElementById('rowTo').value;
+ var codobject=JSON.stringify(code);
+ //alert(codobject);
+
+
+
+ console.log(codobject)
+ $.ajax({
+
+ url:"getData",
+ type:"POST",
+ data:codobject,
+ contentType:"application/json;charset=utf-8",
+ dataType: 'json',
+ success: function(data) {
+ loadtable(data);
+
+ },
+ error : function(request, status, error) {
+ alert(error.toString)
+ }
+
+ })
+
+ })
+ //close filter code
+
\ No newline at end of file
--- 'a/src/main/webapp/views/attributenew.jsp'
+++ b/src/main/webapp/views/attributenew.jsp
@@ -496,7 +496,7 @@
<div class="modal-footer">
<button id="cityfilter" type="button" class="btn btn-rounded btn-outline-info" onclick="onclicktaluka()">Filter</button>
- <button id="reset" name="reset" onclick="resetForm1()" class="btn btn-rounded btn-outline-info">Reset</button>
+ <button id="reset2" name="reset2" onclick="resetForm1()" class="btn btn-rounded btn-outline-info">Reset</button>
</div>
@@ -518,7 +518,7 @@
<div class="card">
<!-- <div class="card-body"> -->
- <div id="target-map" style="width:100%!important; height:535px"></div>
+ <div id="target-map" style="width:100%!important; height:680px;"></div>
<div id="latlon" class="latlon"></div>
<div id="scale" class="scale-line"></div>
<div id="location"
@@ -699,7 +699,7 @@
<script src="customol/js/geomForm.js"></script>
<script src="mis/js/services/misservices.js"></script>
<script src="mis/js/customscripts/search.js"></script>
-<script src="mis/js/customscripts/tables.js"></script>
+
<script src=https://code.jquery.com/jquery-3.5.1.js></script>
<script src=https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js></script>
<script src=https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js></script>
@@ -710,8 +710,8 @@
<script src=https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js></script>
<script src=https://cdn.datatables.net/buttons/1.6.5/js/buttons.print.min.js></script>
<script src=//cdn.datatables.net/1.10.22/js/jquery.dataTables.min.js></script>
-
-<script src="mis/js/customscripts/filter.js"></script>
+<script src="mis/js/customscripts/tables.js"></script>
+<!-- <script src="mis/js/customscripts/filter.js"></script> -->
</body>