Skip to content

O
OKU-GIS
Commit 495122ee authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

push fix aman lancar jaya

parent 630f31fb
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 115 deletions
API/views.py
View file @ 495122ee
...@@ -1060,7 +1060,7 @@ def hasilsearch(request): ...@@ -1060,7 +1060,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
layanan_kesehatan_res = layanan_kesehatan.fetchall() layanan_kesehatan_res = layanan_kesehatan.fetchall()
lat_po_lk = [] lat_po_lk = []
...@@ -1110,7 +1110,7 @@ def hasilsearch(request): ...@@ -1110,7 +1110,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
puskesmas_res = puskesmas.fetchall() puskesmas_res = puskesmas.fetchall()
lat_po_pks = [] lat_po_pks = []
...@@ -1159,7 +1159,7 @@ def hasilsearch(request): ...@@ -1159,7 +1159,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
rumah_sakit_res = rumah_sakit.fetchall() rumah_sakit_res = rumah_sakit.fetchall()
lat_po_rs = [] lat_po_rs = []
...@@ -1208,7 +1208,7 @@ def hasilsearch(request): ...@@ -1208,7 +1208,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
sarana_ibadah_res = sarana_ibadah.fetchall() sarana_ibadah_res = sarana_ibadah.fetchall()
lat_po_si = [] lat_po_si = []
...@@ -1259,7 +1259,7 @@ def hasilsearch(request): ...@@ -1259,7 +1259,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
sarana_pendidikan_res = sarana_pendidikan.fetchall() sarana_pendidikan_res = sarana_pendidikan.fetchall()
lat_po_sp = [] lat_po_sp = []
...@@ -1310,7 +1310,7 @@ def hasilsearch(request): ...@@ -1310,7 +1310,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
spbu_res = spbu.fetchall() spbu_res = spbu.fetchall()
lat_po_spbu = [] lat_po_spbu = []
...@@ -1359,7 +1359,7 @@ def hasilsearch(request): ...@@ -1359,7 +1359,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
stasiun_res = stasiun.fetchall() stasiun_res = stasiun.fetchall()
lat_po_st = [] lat_po_st = []
...@@ -1409,7 +1409,7 @@ def hasilsearch(request): ...@@ -1409,7 +1409,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
terminal_res = terminal.fetchall() terminal_res = terminal.fetchall()
lat_po_tr = [] lat_po_tr = []
...@@ -1454,7 +1454,7 @@ def hasilsearch(request): ...@@ -1454,7 +1454,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
cagar_budaya_res = cagar_budaya.fetchall() cagar_budaya_res = cagar_budaya.fetchall()
lat_po_cb = [] lat_po_cb = []
...@@ -1503,7 +1503,7 @@ def hasilsearch(request): ...@@ -1503,7 +1503,7 @@ def hasilsearch(request):
JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom ) JOIN geo_prov_kab b ON st_intersects ( A.geom, b.geom )
JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom) JOIN geo_data_kecamatan c ON st_intersects(A.geom, c.geom)
join geo_data_kelurahan d on st_intersects(A.geom, d.geom) join geo_data_kelurahan d on st_intersects(A.geom, d.geom)
WHERE d.desa = '%s'"""% nama_desa) WHERE a.is_deleted = 0 and d.desa = '%s'"""% nama_desa)
gardu_listrik_res = gardu_listrik.fetchall() gardu_listrik_res = gardu_listrik.fetchall()
lat_po_gl = [] lat_po_gl = []
...@@ -2563,24 +2563,24 @@ def createbang(request): ...@@ -2563,24 +2563,24 @@ def createbang(request):
if tibang == "" and ltbang != "": if tibang == "" and ltbang != "":
tb = int(int(ltbang)*3) tb = int(int(ltbang)*3)
elif tibang == "" and ltbang == "": elif tibang == "" and ltbang == "":
tb = 0 tb = 3
ltb = 0 ltb = 1
else: else:
tb = tibang tb = tibang
except: except:
tb = 0 tb = 3
print(tb) print(tb)
try: try:
if ltbang == "" and tibang != "": if ltbang == "" and tibang != "":
ltb = int(int(tibang)/3) ltb = int(int(tibang)/3)
elif tibang == "" and ltbang == "": elif tibang == "" and ltbang == "":
tb = 0 tb = 3
ltb = 0 ltb = 1
else: else:
ltb = ltbang ltb = ltbang
except: except:
ltb = 0 ltb = 1
print(ltb) print(ltb)
if kilimep == "": if kilimep == "":
......
static/image/bangunan/coba tess bangunan_1024264785977.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
static/image/bangunan/coba tess bangunan_3531676928143.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
static/image/bangunan/coba tess bangunan_5966391880127.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
static/img/image/Kantor Desa Pandandulang a_1021203229271.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
static/img/image/Kantor Desa Pandandulang a_4622449380234.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
static/media/bukti_penyelesaian/None001_5400652564353.png 0 → 100644
View file @ 495122ee
This diff is collapsed.
templates/includes/js-m.html
View file @ 495122ee
...@@ -832,6 +832,7 @@ ...@@ -832,6 +832,7 @@
} }
$(document).on("click", "#btn_edit_adm", function() { $(document).on("click", "#btn_edit_adm", function() {
var map_edit = L.map('map-for-edit', { var map_edit = L.map('map-for-edit', {
editable: true, editable: true,
zoomControl: false, zoomControl: false,
......
templates/includes/js-o.html
View file @ 495122ee
...@@ -4726,6 +4726,10 @@ ...@@ -4726,6 +4726,10 @@
icon: "success", icon: "success",
confirmButtonColor: "#00BCD4" confirmButtonColor: "#00BCD4"
}) })
$("#modal__create").modal("toggle");
$("#modal_option_create").modal("toggle");
// $("#modal_option_create").css("display", "none");
} else { } else {
swal({ swal({
title: response.info, title: response.info,
...@@ -4788,6 +4792,9 @@ ...@@ -4788,6 +4792,9 @@
icon: "success", icon: "success",
confirmButtonColor: "#00BCD4" confirmButtonColor: "#00BCD4"
}) })
$("#modal__create").modal("toggle");
$("#modal_option_create").modal("toggle");
// $("#modal_option_create").css("display", "none");
} else { } else {
swal({ swal({
title: response.info, title: response.info,
...@@ -4832,6 +4839,9 @@ ...@@ -4832,6 +4839,9 @@
icon: "success", icon: "success",
confirmButtonColor: "#00BCD4" confirmButtonColor: "#00BCD4"
}) })
$("#modal__create").modal("toggle");
$("#modal_option_create").modal("toggle");
// $("#modal_option_create").css("display", "none");
} else { } else {
swal({ swal({
title: response.info, title: response.info,
...@@ -4877,7 +4887,10 @@ ...@@ -4877,7 +4887,10 @@
confirmButtonColor: "#00BCD4" confirmButtonColor: "#00BCD4"
}, function() { }, function() {
// $("#modal_point").css('display', 'none'); // $("#modal_point").css('display', 'none');
location.reload(); // location.reload();
$("#modal__create").modal("toggle");
$("#modal_option_create").modal("toggle");
// $("#modal_option_create").css("display", "none");
}) })
} else { } else {
swal({ swal({
......
templates/layout/layout.html
View file @ 495122ee
...@@ -440,105 +440,7 @@ ...@@ -440,105 +440,7 @@
<!-- /page content --> <!-- /page content -->
</div> </div>
<div class="modal fade" id="modal_edit_p_point">
<div class="modal-dialog md">
<div class="modal-content" style="border-radius:10px;">
<div class="modal-header bg-info" style=" border-top-left-radius: 10px;
border-top-right-radius: 10px;">
<button type="button" class="close" data-dismiss="modal" onclick="destroyfade()">&times;</button>
<h6 class="modal-title">Edit Point</h6>
</div>
<div class="tab-pane has-padding" id="panel-tab2">
<div class="tab-pane" id="bottom-justified-data">
<div class="tabbable">
<ul class="nav nav-tabs nav-tabs-bottom nav-justified">
<li onclick="changetabs(this)" id="koordinat_cek" class="active"><a href="#left-tab1-feas-upli" data-toggle="tab">Koordinat</a></li>
<li onclick="changetabs(this)" id="info_umum"><a href="#right-tab2-feas-upli" data-toggle="tab">Informasi Umum</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="left-tab1-feas-upli">
<div id="map-for-edit" style="height: 300px;position: relative;margin:10px"></div>
<div class="form-group">
<label class="col-lg-2 control-label" style="margin-top:10px">Image</label>
<div class="col-lg-9" style="margin-top:10px">
<input type="file" id="fileadm" name="images[]" multiple accept="image/jpg,image/png,image/jpeg,image/gif">
<input style="display:none;" id="gambar_adm_edit" type="text" class="form-control" value="" required>
<input style="display:none;" id="coordinateZoneedit_p" type="text" class="form-control" value="" required>
<input style="display:none;" id="db_p" type="text" class="form-control" value="" required>
</div>
</div>
</div>
<div class="tab-pane" id="right-tab2-feas-upli">
<div class="modal-body" style="min-height: 300px;overflow-y: auto;">
<div class="form-group">
<input style="display:none;" id="id_adm_edit" type="text" class="form-control" value="" required>
<input style="display:none;" id="coordinateZoneedit_adm_edit" type="text" class="form-control" value="" required>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Nama Point</label>
<div class="col-lg-9">
<input id="namobj_adm_edit" type="text" class="form-control" value="` + data['result'][0][0]['properties']['f2'] + `" required>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Alamat</label>
<div class="col-lg-4">
<input id="alamat_adm_edit" type="text" class="form-control" required>
</div>
<div class="col-lg-4" style="margin-top: 15px;"></div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Luas (m2)</label>
<div class="col-lg-9">
<input id="luas_tanah_adm_edit" type="text" class="form-control" required>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Penanggung Jawab</label>
<div class="col-lg-9">
<input id="perangkat_adm_edit" type="text" class="form-control" required>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="modal-footer">
<!-- <button type="button" class="btn btn-link" data-dismiss="modal" onclick="destroyfade()">Close</button> -->
<button type="button" class="btn btn-info" id="saveedit_p">Save changes</button>
</div>
</div>
</div>
</div>
......
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