perbaiki filter dan pagination bantuan dll#1551
Merged
Merged
Conversation
|
🔄 AI PR Review sedang antri di server...
|
Contributor
|
ada conflict mas @habibie11 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
issue #1546
penyesuaian migrasi di Api Gabungan https://github.com/OpenSID/API-Database-Gabungan/pull/405
📋 Ringkasan
Menyelaraskan AJAX, parameter, dan komponen dropdown pada halaman Data Program Bantuan Gabungan agar konsisten dengan pola yang sudah diterapkan di halaman Data Penduduk Gabungan.
File yang diubah
resources/views/data/program_bantuan/gabungan/index.blade.phpAcuan
resources/views/data/penduduk/gabungan/index.blade.php🔄 Perubahan
1. Dropdown Desa — gunakan shared component
Sebelum: Dropdown desa menggunakan 3 sumber sekaligus yang saling tumpang tindih:
<select>inline (baris 27-36)@foreach ($list_desa as $desa)yang me-render opsi server-side (baris 32-34)loadDesa()yang melakukan AJAX POST ke/api/v1/opendk/desa-datatable, lalu menimpa seluruh isi<select>dengan.empty().append(...)(baris 63-88)Default value
""(empty string), label"Semua Desa".Sesudah: Menggunakan shared component
@include('layouts.fragments.list-desa')yang me-render data desa viaDesaServicesecara server-side. FungsiloadDesa()dan@foreachBlade dihapus karena tidak diperlukan lagi.2. DataTable AJAX — hapus header tidak perlu
Sebelum:
Sesudah:
Header
Accept: application/ld+jsontidak standar dan tidak digunakan di penduduk. HeaderContent-Typetidak diperlukan karena DataTables akan mengirimkannya otomatis.3. DataTable
data()— hapusfields[program], perbaiki sentinel desaSebelum:
Sesudah:
fields[program]dihapus — parameter ini tidak dikirim di penduduk.filter[kode_desa]sekarang menangani sentinel"Semua"menjadi'', sama persis seperti penduduk.4. DataTable
dataSrc()— return data mentah, mapping kerender()Sebelum: Mapping dilakukan di
dataSrcvia.map():Sesudah: Return
json.datalangsung, mapping default value dipindahkan kerender()di tiap kolom:Dan di kolom:
5. Export Excel — tambahkan
kode_desadengan handle sentinelSebelum: Parameter
kode_desatidak dikirim sama sekali ke endpoint export. HanyatotalDatadankode_kecamatanyang dikirim (baris 225-228):Sesudah:
kode_desaditambahkan dengan handle sentinel"Semua":Ini memperbaiki bug di mana export Excel selalu mengunduh semua data tanpa memperhitungkan filter desa yang sedang aktif.
6. Tambahkan
@include('forms.datatable-vertical')Ditambahkan di akhir
@push('scripts')untuk konsistensi styling vertikal-align sel tabel, sama seperti di penduduk.✅ Hasil
Setelah perubahan ini, halaman program bantuan memiliki pola yang konsisten dengan penduduk:
@foreach+loadDesa()AJAX (3 sumber)@include('layouts.fragments.list-desa')(1 sumber)filter[kode_desa]desaId || ''selectedDesa == 'Semua' ? '' : selectedDesafields[program]dataSrcmapping.map()didataSrcrender()di tiap kolomkode_desa"Semua"→""datatable-vertical🧪 Testing
DesaServicekode_desakosongkode_desayang sesuai