From ea1ff249b021e777934433e8ec64a619fe5cc454 Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Tue, 30 Jul 2024 06:18:40 +0700 Subject: [PATCH 1/7] update --- .../views/website/partial/peta.blade.php | 105 ++++++++++-------- 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/resources/views/website/partial/peta.blade.php b/resources/views/website/partial/peta.blade.php index fcfb98d1..376a430d 100644 --- a/resources/views/website/partial/peta.blade.php +++ b/resources/views/website/partial/peta.blade.php @@ -74,62 +74,77 @@ @section('js') - + }); + @endsection \ No newline at end of file From 3147f9ce6ae992abb1bf97625fb1aee648e04449 Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Tue, 30 Jul 2024 06:38:47 +0700 Subject: [PATCH 2/7] peta dan jumlah pengguna --- .../WebsiteDashboardController.php | 16 ++++++++++++ .../views/website/partial/peta.blade.php | 26 ++++++++----------- routes/web.php | 1 + 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/WebsiteDashboardController.php b/app/Http/Controllers/WebsiteDashboardController.php index b117a0f9..b9eef12e 100644 --- a/app/Http/Controllers/WebsiteDashboardController.php +++ b/app/Http/Controllers/WebsiteDashboardController.php @@ -33,6 +33,11 @@ public function index(Request $request) return view('website.dashboard', [ 'fillters' => $fillters, 'wilayah' => Openkab::withCount('wilayah')->get(), + 'jml_openkab' => Openkab::count(), + 'jml_opendk' => Opendk::count(), + 'jml_opensid' => Desa::count(), + 'jml_layanandesa' => TrackMobile::count(), + 'jml_keloladesa' => TrackKeloladesa::count(), ]); } @@ -192,4 +197,15 @@ public function opendk(Request $request) { return view('website.opendk'); } + + public function dataPeta() + { + $markers = Desa::select(['lat', 'lng', 'alamat_kantor as popup'])->get()->map(function ($marker) { + $marker->color = 'default'; + return $marker; + }); + + // Mengembalikan data sebagai response JSON + return response()->json($markers); + } } diff --git a/resources/views/website/partial/peta.blade.php b/resources/views/website/partial/peta.blade.php index 376a430d..09a2134e 100644 --- a/resources/views/website/partial/peta.blade.php +++ b/resources/views/website/partial/peta.blade.php @@ -23,7 +23,7 @@ OpenKab
- 21 + {{$jml_openkab}}
@@ -34,7 +34,7 @@ OpenDK
- 2981 + {{$jml_opendk}}
@@ -45,7 +45,7 @@ OpenSID
- 31981 + {{$jml_opensid}}
@@ -56,7 +56,7 @@ LayananDesa
- 4321 + {{$jml_layanandesa}}
@@ -67,7 +67,7 @@ KelolaDesa
- 121 + {{$jml_keloladesa}}
@@ -134,16 +134,12 @@ className: color }); } - // Menambahkan banyak marker dengan ikon berbeda - var markers = [ - {lat: -7.322962697427194, lng: 112.56597161293031, popup: 'Marker 1', color: 'default'}, - {lat: -7.0131397, lng: 112.3854046, popup: 'Marker 2', color: 'default'}, - {lat: -7.408239413897698, lng: 109.56422567367555, popup: 'Marker 3', color: 'default'} - ]; - - markers.forEach(function(marker) { - L.marker([marker.lat, marker.lng], {icon: createIcon(marker.color)}).addTo(map) - .bindPopup(marker.popup); + // Mendapatkan data marker dari API Laravel + $.getJSON('/web/data-peta', function(data) { + data.forEach(function(marker) { + L.marker([marker.lat, marker.lng], {icon: createIcon(marker.color)}).addTo(map) + .bindPopup(marker.popup); + }); }); }); diff --git a/routes/web.php b/routes/web.php index 70a800f8..2bad90db 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,6 +47,7 @@ Route::get('/', [DashboardController::class, 'index'])->middleware('web.dashboard'); Route::get('/web/opendk', [WebsiteDashboardController::class, 'opendk'])->middleware('web.dashboard'); Route::get('/home', [DashboardController::class, 'index'])->middleware('web.dashboard'); +Route::get('/web/data-peta', [WebsiteDashboardController::class, 'dataPeta']); // datatable Route::prefix('datatables')->as('datatables:') From 38606f72ecbf259ee40567eb64c8dd27bfb87b9d Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Tue, 30 Jul 2024 06:44:03 +0700 Subject: [PATCH 3/7] update --- app/Http/Controllers/DashboardController.php | 11 +++++++++++ app/Http/Controllers/WebsiteDashboardController.php | 11 ----------- routes/web.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 49f7bae5..8e63648e 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -163,4 +163,15 @@ public function datatablePenggunaOpendk(Request $request) abort(404); // Mengembalikan 404 jika bukan permintaan AJAX } + public function dataPeta() + { + $markers = Desa::select(['lat', 'lng', 'alamat_kantor as popup'])->get()->map(function ($marker) { + $marker->color = 'default'; + return $marker; + }); + + // Mengembalikan data sebagai response JSON + return response()->json($markers); + } + } diff --git a/app/Http/Controllers/WebsiteDashboardController.php b/app/Http/Controllers/WebsiteDashboardController.php index b9eef12e..3c850b6e 100644 --- a/app/Http/Controllers/WebsiteDashboardController.php +++ b/app/Http/Controllers/WebsiteDashboardController.php @@ -197,15 +197,4 @@ public function opendk(Request $request) { return view('website.opendk'); } - - public function dataPeta() - { - $markers = Desa::select(['lat', 'lng', 'alamat_kantor as popup'])->get()->map(function ($marker) { - $marker->color = 'default'; - return $marker; - }); - - // Mengembalikan data sebagai response JSON - return response()->json($markers); - } } diff --git a/routes/web.php b/routes/web.php index 2bad90db..01f60656 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,7 +47,7 @@ Route::get('/', [DashboardController::class, 'index'])->middleware('web.dashboard'); Route::get('/web/opendk', [WebsiteDashboardController::class, 'opendk'])->middleware('web.dashboard'); Route::get('/home', [DashboardController::class, 'index'])->middleware('web.dashboard'); -Route::get('/web/data-peta', [WebsiteDashboardController::class, 'dataPeta']); +Route::get('/web/data-peta', [DashboardController::class, 'dataPeta']); // datatable Route::prefix('datatables')->as('datatables:') From 5a2601a2ade06efb498a1ae45b95925dfe255af4 Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Wed, 14 Aug 2024 14:49:34 +0700 Subject: [PATCH 4/7] update --- routes/web.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/routes/web.php b/routes/web.php index 28891c55..f0755efd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -43,21 +43,7 @@ 'verify' => true, ]); -// index dashboard -Route::get('/web', [WebsiteDashboardController::class, 'index'])->middleware('web.dashboard'); -Route::get('/web/openkab', [WebsiteDashboardController::class, 'openkab'])->middleware('web.dashboard'); -Route::get('/web/opensid', [WebsiteDashboardController::class, 'opensid'])->middleware('web.dashboard'); -Route::get('/', [DashboardController::class, 'index'])->middleware('web.dashboard'); -Route::get('/web/keloladesa', [WebsiteDashboardController::class, 'keloladesa'])->middleware('web.dashboard'); -Route::get('/web/layanandesa', [WebsiteDashboardController::class, 'layanandesa'])->middleware('web.dashboard'); -Route::get('/web/opendk', [WebsiteDashboardController::class, 'opendk'])->middleware('web.dashboard'); -Route::get('/web/opensid', [WebsiteDashboardController::class, 'opensid'])->middleware('web.dashboard'); -Route::get('/web/opensid-data', [WebsiteDashboardController::class, 'opensidData'])->middleware('web.dashboard'); -Route::get('/home', [DashboardController::class, 'index'])->middleware('web.dashboard'); -Route::get('/web/data-peta', [DashboardController::class, 'dataPeta']); - Route::group(['middleware' => 'web.dashboard'],function(){ - Route::get('/', [WebsiteDashboardController::class, 'index']); Route::prefix('web')->group(function(){ Route::get('', [WebsiteDashboardController::class, 'index']); Route::get('openkab', [WebsiteDashboardController::class, 'openkab']); @@ -80,6 +66,8 @@ Route::get('keloladesa/versi/detail', [KelolaDesaDashboardController::class, 'versi_detail']); Route::get('keloladesa/install_baru', [KelolaDesaDashboardController::class, 'install_baru']); Route::get('keloladesa/peta', [KelolaDesaDashboardController::class, 'peta']); + Route::get('data-peta', [DashboardController::class, 'dataPeta']); + }); }); From 64dc48360d3f8e72aef68fa6b5d74b970b39a443 Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Wed, 14 Aug 2024 14:50:01 +0700 Subject: [PATCH 5/7] update --- routes/web.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/web.php b/routes/web.php index f0755efd..1548933f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -44,6 +44,7 @@ ]); Route::group(['middleware' => 'web.dashboard'],function(){ + Route::get('/', [WebsiteDashboardController::class, 'index']); Route::prefix('web')->group(function(){ Route::get('', [WebsiteDashboardController::class, 'index']); Route::get('openkab', [WebsiteDashboardController::class, 'openkab']); From 1e0d1fb3ab3b1057a4daaf960ad44145b2063531 Mon Sep 17 00:00:00 2001 From: Firliani Fauziah Date: Wed, 14 Aug 2024 14:50:11 +0700 Subject: [PATCH 6/7] update --- routes/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 1548933f..41de4ead 100644 --- a/routes/web.php +++ b/routes/web.php @@ -68,7 +68,6 @@ Route::get('keloladesa/install_baru', [KelolaDesaDashboardController::class, 'install_baru']); Route::get('keloladesa/peta', [KelolaDesaDashboardController::class, 'peta']); Route::get('data-peta', [DashboardController::class, 'dataPeta']); - }); }); From ea364ac90fc1359023e4ce141bc5b1e6812fe908 Mon Sep 17 00:00:00 2001 From: Abah Roland Date: Thu, 15 Aug 2024 04:24:00 +0700 Subject: [PATCH 7/7] [ci skip] memutahirkan catatan rilis --- catatan_rilis.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catatan_rilis.md b/catatan_rilis.md index baa20bfb..93918270 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -36,6 +36,7 @@ Di rilis v2408.0.0 berisi perbaikan yang diminta Komunitas Open Desa. 32. [#386](https://github.com/OpenSID/pantau/issues/386) Penambahan data no hp pada pengguna OpenSID yang diambil dari identitas desa. 33. [#389](https://github.com/OpenSID/pantau/issues/389) Penambahan fungsi collapse pada bagian pengguna OpenSID berdasarkan wilayah. 34. [#309](https://github.com/OpenSID/pantau/issues/309) Penambahan fungsi filter di halaman dasbor. +35. [#308](https://github.com/OpenSID/pantau/issues/308) Penambahan fungsi peta untuk keseluruhan aplikasi OpenDesa #### Perbaikan Bug