diff --git a/resources/views/components/excel-download-button.blade.php b/resources/views/components/excel-download-button.blade.php
index 85ec96e5..a298c75b 100644
--- a/resources/views/components/excel-download-button.blade.php
+++ b/resources/views/components/excel-download-button.blade.php
@@ -69,7 +69,9 @@
 
                         // Prepare download URL
                         const url = new URL(downloadUrl);
-
+                        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+                        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+                        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");                
                         let urlParams = new URLSearchParams();
 
                         if (tableId) {
diff --git a/resources/views/components/print-button.blade.php b/resources/views/components/print-button.blade.php
index 8508118c..fb3c72fd 100644
--- a/resources/views/components/print-button.blade.php
+++ b/resources/views/components/print-button.blade.php
@@ -30,6 +30,9 @@
                 e.preventDefault();
 
                 const printUrl = new URL(this.dataset.printUrl);
+                printUrl.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+                printUrl.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+                printUrl.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");                
                 const tableId = this.dataset.tableId;
                 const filters = JSON.parse(this.dataset.filters || '{}');
                 const additionalParams = JSON.parse(this.dataset.additionalParams || '{}');
@@ -48,6 +51,7 @@
                     // Get filters/search from DataTable's ajax.params
                     if (typeof dataTable.ajax.params === 'function') {
                         const params = dataTable.ajax.params();
+                        
                         Object.entries(params).forEach(([key, value]) => {
                             if (value && value !== '' && value !== 'null') {
                                 printUrl.searchParams.append(key, value);
@@ -59,8 +63,7 @@
                 // Add additional static parameters
                 Object.entries(additionalParams).forEach(([key, value]) => {
                     printUrl.searchParams.append(key, value);
-                });
-
+                });                
                 // Open print URL in new window
                 window.open(printUrl.href, '_blank');
             });
diff --git a/resources/views/data_pokok/data_presisi/ketenagakerjaan/cetak.blade.php b/resources/views/data_pokok/data_presisi/ketenagakerjaan/cetak.blade.php
index 726c6dbf..956f96e4 100644
--- a/resources/views/data_pokok/data_presisi/ketenagakerjaan/cetak.blade.php
+++ b/resources/views/data_pokok/data_presisi/ketenagakerjaan/cetak.blade.php
@@ -17,8 +17,8 @@
             <tr class="border thick">
                 <th>NO</th>
                 <th>NIK</th>
-                <th>NOMOR KK</th>
-                <th>NAMA</th>
+                <th>NAMA KEPALA KELUARGA</th>
+                <th>JUMLAH ANGGOTA</th>
                 <th>JENIS PEKERJAAN</th>
                 <th>TEMPAT KERJA</th>
                 <th>FREKWENSI MENGIKUTI PELATIHAN SETAHUN</th>
@@ -38,7 +38,7 @@
             var filter = str.replace(/&amp;/g, '&')
             const header = @include('layouts.components.header_bearer_api_gabungan');
             $.ajax({
-                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/ketenagakerjaan' }}?${filter}`,
+                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/ketenagakerjaan/rtm' }}?${filter}`,
                 headers: header,
                 method: 'get',
                 success: function(json) {
@@ -48,8 +48,8 @@
                             <tr>
                                 <td class="padat">${no}</td>
                                 <td>${item.attributes.nik || 'N/A'}</td>
-                                <td>${item.attributes.no_kk || 'N/A'}</td>
-                                <td>${item.attributes.nama || 'N/A'}</td>
+                                <td>${item.attributes.kepala_keluarga || 'N/A'}</td>
+                                <td>${item.attributes.jumlah_anggota || 'N/A'}</td>
                                 <td>${item.attributes.jenis_pekerjaan || 'N/A'}</td>
                                 <td>${item.attributes.tempat_kerja || 'N/A'}</td>
                                 <td>${item.attributes.frekwensi_mengikuti_pelatihan_setahun || 'N/A'}</td>
diff --git a/resources/views/data_pokok/data_presisi/ketenagakerjaan/index.blade.php b/resources/views/data_pokok/data_presisi/ketenagakerjaan/index.blade.php
index 23a3e14a..6c7e40fd 100644
--- a/resources/views/data_pokok/data_presisi/ketenagakerjaan/index.blade.php
+++ b/resources/views/data_pokok/data_presisi/ketenagakerjaan/index.blade.php
@@ -3,107 +3,96 @@
 @section('title', $title)
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @push('css')
-   <style nonce="{{ csp_nonce() }}" >
-        .details {
-            margin-left: 20px;
-        }
-    </style>
+<style nonce="{{ csp_nonce() }}">
+    .details {
+        margin-left: 20px;
+    }
+</style>
 @endpush
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card card-outline card-primary">
-                <div class="card-body">
-                    <div class="chart" id="grafik">
-                        <canvas id="barChart"></canvas>
-                    </div>
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-body">
+                <div class="chart" id="grafik">
+                    <canvas id="barChart"></canvas>
                 </div>
             </div>
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>{{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
-                        </div>
+        </div>
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-presisi/ketenagakerjaan/cetak')" table-id="table-ketenagakerjaan" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/ketenagakerjaan/rtm/download'" table-id="table-ketenagakerjaan" filename="data_presisi_ketenagakerjaan" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="table-ketenagakerjaan">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Jenis Pekerjaan</th>
-                                    <th>Tempat Kerja</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="table-ketenagakerjaan">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Jenis Pekerjaan</th>
+                                <th>Tempat Kerja</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
-    @include('data_pokok.data_presisi.ketenagakerjaan.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-            var url = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/ketenagakerjaan/rtm' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-            url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
-            var dtks = $('#table-ketenagakerjaan').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+@include('data_pokok.data_presisi.ketenagakerjaan.chart')
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+        var url = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/ketenagakerjaan/rtm' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
+        var dtks = $('#table-ketenagakerjaan').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            ordering: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,
+                        "filter[search]": row.search.value,
+                        "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
+                        "config_desa": "{{ session('desa.id') ?? '' }}",
+                        "filter[tahun]": $('#filter-tahun').val(),
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,  
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "page[number]": (row.start / row.length) + 1,
-                            "filter[search]": row.search.value,
-                            "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
-                            "config_desa": "{{ session('desa.id') ?? '' }}",
-                            "filter[tahun]": $('#filter-tahun').val(),
-                        };
-                    },
-                    dataSrc: function(json) {
-                        if (json.data.length > 0) {
+                dataSrc: function(json) {
+                    if (json.data.length > 0) {
                         json.recordsTotal = json.meta.pagination.total
                         json.recordsFiltered = json.meta.pagination.total
                         data_grafik = [];
@@ -114,77 +103,76 @@
                         return json.data;
                     }
                     return false;
-                    },
                 },
-                columnDefs: [{
-                        targets: '_all',
-                        className: 'text-nowrap',
-                    },
-                ],
-                columns: [
-                    {
-                        data: function(data) {
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id' : data.id,
-                                'no_kartu_rumah': d.no_kk,
-                                'nama_kepala_keluarga': d.kepala_keluarga,
-                                'alamat': d.alamat,
-                                'jumlah_anggota': d.jumlah_anggota,
-                                'jumlah_kk': d.jumlah_kk,
-                            }
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
-                            const _url =  "{{ route('data-pokok.data-presisi-ketenagakerjaan.detail', ['data' => '__DATA__']) }}".replace('__DATA__', jsonData)
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+                        let d = data.attributes
+                        let obj = {
+                            'rtm_id': data.id,
+                            'no_kartu_rumah': d.no_kk,
+                            'nama_kepala_keluarga': d.kepala_keluarga,
+                            'alamat': d.alamat,
+                            'jumlah_anggota': d.jumlah_anggota,
+                            'jumlah_kk': d.jumlah_kk,
+                        }
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        const _url = "{{ route('data-pokok.data-presisi-ketenagakerjaan.detail', ['data' => '__DATA__']) }}".replace('__DATA__', jsonData)
+                        return `<a href="${_url}" title="Detail" data-button="Detail">
                                 <button type="button" class="btn btn-info btn-sm">Detail</button>
                             </a>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        orderable: false,
-                    },
-                    {
-                        data: "attributes.kepala_keluarga",
-                    },
-                    {
-                        data: "attributes.jumlah_anggota",
-                    },
-                    {
-                        data: "attributes.jenis_pekerjaan",
-                        render: (data) => data || 'N/A',
-                    },
-                    {
-                        data: "attributes.tempat_kerja",
-                        render: (data) => data || 'N/A',
                     },
-                    
-                ],
-            })
-            // Add event listener for opening and closing details
-            dtks.on('click', 'td.details-control', function () {
-                let tr = $(this).closest('tr');
-                let row = dtks.row(tr);
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
-            function format(data) {
-                return `
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    "orderable": false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.kepala_keluarga",
+                },
+                {
+                    data: "attributes.jumlah_anggota",
+                },
+                {
+                    data: "attributes.jenis_pekerjaan",
+                    render: (data) => data || 'N/A',
+                },
+                {
+                    data: "attributes.tempat_kerja",
+                    render: (data) => data || 'N/A',
+                },
+
+            ],
+        })
+        // Add event listener for opening and closing details
+        dtks.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = dtks.row(tr);
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
+
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>Frekwensi Mengikuti Pelatihan Setahun:</strong></td>
@@ -220,20 +208,20 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-            // Event listener for year filter change
-            $('#filter-tahun').on('change', function() {
-                dtks.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-            
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('data-pokok.data-presisi-ketenagakerjaan.cetak') }}";
-                let params = dtks.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string 
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
-        })
-    </script>
+        }
+        // Event listener for year filter change
+        $('#filter-tahun').on('change', function() {
+            dtks.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+
+        $('#cetak').on('click', function() {
+            let baseUrl = "{{ route('data-pokok.data-presisi-ketenagakerjaan.cetak') }}";
+            let params = dtks.ajax.params(); // Get DataTables params
+            let queryString = new URLSearchParams(params).toString(); // Convert params to query string 
+            window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
+        });
+    })
+</script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/data_pokok/data_presisi/pangan/cetak.blade.php b/resources/views/data_pokok/data_presisi/pangan/cetak.blade.php
index 0ab97e23..d50bb895 100644
--- a/resources/views/data_pokok/data_presisi/pangan/cetak.blade.php
+++ b/resources/views/data_pokok/data_presisi/pangan/cetak.blade.php
@@ -12,13 +12,13 @@
 
 @section('content')
     @include('partials.breadcrumbs')
-    <table class="border thick" id="tabel-sandang">
+    <table class="border thick" id="tabel-pangan">
         <thead>
             <tr class="border thick">
                 <th>NO</th>
                 <th>NIK</th>
-                <th>NOMOR KK</th>
-                <th>NAMA</th>
+                <th>NAMA KEPALA KELUARGA</th>
+                <th>JUMLAH ANGGOTA RTM</th>
                 <th>JENIS LAHAN</th>
                 <th>LUAS LAHAN</th>
                 <th>LUAS TANAM</th>
@@ -35,7 +35,7 @@
                 <th>FREKWENSI KONSUMSI BUAH PERHARI</th>
                 <th>FREKWENSI KONSUMSI DAGING PERHARI</th>
                 <th>TANGGAL PENGISIAN</th>
-                <th>STATUS PENGISIAN</th>
+                <th>STATUS PENGISIAN</th>                
             </tr>
         </thead>
         <tbody></tbody>
@@ -46,10 +46,11 @@
     <script nonce="{{ csp_nonce() }}"  >
         document.addEventListener("DOMContentLoaded", function(event) {
             var str = `{{ $filter }}`
-            var filter = str.replace(/&amp;/g, '&')
+            var filter = str.replace(/&amp;/g, '&').replace(/undefined/g, '')
+            
             const header = @include('layouts.components.header_bearer_api_gabungan');
             $.ajax({
-                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/pangan' }}?${filter}`,
+                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/pangan/rtm' }}?${filter}`,
                 headers: header,
                 method: 'get',
                 success: function(json) {
@@ -59,10 +60,10 @@
                             <tr>
                                 <td class="padat">${no}</td>
                                 <td>${item.attributes.nik || 'N/A'}</td>
-                                <td>${item.attributes.no_kk || 'N/A'}</td>
-                                <td>${item.attributes.nama || 'N/A'}</td>
+                                <td>${item.attributes.kepala_keluarga || 'N/A'}</td>
+                                <td>${item.attributes.jumlah_anggota || 'N/A'}</td>
                                 <td>${item.attributes.jenis_lahan || 'N/A'}</td>
-                                <td>${item.attributes.luas_lahan || 'N/A'}</td>
+                                <td>${item.attributes.luas_lahan || 'N/A'}</td> 
                                 <td>${item.attributes.luas_tanam || 'N/A'}</td>
                                 <td>${item.attributes.status_lahan || 'N/A'}</td>
                                 <td>${item.attributes.komoditi_utama_tanaman_pangan || 'N/A'}</td>
@@ -77,11 +78,10 @@
                                 <td>${item.attributes.frekwensi_konsumsi_buah_perhari || 'N/A'}</td>
                                 <td>${item.attributes.frekwensi_konsumsi_daging_perhari || 'N/A'}</td>
                                 <td>${item.attributes.tanggal_pengisian || 'N/A'}</td>
-                                <td>${item.attributes.status_pengisian || 'N/A'}</td>
-
+                                <td>${item.attributes.status_pengisian || 'N/A'}</td>                               
                             </tr>
                             `
-                        $('#tabel-sandang tbody').append(row)
+                        $('#tabel-pangan tbody').append(row)
                         no++;
                     })
                 }
diff --git a/resources/views/data_pokok/data_presisi/pangan/index.blade.php b/resources/views/data_pokok/data_presisi/pangan/index.blade.php
index bed0825c..4b799bfe 100644
--- a/resources/views/data_pokok/data_presisi/pangan/index.blade.php
+++ b/resources/views/data_pokok/data_presisi/pangan/index.blade.php
@@ -3,190 +3,177 @@
 @section('title', $title)
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @push('css')
-   <style nonce="{{ csp_nonce() }}" >
-        .details {
-            margin-left: 20px;
-        }
-    </style>
+<style nonce="{{ csp_nonce() }}">
+    .details {
+        margin-left: 20px;
+    }
+</style>
 @endpush
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card card-outline card-primary">
-                <div class="card-body">
-                    <div class="chart" id="grafik">
-                        <canvas id="barChart"></canvas>
-                    </div>
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-body">
+                <div class="chart" id="grafik">
+                    <canvas id="barChart"></canvas>
                 </div>
             </div>
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for ($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>
-                                        {{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
-                        </div>
+        </div>
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-presisi/pangan/cetak')" table-id="table-pangan" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/pangan/rtm/download'" table-id="table-pangan" filename="data_presisi_pangan" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="table-pangan">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Jenis Lahan</th>
-                                    <th>Luas Lahan</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="table-pangan">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Jenis Lahan</th>
+                                <th>Luas Lahan</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
-    @include('data_pokok.data_presisi.pangan.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-            var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/pangan/rtm' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-            url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
-            var dtks = $('#table-pangan').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+@include('data_pokok.data_presisi.pangan.chart')
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+        var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/pangan/rtm' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
+        var dtks = $('#table-pangan').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            ordering: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,
+                        "filter[search]": row.search.value,
+                        "filter[tahun]": $('#filter-tahun').val(),
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "page[number]": (row.start / row.length) + 1,
-                            "filter[search]": row.search.value,
-                            "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
-                            "config_desa": "{{ session('desa.id') ?? '' }}",
-                            "filter[tahun]": $('#filter-tahun').val(),
-                        };
-                    },
-                    dataSrc: function(json) {
-                        if (json.data.length > 0) {
-                            json.recordsTotal = json.meta.pagination.total
-                            json.recordsFiltered = json.meta.pagination.total
-                            data_grafik = [];
-                            json.data.forEach(function(item, index) {
-                                data_grafik.push(item.attributes)
-                            })
-                            grafikPie()
-                            return json.data;
-                        }
-                        return false;
-                    },
+                dataSrc: function(json) {
+                    // Set default values untuk recordsTotal dan recordsFiltered
+                    json.recordsTotal = json.meta?.pagination?.total || 0;
+                    json.recordsFiltered = json.meta?.pagination?.total || 0;
+                    if (json.data.length > 0) {
+                        data_grafik = [];
+                        json.data.forEach(function(item, index) {
+                            data_grafik.push(item.attributes)
+                        })
+                        grafikPie()
+                        return json.data;
+                    }
+                    return false;
                 },
-                columnDefs: [{
-                    targets: '_all',
-                    className: 'text-nowrap',
-                }, ],
-                columns: [{
-                        data: function(data) {
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id': data.id,
-                                'no_kartu_rumah': d.no_kk,
-                                'nama_kepala_keluarga': d.kepala_keluarga,
-                                'alamat': d.alamat,
-                                'jumlah_anggota': d.jumlah_anggota,
-                                'jumlah_kk': d.jumlah_kk,
-                            }
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
-                            const _url =
-                                "{{ route('data-pokok.data-presisi-pangan.detail', ['data' => '__DATA__']) }}"
-                                .replace('__DATA__', jsonData)
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+                        let d = data.attributes
+                        let obj = {
+                            'rtm_id': data.id,
+                            'no_kartu_rumah': d.no_kk,
+                            'nama_kepala_keluarga': d.kepala_keluarga,
+                            'alamat': d.alamat,
+                            'jumlah_anggota': d.jumlah_anggota,
+                            'jumlah_kk': d.jumlah_kk,
+                        }
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        const _url =
+                            "{{ route('data-pokok.data-presisi-pangan.detail', ['data' => '__DATA__']) }}"
+                            .replace('__DATA__', jsonData)
+                        return `<a href="${_url}" title="Detail" data-button="Detail">
                                 <button type="button" class="btn btn-info btn-sm">Detail</button>
                             </a>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        orderable: false,
-                    },
-                    {
-                        data: "attributes.kepala_keluarga",
-                    },
-                    {
-                        data: "attributes.jumlah_anggota",
-                    },
-                    {
-                        data: "attributes.jenis_lahan",
-                        render: (data) => data || 'N/A',
-                    },
-                    {
-                        data: "attributes.luas_lahan",
-                        render: (data) => data || 'N/A',
                     },
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    "orderable": false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.kepala_keluarga",
+                },
+                {
+                    data: "attributes.jumlah_anggota",
+                },
+                {
+                    data: "attributes.jenis_lahan",
+                    render: (data) => data || 'N/A',
+                },
+                {
+                    data: "attributes.luas_lahan",
+                    render: (data) => data || 'N/A',
+                },
 
-                ],
-            })
-            // Add event listener for opening and closing details
-            dtks.on('click', 'td.details-control', function() {
-                let tr = $(this).closest('tr');
-                let row = dtks.row(tr);
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
+            ],
+        })
+        // Add event listener for opening and closing details
+        dtks.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = dtks.row(tr);
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
 
-            function format(data) {
-                return `
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>Luas tanam:</strong></td>
@@ -262,20 +249,13 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-            // Event listener for year filter change
-            $('#filter-tahun').on('change', function() {
-                dtks.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('data-pokok.data-presisi-pangan.cetak') }}";
-                let params = dtks.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
-        })
-    </script>
-@endsection
+        }
+        // Event listener for year filter change
+        $('#filter-tahun').on('change', function() {
+            dtks.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+    })
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/dtks/sandang/cetak.blade.php b/resources/views/dtks/sandang/cetak.blade.php
index 472cab18..9381a1e5 100644
--- a/resources/views/dtks/sandang/cetak.blade.php
+++ b/resources/views/dtks/sandang/cetak.blade.php
@@ -41,7 +41,7 @@
 
             const header = @include('layouts.components.header_bearer_api_gabungan');
             $.ajax({
-                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/sandang' }}?${filter}`,
+                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/sandang/rtm' }}?${filter}`,
                 headers: header,
                 method: 'get',
                 success: function(json) {
@@ -52,8 +52,8 @@
                             <tr>
                                 <td class="padat">${no}</td>
                                 <td>${item.attributes.nik || 'N/A'}</td>
-                                <td>${item.attributes.no_kk || 'N/A'}</td>
-                                <td>${item.attributes.nama || 'N/A'}</td>
+                                <td>${item.attributes.kepala_keluarga || 'N/A'}</td>
+                                <td>${item.attributes.jumlah_anggota || 'N/A'}</td>
                                 <td>${item.attributes.jml_pakaian_yg_dimiliki || 'N/A'}</td>
                                 <td>${item.attributes.frekwensi_beli_pakaian_pertahun || 'N/A'}</td>
                                 <td>${item.attributes.jenis_pakaian || 'N/A'}</td>
@@ -61,9 +61,7 @@
                                 <td>${item.attributes.tmpt_cuci_pakaian || 'N/A'}</td>
                                 <td>${item.attributes.jml_pakaian_seragam || 'N/A'}</td>
                                 <td>${item.attributes.jml_pakaian_sembahyang || 'N/A'}</td>
-                                <td>${item.attributes.jml_pakaian_kerja || 'N/A'}</td>
-                                <td>${item.attributes.tanggal_pengisian || 'N/A'}</td>
-                                <td>${item.attributes.status_pengisian || 'N/A'}</td>
+                                <td>${item.attributes.jml_pakaian_kerja || 'N/A'}</td>                                
                             </tr>
                             `
 
diff --git a/resources/views/dtks/sandang/index.blade.php b/resources/views/dtks/sandang/index.blade.php
index fd805b41..6ad7372f 100644
--- a/resources/views/dtks/sandang/index.blade.php
+++ b/resources/views/dtks/sandang/index.blade.php
@@ -3,211 +3,182 @@
 @section('title', $title)
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @push('css')
-   <style nonce="{{ csp_nonce() }}" >
-        .details {
-            margin-left: 20px;
-        }
-    </style>
+<style nonce="{{ csp_nonce() }}">
+    .details {
+        margin-left: 20px;
+    }
+</style>
 @endpush
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card card-outline card-primary">
-                <div class="card-body">
-                    <div class="chart" id="grafik">
-                        <canvas id="barChart"></canvas>
-                    </div>
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-body">
+                <div class="chart" id="grafik">
+                    <canvas id="barChart"></canvas>
                 </div>
             </div>
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>{{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
-                        </div>
+        </div>
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-pokok/sandang/cetak')" table-id="table-dtks" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/sandang/rtm/download'" table-id="table-dtks" filename="data_presisi_sandang" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="table-dtks">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Jumlah Pakaian dimiliki</th>
-                                    <th>Frekwensi Beli Pakaian</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="table-dtks">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Jumlah Pakaian dimiliki</th>
+                                <th>Frekwensi Beli Pakaian</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
-    @include('dtks.sandang.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-
-
-            var url = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/sandang/rtm' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-
-            const desaKategoriId = parseInt("{{ session('desa.id') ?? '0' }}", 10);
-            url.searchParams.set("config_desa", isNaN(desaKategoriId) ? 0 : desaKategoriId);
-            // url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
-
-            var dtks = $('#table-dtks').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+@include('dtks.sandang.chart')
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+
+
+        var url = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/sandang/rtm' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");        
+
+        var dtks = $('#table-dtks').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            ordering: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,
+                        "filter[search]": row.search.value,
+                        "filter[tahun]": $('#filter-tahun').val(),                      
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,  
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "page[number]": (row.start / row.length) + 1,
-                            "filter[search]": row.search.value,
-                            "filter[tahun]": $('#filter-tahun').val(),
-                            // "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
-                            // "config_desa": "{{ session('desa.id') ?? '' }}",
-                        };
-                    },
-                    dataSrc: function(json) {
-                        // if (json.data.length > 0) {
-                        //     json.recordsTotal = json.meta.pagination.total
-                        //     json.recordsFiltered = json.meta.pagination.total
-                        //     data_grafik = [];
-                        //     json.data.forEach(function(item, index) {
-                        //         data_grafik.push(item.attributes)
-                        //     })
-                        //     grafikPie()
-                        //     return json.data;
-                        // }
-                        // return false;
+                dataSrc: function(json) {                   
 
-                        json.recordsTotal = json.meta?.pagination?.total || 0;
-                        json.recordsFiltered = json.meta?.pagination?.total || 0;
+                    json.recordsTotal = json.meta?.pagination?.total || 0;
+                    json.recordsFiltered = json.meta?.pagination?.total || 0;
 
-                        if (json.data && json.data.length > 0) {
-                            data_grafik = json.data.map(item => item.attributes);
-                            grafikPie();
-                        }
+                    if (json.data && json.data.length > 0) {
+                        data_grafik = json.data.map(item => item.attributes);
+                        grafikPie();
+                    }
 
-                        return json.data || [];
-                    },
+                    return json.data || [];
                 },
-                columnDefs: [{
-                        targets: '_all',
-                        className: 'text-nowrap',
-                    },
-                ],
-                columns: [
-                    {
-                        data: function(data) {
-
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id' : data.id,
-                                'no_kartu_rumah': d.no_kk,
-                                'nama_kepala_keluarga': d.kepala_keluarga,
-                                'alamat': d.alamat,
-                                'jumlah_anggota': d.jumlah_anggota,
-                                'jumlah_kk': d.jumlah_kk,
-                            }
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+
+                        let d = data.attributes
+                        let obj = {
+                            'rtm_id': data.id,
+                            'no_kartu_rumah': d.no_kk,
+                            'nama_kepala_keluarga': d.kepala_keluarga,
+                            'alamat': d.alamat,
+                            'jumlah_anggota': d.jumlah_anggota,
+                            'jumlah_kk': d.jumlah_kk,
+                        }
 
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
 
-                            const _url =  "{{ route('detail_datasandang', ['data' => '__DATA__']) }}".replace('__DATA__', jsonData)
+                        const _url = "{{ route('detail_datasandang', ['data' => '__DATA__']) }}".replace('__DATA__', jsonData)
 
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+                        return `<a href="${_url}" title="Detail" data-button="Detail">
                                 <button type="button" class="btn btn-info btn-sm">Detail</button>
                             </a>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        orderable: false,
-                    },
-                    {
-                        data: "attributes.kepala_keluarga",
                     },
-                    {
-                        data: "attributes.jumlah_anggota",
-                    },
-                    {
-                        data: "attributes.jumlah_pakaian_yang_dimiliki",
-                        render: (data) => data || 'N/A',
-                    },
-                    {
-                        data: "attributes.frekwensi_beli_pakaian",
-                        render: (data) => data || 'N/A',
-                    },
-                    
-                ],
-            })
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    "orderable": false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.kepala_keluarga",
+                },
+                {
+                    data: "attributes.jumlah_anggota",
+                },
+                {
+                    data: "attributes.jml_pakaian_yg_dimiliki",
+                    render: (data) => data || 'N/A',
+                },
+                {
+                    data: "attributes.frekwensi_beli_pakaian_pertahun",
+                    render: (data) => data || 'N/A',
+                },
 
-            // Add event listener for opening and closing details
-            dtks.on('click', 'td.details-control', function () {
-                let tr = $(this).closest('tr');
-                let row = dtks.row(tr);
+            ],
+        })
 
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
+        // Add event listener for opening and closing details
+        dtks.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = dtks.row(tr);
+
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
 
-            function format(data) {
-                return `
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>DTKS:</strong></td>
@@ -239,21 +210,21 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-
-            $('#filter-tahun').on('change', function() {
-                dtks.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('cetak_datasandang') }}";
-                let params = dtks.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
+        }
 
-        })
-    </script>
-@endsection
+        $('#filter-tahun').on('change', function() {
+            dtks.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+
+        $('#cetak').on('click', function() {
+            let baseUrl = "{{ route('cetak_datasandang') }}";
+            let params = dtks.ajax.params(); // Get DataTables params
+            let queryString = new URLSearchParams(params).toString(); // Convert params to query string
+            window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
+        });
+
+    })
+</script>
+@endsection
\ No newline at end of file