From 5efa793db5c8b58633232e560bf766c8b01b229c Mon Sep 17 00:00:00 2001
From: ahmad afandi <ahmad.afandi85@gmail.com>
Date: Thu, 14 Aug 2025 14:13:55 +0700
Subject: [PATCH 1/3] Tambahkan kolom nama desa pada halaman menu bantuan
 OpenKab

---
 resources/views/bantuan/index.blade.php       | 311 +++++++++---------
 .../excel-download-button.blade.php           | 205 ++++++++++++
 resources/views/penduduk/index.blade.php      | 153 +--------
 3 files changed, 367 insertions(+), 302 deletions(-)
 create mode 100644 resources/views/components/excel-download-button.blade.php

diff --git a/resources/views/bantuan/index.blade.php b/resources/views/bantuan/index.blade.php
index e5db85038..4466f0814 100644
--- a/resources/views/bantuan/index.blade.php
+++ b/resources/views/bantuan/index.blade.php
@@ -23,6 +23,7 @@
                             <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url=""><i
                                     class="fa fa-print"></i>
                                 Cetak</button>
+                            <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/bantuan/download'" table-id="bantuan" filename="data_bantuan" />
                         </div>
                     </div>
                 </div>
@@ -80,6 +81,7 @@ class="fas fa-search"></span></button>
                                 <tr>
                                     <th>No</th>
                                     <th>Aksi</th>
+                                    <th>Nama {{ config('app.sebutanDesa') }}</th>
                                     <th>Nama Program</th>
                                     <th>Asal Dana</th>
                                     <th>Jumlah Peseerta</th>
@@ -98,178 +100,187 @@ class="fas fa-search"></span></button>
 @endsection
 
 @section('js')
-    <script nonce="{{ csp_nonce() }}"  >
-    document.addEventListener("DOMContentLoaded", function(event) {
+    <script nonce="{{ csp_nonce() }}">
+        document.addEventListener("DOMContentLoaded", function(event) {
 
-        const header = @include('layouts.components.header_bearer_api_gabungan');
-        var urlBantuan = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/bantuan' }}");
-        var urlSasaran = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/bantuan/sasaran' }}");
-        var urlTahun = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/bantuan/tahun' }}");
+            const header = @include('layouts.components.header_bearer_api_gabungan');
+            var urlBantuan = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/bantuan' }}");
+            var urlSasaran = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/bantuan/sasaran' }}");
+            var urlTahun = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/bantuan/tahun' }}");
 
-        var bantuan = $('#bantuan').DataTable({
-            processing: true,
-            serverSide: true,
-            autoWidth: false,
-            ordering: true,
-            searchPanes: {
-                viewTotal: false,
-                columns: [0]
-            },
-            ajax: {
-                url: urlBantuan,
-                headers: header,
-                method: 'get',
-                data: function(row) {
-                    return {
-                        "page[size]": row.length,
-                        "page[number]": (row.start / row.length) + 1,
-                        "filter[search]": row.search.value,
-                        "sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row.order[0]?.column]
-                            ?.name,
-                        "filter[sasaran]": $("#sasaran").val(),
-                        "filter[tahun]": $("#tahun").val(),
-                        "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
-                        "config_desa": "{{ session('desa.id') ?? '' }}",
-                    };
+            var bantuan = $('#bantuan').DataTable({
+                processing: true,
+                serverSide: true,
+                autoWidth: false,
+                ordering: true,
+                searchPanes: {
+                    viewTotal: false,
+                    columns: [0]
                 },
-                dataSrc: function(json) {
-                    json.recordsTotal = json.meta.pagination.total
-                    json.recordsFiltered = json.meta.pagination.total
+                ajax: {
+                    url: urlBantuan,
+                    headers: header,
+                    method: 'get',
+                    data: function(row) {
+                        return {
+                            "page[size]": row.length,
+                            "page[number]": (row.start / row.length) + 1,
+                            "filter[search]": row.search.value,
+                            "sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row.order[0]
+                                    ?.column]
+                                ?.name,
+                            "filter[sasaran]": $("#sasaran").val(),
+                            "filter[tahun]": $("#tahun").val(),
+                            "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
+                            "config_desa": "{{ session('desa.id') ?? '' }}",
+                        };
+                    },
+                    dataSrc: function(json) {
+                        json.recordsTotal = json.meta.pagination.total
+                        json.recordsFiltered = json.meta.pagination.total
 
-                    return json.data
-                },
-            },
-            columnDefs: [{
-                    targets: '_all',
-                    className: 'text-nowrap',
-                },
-                {
-                    targets: [0, 1, 4, 5, 6, 7],
-                    orderable: false,
-                    searchable: false,
-                },
-            ],
-            columns: [{
-                    data: null,
+                        return json.data
+                    },
                 },
-                {
-                    data: function(data) {
-                        return `<a href="{{ url('bantuan/detail') }}/${data.id}">
+                columnDefs: [{
+                        targets: '_all',
+                        className: 'text-nowrap',
+                    },
+                    {
+                        targets: [0, 1, 4, 5, 6, 7],
+                        orderable: false,
+                        searchable: false,
+                    },
+                ],
+                columns: [{
+                        data: null,
+                    },
+                    {
+                        data: function(data) {
+                            return `<a href="{{ url('bantuan/detail') }}/${data.id}">
                             <button class="btn btn-info btn-sm"><i class="fas fa-eye"></i> Detail</button>
                         </a>`;
 
 
+                        },
                     },
-                },
-                {
-                    data: "attributes.nama",
-                    name: "nama"
-                },
-                {
-                    data: "attributes.asaldana",
-                    name: "asaldana"
-                },
-                {
-                    data: "attributes.jumlah_peserta",
-                    name: "jumlah_peserta",
-                    className: 'text-center'
-                },
-                {
-                    data: function(data) {
-                        return data.attributes.sdate + ' - ' + data.attributes.edate
+                    {
+                        data: 'attributes.nama_desa',
+                        orderable: false,
+                        searchable: false,
+                        defaultContent: '',
+                        className: 'text-center',
                     },
-                },
-                {
-                    data: "attributes.nama_sasaran",
-                    name: "nama_sasaran",
-                },
-                {
-                    data: function(data) {
-                        return data.attributes.status == 1 ? 'Aktif' : 'Tidak Aktif'
+                    {
+                        data: "attributes.nama",
+                        name: "nama"
                     },
-                },
-            ],
-            order: [
-                [2, 'asc']
-            ]
-        })
+                    {
+                        data: "attributes.asaldana",
+                        name: "asaldana"
+                    },
+                    {
+                        data: "attributes.jumlah_peserta",
+                        name: "jumlah_peserta",
+                        className: 'text-center'
+                    },
+                    {
+                        data: function(data) {
+                            return data.attributes.sdate + ' - ' + data.attributes.edate
+                        },
+                    },
+                    {
+                        data: "attributes.nama_sasaran",
+                        name: "nama_sasaran",
+                    },
+                    {
+                        data: function(data) {
+                            return data.attributes.status == 1 ? 'Aktif' : 'Tidak Aktif'
+                        },
+                    },
+                ],
+                order: [
+                    [3, 'asc']
+                ]
+            })
+
+            bantuan.on('draw.dt', function() {
+                var PageInfo = $('#bantuan').DataTable().page.info();
+                bantuan.column(0, {
+                    page: 'current'
+                }).nodes().each(function(cell, i) {
+                    cell.innerHTML = i + 1 + PageInfo.start;
+                });
+            });
 
-        bantuan.on('draw.dt', function() {
-            var PageInfo = $('#bantuan').DataTable().page.info();
-            bantuan.column(0, {
-                page: 'current'
-            }).nodes().each(function(cell, i) {
-                cell.innerHTML = i + 1 + PageInfo.start;
+            $('#sasaran').select2({
+                theme: 'bootstrap4',
+                minimumResultsForSearch: -1,
+                ajax: {
+                    url: urlSasaran,
+                    headers: header,
+                    dataType: 'json',
+                    processResults: function(response) {
+                        return {
+                            results: response.data.map(function(item) {
+                                return {
+                                    id: item.id,
+                                    text: item.nama
+                                }
+                            })
+                        };
+                    }
+                },
             });
-        });
 
-        $('#sasaran').select2({
-            theme: 'bootstrap4',
-            minimumResultsForSearch: -1,
-            ajax: {
-                url: urlSasaran,
-                headers: header,
-                dataType: 'json',
-                processResults: function(response) {
-                    return {
-                        results: response.data.map(function(item) {
-                            return {
-                                id: item.id,
-                                text: item.nama
-                            }
-                        })
-                    };
-                }
-            },
-        });
+            $('#tahun').select2({
+                minimumResultsForSearch: -1,
+                theme: 'bootstrap4',
+                ajax: {
+                    url: urlTahun,
+                    headers: header,
+                    dataType: 'json',
+                    processResults: function(data) {
+                        if (data.data.tahun_awal == null) {
+                            return null
+                        };
+                        const element = new Array();
 
-        $('#tahun').select2({
-            minimumResultsForSearch: -1,
-            theme: 'bootstrap4',
-            ajax: {
-                url: urlTahun,
-                headers: header,
-                dataType: 'json',
-                processResults: function(data) {
-                    if (data.data.tahun_awal == null) {
-                        return null
-                    };
-                    const element = new Array();
+                        for (let index = data.data.tahun_awal; index <= data.data
+                            .tahun_akhir; index++) {
+                            element.push({
+                                id: index,
+                                text: index
+                            });
+                        }
 
-                    for (let index = data.data.tahun_awal; index <= data.data.tahun_akhir; index++) {
-                        element.push({
-                            id: index,
-                            text: index
-                        });
+                        return {
+                            results: element
+                        };
                     }
-
-                    return {
-                        results: element
-                    };
-                }
-            },
-        });
+                },
+            });
 
 
-        $('#filter').on('click', function(e) {
-            bantuan.draw();
-        });
+            $('#filter').on('click', function(e) {
+                bantuan.draw();
+            });
 
-        $(document).on('click', '#reset', function(e) {
-            e.preventDefault();
-            $('#sasaran').val('').change();
-            $('#tahun').val('').change();
+            $(document).on('click', '#reset', function(e) {
+                e.preventDefault();
+                $('#sasaran').val('').change();
+                $('#tahun').val('').change();
 
-            bantuan.ajax.reload();
-        });
+                bantuan.ajax.reload();
+            });
 
-        $('#cetak').on('click', function() {
-            let url = new URL("{{ url('bantuan/cetak') }}");
-            url.searchParams.append("sasaran", $("#sasaran").val() ?? '');
-            url.searchParams.append("tahun", $("#tahun").val() ?? '');
-            url.searchParams.append("search", $('input[aria-controls="bantuan"]').val() ?? '');
-            window.open(url.href, '_blank');
-        });
-    })
+            $('#cetak').on('click', function() {
+                let url = new URL("{{ url('bantuan/cetak') }}");
+                url.searchParams.append("sasaran", $("#sasaran").val() ?? '');
+                url.searchParams.append("tahun", $("#tahun").val() ?? '');
+                url.searchParams.append("search", $('input[aria-controls="bantuan"]').val() ?? '');
+                window.open(url.href, '_blank');
+            });
+        })
     </script>
 @endsection
diff --git a/resources/views/components/excel-download-button.blade.php b/resources/views/components/excel-download-button.blade.php
new file mode 100644
index 000000000..85ec96e5b
--- /dev/null
+++ b/resources/views/components/excel-download-button.blade.php
@@ -0,0 +1,205 @@
+@props([
+    'id' => 'download-excel',
+    'label' => 'Excel',
+    'size' => 'btn-sm',
+    'variant' => 'btn-success',
+    'icon' => 'fa fa-file-excel',
+    'disabled' => false,
+    'loadingText' => 'Downloading...',
+    'downloadUrl' => '',
+    'tableId' => '',
+    'filename' => 'data_export',
+    'apiHeaders' => [],
+    'additionalParams' => [],
+    'class' => '',
+])
+
+<button id="{{ $id }}" type="button" class="btn {{ $variant }} {{ $size }} {{ $class }}"
+    @if ($disabled) disabled @endif data-download-url="{{ $downloadUrl }}"
+    data-table-id="{{ $tableId }}" data-filename="{{ $filename }}">
+    <i class="{{ $icon }}"></i>
+    {{ $label }}
+</button>
+
+@once
+    @push('js')
+        <script nonce="{{ csp_nonce() }}">
+            document.addEventListener("DOMContentLoaded", function() {
+                // Handle all excel download buttons
+                document.querySelectorAll('[data-download-url]').forEach(function(button) {
+                    button.addEventListener('click', function() {
+                        const downloadUrl = this.getAttribute('data-download-url');
+                        const tableId = this.getAttribute('data-table-id');
+                        const filename = this.getAttribute('data-filename');
+
+                        downloadExcelData(this, downloadUrl, tableId, filename);
+                    });
+                });
+
+                async function downloadExcelData(button, downloadUrl, tableId, filename) {
+                    const originalHtml = button.innerHTML;
+                    try {
+                        // Get headers - try to use the global header from the page
+                        const headers = @include('layouts.components.header_bearer_api_gabungan');
+
+                        // Get table instance if tableId is provided
+                        if (tableId) {
+                            const table = $('#' + tableId).DataTable();
+                            const info = table.page.info();
+                            const totalData = info.recordsTotal;
+
+                            if (totalData === 0) {
+                                if (typeof Swal !== 'undefined') {
+                                    Swal.fire({
+                                        icon: 'warning',
+                                        title: 'Tidak Ada Data',
+                                        text: 'Tidak ada data untuk diunduh. Silakan periksa filter Anda.',
+                                        confirmButtonText: 'OK'
+                                    });
+                                } else {
+                                    alert('Tidak ada data untuk diunduh');
+                                }
+                                return;
+                            }
+                        }
+
+                        // Show loading state
+                        button.disabled = true;
+                        button.innerHTML = '<i class="fa fa-spinner fa-spin"></i> Downloading...';
+
+                        // Prepare download URL
+                        const url = new URL(downloadUrl);
+
+                        let urlParams = new URLSearchParams();
+
+                        if (tableId) {
+                            // Get filter parameters from DataTable
+                            const table = $('#' + tableId).DataTable();
+                            const filterParams = table.ajax.params();
+
+                            // Remove pagination parameters since we want all data
+                            delete filterParams['page[size]'];
+                            delete filterParams['page[number]'];
+
+                            // Handle umur filter conversion if exists
+                            if (filterParams['filter[umur]'] && typeof filterParams['filter[umur]'] === 'object') {
+                                const umurObj = filterParams['filter[umur]'];
+
+                                if (umurObj.min && umurObj.min !== '') {
+                                    filterParams['filter[umur][min]'] = umurObj.min;
+                                }
+                                if (umurObj.max && umurObj.max !== '') {
+                                    filterParams['filter[umur][max]'] = umurObj.max;
+                                }
+                                if (umurObj.satuan) {
+                                    filterParams['filter[umur][satuan]'] = umurObj.satuan;
+                                }
+
+                                delete filterParams['filter[umur]'];
+                            }
+
+                            // Convert to URLSearchParams
+                            Object.keys(filterParams).forEach(key => {
+                                const value = filterParams[key];
+                                if (value !== null && value !== undefined && value !== '' && value !==
+                                    'null') {
+                                    urlParams.append(key, value);
+                                }
+                            });
+
+                            const info = table.page.info();
+                            urlParams.append('totalData', info.recordsTotal);
+                        }
+
+                        // Make fetch request
+                        const response = await fetch(url, {
+                            method: 'POST',
+                            headers: {
+                                ...headers,
+                                'Content-Type': 'application/x-www-form-urlencoded',
+                                'Accept': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                            },
+                            body: urlParams
+                        });
+
+                        if (!response.ok) {
+                            const errorText = await response.text();
+                            throw new Error(`HTTP ${response.status}: ${errorText}`);
+                        }
+
+                        // Validate response content type
+                        const contentType = response.headers.get('content-type');
+                        if (!contentType || (!contentType.includes(
+                                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') &&
+                                !contentType.includes('application/vnd.ms-excel'))) {
+                            throw new Error('Response is not a valid Excel file');
+                        }
+
+                        // Get filename from response headers or generate one
+                        const contentDisposition = response.headers.get('content-disposition');
+                        let finalFilename = filename + '.xlsx';
+
+                        if (contentDisposition) {
+                            const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
+                            if (matches != null && matches[1]) {
+                                finalFilename = matches[1].replace(/['"]/g, '');
+                            }
+                        } else {
+                            // Generate filename with timestamp
+                            const now = new Date();
+                            const timestamp = now.toISOString().slice(0, 19).replace(/[-:T]/g, '');
+                            finalFilename = `${filename}_${timestamp}.xlsx`;
+                        }
+
+                        // Create blob and download
+                        const blob = await response.blob();
+                        const downloadLink = window.URL.createObjectURL(blob);
+                        const a = document.createElement('a');
+                        a.href = downloadLink;
+                        a.download = finalFilename;
+                        document.body.appendChild(a);
+                        a.click();
+                        window.URL.revokeObjectURL(downloadLink);
+                        document.body.removeChild(a);
+
+                        // Show success message
+                        if (typeof Swal !== 'undefined') {
+                            Swal.fire({
+                                icon: 'success',
+                                title: 'Berhasil!',
+                                text: `File Excel "${finalFilename}" berhasil diunduh`,
+                                timer: 3000,
+                                showConfirmButton: false
+                            });
+                        }
+
+                    } catch (error) {
+                        console.error('Download error:', error);
+
+                        // Show error message
+                        if (typeof Swal !== 'undefined') {
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Gagal Download!',
+                                html: `
+                        <p>Terjadi kesalahan saat mengunduh file Excel:</p>
+                        <p><small>${error.message}</small></p>
+                        <p>Silakan coba lagi atau hubungi administrator.</p>
+                    `,
+                                confirmButtonText: 'OK'
+                            });
+                        } else {
+                            alert('Gagal download: ' + error.message);
+                        }
+                    } finally {
+                        // Reset button state
+                        console.log('Resetting button state');
+                        console.log('Original HTML:', originalHtml);
+                        button.disabled = false;
+                        button.innerHTML = originalHtml;
+                    }
+                }
+            });
+        </script>
+    @endpush
+@endonce
diff --git a/resources/views/penduduk/index.blade.php b/resources/views/penduduk/index.blade.php
index 1add1f804..0f50d28d4 100644
--- a/resources/views/penduduk/index.blade.php
+++ b/resources/views/penduduk/index.blade.php
@@ -44,10 +44,7 @@
                                 <i class="fa fa-print"></i>
                                 Cetak
                             </button>
-                            <button id="download-excel" type="button" class="btn btn-success btn-sm">
-                                <i class="fa fa-file-excel"></i>
-                                Excel
-                            </button>
+                            <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/penduduk/download'" table-id="penduduk" filename="data_penduduk" />
                         </div>
                     </div>
                 </div>
@@ -373,10 +370,6 @@ className: 'text-nowrap',
                 window.open(`{{ url('penduduk/cetak') }}?${$.param(penduduk.ajax.params())}`, '_blank');
             });
 
-            $('#download-excel').on('click', function() {
-                downloadExcel();
-            });
-
             $('select.select2-filter').each(function() {
                 $(this).select2({
                     width: '100%',
@@ -488,149 +481,5 @@ function getDataset(data, chart) {
                 value: val.total
             }));
         }
-
-        // Function to download Excel
-        async function downloadExcel() {
-            try {
-                const header = @include('layouts.components.header_bearer_api_gabungan');
-                // Check if there's data to download
-                const tableData = $('#penduduk').DataTable();
-                const info = tableData.page.info();
-                const totalData = info.recordsTotal;
-                if (totalData === 0) {
-                    Swal.fire({
-                        icon: 'warning',
-                        title: 'Tidak Ada Data',
-                        text: 'Tidak ada data penduduk untuk diunduh. Silakan periksa filter Anda.',
-                        confirmButtonText: 'OK'
-                    });
-                    return;
-                }
-
-                // Show loading state
-                const $btnExcel = $('#download-excel');
-                $btnExcel.prop('disabled', true).html(
-                    '<i class="fa fa-spinner fa-spin"></i> Downloading...');
-
-                // Prepare URL for download
-                const downloadUrl = new URL(
-                    `{{ config('app.databaseGabunganUrl') }}/api/v1/penduduk/download`);
-
-                // Gunakan fungsi data yang sama persis dengan DataTable untuk konsistensi
-                const filterParams = tableData.ajax.params();
-
-                // Remove pagination parameters since we want all data
-                delete filterParams['page[size]'];
-                delete filterParams['page[number]'];
-
-                // Handle umur filter - convert object to separate min/max parameters for backend
-                if (filterParams['filter[umur]'] && typeof filterParams['filter[umur]'] === 'object') {
-                    const umurObj = filterParams['filter[umur]'];
-
-                    // Create separate parameters for min and max
-                    if (umurObj.min && umurObj.min !== '') {
-                        filterParams['filter[umur][min]'] = umurObj.min;
-                    }
-                    if (umurObj.max && umurObj.max !== '') {
-                        filterParams['filter[umur][max]'] = umurObj.max;
-                    }
-                    if (umurObj.satuan) {
-                        filterParams['filter[umur][satuan]'] = umurObj.satuan;
-                    }
-
-                    // Remove the original object parameter
-                    delete filterParams['filter[umur]'];
-                }
-
-                // Convert filterParams to URLSearchParams for proper encoding
-                const urlParams = new URLSearchParams();
-                Object.keys(filterParams).forEach(key => {
-                    const value = filterParams[key];
-                    if (value !== null && value !== undefined && value !== '' && value !== 'null') {
-                        urlParams.append(key, value);
-                    }
-                });
-
-                urlParams.append('totalData', totalData);
-
-                // Make fetch request
-                const response = await fetch(downloadUrl, {
-                    method: 'POST',
-                    headers: {
-                        ...header,
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'Accept': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-                    },
-                    body: urlParams
-                });
-
-                if (!response.ok) {
-                    const errorText = await response.text();
-                    throw new Error(`HTTP ${response.status}: ${errorText}`);
-                }
-
-                // Check if response is actually a file
-                const contentType = response.headers.get('content-type');
-                if (!contentType || (!contentType.includes(
-                            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') && !
-                        contentType.includes('application/vnd.ms-excel'))) {
-                    throw new Error('Response is not a valid Excel file');
-                }
-
-                // Get filename from response headers or generate one
-                const contentDisposition = response.headers.get('content-disposition');
-                let filename = 'data_penduduk.xlsx';
-                if (contentDisposition) {
-                    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-                    if (matches != null && matches[1]) {
-                        filename = matches[1].replace(/['"]/g, '');
-                    }
-                } else {
-                    // Generate filename with timestamp
-                    const now = new Date();
-                    const timestamp = now.toISOString().slice(0, 19).replace(/[-:T]/g, '');
-                    filename = `data_penduduk_${timestamp}.xlsx`;
-                }
-
-                // Create blob and download
-                const blob = await response.blob();
-                const url = window.URL.createObjectURL(blob);
-                const a = document.createElement('a');
-                a.href = url;
-                a.download = filename;
-                document.body.appendChild(a);
-                a.click();
-                window.URL.revokeObjectURL(url);
-                document.body.removeChild(a);
-
-                // Show success message
-                Swal.fire({
-                    icon: 'success',
-                    title: 'Berhasil!',
-                    text: `File Excel "${filename}" berhasil diunduh`,
-                    timer: 3000,
-                    showConfirmButton: false
-                });
-
-            } catch (error) {
-                console.error('Download error:', error);
-
-                // Show error message with SweetAlert
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Gagal Download!',
-                    html: `
-                            <p>Terjadi kesalahan saat mengunduh file Excel:</p>
-                            <p><small>${error.message}</small></p>
-                            <p>Silakan coba lagi atau hubungi administrator.</p>
-                        `,
-                    confirmButtonText: 'OK'
-                });
-            } finally {
-                // Reset button state
-                const $btnExcel = $('#download-excel');
-                $btnExcel.prop('disabled', false).html('<i class="fa fa-file-excel"></i> Excel');
-            }
-        }
     </script>
 @endsection

From 10733073bd299013da288c957afbd9cfb14affaf Mon Sep 17 00:00:00 2001
From: ahmad afandi <ahmad.afandi85@gmail.com>
Date: Thu, 14 Aug 2025 14:35:39 +0700
Subject: [PATCH 2/3] perbaikan cetak

---
 resources/views/bantuan/cetak.blade.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/views/bantuan/cetak.blade.php b/resources/views/bantuan/cetak.blade.php
index b006ffed0..2c67f42c4 100644
--- a/resources/views/bantuan/cetak.blade.php
+++ b/resources/views/bantuan/cetak.blade.php
@@ -10,24 +10,23 @@
             try {
                 const headers = @include('layouts.components.header_bearer_api_gabungan');
                 var create_url = new URL({{ json_encode(config('app.databaseGabunganUrl')) }} + '/api/v1/bantuan/cetak');
-
+    
                 create_url.searchParams.set('kode_kecamatan', {{ json_encode(session('kecamatan.kode_kecamatan') ?? '') }});
                 create_url.searchParams.set('config_desa', {{ json_encode(session('desa.id') ?? '') }});
-
+    
                 @foreach ($filter as $key => $value)
-                    create_url.searchParams.append('filter[{{ $key }}]', {{ json_encode($value) }});
-                @endforeach
-
+                    create_url.searchParams.append('filter[{{ $key }}]', {{ json_encode($value) }}); @endforeach
+    
                 const response = await fetch(create_url.href, {
                     method: 'GET',
                     headers: headers
                 });
-
+    
                 if (!response.ok) throw new Error('Gagal mengambil data');
-
+    
                 const result = await response.json();
                 this.data = result.data;
-
+    
                 await $nextTick();
                 window.print();
             } catch (error) {
@@ -40,6 +39,7 @@
             <thead>
                 <tr class="border thick">
                     <th class="padat">No</th>
+                    <th class="padat">Nama {{ config('app.sebutanDesa') }}</th>
                     <th class="padat">Nama Program</th>
                     <th class="padat">Asal Dana</th>
                     <th class="padat">Jumlah Peserta</th>
@@ -52,6 +52,7 @@
                 <template x-for="(value, index) in data">
                     <tr>
                         <td class="padat" x-text="index+1"></td>
+                        <td x-text="value.attributes.nama_desa"></td>
                         <td x-text="value.attributes.nama"></td>
                         <td x-text="value.attributes.asaldana"></td>
                         <td x-text="value.attributes.jumlah_peserta"></td>

From bdea0dc026ebf15057564484c2454a421f4f6cab Mon Sep 17 00:00:00 2001
From: Abah Roland <59082428+vickyrolanda@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:31:03 +0700
Subject: [PATCH 3/3] [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 e43946ab4..61b4bfb98 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -6,6 +6,7 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu
 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.
 4. [#777](https://github.com/OpenSID/OpenKab/issues/777) Penambahan statistik pekerja migran penduduk.
+5. [#796](https://github.com/OpenSID/OpenKab/issues/796) Penambahan kolom nama desa pada halaman menu bantuan OpenKab.
 
 #### Perbaikan BUG