Commit e0f3e701 authored by Manggar Mahardhika's avatar Manggar Mahardhika

push

parent e4384ee8
...@@ -63,7 +63,7 @@ class Dashboard(generic.TemplateView): ...@@ -63,7 +63,7 @@ class Dashboard(generic.TemplateView):
puskesmas_result.append(i[0]) puskesmas_result.append(i[0])
with conn.cursor() as rumah_sakit: with conn.cursor() as rumah_sakit:
rumah_sakit.execute("SELECT json_build_object('type', 'Feature', 'administrasi', (a.namobj, a.remark), 'geometry', ST_AsGeoJSON(a.geom :: geometry) :: json) from geo_rumah_sakit a join geo_prov_kab b on st_intersects(a.geom,b.geom)") rumah_sakit.execute("SELECT json_build_object('type', 'Feature', 'administrasi', (a.namobj, a.alamat, a.remark), 'geometry', ST_AsGeoJSON(a.geom :: geometry) :: json) from geo_rumah_sakit a join geo_prov_kab b on st_intersects(a.geom,b.geom)")
rumah_sakit_res = rumah_sakit.fetchall() rumah_sakit_res = rumah_sakit.fetchall()
rumah_sakit_result = [] rumah_sakit_result = []
......
<style> <style>
#button_hide_point {
line-height: 15px;
width: 40px;
font-size: 10pt;
font-family: tahoma;
margin-top: 3px;
margin-right: 3px;
position: absolute;
top: 0;
right: 0;
z-index: 99999999;
}
#button_unhide_point {
line-height: 15px;
width: 40px;
font-size: 10pt;
font-family: tahoma;
right: 60px;
position: absolute;
bottom: 0;
z-index: 99999999;
}
.legendapo { .legendapo {
background: #ffffffa6; background: #ffffffa6;
position: fixed; position: fixed;
......
...@@ -382,6 +382,88 @@ ...@@ -382,6 +382,88 @@
offset: [0, 0] offset: [0, 0]
}); });
return marker return marker
},onEachFeature: function(feature, layer) {
layer.on({
click: function(e) {
content =`
<table class="table table-hover tasks-list">
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/icon/rs.svg" alt="Image" style="width: 100%;max-height: 237px;height:237">
</th>
</tr>
</thead>
<tbody>
<div class= "container">
<tr style="height: 100px;">
<th>
<div>
<h1 style="font-family: Google Sans,Roboto,Arial,sans-serif;
letter-spacing: 0;
font-weight: 400;">
<span style="font-size: x-large;">
` + feature.administrasi.f1 + `
</span>
</h1>
</div>
</th>
</tr>
</div>
<div class= "container">
<tr style="height: 30px;">
<th>
<span>
` + feature.administrasi.f3 + `
</span>
</th>
</tr>
</div>
<div class= "container">
<tr style="height: 40px;">
<th>
<span>
` + feature.administrasi.f2 + `
</span>
</th>
</tr>
</div>
<div class= "container">
<tr style="height: 40px;">
<th>
<p>
<span>Luas Bangunan : None</span>
</p>
<p>
<span>Luas Tanah : None</span>
</p>
<p>
<span>Tinggi Bangunan : None</span>
</p>
</th>
</tr>
</div>
<div class= "container">
<tr style="height: 40px;">
<th>
<p>
<span> </span>
</p>
</th>
</tr>
</div>
</tbody>
</table>`;
$("#panel-samping").css("display", "block");
$("#button_hide_panel").css("display", "block")
$("#thisFooter").css('left', '380px');
$("#thisFooter").css('width', '930px');
$("#thisFooter").css('display', 'none');
$("#button_unhide").css('display', 'block')
$("#isi_panel").html(content)
$()
}
})
} }
}); });
......
...@@ -855,9 +855,6 @@ ...@@ -855,9 +855,6 @@
click: function(e) { click: function(e) {
//var geogeo = geocodeService.reverse().latlng(e.latlng).run(function(error, result) { //var geogeo = geocodeService.reverse().latlng(e.latlng).run(function(error, result) {
var content = ` var content = `
<a id="btn_edit_kelurahan" style="position: absolute;
top: 240px;
right: 5px;">Edit</a>
<table class="table table-hover tasks-list"> <table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<input type="hidden" id="infoLongitude"> <input type="hidden" id="infoLongitude">
<input type="hidden" id="infoLatitude"> <input type="hidden" id="infoLatitude">
<input type="hidden" id="infoLimitx"> <input type="hidden" id="infoLimitx">
<div>
<a href="#" class="btn btn-default" id="button_hide_point"><span class="caret" style="margin-left: -5px;"></span></a>
</div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="col-md-2" style="min-width: 150px;"> <div class="col-md-2" style="min-width: 150px;">
...@@ -301,4 +303,7 @@ ...@@ -301,4 +303,7 @@
</div> </div>
</div> </div>
<div>
<a href="#" class="btn btn-default" id="button_unhide_point" style="display: none;"><span class="caret" style="margin-left: -5px;transform: rotate(180deg)"></span></a>
</div>
</div> </div>
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment