From 57d913f75fe43bb0cff9a5acd9f147c324a16ad2 Mon Sep 17 00:00:00 2001 From: ='fauz <='fauzgabriel@gmail.com> Date: Thu, 3 Jul 2025 02:23:29 +0700 Subject: [PATCH] url --- app/__pycache__/mapController.cpython-313.pyc | Bin 7125 -> 7125 bytes app/mapController.py | 4 +- templates/map.html | 56 ++++++++++-------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/app/__pycache__/mapController.cpython-313.pyc b/app/__pycache__/mapController.cpython-313.pyc index f4515ec6b3558a0d7ea5ee0057f67690a7b445c8..f8f43a71ed62c2d6512c3fff814428750ac9308d 100644 GIT binary patch delta 45 zcmca=e$|}oGcPX}0}yO#+sKtK%$Pm-t%&jD3;ZmT6+~G!ZxuFYWK7=tR^$a608R%E A-2eap delta 45 wcmca=e$|}oGcPX}0}$vmZ{*4sp6n&0F_}}CZ}WO#TShSFBtOq)1<|c+04c8w-T(jq diff --git a/app/mapController.py b/app/mapController.py index 1dbe349..246ced6 100644 --- a/app/mapController.py +++ b/app/mapController.py @@ -113,7 +113,7 @@ def fetch_geojson(conn, level, parent_code=None): cur.execute(""" SELECT wk.id, wk.kode, wk.nama,lat,wk.lng,wk.path, pik.persen_per_status as idx FROM wil_kabupatenkota wk JOIN vw_persentase_indeks_kabkota pik on pik.kode = wk.kode - WHERE lower(pip.status) in ('maju','mandiri') + WHERE lower(pik.status) in ('maju','mandiri') AND provinsi_id = %s """, (parent_code,)) elif level == 'kecamatan': @@ -121,7 +121,7 @@ def fetch_geojson(conn, level, parent_code=None): SELECT wkc.id, wkc.kode, wkc.nama,wkc.lat,wkc.lng,wkc.path , pic.persen as idx FROM wil_kecamatan wkc JOIN vw_persentase_indeks_kecamatan as pic on pic.id = wkc.id - WHERE lower(pip.status) in ('maju','mandiri') + WHERE lower(pic.status) in ('maju','mandiri') AND kabupatenkota_id = %s""", (parent_code,)) elif level == 'desa': cur.execute(""" diff --git a/templates/map.html b/templates/map.html index 7b50271..1ce536c 100644 --- a/templates/map.html +++ b/templates/map.html @@ -486,12 +486,13 @@ } async function fetchStatusDesaByProvinsi(kodeProvinsi) { - const url = `http://localhost:5000/api/status-provinsi/${kodeProvinsi}`; - const urltdd = `http://localhost:5000/api/status/danadesa/provinsi/${kodeProvinsi}`; - const urldd = `http://localhost:5000/api/provinsi/serapan/${kodeProvinsi}`; - const urlpd = `http://localhost:5000//api/provinsi/pendamping/${kodeProvinsi}` - const urlkop = `http://localhost:5000//api/provinsi/koperasi/${kodeProvinsi}` - const urlbd = `http://localhost:5000/api/provinsi/bumdes/${kodeProvinsi}`; + const baseUrl = window.location.origin; + const url = `${baseUrl}/api/status-provinsi/${kodeProvinsi}`; + const urltdd = `${baseUrl}/api/status/danadesa/provinsi/${kodeProvinsi}`; + const urldd = `${baseUrl}/api/provinsi/serapan/${kodeProvinsi}`; + const urlpd = `${baseUrl}//api/provinsi/pendamping/${kodeProvinsi}` + const urlkop = `${baseUrl}//api/provinsi/koperasi/${kodeProvinsi}` + const urlbd = `${baseUrl}/api/provinsi/bumdes/${kodeProvinsi}`; try { const res = await fetch(url); const tdd = await fetch(urltdd) @@ -516,12 +517,13 @@ } async function fetchStatusDesaByKabupatenkota(kode_prov, kode_kabkota) { - const url = `http://localhost:5000/api/status-kabupatenkota/${kode_prov}/${kode_kabkota}` - const urltdd = `http://localhost:5000/api/status/danadesa/kabkota/${kode_kabkota}`; - const urldd = `http://localhost:5000/api/kabkota/serapan/${kode_kabkota}`; - const urlpd = `http://localhost:5000//api/kabkota/pendamping/${kode_kabkota}` - const urlkop = `http://localhost:5000//api/kabkota/koperasi/${kode_kabkota}` - const urlbd = `http://localhost:5000/api/kabkota/bumdes/${kode_kabkota}`; + const baseUrl = window.location.origin; + const url = `${baseUrl}/api/status-kabupatenkota/${kode_prov}/${kode_kabkota}` + const urltdd = `${baseUrl}/api/status/danadesa/kabkota/${kode_kabkota}`; + const urldd = `${baseUrl}/api/kabkota/serapan/${kode_kabkota}`; + const urlpd = `${baseUrl}//api/kabkota/pendamping/${kode_kabkota}` + const urlkop = `${baseUrl}//api/kabkota/koperasi/${kode_kabkota}` + const urlbd = `${baseUrl}/api/kabkota/bumdes/${kode_kabkota}`; try{ const res = await fetch(url) const tdd = await fetch(urltdd) @@ -546,12 +548,13 @@ } async function fetchStatusDesaByKecamatan(province_code, region_code, district_code){ - const url = `http://localhost:5000/api/status-kecamatan/${province_code}/${region_code}/${district_code}` - const urltdd = `http://localhost:5000/api/status/danadesa/kecamatan/${district_code}`; - const urldd = `http://localhost:5000/api/kecamatan/serapan/${district_code}`; - const urlpd = `http://localhost:5000//api/kecamatan/pendamping/${district_code}` - const urlkop = `http://localhost:5000//api/kecamatan/koperasi/${district_code}` - const urlbd = `http://localhost:5000/api/kecamatan/bumdes/${district_code}`; + const baseUrl = window.location.origin; + const url = `${baseUrl}/api/status-kecamatan/${province_code}/${region_code}/${district_code}` + const urltdd = `${baseUrl}/api/status/danadesa/kecamatan/${district_code}`; + const urldd = `${baseUrl}/api/kecamatan/serapan/${district_code}`; + const urlpd = `${baseUrl}//api/kecamatan/pendamping/${district_code}` + const urlkop = `${baseUrl}//api/kecamatan/koperasi/${district_code}` + const urlbd = `${baseUrl}/api/kecamatan/bumdes/${district_code}`; try { const res = await fetch(url) const tdd = await fetch(urltdd) @@ -576,12 +579,13 @@ } async function fetchStatusDesaByDesa(province_code, region_code, district_code, village_code){ - const url = `http://localhost:5000//api/desa/status/${province_code}/${region_code}/${district_code}/${village_code}` - const urltdd = `http://localhost:5000/api/status/danadesa/desa/${village_code}`; - const urldd = `http://localhost:5000/api/desa/serapan/${village_code}`; - const urlpd = `http://localhost:5000//api/desa/pendamping/${village_code}` - const urlkop = `http://localhost:5000//api/desa/koperasi/${village_code}` - const urlbd = `http://localhost:5000/api/desa/bumdes/${village_code}`; + const baseUrl = window.location.origin; + const url = `${baseUrl}//api/desa/status/${province_code}/${region_code}/${district_code}/${village_code}` + const urltdd = `${baseUrl}/api/status/danadesa/desa/${village_code}`; + const urldd = `${baseUrl}/api/desa/serapan/${village_code}`; + const urlpd = `${baseUrl}/api/desa/pendamping/${village_code}` + const urlkop = `${baseUrl}/api/desa/koperasi/${village_code}` + const urlbd = `${baseUrl}/api/desa/bumdes/${village_code}`; try { const res = await fetch(url) const tdd = await fetch(urltdd) @@ -824,8 +828,8 @@ theme: 'bootstrap-4' } ); let total_dd_container = document.getElementById('tot_dd') - fetchTotDana('http://localhost:5000/api/desa/total-dana-desa') - fethTotSerapan('http://localhost:5000/api/desa/total-serapan-dana') + fetchTotDana('/api/desa/total-dana-desa') + fethTotSerapan('/api/desa/total-serapan-dana') function fetchTotDana(url){ fetch(url) .then(res => res.json())