From 82593296442a54208e7acfb16ba07e60733d1224 Mon Sep 17 00:00:00 2001
From: ahmad afandi <ahmad.afandi85@gmail.com>
Date: Fri, 15 Aug 2025 07:30:40 +0700
Subject: [PATCH 1/4] Tambahkan kolom nama desa pada halaman ketenagakerjaan di
 OpenKab

---
 app/Http/Controllers/DataPokokController.php  |   5 +
 .../views/components/print-button.blade.php   |  69 +++++++
 .../ketenagakerjaan/cetak.blade.php           |  73 +++++++
 .../ketenagakerjaan/index.blade.php           | 182 ++++++++++--------
 routes/web.php                                |   8 +-
 5 files changed, 247 insertions(+), 90 deletions(-)
 create mode 100644 resources/views/components/print-button.blade.php
 create mode 100644 resources/views/data_pokok/ketenagakerjaan/cetak.blade.php

diff --git a/app/Http/Controllers/DataPokokController.php b/app/Http/Controllers/DataPokokController.php
index e6d4281ff..e8b06f16d 100644
--- a/app/Http/Controllers/DataPokokController.php
+++ b/app/Http/Controllers/DataPokokController.php
@@ -70,6 +70,11 @@ public function ketenagakerjaan()
         return view('data_pokok.ketenagakerjaan.index', ['title' => $title]);
     }
 
+    public function cetakKetenagakerjaan(Request $request)
+    {
+        return view('data_pokok.ketenagakerjaan.cetak', ['filter' => $request->getQueryString()]);
+    }
+
     public function infrastruktur()
     {
         $title = 'Data Prasarana dan Sarana';
diff --git a/resources/views/components/print-button.blade.php b/resources/views/components/print-button.blade.php
new file mode 100644
index 000000000..8508118c9
--- /dev/null
+++ b/resources/views/components/print-button.blade.php
@@ -0,0 +1,69 @@
+{{-- resources/views/components/print-button.blade.php --}}
+@props([
+    'label' => 'Cetak',
+    'icon' => 'fa fa-print',
+    'variant' => 'btn-primary',
+    'size' => 'btn-sm',
+    'printUrl' => '',
+    'tableId' => '',
+    'filters' => [],
+    'additionalParams' => [],
+])
+
+@php
+    $buttonId = 'print-btn-' . $tableId;
+@endphp
+
+<button type="button" class="btn {{ $variant }} {{ $size }}" id="{{ $buttonId }}"
+    data-print-url="{{ $printUrl }}" data-table-id="{{ $tableId }}" data-filters="{{ json_encode($filters) }}"
+    data-additional-params="{{ json_encode($additionalParams) }}">
+    <i class="{{ $icon }}"></i>
+    {{ $label }}
+</button>
+
+<script nonce="{{ csp_nonce() }}">
+    document.addEventListener("DOMContentLoaded", function() {
+        const printButton = document.getElementById('{{ $buttonId }}');
+
+        if (printButton) {
+            printButton.addEventListener('click', function(e) {
+                e.preventDefault();
+
+                const printUrl = new URL(this.dataset.printUrl);
+                const tableId = this.dataset.tableId;
+                const filters = JSON.parse(this.dataset.filters || '{}');
+                const additionalParams = JSON.parse(this.dataset.additionalParams || '{}');
+
+                // Add filter parameters
+                Object.entries(filters).forEach(([filterId, paramName]) => {
+                    const filterElement = document.getElementById(filterId);
+                    if (filterElement && filterElement.value) {
+                        printUrl.searchParams.append(paramName, filterElement.value);
+                    }
+                });
+
+                // Add search parameter from DataTable
+                if (tableId) {
+                    const dataTable = $('#' + tableId).DataTable();
+                    // 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);
+                            }
+                        });
+                    }
+                }
+
+                // 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');
+            });
+        }
+    });
+</script>
diff --git a/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php b/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php
new file mode 100644
index 000000000..43264654c
--- /dev/null
+++ b/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php
@@ -0,0 +1,73 @@
+@extends('layouts.cetak.index')
+
+@section('title', 'Data Ketenagakerjaan')
+
+@section('content')
+    @include('partials.breadcrumbs')
+    <div x-data="{
+        data: {},
+        async retrievePosts() {
+            try {
+                const headers = @include('layouts.components.header_bearer_api_gabungan');
+                var create_url = new URL({{ json_encode(config('app.databaseGabunganUrl')) }} + '/api/v1/ketenagakerjaan');
+    
+                create_url.searchParams.set('kode_kecamatan', {{ json_encode(session('kecamatan.kode_kecamatan') ?? '') }});
+                create_url.searchParams.set('config_desa', {{ json_encode(session('desa.id') ?? '') }});
+    
+                // Get current URL parameters and add them to create_url
+                const currentUrl = new URL(window.location.href);
+                const urlParams = currentUrl.searchParams;
+    
+                // Add all search parameters from current URL
+                for (const [key, value] of urlParams.entries()) {
+                    if (value && value !== '' && value !== 'null') {
+                        create_url.searchParams.set(key, value);
+                    }
+                }
+    
+                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) {
+                console.error('Terjadi kesalahan:', error);
+                alert('Terjadi kesalahan saat mengambil data.');
+            }
+        }
+    }" x-init="retrievePosts">
+        <table class="border thick" id="tabel-penduduk">
+            <thead>
+                <tr class="border thick">
+                    <th class="padat">No</th>
+                    <th class="padat">Nama {{ config('app.sebutanDesa') }}</th>
+                    <th class="padat">NIK</th>
+                    <th class="padat">Pekerjaan</th>
+                    <th class="padat">Jabatan</th>
+                    <th class="padat">Jumlah Penghasilan</th>
+                    <th class="padat">Pelatihan</th>
+                </tr>
+            </thead>
+            <tbody>
+                <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.nik"></td>
+                        <td x-text="value.attributes.pekerjaan"></td>
+                        <td x-text="value.attributes.jabatan"></td>
+                        <td x-text="value.attributes.jumlah_penghasilan"></td>
+                        <td x-text="value.attributes.pelatihan"></td>
+                    </tr>
+                </template>
+            </tbody>
+        </table>
+    </div>
+@stop
diff --git a/resources/views/data_pokok/ketenagakerjaan/index.blade.php b/resources/views/data_pokok/ketenagakerjaan/index.blade.php
index c88c2bacb..e410b6edb 100644
--- a/resources/views/data_pokok/ketenagakerjaan/index.blade.php
+++ b/resources/views/data_pokok/ketenagakerjaan/index.blade.php
@@ -42,7 +42,14 @@
         <div class="col-lg-12">
             <div class="card card-outline card-primary">
                 <div class="card-header">
-                    <div class="float-left">{{ $title }}</div>
+                    <div>{{ $title }}</div>
+                    <div class="row">
+                        <div class="col-sm-3">
+                            <x-print-button :print-url="url('data-pokok/ketenagakerjaan/cetak')" table-id="ketenagakerjaan" :filter="[]" />
+                            <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/ketenagakerjaan/download'" table-id="ketenagakerjaan"
+                                filename="data_ketenagakerjaan" />
+                        </div>
+                    </div>
                 </div>
                 <div class="card-body">
                     <div class="table-responsive">
@@ -50,6 +57,7 @@
                             <thead>
                                 <tr>
                                     <th>No</th>
+                                    <th>Nama {{ config('app.sebutanDesa') }}</th>
                                     <th>NIK</th>
                                     <th>Pekerjaan</th>
                                     <th>Jabatan</th>
@@ -68,96 +76,100 @@
 
 @section('js')
     @include('data_pokok.ketenagakerjaan.chart')
-    <script nonce="{{ csp_nonce() }}"  >
+    <script nonce="{{ csp_nonce() }}">
         let data_grafik = [];
-    document.addEventListener("DOMContentLoaded", function(event) {
+        document.addEventListener("DOMContentLoaded", function(event) {
 
-        const header = @include('layouts.components.header_bearer_api_gabungan');
-        var url = new URL("{{ config('app.databaseGabunganUrl').'/api/v1/ketenagakerjaan' }}");
-        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-        url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
+            const header = @include('layouts.components.header_bearer_api_gabungan');
+            var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/ketenagakerjaan' }}");
+            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+            url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
 
-        var ketenagakerjaan = $('#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,
-                        "filter[kode_desa]": $("#kode_desa").val(),
-                    };
+            var ketenagakerjaan = $('#ketenagakerjaan').DataTable({
+                processing: true,
+                serverSide: true,
+                autoWidth: false,
+                ordering: false,
+                searchPanes: {
+                    viewTotal: false,
+                    columns: [0]
                 },
-                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;
+                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[kode_desa]": $("#kode_desa").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;
+                    },
                 },
-            },
-            columnDefs: [{
-                        targets: '_all',
-                        className: 'text-nowrap',
+                columnDefs: [{
+                    targets: '_all',
+                    className: 'text-nowrap',
+                }, ],
+                columns: [{
+                        data: null,
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.nama_desa",
+                        name: "nama_desa",
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.nik",
+                        name: "nik",
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.pekerjaan",
+                        name: "pekerjaan",
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.jabatan",
+                        name: "jabatan",
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.jumlah_penghasilan",
+                        name: "jumlah_penghasilan",
+                        orderable: false
+                    },
+                    {
+                        data: "attributes.pelatihan",
+                        name: "pelatihan",
+                        orderable: false
                     },
                 ],
-            columns: [{
-                    data: null,
-                    orderable: false
-                },
-                {
-                    data: "attributes.nik",
-                    name: "nik",
-                    orderable: false
-                },
-                {
-                    data: "attributes.pekerjaan",
-                    name: "pekerjaan",
-                    orderable: false
-                },
-                {
-                    data: "attributes.jabatan",
-                    name: "jabatan",
-                    orderable: false
-                },
-                {
-                    data: "attributes.jumlah_penghasilan",
-                    name: "jumlah_penghasilan",
-                    orderable: false
-                },
-                {
-                    data: "attributes.pelatihan",
-                    name: "pelatihan",
-                    orderable: false
-                },
-            ],
-        })
-        ketenagakerjaan.on('draw.dt', function() {
-            var PageInfo = $('#ketenagakerjaan').DataTable().page.info();
-            ketenagakerjaan.column(0, {
-                page: 'current'
-            }).nodes().each(function(cell, i) {
-                cell.innerHTML = i + 1 + PageInfo.start;
+            })
+            ketenagakerjaan.on('draw.dt', function() {
+                var PageInfo = $('#ketenagakerjaan').DataTable().page.info();
+                ketenagakerjaan.column(0, {
+                    page: 'current'
+                }).nodes().each(function(cell, i) {
+                    cell.innerHTML = i + 1 + PageInfo.start;
+                });
             });
-        });
-    })
+        })
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/routes/web.php b/routes/web.php
index f6b449f9c..4bdaa6f04 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -136,7 +136,6 @@
             Route::get('/detail/{no_kk}', 'show')->name('keluarga.detail');
         });
 
-
     // rtm
     Route::middleware(['permission:penduduk-read'])->controller(RtmController::class)
         ->prefix('rtm')
@@ -159,7 +158,9 @@
     Route::middleware(['permission:datapresisi-read'])->controller(DataPokokController::class)
         ->prefix('data-pokok')
         ->group(function () {
-            Route::middleware(['permission:datapokok-ketenagakerjaan-read'])->get('/ketenagakerjaan', 'ketenagakerjaan')->name('pendidikan');
+            Route::middleware(['permission:datapokok-ketenagakerjaan-read'])->get('/ketenagakerjaan', 'ketenagakerjaan')->name('ketenagakerjaan');
+            Route::middleware(['permission:datapokok-ketenagakerjaan-read'])->get('/ketenagakerjaan/cetak', 'cetakKetenagakerjaan');
+
             Route::middleware(['permission:datapokok-pendidikan-read'])->get('/pendidikan', 'pendidikan')->name('pendidikan');
             Route::middleware(['permission:datapokok-pariwisata-read'])->get('/pariwisata', 'pariwisata')->name('pariwisata');
             Route::middleware(['permission:datapokok-jaminan-sosial-read'])->get('/jaminan-sosial', 'jaminanSosial')->name('jaminan-sosial');
@@ -229,7 +230,6 @@
     });
 
     Route::prefix('data-presisi')->group(function () {
-
         Route::prefix('kesehatan')->group(function () {
             Route::get('/', [App\Http\Controllers\DataPresisiKesehatanController::class, 'index'])->name('data-pokok.data-presisi.index');
             Route::get('/detail', [App\Http\Controllers\DataPresisiKesehatanController::class, 'detail'])->name('data-pokok.data-presisi.detail');
@@ -237,7 +237,6 @@
         })
         ->middleware(['permission:datapresisi-kesehatan-read']);
 
-
         Route::prefix('seni-budaya')->group(function () {
             Route::get('/', [App\Http\Controllers\DataPresisiSeniBudayaController::class, 'index'])->name('data-pokok.data-presisi-seni-budaya.index');
             Route::get('/detail', [App\Http\Controllers\DataPresisiSeniBudayaController::class, 'detail'])->name('data-pokok.data-presisi-seni-budaya.detail');
@@ -272,7 +271,6 @@
             Route::get('cetak', [App\Http\Controllers\DataPresisiAdatController::class, 'cetak'])->name('data-pokok.data-presisi-adat.cetak');
         })
         ->middleware(['permission:datapresisi-adat-read']);
-
     });
 
     // Prodeskel

From c0d827b7797f731462580c4217bb00743dddda23 Mon Sep 17 00:00:00 2001
From: ahmad afandi <ahmad.afandi85@gmail.com>
Date: Fri, 15 Aug 2025 08:18:01 +0700
Subject: [PATCH 2/4] sesuaikan cetak

---
 resources/views/data_pokok/ketenagakerjaan/cetak.blade.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php b/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php
index 43264654c..f2a4166fe 100644
--- a/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php
+++ b/resources/views/data_pokok/ketenagakerjaan/cetak.blade.php
@@ -11,9 +11,6 @@
                 const headers = @include('layouts.components.header_bearer_api_gabungan');
                 var create_url = new URL({{ json_encode(config('app.databaseGabunganUrl')) }} + '/api/v1/ketenagakerjaan');
     
-                create_url.searchParams.set('kode_kecamatan', {{ json_encode(session('kecamatan.kode_kecamatan') ?? '') }});
-                create_url.searchParams.set('config_desa', {{ json_encode(session('desa.id') ?? '') }});
-    
                 // Get current URL parameters and add them to create_url
                 const currentUrl = new URL(window.location.href);
                 const urlParams = currentUrl.searchParams;
@@ -36,7 +33,7 @@
                 this.data = result.data;
     
                 await $nextTick();
-                //window.print();
+                window.print();
             } catch (error) {
                 console.error('Terjadi kesalahan:', error);
                 alert('Terjadi kesalahan saat mengambil data.');

From 08bb5f4d615e55771f545e7679a41122d7fe27c3 Mon Sep 17 00:00:00 2001
From: Abah Roland <59082428+vickyrolanda@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:37:59 +0700
Subject: [PATCH 3/4] [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 61b4bfb98..b12ca0016 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -7,6 +7,7 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu
 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.
+6. [#799](https://github.com/OpenSID/OpenKab/issues/799) Penambahan kolom nama desa pada beberapa halaman kesehatan di OpenKab.
 
 #### Perbaikan BUG
 

From 84f957d2962a28e516c6d7711e760f83fd2321b7 Mon Sep 17 00:00:00 2001
From: Abah Roland <59082428+vickyrolanda@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:48:11 +0700
Subject: [PATCH 4/4] [ci skip] memutahirkan catatan rilis

---
 catatan_rilis.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/catatan_rilis.md b/catatan_rilis.md
index b12ca0016..64fc31b04 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -8,6 +8,8 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu
 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.
 6. [#799](https://github.com/OpenSID/OpenKab/issues/799) Penambahan kolom nama desa pada beberapa halaman kesehatan di OpenKab.
+7. [#797](https://github.com/OpenSID/OpenKab/issues/797) Penambahan kolom nama desa pada halaman ketenagakerjaan di OpenKab.
+
 
 #### Perbaikan BUG