diff --git a/app/Http/Controllers/DasborController.php b/app/Http/Controllers/DasborController.php index 2080b19de..240ec8a78 100644 --- a/app/Http/Controllers/DasborController.php +++ b/app/Http/Controllers/DasborController.php @@ -16,7 +16,7 @@ public function index() $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'url' => url('kecamatan'), 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'url' => url('desa'), 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'url' => url('desa'), 'text' => strtolower($data['sebutanDesa'] ?? 'desa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'url' => url('penduduk'), 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'url' => url('keluarga'), 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; diff --git a/app/Http/Controllers/Web/PageController.php b/app/Http/Controllers/Web/PageController.php index 32b459610..d62ba32eb 100644 --- a/app/Http/Controllers/Web/PageController.php +++ b/app/Http/Controllers/Web/PageController.php @@ -21,14 +21,14 @@ public function getIndex() $bantuanSummary = 0; $categoriesItems = [ ['key' => 'penduduk', 'text' => 'penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], - ['key' => 'kabupaten', 'text' => 'kabupaten', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], + ['key' => 'kabupaten', 'text' => config('app.sebutanKab'), 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'bantuan', 'text' => 'bantuan', 'value' => $bantuanSummary, 'icon' => 'web/img/bantuan.jpg'], ]; - $listKabupaten = ['' => 'Pilih Kabupaten']; + $listKabupaten = ['' => 'Pilih '.config('app.sebutanKab')]; $listKecamatan = ['' => 'Pilih Kecamatan']; - $listDesa = ['' => 'Pilih Desa']; + $listDesa = ['' => 'Pilih '.config('app.sebutanDesa')]; return view('web.index', compact('categoriesItems', 'listKecamatan', 'listDesa', 'listKabupaten')); } diff --git a/app/Http/Controllers/Web/PresisiController.php b/app/Http/Controllers/Web/PresisiController.php index 777343c86..176ea996b 100644 --- a/app/Http/Controllers/Web/PresisiController.php +++ b/app/Http/Controllers/Web/PresisiController.php @@ -23,12 +23,12 @@ public function index() $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; $listKecamatan = ['' => 'Pilih Kecamatan']; - $listDesa = ['' => 'Pilih Desa']; + $listDesa = ['' => 'Pilih '.config('app.sebutanDesa')]; return view('presisi.index', compact('categoriesItems', 'listKecamatan', 'listDesa')); } @@ -41,7 +41,7 @@ public function kependudukan($id = '') $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; @@ -64,7 +64,7 @@ public function kesehatan($kuartal = null, $tahun = null, $id = null, $kabupaten $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; @@ -121,7 +121,7 @@ public function rtm($id = '') $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; @@ -141,7 +141,7 @@ public function keluarga($id = '') $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; @@ -157,7 +157,7 @@ public function bantuan($id = '') $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; @@ -176,7 +176,7 @@ public function geoSpasial() $keluargaSummary = 0; $categoriesItems = [ ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'], - ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], + ['key' => 'desa', 'text' => config('app.sebutanDesa'), 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'], ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'], ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'], ]; diff --git a/app/Http/Requests/IdentitasRequest.php b/app/Http/Requests/IdentitasRequest.php index 56f672ca9..01ea70a81 100644 --- a/app/Http/Requests/IdentitasRequest.php +++ b/app/Http/Requests/IdentitasRequest.php @@ -31,6 +31,7 @@ public function rules() 'nama_provinsi' => 'required|string', 'kode_provinsi' => 'required|string', 'sebutan_kab' => 'required|regex:/^[A-Za-z\.\']+(?:\s[A-Za-z\.\']+)*$/u|max:50', + 'sebutan_desa' => 'required|regex:/^[A-Za-z\.\']+(?:\s[A-Za-z\.\']+)*$/u|max:50', ]; } } diff --git a/app/Http/Transformers/IdentitasTransformer.php b/app/Http/Transformers/IdentitasTransformer.php index 8e21299fc..36d25358f 100644 --- a/app/Http/Transformers/IdentitasTransformer.php +++ b/app/Http/Transformers/IdentitasTransformer.php @@ -30,6 +30,7 @@ public function transform(Identitas $identitas) 'nama_provinsi' => $identitas->nama_provinsi, 'kode_provinsi' => $identitas->kode_provinsi, 'sebutan_kab' => $identitas->sebutan_kab, + 'sebutan_desa' => $identitas->sebutan_desa, ]; } } diff --git a/app/Listeners/MenuListener.php b/app/Listeners/MenuListener.php index a05419c5c..7f66ecbd0 100644 --- a/app/Listeners/MenuListener.php +++ b/app/Listeners/MenuListener.php @@ -93,7 +93,7 @@ public function handle(BuildingMenu $event) 'url' => 'sesi/hapus/desa', 'active' => ! session()->has('desa'), 'data' => [ - 'desa' => 'Desa', + 'desa' => config('app.sebutanDesa', 'Desa'), ], ]); diff --git a/app/Models/Identitas.php b/app/Models/Identitas.php index 7130386fb..6961d874c 100644 --- a/app/Models/Identitas.php +++ b/app/Models/Identitas.php @@ -13,7 +13,7 @@ class Identitas extends OpenKabModel protected $fillable = [ 'nama_aplikasi', 'deskripsi', 'favicon', 'logo', 'nama_kabupaten', 'kode_kabupaten', - 'nama_provinsi', 'kode_provinsi', 'sebutan_kab', + 'nama_provinsi', 'kode_provinsi', 'sebutan_kab', 'sebutan_desa', ]; public static function pengaturan() @@ -22,6 +22,7 @@ public static function pengaturan() $data['nama_aplikasi'] = $identitas->nama_aplikasi ?? config('app.namaAplikasi'); $data['sebutanKab'] = $identitas->sebutan_kab ?? config('app.sebutanKab'); + $data['sebutanDesa'] = $identitas->sebutan_desa ?? config('app.sebutanDesa'); $nama_kabupaten = preg_replace('/KAB/', '', $identitas->nama_kabupaten) ?? config('app.namaKab'); $data['nama_kabupaten'] = strtolower($data['sebutanKab']) == 'kota' ? $nama_kabupaten : $data['sebutanKab'].' '.$nama_kabupaten; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 2ba771e68..5a60d3915 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -59,7 +59,8 @@ public function boot() // daftarkan data identitas aplikasi disini, karena akan dipakai di hampir semua view View::share('identitasAplikasi', $identitasAplikasi); View::share('settingAplikasi', $settingAplikasi); - + config()->set(['app.sebutanDesa' => $identitasAplikasi['sebutan_desa'] ?? 'Desa']); + config()->set(['app.sebutanKab' => $identitasAplikasi['sebutan_kab'] ?? 'Kabupaten']); $this->bootConfigAdminLTE($identitasAplikasi, $settingAplikasi); } } diff --git a/catatan_rilis.md b/catatan_rilis.md index 9e15528b7..9e5c3cd70 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -4,6 +4,7 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu 1. [#784](https://github.com/OpenSID/OpenKab/issues/784) Penambahan fungsi export excel pada halaman data statistik pada OpenKab. 2. [#789](https://github.com/OpenSID/OpenKab/issues/789) Penambahan fungsi export data ke excel. +3. [#800](https://github.com/OpenSID/OpenKab/issues/800) Penambahan fungsi untuk penyebutan kelurahan / desa & Kabupaten / Kota. #### Perbaikan BUG diff --git a/config/app.php b/config/app.php index ea3fcd4a3..ca65a4b11 100644 --- a/config/app.php +++ b/config/app.php @@ -21,6 +21,7 @@ 'namaKab' => env('APP_NAMA_KAB', 'Nama Kabupaten'), 'namaProv' => env('APP_NAMA_PROV', 'Nama Provinsi'), 'sebutanKab' => env('APP_SEBUTAN_KAB', 'Kota'), + 'sebutanDesa' => env('APP_SEBUTAN_DESA', 'Desa'), 'serverPantau' => env('APP_PANTAU', 'https://pantau.opensid.my.id/'), 'tokenPantau' => env('TOKEN_PANTAU', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6bnVsbCwidGltZXN0YW1wIjoxNjAzNDY2MjM5fQ.HVCNnMLokF2tgHwjQhSIYo6-2GNXB4-Kf28FSIeXnZw'), @@ -80,7 +81,7 @@ | */ - 'timezone' => env('APP_TIMEZONE','UTC'), + 'timezone' => env('APP_TIMEZONE', 'UTC'), /* |-------------------------------------------------------------------------- @@ -224,11 +225,11 @@ 'aliases' => Facade::defaultAliases()->merge([ // 'ExampleClass' => App\Example\ExampleClass::class, - 'Image' => Intervention\Image\Facades\Image::class + 'Image' => Intervention\Image\Facades\Image::class, ])->toArray(), 'format' => [ - 'date' => env('FORMAT_DATE','d/m/Y'), - 'date_js' => env('FORMAT_DATE_JS','DD/MM/YYYY') - ] + 'date' => env('FORMAT_DATE', 'd/m/Y'), + 'date_js' => env('FORMAT_DATE_JS', 'DD/MM/YYYY'), + ], ]; diff --git a/database/migrations/2025_08_11_000001_add_sebutan_desa_to_identitas_table.php b/database/migrations/2025_08_11_000001_add_sebutan_desa_to_identitas_table.php new file mode 100644 index 000000000..22de176ef --- /dev/null +++ b/database/migrations/2025_08_11_000001_add_sebutan_desa_to_identitas_table.php @@ -0,0 +1,32 @@ +string('sebutan_desa', 100)->default('Desa')->after('sebutan_kab'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('identitas', function (Blueprint $table) { + $table->dropColumn('sebutan_desa'); + }); + } +}; diff --git a/database/seeders/IdentitasSeeder.php b/database/seeders/IdentitasSeeder.php index 4fb77b684..8ad1c6e0f 100644 --- a/database/seeders/IdentitasSeeder.php +++ b/database/seeders/IdentitasSeeder.php @@ -21,6 +21,7 @@ public function run() 'nama_provinsi' => 'Nusa Tenggara Barat', 'kode_provinsi' => '52', 'sebutan_kab' => 'Kota', + 'sebutan_desa' => 'Kelurahan', ]); } } diff --git a/resources/views/components/wilayah_filter.blade.php b/resources/views/components/wilayah_filter.blade.php index e0aed295a..f8641fe06 100644 --- a/resources/views/components/wilayah_filter.blade.php +++ b/resources/views/components/wilayah_filter.blade.php @@ -5,7 +5,7 @@
@@ -16,7 +16,8 @@
-
diff --git a/resources/views/components/wilayah_filter_js.blade.php b/resources/views/components/wilayah_filter_js.blade.php index be6fb0d36..e3df56035 100644 --- a/resources/views/components/wilayah_filter_js.blade.php +++ b/resources/views/components/wilayah_filter_js.blade.php @@ -20,7 +20,7 @@ }, 'json') $('#filter_kabupaten').select2({ - placeholder: "Pilih Kabupaten", + placeholder: "Pilih {{ config('app.sebutanKab') }}", allowClear: true, height: '100%', width: '100%', @@ -33,7 +33,7 @@ }) $('#filter_desa').select2({ - placeholder: "Pilih Desa", + placeholder: "Pilih {{ config('app.sebutanDesa') }}", allowClear: true, width: '100%', }) diff --git a/resources/views/dasbor/data-desa.blade.php b/resources/views/dasbor/data-desa.blade.php index 318bf8ca3..703d2ea7c 100644 --- a/resources/views/dasbor/data-desa.blade.php +++ b/resources/views/dasbor/data-desa.blade.php @@ -1,19 +1,20 @@
-
-
Data Kelurahan /Desa
-
-
- - - - - - - - - - -
NoDesaKecamatanJumlah Penduduk
-
-
-
\ No newline at end of file +
+
Data {{ config('app.sebutanDesa') }} +
+
+
+ + + + + + + + + + +
No{{ config('app.sebutanDesa') }}KecamatanJumlah Penduduk
+
+
+
diff --git a/resources/views/data_pokok/pariwisata/index.blade.php b/resources/views/data_pokok/pariwisata/index.blade.php index d3e0dc62f..b3c8d066d 100644 --- a/resources/views/data_pokok/pariwisata/index.blade.php +++ b/resources/views/data_pokok/pariwisata/index.blade.php @@ -50,7 +50,7 @@ ID - Desa + {{ config('app.sebutanDesa') }} Jenis Hiburan Jumlah Penginapan Lokasi/Tempat/Area Wisata @@ -70,122 +70,122 @@ @section('js') @include('data_pokok.pariwisata.chart') - @endsection diff --git a/resources/views/desa/cetak.blade.php b/resources/views/desa/cetak.blade.php index 3ae09e775..53b4c2e42 100644 --- a/resources/views/desa/cetak.blade.php +++ b/resources/views/desa/cetak.blade.php @@ -16,7 +16,7 @@ No - Desa + {{ config('app.sebutanDesa') }} Kecamatan Jumlah Penduduk diff --git a/resources/views/desa/index.blade.php b/resources/views/desa/index.blade.php index 40a6f7e41..84a3865ff 100644 --- a/resources/views/desa/index.blade.php +++ b/resources/views/desa/index.blade.php @@ -38,7 +38,7 @@
+ title="Pilih {{ config('app.sebutanDesa') }}"> @if ($filters['kode_desa'] ?? false) @@ -102,7 +102,7 @@ class="fas fa-search"> No - Desa + {{ config('app.sebutanDesa') }} Kecamatan Jumlah Penduduk diff --git a/resources/views/identitas/edit.blade.php b/resources/views/identitas/edit.blade.php index 1b045601d..c5bda83c4 100644 --- a/resources/views/identitas/edit.blade.php +++ b/resources/views/identitas/edit.blade.php @@ -1,7 +1,7 @@ @extends('layouts.index') @push('css') -