Skip to content

Tambahkan fitur untuk penyebutan kelurahan / desa & Kabupaten / Kota #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vickyrolanda merged 7 commits into from
Aug 12, 2025
Merged

Tambahkan fitur untuk penyebutan kelurahan / desa & Kabupaten / Kota #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d42240
Tambahkan fitur untuk penyebutan kelurahan / desa & Kabupaten / Kota …
pandigresik Aug 11, 2025
be0c598
sesuaikan title dan placeholder
pandigresik Aug 11, 2025
7d1e156
update placeholder
pandigresik Aug 11, 2025
ad228d8
update label
pandigresik Aug 11, 2025
f939b20
kembalikan
pandigresik Aug 11, 2025
657ad10
Merge branch 'bug-fix' into dev-800
vickyrolanda Aug 12, 2025
cb4ba09
[ci skip] memutahirkan catatan rilis
vickyrolanda Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/DasborController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
];
Expand Down
8 changes: 4 additions & 4 deletions app/Http/Controllers/Web/PageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand Down
16 changes: 8 additions & 8 deletions app/Http/Controllers/Web/PresisiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand All @@ -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'],
];
Expand All @@ -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'],
];
Expand Down Expand Up @@ -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'],
];
Expand All @@ -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'],
];
Expand All @@ -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'],
];
Expand All @@ -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'],
];
Expand Down
1 change: 1 addition & 0 deletions app/Http/Requests/IdentitasRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
];
}
}
1 change: 1 addition & 0 deletions app/Http/Transformers/IdentitasTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
}
}
2 changes: 1 addition & 1 deletion app/Listeners/MenuListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
],
]);

Expand Down
3 changes: 2 additions & 1 deletion app/Models/Identitas.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
1 change: 1 addition & 0 deletions catatan_rilis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions config/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down Expand Up @@ -80,7 +81,7 @@
|
*/

'timezone' => env('APP_TIMEZONE','UTC'),
'timezone' => env('APP_TIMEZONE', 'UTC'),

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -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'),
],
];
32 changes: 32 additions & 0 deletions database/migrations/2025_08_11_000001_add_sebutan_desa_to_identitas_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('identitas', function (Blueprint $table) {
$table->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');
});
}
};
1 change: 1 addition & 0 deletions database/seeders/IdentitasSeeder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public function run()
'nama_provinsi' => 'Nusa Tenggara Barat',
'kode_provinsi' => '52',
'sebutan_kab' => 'Kota',
'sebutan_desa' => 'Kelurahan',
]);
}
}
5 changes: 3 additions & 2 deletions resources/views/components/wilayah_filter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-3">
<select name="Filter Kabupaten" id="filter_kabupaten" required class="form-control"
title="Pilih Kabupaten">
title="Pilih {{ config('app.sebutanKab') }}">
<option value="">All</option>
</select>
</div>
Expand All @@ -16,7 +16,8 @@
</select>
</div>
<div class="col-md-3">
<select name="Filter Desa" id="filter_desa" required class="form-control" title="Pilih Desa">
<select name="Filter Desa" id="filter_desa" required class="form-control"
title="Pilih {{ config('app.sebutanDesa') }}">
<option value="">All</option>
</select>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/wilayah_filter_js.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}, 'json')

$('#filter_kabupaten').select2({
placeholder: "Pilih Kabupaten",
placeholder: "Pilih {{ config('app.sebutanKab') }}",
allowClear: true,
height: '100%',
width: '100%',
Expand All @@ -33,7 +33,7 @@
})

$('#filter_desa').select2({
placeholder: "Pilih Desa",
placeholder: "Pilih {{ config('app.sebutanDesa') }}",
allowClear: true,
width: '100%',
})
Expand Down
37 changes: 19 additions & 18 deletions resources/views/dasbor/data-desa.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<div class="col-md-12">
<div class="card rounded-0 elevation-0">
<div class="card-header bg-white">Data Kelurahan /Desa</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped" id="summary-penduduk">
<thead>
<tr>
<th class="padat">No</th>
<th>Desa</th>
<th>Kecamatan</th>
<th class="padat">Jumlah Penduduk</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
</div>
<div class="card rounded-0 elevation-0">
<div class="card-header bg-white">Data {{ config('app.sebutanDesa') }}
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped" id="summary-penduduk">
<thead>
<tr>
<th class="padat">No</th>
<th>{{ config('app.sebutanDesa') }}</th>
<th>Kecamatan</th>
<th class="padat">Jumlah Penduduk</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div>
</div>
Loading