Skip to content

O
OKU-GIS
Commit 0c7bf91e authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

wah fix

parent 0fecd5ae
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 226 deletions
API/views.py
View file @ 0c7bf91e
......@@ -3605,7 +3605,8 @@ def filt_perbaikan_kecamatan(request):
tp.TYPE,
tp.tgl_perbaikan,
tp.anggaran,
tp.tgl_selesai
tp.tgl_selesai,
tp.id
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
......@@ -3636,7 +3637,8 @@ def filt_perbaikan_kecamatan(request):
tp.anggaran,
tp.tgl_selesai,
gdl.desa,
gdc.kecamatan
gdc.kecamatan,
tp.id
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
......@@ -3659,6 +3661,7 @@ def filt_perbaikan_kecamatan(request):
'tgl_selesai':j[6],
'desa':j[7],
'kecamatan':j[8],
'id':j[9],
}
res_all.append(data_all)
......@@ -3682,7 +3685,8 @@ def filt_perbaikan_desa(request):
tp.anggaran,
tp.tgl_selesai,
gdl.desa,
gdc.kecamatan
gdc.kecamatan,
tp.id
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
......@@ -3705,6 +3709,7 @@ def filt_perbaikan_desa(request):
'tgl_selesai':j[6],
'desa':j[7],
'kecamatan':j[8],
'id':j[9],
}
res_all.append(data_all)
......@@ -4392,12 +4397,15 @@ def search_list_perbaikan(request):
tp.TYPE,
tp.tgl_perbaikan,
tp.anggaran,
tp.tgl_selesai
tp.tgl_selesai,
tp.id
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
WHERE
( gl.NAME ILIKE'{}%' OR tp.NAME ILIKE'{}%' OR tp.TYPE ILIKE'{}%' OR tp.anggaran ILIKE'{}%' )""".format(v,v,v,v))
( gl.NAME ILIKE'{}%' OR tp.NAME ILIKE'{}%' OR tp.TYPE ILIKE'{}%' OR tp.anggaran ILIKE'{}%' )
Order by tp.id desc
""".format(v,v,v,v))
search_list = list_s.fetchall()
return Response(search_list)
......@@ -4470,12 +4478,14 @@ def data_perbaikan(request):
tp.anggaran,
tp.tgl_selesai,
gdl.desa,
gdc.kecamatan
gdc.kecamatan,
tp.id
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
JOIN geo_data_kelurahan gdl on st_intersects(st_setsrid(gdl.geom, 4326), st_setsrid(tp.geom, 4326))
JOIN geo_data_kecamatan gdc ON st_intersects ( st_setsrid ( gdc.geom, 4326 ), st_setsrid ( tp.geom, 4326 ) )
ORDER BY tp.id desc
""")
res_perbaikan = data_per.fetchall()
......@@ -4491,6 +4501,7 @@ def data_perbaikan(request):
'tgl_selesai':j[6],
'desa':j[7],
'kecamatan':j[8],
'id':j[9],
}
res_all.append(data_all)
......
Application/views.py
View file @ 0c7bf91e
......@@ -711,7 +711,8 @@ def perbaikanrenovasi(request):
@api_view(('POST',))
def loadDetail(request):
id_object = request.POST.get('id')
id_object = request.POST.get('ido')
id = request.POST.get('id')
with conn.cursor() as data_per:
data_per.execute("""
SELECT
......@@ -737,7 +738,7 @@ def loadDetail(request):
FROM
tbl_perbaikan tp
JOIN geo_label gl ON gl.ID = tp.type_id
where tp.id_object = %s"""% id_object)
where tp.id_object = %s and tp.id = %s"""% (id_object,id))
res_perbaikan = data_per.fetchall()
res_all = []
......@@ -873,16 +874,25 @@ def saveperbaikan(request):
# print('tidakoke')
yak = str(coor)
suk = yak.replace("""{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":""","")
sik = suk.replace("""}}""","")
cor = sik.replace("""[[[""","(")
coran = cor.replace("""]]]""",")")
ll = coran.replace(","," ")
ii = ll.replace("] [",",")
mm = ii.replace('{"type":"FeatureCollection" "features":', '')
nn = mm.replace('}', '')
# suk = yak.replace("""{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":""","")
# sik = suk.replace("""}}""","")
# cor = sik.replace("""[[[""","(")
# coran = cor.replace("""]]]""",")")
# ll = coran.replace(","," ")
# ii = ll.replace("] [",",")
# mm = ii.replace('{"type":"FeatureCollection" "features":', '')
# nn = mm.replace('}', '')
suk = yak.replace("""[[[""","(")
sik = suk.replace("]],[[",").(")
sak = sik.replace("],["," . ")
sok = sak.replace(","," ")
sot = sok.replace(").(","),(")
siap = sot.replace(" . "," , ")
sek = siap.replace("]]]",")")
corcoran = f'MULTILINESTRING({nn})'
corcoran = f'MULTILINESTRING({sek})'
print(corcoran)
format = (proposal.name).split(".")
num = random.randrange(1, 10000000000000)
......@@ -977,6 +987,7 @@ def saveperbaikan(request):
code = 1
respon = {"data":data,"info":info,"code":code}
return Response(respon)
# return 1
# from django.core.files.storage import FileSystemStorage
# import random
......@@ -1015,7 +1026,7 @@ def saveperbaikanbangunan(request):
# co_edit = cood_edit['geometry']['coordinates']
yak = str(coor)
suk = yak.replace("""{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":""","")
suk = yak.replace("""{"type":"Feature","properties":{},"geometry":{"type":"MultiPolygon","coordinates":""","")
sik = suk.replace("""}}""","")
cor = sik.replace("""[[[""","((")
coran = cor.replace("""]]]""","))")
......
static/js/action.js
View file @ 0c7bf91e
......@@ -43,7 +43,8 @@ $("#upload_image").change(function() {
});
function getdetailper(id) {
$(".map_detail_p_p").html(``)
console.log(id)
$.ajax({
url: "get-detail-perbaikan",
data: {
......@@ -53,10 +54,12 @@ function getdetailper(id) {
success: function(data) {
$(".map_detail_p_p").html(`<div id="map_detail_perbaikan_dash" style=" position: relative; height: 220px; width: 90%; border-radius: 5px; ">`)
var map_detail_perbaikan = L.map('map_detail_perbaikan_dash', {
editable: true,
editable: false,
zoomControl: false,
drawControl: true
drawControl: false
}).setView([-4.125826277307029, 104.1881561279297], 10);
L.tileLayer('https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off', {
......@@ -96,27 +99,41 @@ function getdetailper(id) {
$(".nama_detail_dash").html(data[0]['name']);
$(".type_detail_dash").html(data[0]['type'])
$(".tanggal_perbaikan_detail_dash").text(data[0]['tgl_perbaikan'])
$(".anggaran_detail_dash").html(data[0]['anggaran'])
$(".penanggung_jawab_detail_dash").html(data[0]['pj'])
$(".penanggung_jawab_lapangan_detail_dash").html(data[0]['pj_lapangan'])
$(".kontraktor_detail_dash").html(data[0]['kontraktor'])
// $(".anggaran_detail_dash").html(data[0]['anggaran'])
// $(".penanggung_jawab_detail_dash").html(data[0]['pj'])
// $(".penanggung_jawab_lapangan_detail_dash").html(data[0]['pj_lapangan'])
// $(".kontraktor_detail_dash").html(data[0]['kontraktor'])
$(".panjang_jalan_detail_dash").html(data[0]['panjang'])
$(".lebar_jalan_detail_dash").html(data[0]['lbr_jln_reno'])
$(".proposal_detail_dash").html(`
<a href="static/media/proposal/` + data[0]['proposal'] + `" target="_blank" "id="downloadproposal">
<img src="static/img/icon-1/proposal.svg" alt=" " style="height: 65px;width: 65px; ">
</a>`);
$(".bukti_detail_perbaikan_dash").html(`
<a href="static/media/bukti_penyelesaian/` + data[0].bukti_selesai + `" target="_blank" id="view-bukti">
<img src="static/img/icon-1/bukti.svg" alt=" " style="height: 70px;
width: 50px;">
</a>`);
// $(".proposal_detail_dash").html(`
// <a href="static/media/proposal/` + data[0]['proposal'] + `" target="_blank" "id="downloadproposal">
// <img src="static/img/icon-1/proposal.svg" alt=" " style="height: 65px;width: 65px; ">
// </a>`);
// $(".bukti_detail_perbaikan_dash").html(`
// <a href="static/media/bukti_penyelesaian/` + data[0].bukti_selesai + `" target="_blank" id="view-bukti">
// <img src="static/img/icon-1/bukti.svg" alt=" " style="height: 70px;
// width: 50px;">
// </a>`);
//hide ngaco
// $("#bkt_ang").html(``)
// $("#bkt_peja").html(``)
// $("#bkt_pjlap").html(``)
// $("#bkt_kont").html(``)
// $("#bkt_lbrjln").html(``)
// $("#bkt_prop").html(``)
// $("#bkt_bukti").html(``)
//end hide ngaco
$('.map_detail_p_jalan').show()
map_detail_perbaikan.setView([data[0]['geometry']['coordinates'][0][0][1], data[0]['geometry']['coordinates'][0][0][0]], 18)
var myLines = [data[0]['geometry']];
// var myLines = data;
// console.log(myLines)
var geo_jalan_perbaikan = L.geoJson(data[0]['geometry'], {
style: function(feature) {
......
static/js/scripts_js_m.js
View file @ 0c7bf91e
......@@ -4,7 +4,7 @@
geo_po_adm = L.geoJson(null, {
pointToLayer: function(feature, latlng) {
// console.log(feature.administrasi.f1)
// //console.log(feature.administrasi.f1)
if (feature.administrasi.f2 == 'Kantor Polisi') {
var smallIcon = new L.Icon({
iconSize: [25, 25],
......@@ -479,7 +479,7 @@ geo_po_adm = L.geoJson(null, {
if (feature.administrasi.f16 != "None") {
var list_history = feature.administrasi.f16
console.log(list_history[0].split(",")[0])
//console.log(list_history[0].split(",")[0])
var perbaikan_pt = `<div class='row'>
<label class="col-md-8">` + list_history[0].split(",")[1] + `</label>
......@@ -745,7 +745,7 @@ function k_adm() {
// var lastZoom;
// map.on('zoomend', function() {
// var zoom = map.getZoom();
// // console.log(zoom)
// // //console.log(zoom)
// if (zoom < 14 && (!lastZoom || lastZoom >= 14)) {
// if (checkBox.checked == true) {
// $.ajax({
......@@ -756,13 +756,13 @@ function k_adm() {
// // loaderPage(false);
// // map.setView([-4.125826277307029, 104.1881561279297], 13);
// // var len = response['kecamatan'].length;
// // console.log(response)
// // //console.log(response)
// var data_de = []
// for (var i = 0; i < response['kantor_administrasi'].length; i++) {
// geoj = response['kantor_administrasi'][i];
// data_de.push(geoj);
// }
// // console.log(data_de)
// // //console.log(data_de)
// geo_json_po_adm(data_de);
// }
// });
......@@ -800,13 +800,13 @@ function k_adm() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['kantor_administrasi'].length; i++) {
geoj = response['kantor_administrasi'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_adm(data_de);
newe(markeradm, geo_po_adm, checkBox)
}
......@@ -949,7 +949,7 @@ $(document).on("click", "#btn_delete_adm", function() {
setTimeout(function() {
map_delete.invalidateSize();
}, 1000);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_delete.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -1347,13 +1347,13 @@ function l_kes() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['layanan_kesehatan'].length; i++) {
geoj = response['layanan_kesehatan'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_kes(data_de);
newe(markerkes, geo_po_kes, checkBox)
}
......@@ -1392,7 +1392,7 @@ $(document).on("click", "#btn_edit_lk", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -1797,13 +1797,13 @@ function pks() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['apiviewpuskesmas'].length; i++) {
geoj = response['apiviewpuskesmas'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_puskes(data_de);
newe(markerpuskes, geo_po_puskes, checkBox)
}
......@@ -1842,7 +1842,7 @@ $(document).on("click", "#btn_edit_puskes", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -2232,13 +2232,13 @@ function rs() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['rumah_sakit'].length; i++) {
geoj = response['rumah_sakit'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_rumah_sakit(data_de);
geo_po_rumah_sakit.addTo(map)
}
......@@ -2275,7 +2275,7 @@ $(document).on("click", "#btn_edit_rs", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -2788,13 +2788,13 @@ function fiksi() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['sarana_ibadah'].length; i++) {
geoj = response['sarana_ibadah'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_sarana_ibadah(data_de);
newe(markeribdh, geo_po_sarana_ibadah, checkBox)
}
......@@ -2833,7 +2833,7 @@ $(document).on("click", "#btn_edit_si", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -3326,13 +3326,13 @@ function didik() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['sarana_pendidikan'].length; i++) {
geoj = response['sarana_pendidikan'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_sarana_pendidikan(data_de);
newe(markerpend, geo_po_sarana_pendidikan, checkBox)
}
......@@ -3371,7 +3371,7 @@ $(document).on("click", "#btn_edit_sp", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -3746,7 +3746,7 @@ $(document).on("click", "#saveeditsp", function() {
// }, 1000);
// loaderPage(false);
// console.log(data)
// //console.log(data)
// // map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
// map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
// let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -3763,7 +3763,7 @@ $(document).on("click", "#saveeditsp", function() {
// $(document).on("click", "#saveeditspbu", function() {
// var idspbu = $('#idspbu').val();
// var poi = $('#coordinateZoneeditspbu').val();
// console.log(poi)
// //console.log(poi)
// var data = new FormData();
// data.append("file", $("input[id^='filespbu']")[0].files[0]);
// data.append("csrfmiddlewaretoken", "{{ csrf_token }}");
......@@ -4130,13 +4130,13 @@ function sthall() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['apiviewstasiun'].length; i++) {
geoj = response['apiviewstasiun'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_stasiun(data_de);
geo_po_stasiun.addTo(map)
}
......@@ -4173,7 +4173,7 @@ $(document).on("click", "#btn_edit_st", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -4190,7 +4190,7 @@ $(document).on("click", "#btn_edit_st", function() {
$(document).on("click", "#saveeditst", function() {
var idst = $('#idst').val();
var poi = $('#coordinateZoneeditst').val();
console.log(poi)
//console.log(poi)
var data = new FormData();
data.append("file", $("input[id^='file']")[0].files[0]);
data.append("csrfmiddlewaretoken", "{{ csrf_token }}");
......@@ -4552,13 +4552,13 @@ function temanggung() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['apiviewterminal'].length; i++) {
geoj = response['apiviewterminal'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_terminal(data_de);
geo_po_terminal.addTo(map)
}
......@@ -4595,7 +4595,7 @@ $(document).on("click", "#btn_edit_tr", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -4975,13 +4975,13 @@ function cb100() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['apiviewcagarbudaya'].length; i++) {
geoj = response['apiviewcagarbudaya'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_cagar_budaya(data_de);
geo_po_cagar_budaya.addTo(map)
}
......@@ -5018,7 +5018,7 @@ $(document).on("click", "#btn_edit_cb", function() {
map_edit.invalidateSize();
}, 1000);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -5085,7 +5085,7 @@ $(document).on("click", "#saveeditcb", function() {
// var gardu_listrik = "{{ gardu_listrik }}".replace(/&#x27;/g, '"');
// var result_gardu_listrik = JSON.parse("" + gardu_listrik + "")
// console.log(result_gardu_listrik)
// //console.log(result_gardu_listrik)
var geo_po_gardu_listrik = L.geoJson(null, {
pointToLayer: function(feature, latlng) {
......@@ -5407,13 +5407,13 @@ function gl100() {
// loaderPage(false);
// map.setView([-4.125826277307029, 104.1881561279297], 13);
// var len = response['kecamatan'].length;
// console.log(response)
// //console.log(response)
var data_de = []
for (var i = 0; i < response['apiviewgardulistrik'].length; i++) {
geoj = response['apiviewgardulistrik'][i];
data_de.push(geoj);
}
// console.log(data_de)
// //console.log(data_de)
geo_json_po_gardu_listrik(data_de);
geo_po_gardu_listrik.addTo(map)
}
......@@ -5450,7 +5450,7 @@ $(document).on("click", "#btn_edit_gl", function() {
}, 1000);
loaderPage(false);
console.log(data)
//console.log(data)
// map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
map_edit.setView([data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]], 19);
let dapoin = [data['geometry']['coordinates'][1], data['geometry']['coordinates'][0]]
......@@ -5637,7 +5637,7 @@ function newe(marques, xnxx, xxx) {
var lastZoom;
map.on('zoomend', function() {
var zoom = map.getZoom();
// console.log(zoom)
// //console.log(zoom)
if (zoom < 14 && (!lastZoom || lastZoom >= 14)) {
if (xxx.checked == true) {
map.removeLayer(marques);
......@@ -5664,7 +5664,7 @@ function newe(marques, xnxx, xxx) {
}
function changetabs(params) {
// console.log(params)
// //console.log(params)
var hrf = $(params).find("a").attr("href");
......@@ -5798,9 +5798,9 @@ function swiftAlert(itype, ititle, itext) {
// success: function(data) {
// document.getElementById("mapschange").checked = true;
// $("#modalsearch3d").modal("toggle")
// // console.log(data['polygon_o'])
// // console.log(data['line_o'])
// // console.log(data['kantor_administrasi'])
// // //console.log(data['polygon_o'])
// // //console.log(data['line_o'])
// // //console.log(data['kantor_administrasi'])
// map_cesium.camera.flyTo({
// destination: Cesium.Cartesian3.fromDegrees(data['lat'], data['lng'], 750)
......@@ -5932,13 +5932,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// nameadm: data['infoadm'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entity = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entity);
// }
......@@ -5992,13 +5992,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namelk: data['infolk'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitylk = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitylk);
// }
......@@ -6052,13 +6052,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namepks: data['infopks'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitypks = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitypks);
// }
......@@ -6068,7 +6068,7 @@ function swiftAlert(itype, ititle, itext) {
// var long = data['longrs'];
// var poin = data['infors'];
// var rema = data['remars'][i];
// console.log(rema)
// //console.log(rema)
// var surfacePosition = Cesium.Cartesian3.fromDegrees(
// long[i],
......@@ -6113,13 +6113,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namers: data['infors'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entityrs = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entityrs);
// }
......@@ -6182,13 +6182,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namesi: data['infosi'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitysi = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitysi);
// }
......@@ -6251,13 +6251,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namesp: data['infosp'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitysp = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitysp);
// }
......@@ -6311,13 +6311,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namespbu: data['infospbu'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entityspbu = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entityspbu);
// }
......@@ -6371,13 +6371,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namest: data['infost'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entityst = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entityst);
// }
......@@ -6431,13 +6431,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namest: data['infost'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entityst = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entityst);
// }
......@@ -6491,13 +6491,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// nametr: data['infotr'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitytr = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitytr);
// }
......@@ -6546,13 +6546,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namecb: data['infocb'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitycb = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitycb);
// }
......@@ -6601,13 +6601,13 @@ function swiftAlert(itype, ititle, itext) {
// },
// namegl: data['infogl'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entitygl = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entitygl);
// }
......@@ -7644,10 +7644,10 @@ function swiftAlert(itype, ititle, itext) {
// })
// } else {
// console.log('Unknown entity selected.');
// //console.log('Unknown entity selected.');
// }
// } else {
// console.log('Deselected.');
// //console.log('Deselected.');
// }
// });
......@@ -7672,7 +7672,7 @@ function swiftAlert(itype, ititle, itext) {
// minZoom: 4,
// }).addTo(map_tampak);
// var id_polytmpk = $('#idbangunantampak').val();
// // console.log(id_polyhps)
// // //console.log(id_polyhps)
// loaderPage(true);
// $.ajax({
......@@ -7820,9 +7820,9 @@ function mapsganti() {
success: function(data) {
document.getElementById("mapschange").checked = true;
// $("#modalsearch3d").modal("toggle")
// console.log(data['polygon_o'])
// console.log(data['line_o'])
// console.log(data['kantor_administrasi'])
// //console.log(data['polygon_o'])
// //console.log(data['line_o'])
// //console.log(data['kantor_administrasi'])
map_cesium.camera.flyTo({
destination: Cesium.Cartesian3.fromDegrees(data['lat'], data['lng'], 750)
......@@ -7954,13 +7954,13 @@ function mapsganti() {
},
nameadm: data['infoadm'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entity = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entity);
}
......@@ -8014,13 +8014,13 @@ function mapsganti() {
},
namelk: data['infolk'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitylk = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitylk);
}
......@@ -8074,13 +8074,13 @@ function mapsganti() {
},
namepks: data['infopks'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitypks = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitypks);
}
......@@ -8090,7 +8090,7 @@ function mapsganti() {
var long = data['longrs'];
var poin = data['infors'];
var rema = data['remars'][i];
console.log(rema)
//console.log(rema)
var surfacePosition = Cesium.Cartesian3.fromDegrees(
long[i],
......@@ -8135,13 +8135,13 @@ function mapsganti() {
},
namers: data['infors'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entityrs = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entityrs);
}
......@@ -8204,13 +8204,13 @@ function mapsganti() {
},
namesi: data['infosi'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitysi = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitysi);
}
......@@ -8273,13 +8273,13 @@ function mapsganti() {
},
namesp: data['infosp'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitysp = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitysp);
}
......@@ -8333,13 +8333,13 @@ function mapsganti() {
// },
// namespbu: data['infospbu'][i]
// });
// // console.log(nameadm)
// // //console.log(nameadm)
// var entityspbu = new Cesium.Entity({
// polyline: polyline,
// // name: data['infoadm'][i]
// });
// // console.log(name)
// // //console.log(name)
// map_cesium.entities.add(entityspbu);
// }
......@@ -8393,13 +8393,13 @@ function mapsganti() {
},
namest: data['infost'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entityst = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entityst);
}
......@@ -8453,13 +8453,13 @@ function mapsganti() {
},
namest: data['infost'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entityst = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entityst);
}
......@@ -8513,13 +8513,13 @@ function mapsganti() {
},
nametr: data['infotr'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitytr = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitytr);
}
......@@ -8568,13 +8568,13 @@ function mapsganti() {
},
namecb: data['infocb'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitycb = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitycb);
}
......@@ -8623,13 +8623,13 @@ function mapsganti() {
},
namegl: data['infogl'][i]
});
// console.log(nameadm)
// //console.log(nameadm)
var entitygl = new Cesium.Entity({
polyline: polyline,
// name: data['infoadm'][i]
});
// console.log(name)
// //console.log(name)
map_cesium.entities.add(entitygl);
}
......@@ -10205,10 +10205,10 @@ function mapsganti() {
})
} else {
console.log('Unknown entity selected.');
//console.log('Unknown entity selected.');
}
} else {
console.log('Deselected.');
//console.log('Deselected.');
}
});
......@@ -10254,7 +10254,7 @@ $(document).on("click", "#btn_upload_tampak", function() {
minZoom: 4,
}).addTo(map_tampak);
var id_polytmpk = $('#idbangunantampak').val();
// console.log(id_polyhps)
// //console.log(id_polyhps)
loaderPage(true);
$.ajax({
......@@ -10387,9 +10387,9 @@ var geo_bangunan = L.geoJson(null, {
// var list_history = feature.properties.f4
// for (var i = 0; i < list_history.length; i++) {
// var dt_history = list_history[i].split(",");
// console.log(dt_history[0])
// console.log(dt_history[1])
// console.log(dt_history[2])
// //console.log(dt_history[0])
// //console.log(dt_history[1])
// //console.log(dt_history[2])
// }
// if (feature.administrasi.f11 != 'None'){
// var cbb = `<option value="null" disabled>-- Pilih Jenis Point --</option>
......@@ -10475,7 +10475,7 @@ var geo_bangunan = L.geoJson(null, {
} else {
history = ``
}
console.log(feature.administrasi)
//console.log(feature.administrasi)
if (feature.administrasi.f15 == null) {
var njop = 0
......@@ -10531,7 +10531,7 @@ var geo_bangunan = L.geoJson(null, {
// if (feature.properties.f4 != null) {
// var list_history = feature.properties.f4
// console.log(list_history[0].split(",")[0])
// //console.log(list_history[0].split(",")[0])
// var perbaikan_bg = `
// <div class='row'>
// <label class="col-md-8">` + list_history[0].split(",")[1] + `</label>
......@@ -11166,13 +11166,13 @@ map.on("moveend", function() {
},
dataType: 'json',
success: function(data) {
// console.log(data)
// //console.log(data)
let list_poly = [];
for (var i = 0; i < data['gen'].length; i++) {
geoj = data['gen'][i][0];
list_poly.push(geoj);
};
// console.log(list_poly)
// //console.log(list_poly)
geo_json_bangunan(list_poly);
}
});
......@@ -11245,8 +11245,8 @@ $(document).on("click", "#btn_edit_bangunan", function() {
var data_id = data['result'][i][0];
var data_po = data['result'][i][1];
var data_kab = `<option value="` + data_id + `">` + data_po + `</option>`;
console.log(data_id)
console.log(data_po)
//console.log(data_id)
//console.log(data_po)
var data_kab = `<option value="` + data_id + `">` + data_po + `</option>`;
data_all_kab.push(data_kab)
};
......@@ -11284,7 +11284,7 @@ $(document).on("click", "#btn_edit_bangunan", function() {
// var njop_tkp = a
// var njop_d_pbb = b
console.log(njop_d_pbb, njop_tkp)
//console.log(njop_d_pbb, njop_tkp)
// njop_bumi.toLocaleString()
// njop_bang.toLocaleString()
......@@ -11340,7 +11340,7 @@ $(document).on("click", "#btn_edit_bangunan", function() {
// let njoppbb = njop_d_pbb_s.replace(",","")
// isi_all(njoptkp, njoppbb)
}));
// console.log(njoptkp, njoppbb)
// //console.log(njoptkp, njoppbb)
isi_all()
});
......@@ -11391,7 +11391,7 @@ $(document).on("click", "#btn_edit_bangunan", function() {
dataType: 'json',
success: function(data) {
// console.log(data)
// //console.log(data)
setTimeout(function() {
map_edit.invalidateSize();
......@@ -11457,7 +11457,7 @@ $(document).on("click", "#btnsavebangunan", function() {
pbb_j = 0
}
console.log(njop_tkp_j, njop_pbb_j, njkp_j, pbb_j)
//console.log(njop_tkp_j, njop_pbb_j, njkp_j, pbb_j)
var data = new FormData();
data.append("file", $("input[id^='imgbangunan']")[0].files[0]);
......@@ -11493,7 +11493,7 @@ $(document).on("click", "#btnsavebangunan", function() {
data.append('njkp', njkp_j)
data.append('pbb', pbb_j)
console.log($('#idbangunan').val())
//console.log($('#idbangunan').val())
$.ajax({
url: "api/validatedit",
......@@ -11543,7 +11543,7 @@ $(document).on("click", "#btn_delete_bangunan", function() {
minZoom: 4,
}).addTo(map_delete);
var id_polyhps = $('#idbangunanhps').val();
// console.log(id_polyhps)
// //console.log(id_polyhps)
loaderPage(true);
$.ajax({
......@@ -11656,14 +11656,14 @@ $(document).on("click", "#btn_perbaikan_bangunan", function() {
polylyly = L.polygon(list_poly_edit).addTo(map_bang)
// polylyly.enableEdit();
var hasil = (JSON.stringify(polylyly.toGeoJSON()))
// console.log(polylyly)
// console.log(hasil)
// //console.log(polylyly)
// //console.log(hasil)
// $("#coorbangbaru").val(hasil);
$('#save-perbaikan_bang').click(function() {
$("#coorbangbaru").val(hasil);
console.log(hasil);
// console.log("tes");
//console.log(hasil);
// //console.log("tes");
})
}
})
......@@ -11729,8 +11729,8 @@ $(document).on("click", "#save-perbaikan_bang", function(e) {
data.append(keyss[0], data_umum[i][keyss[0]])
}
// console.log(data)
// console.log(data_umum)
// //console.log(data)
// //console.log(data_umum)
$.ajax({
url: "save-perbaikan-bang",
......
static/js/scripts_js_o.js
View file @ 0c7bf91e
......@@ -1988,7 +1988,7 @@ $(document).on("click", "#btnsavetuplah", function() {
var geo_jalan = L.geoJson(null, {
style: function(feature) {
var zoom = map.getZoom()
console.log(zoom)
// console.log(zoom)
if (zoom < 18) {
return {
......@@ -2076,10 +2076,10 @@ var geo_jalan = L.geoJson(null, {
if (feature.properties.f7 != null) {
console.log(feature.properties.f7)
// console.log(feature.properties.f7)
var list_history = feature.properties.f7
console.log(list_history[0].split(",")[0])
// console.log(list_history[0].split(",")[0])
var perbaikan_jl = `<div class='row'>
<label class="col-md-8">` + list_history[0].split(",")[1] + `</label>
......@@ -2625,7 +2625,7 @@ var geo_sungai = L.geoJson(null, {
layer.on({
click: function(e) {
console.log('cdcd')
// console.log('cdcd')
}
});
......@@ -3075,6 +3075,7 @@ $(document).on("click", "#btn_perbaikan_jalan", function() {
}
editableLayers.addLayer(layer);
});
// console.log(editableLayers)
function getjalanper(id) {
$.ajax({
......@@ -3144,13 +3145,17 @@ $(document).on("click", "#btn_perbaikan_jalan", function() {
var latlngs = data[3];
map_input.setView([latlngs['geometry']['coordinates'][0][0][1], latlngs['geometry']['coordinates'][0][0][0]], 17)
geo_jalan_input.addData(data[3]);
$("#map-insert > div.leaflet-control-container > div.leaflet-top.leaflet-left > div:nth-child(1) > div > div > a.leaflet-draw-draw-marker").css("display", "none")
$('#save-perbaikan').click(function() {
// console.log(editableLayers)
var hasil = JSON.stringify(editableLayers.toGeoJSON());
$("#coorjalbaru").val(hasil);
var h2 = hasil.replace(`{"type":"FeatureCollection","features":`,``)
var h3 = h2.replace(/{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":/g,"")
var h4 = h3.replace(/}},/g,",")
var h5 = h4.replace(/}}]}/g,"]")
// console.log(h5)
$("#coorjalbaru").val(h5);
// console.log(hasil);
// console.log($("#coorjalbaru").val());
})
......@@ -3225,7 +3230,7 @@ $(document).on("click", "#save-perbaikan", function() {
'kecamatan': kecamatan
}]
console.log(data_umum)
// console.log(data_umum)
data = new FormData()
data.append("proposal", $("input[id^='proposal']")[0].files[0]);
data.append("bukti_selesai", $("input[id^='buktiselesai']")[0].files[0]);
......@@ -4116,7 +4121,7 @@ map.on('contextmenu', function(e) {
var data_all_kab = []
for (var i = 0; i < data['result'].length; i++) {
var data_k = data['result'][i][0];
console.log(data_k)
// console.log(data_k)
var data_kab = `<option value="` + data_k + `">` + data_k + `</option>`;
data_all_kab.push(data_kab)
};
......@@ -4138,7 +4143,7 @@ map.on('contextmenu', function(e) {
},
dataType: 'json',
success: function(data) {
console.log(data)
// console.log(data)
var data_all_kab = []
for (var i = 0; i < data['result'].length; i++) {
var data_id = data['result'][i][0];
......@@ -4493,7 +4498,7 @@ map.on('contextmenu', function(e) {
},
dataType: 'json',
success: function(data) {
console.log(data)
// console.log(data)
var data_all_kab = []
for (var i = 0; i < data['result'].length; i++) {
var data_k = data['result'][i][0];
......
static/js/scripts_layout.js
View file @ 0c7bf91e
......@@ -89,10 +89,10 @@ $(document).on("click", "#btn_search_spes", function() {
var geocodeService = L.esri.Geocoding.geocodeService();
var geocoderNominatim = new L.Control.Geocoder.Nominatim();
var dapoin = [data[0][0]['geometry']['coordinates'][1], data[0][0]['geometry']['coordinates'][0]]
console.log(data[0])
//console.log(data[0])
// map.setView([data[0]['geometry']['coordinates'][0][0][0][1], data[0]['geometry']['coordinates'][0][0][0][0]], 19);
// var result_point = JSON.parse("" + data + "")
// console.log(result_point)
// //console.log(result_point)
var geo_point = L.geoJson(null, {
pointToLayer: function(feature, latlng) {
......@@ -370,7 +370,7 @@ $(document).on("click", "#btn_search_spes", function() {
// },
// dataType: 'json',
// success: function(data) {
// console.log(data)
// //console.log(data)
// dapoin = [data[0][0]['geometry']['coordinates'][1], data[0][0]['geometry']['coordinates'][0]]
// // var poinin = L.marker(dapoin).addTo(map)
......@@ -434,7 +434,7 @@ $(document).on("click", "#btn_search_spes", function() {
data.append('point', poi),
data.append('gambar', $('#gambar').val()),
data.append('dbspo', dbsave)
console.log(data)
//console.log(data)
$.ajax({
url: "api/saveeditspo",
data: data,
......@@ -536,9 +536,9 @@ $(document).on("click", "#btn_search_spes", function() {
// var list_history = feature.properties.f4
// for (var i = 0; i < list_history.length; i++) {
// var dt_history = list_history[i].split(",");
// console.log(dt_history[0])
// console.log(dt_history[1])
// console.log(dt_history[2])
// //console.log(dt_history[0])
// //console.log(dt_history[1])
// //console.log(dt_history[2])
// }
// if (feature.administrasi.f11 != 'None'){
// var cbb = `<option value="null" disabled>-- Pilih Jenis Point --</option>
......@@ -1362,7 +1362,7 @@ $(document).on("click", "#btn_search_spes", function() {
}).addTo(map_delete);
var id_polyhps = $('#idbangunanhps').val();
// console.log(id_polyhps)
// //console.log(id_polyhps)
loaderPage(true);
$.ajax({
......@@ -1695,7 +1695,7 @@ $(document).on("click", "#btn_search_spes", function() {
if (feature.properties.f7 != null) {
var list_history = feature.properties.f7
console.log(list_history[0].split(",")[0])
//console.log(list_history[0].split(",")[0])
var perbaikan_jl = `<div class='row'>
<label class="col-md-8">` + list_history[0].split(",")[1] + `</label>
......@@ -1818,9 +1818,9 @@ $(document).on("click", "#btn_search_spes", function() {
$("#coordinatejalan").val(feature.geometry);
var najal = $('#namajalanedit').val();
console.log(najal)
//console.log(najal)
var ijal = $('#idjalan').val();
console.log(ijal)
//console.log(ijal)
}
});
......@@ -1932,7 +1932,7 @@ $(document).on("click", "#btn_search_spes", function() {
polygon_edit_jalan.remove()
}
var id_poly = $('#idjalan').val();
console.log(id_poly)
//console.log(id_poly)
// var id_poly = idm
$.ajax({
......@@ -2037,7 +2037,7 @@ $(document).on("click", "#btn_search_spes", function() {
$(document).on("click", "#btnsavejalan", function() {
var cek = $("#namajalanedit").val()
console.log(cek)
//console.log(cek)
var data = new FormData();
data.append("file", $("input[id^='imgjalan']")[0].files[0]);
data.append("csrfmiddlewaretoken", "{{ csrf_token }}");
......
static/js/scripts_sidebar.js
View file @ 0c7bf91e
// SIDEBAR JS
$("#sel-kec ").change(function() {
var id_kec = $(this).val()
console.log(id_kec)
// console.log(id_kec)
// $(".datatable-show-all.list_perb").dataTable().fnDestroy();
// $("#list_perbaikan").dataTable().fnDestroy();
......@@ -47,8 +47,9 @@ $("#sel-kec ").change(function() {
var tgl_perbaikan = data['res_perbaikan'][i]['tgl_perbaikan'];
var anggaran = data['res_perbaikan'][i]['anggaran'];
var tgl_selesai = data['res_perbaikan'][i]['tgl_selesai'];
var idbenar = data['res_perbaikan'][i]['id'];
console.log(number, name, name_perbaikan)
// console.log(id_object,idbenar)
var data_gab = `<tr>
<td>` + number + `</td>
......@@ -58,7 +59,7 @@ $("#sel-kec ").change(function() {
<td>` + tgl_perbaikan + `</td>
<td>` + tgl_selesai + `</td>
<td class="text-center ">
<a class="btn mdlFire " onclick="loaddetailid( '` + id_object + `') " data-toggle="modal " data-target="#modal_detail_perbaikan " style="background-color: #5A9AFB;color: white;border-radius: 5px;width: 85px;height: 25px; ">
<a class="btn mdlFire " onclick="loaddetailid(`+id_object+`,`+idbenar+`) " data-toggle="modal " data-target="#modal_detail_perbaikan " style="background-color: #5A9AFB;color: white;border-radius: 5px;width: 85px;height: 25px; ">
<div style="margin-top: -5px; ">
<i class="icon-search4 text-muted text-size-base " style="color: white;font-size: 10px; "></i>
<span>&nbsp;&nbsp;
......@@ -118,7 +119,7 @@ $("#sel-kec ").change(function() {
$("#sel-desa ").change(function() {
var id_desa = $(this).val()
console.log(id_desa)
// console.log(id_desa)
// $(".datatab").dataTable().fnDestroy()
// $(".datatable-show-all.list_perb").dataTable().fnDestroy();
......@@ -146,8 +147,9 @@ $("#sel-desa ").change(function() {
var tgl_perbaikan = data['res_perbaikan'][i]['tgl_perbaikan'];
var anggaran = data['res_perbaikan'][i]['anggaran'];
var tgl_selesai = data['res_perbaikan'][i]['tgl_selesai'];
var idbenar = data['res_perbaikan'][i]['id'];
console.log(number, name, name_perbaikan)
// console.log(number, name, name_perbaikan)
var data_gab = `<tr>
<td>` + number + `</td>
......@@ -157,7 +159,7 @@ $("#sel-desa ").change(function() {
<td>` + tgl_perbaikan + `</td>
<td>` + tgl_selesai + `</td>
<td class="text-center ">
<a class="btn mdlFire " onclick="loaddetailid( '` + id_object + `') " data-toggle="modal " data-target="#modal_detail_perbaikan " style="background-color: #5A9AFB;color: white;border-radius: 5px;width: 85px;height: 25px; ">
<a class="btn mdlFire " onclick="loaddetailid(`+id_object+`,`+idbenar+`)" data-toggle="modal " data-target="#modal_detail_perbaikan " style="background-color: #5A9AFB;color: white;border-radius: 5px;width: 85px;height: 25px; ">
<div style="margin-top: -5px; ">
<i class="icon-search4 text-muted text-size-base " style="color: white;font-size: 10px; "></i>
<span>&nbsp;&nbsp;
......@@ -267,12 +269,14 @@ function datatatata() {
//
// })
function loaddetailid(id) {
function loaddetailid(ido,id) {
$(".map_detail_p").html(``)
var isObject = {};
isObject.ido = ido;
isObject.id = id;
$("#iduser ").val(id)
$("#iduser ").val(ido)
// console.log(ido,id)
$.ajax({
url: "loadDetail",
......@@ -324,7 +328,7 @@ function loaddetailid(id) {
// </a>`);
} else {
console.log(data[0]['jenis'])
// console.log(data[0]['jenis'])
if (data[0]['jenis'] == 'jalan') {
$(".nama_detail").html(data[0]['name']);
$(".type_detail ").html(data[0]['type'])
......@@ -726,7 +730,7 @@ $(".search_list").on('input', function() {
var tgl_perbaikan = data[i][4];
var anggaran = data[i][5];
var tgl_selesai = data[i][6];
var idbenar = data[i][9];
var data_gab = `<li class="media panel panel-body stack-media-on-mobile" style="background: transparent;border: none;color: white;">
<div>
......@@ -748,7 +752,7 @@ $(".search_list").on('input', function() {
` + tgl_selesai + `
</div>
<div>
<a class="btn mdlFire " onclick="loaddetailid( '` + id_object + `') " data-toggle="modal" data-target="#modal_detail_perbaikan" style="background-color: #5A9AFB;color: white;border-radius: 5px;height: 25px; ">
<a class="btn mdlFire " onclick="loaddetailid(`+id_object+`,`+idbenar+`)" data-toggle="modal" data-target="#modal_detail_perbaikan" style="background-color: #5A9AFB;color: white;border-radius: 5px;height: 25px; ">
<span>
<i class="icon-search4 text-muted text-size-base " style="color: white;font-size: 10px; "></i>
&nbsp;&nbsp;
......@@ -774,7 +778,7 @@ $("#perbaikan_manage").on("click", function() {
type: 'get',
success: function(data) {
console.log(data)
// console.log(data)
var data_per = []
var num = 0
for (i in data) {
......@@ -803,9 +807,8 @@ $("#perbaikan_manage").on("click", function() {
` + data[i].tgl_selesai + `
</div>
<div>
<a class="btn mdlFire " onclick="loaddetailid( '` + data[i].id_object + `') " data-toggle="modal" data-target="#modal_detail_perbaikan" style="background-color: #5A9AFB;color: white;border-radius: 5px;">
<a class="btn mdlFire " onclick="loaddetailid(`+data[i].id_object+`,`+data[i].id+`)" data-toggle="modal" data-target="#modal_detail_perbaikan" style="background-color: #5A9AFB;color: white;border-radius: 5px;">
<i class="icon-search4 text-muted text-size-base " style="color: white;font-size: 10px; "></i> &nbsp;&nbsp; Detail
</a>
</div>
</li>`;
......
static/js/search.js
View file @ 0c7bf91e
......@@ -181,7 +181,7 @@ var geo_build = L.geoJson(null, {
<td>` + result.address.Postal + `</td>
</tr>
<table>`;
console.log(result)
// console.log(result)
$("#feature-info").html(content);
if (error) {
......
templates/includes/modal.html
View file @ 0c7bf91e
......@@ -1582,7 +1582,7 @@
</div>
</div>
<div class="isi_detail_cek ">
<!-- <div class="isi_detail_cek " id="bkt_ang">
<div>
<div>
<span>Anggaran</span>
......@@ -1592,9 +1592,9 @@
</div>
</div>
</div>
</div> -->
<div class="isi_detail_cek ">
<!-- <div class="isi_detail_cek " id="bkt_peja">
<div>
<div>
<span>Penanggung jawab</span>
......@@ -1606,7 +1606,7 @@
</div>
</div>
<div class="isi_detail_cek ">
<div class="isi_detail_cek " id="bkt_pjlap">
<div>
<div>
<span>Penanggung jawab lapangan</span>
......@@ -1618,7 +1618,7 @@
</div>
</div>
<div class="isi_detail_cek ">
<div class="isi_detail_cek " id="bkt_kont">
<div>
<div>
<span>Kontraktor</span>
......@@ -1628,7 +1628,7 @@
</div>
</div>
</div>
</div> -->
<div class="isi_detail_cek ">
<div>
......@@ -1642,7 +1642,7 @@
</div>
</div>
<div class="isi_detail_cek ">
<div class="isi_detail_cek " id="bkt_lbrjln">
<div>
<div>
<span>Lebar jalan yang diperbaiki</span>
......@@ -1655,8 +1655,8 @@
</div>
<div style="margin-top: 20px; ">
<div class="row">
<div class="col-md-6 ">
<!-- <div class="row">
<div class="col-md-6 " id="bkt_prop">
<div>
<span>Proposal</span>
</div>
......@@ -1667,7 +1667,7 @@
</div>
</div>
<div class="col-md-6 ">
<div class="col-md-6 " id="bkt_bukti">
<div>
<span>Bukti penyelesaian</span>
</div>
......@@ -1676,7 +1676,7 @@
</div>
</div>
</div>
</div> -->
<div>
<span>Ruas yang diperbaiki</span>
<!-- <div class="row">
......@@ -1689,7 +1689,7 @@
</div>
<div id="previewImage" style="display: none;"></div> -->
<div class="map_detail_p">
<div class="map_detail_p_p">
<div id="map_detail_perbaikan_dash" style=" position: relative; height: 220px; width: 90%; border-radius: 5px; ">
</div>
......
templates/layout/layout.html
View file @ 0c7bf91e
......@@ -533,10 +533,10 @@
var geocodeService = L.esri.Geocoding.geocodeService();
var geocoderNominatim = new L.Control.Geocoder.Nominatim();
var dapoin = [data[0][0]['geometry']['coordinates'][1], data[0][0]['geometry']['coordinates'][0]]
console.log(data[0])
//console.log(data[0])
// map.setView([data[0]['geometry']['coordinates'][0][0][0][1], data[0]['geometry']['coordinates'][0][0][0][0]], 19);
// var result_point = JSON.parse("" + data + "")
// console.log(result_point)
// //console.log(result_point)
var geo_point = L.geoJson(null, {
pointToLayer: function(feature, latlng) {
......@@ -814,7 +814,7 @@
// },
// dataType: 'json',
// success: function(data) {
// console.log(data)
// //console.log(data)
// dapoin = [data[0][0]['geometry']['coordinates'][1], data[0][0]['geometry']['coordinates'][0]]
// // var poinin = L.marker(dapoin).addTo(map)
......@@ -878,7 +878,7 @@
data.append('point', poi),
data.append('gambar', $('#gambar').val()),
data.append('dbspo', dbsave)
console.log(data)
//console.log(data)
$.ajax({
url: "{% url 'api:saveeditspo' %}",
data: data,
......@@ -980,9 +980,9 @@
// var list_history = feature.properties.f4
// for (var i = 0; i < list_history.length; i++) {
// var dt_history = list_history[i].split(",");
// console.log(dt_history[0])
// console.log(dt_history[1])
// console.log(dt_history[2])
// //console.log(dt_history[0])
// //console.log(dt_history[1])
// //console.log(dt_history[2])
// }
// if (feature.administrasi.f11 != 'None'){
// var cbb = `<option value="null" disabled>-- Pilih Jenis Point --</option>
......@@ -1806,7 +1806,7 @@
}).addTo(map_delete);
var id_polyhps = $('#idbangunanhps').val();
// console.log(id_polyhps)
// //console.log(id_polyhps)
loaderPage(true);
$.ajax({
......@@ -2139,7 +2139,7 @@
if (feature.properties.f7 != null) {
var list_history = feature.properties.f7
console.log(list_history[0].split(",")[0])
//console.log(list_history[0].split(",")[0])
var perbaikan_jl = `<div class='row'>
<label class="col-md-8">` + list_history[0].split(",")[1] + `</label>
......@@ -2262,9 +2262,9 @@
$("#coordinatejalan").val(feature.geometry);
var najal = $('#namajalanedit').val();
console.log(najal)
//console.log(najal)
var ijal = $('#idjalan').val();
console.log(ijal)
//console.log(ijal)
}
});
......@@ -2376,7 +2376,7 @@
polygon_edit_jalan.remove()
}
var id_poly = $('#idjalan').val();
console.log(id_poly)
//console.log(id_poly)
// var id_poly = idm
$.ajax({
......@@ -2481,7 +2481,7 @@
$(document).on("click", "#btnsavejalan", function() {
var cek = $("#namajalanedit").val()
console.log(cek)
//console.log(cek)
var data = new FormData();
data.append("file", $("input[id^='imgjalan']")[0].files[0]);
data.append("csrfmiddlewaretoken", "{{ csrf_token }}");
......
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