From e2e3a93fb2e93d75a6ed1c9c79bd9ed77250305e Mon Sep 17 00:00:00 2001 From: ahmad afandi Date: Fri, 15 Aug 2025 08:17:04 +0700 Subject: [PATCH 1/4] awal --- app/Http/Controllers/DataPokokController.php | 5 + .../excel-download-button.blade.php | 205 ++++++++++++++++++ .../views/components/print-button.blade.php | 69 ++++++ .../data_pokok/pendidikan/cetak.blade.php | 70 ++++++ routes/web.php | 5 +- 5 files changed, 350 insertions(+), 4 deletions(-) create mode 100644 resources/views/components/excel-download-button.blade.php create mode 100644 resources/views/components/print-button.blade.php create mode 100644 resources/views/data_pokok/pendidikan/cetak.blade.php diff --git a/app/Http/Controllers/DataPokokController.php b/app/Http/Controllers/DataPokokController.php index e6d4281ff..95f9d106f 100644 --- a/app/Http/Controllers/DataPokokController.php +++ b/app/Http/Controllers/DataPokokController.php @@ -63,6 +63,11 @@ public function pendidikan() return view('data_pokok.pendidikan.index'); } + public function cetakPendidikan(Request $request) + { + return view('data_pokok.pendidikan.cetak', ['filter' => $request->getQueryString()]); + } + public function ketenagakerjaan() { $title = 'Data Pekerjaan dan Pelatihan'; 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' => '', +]) + + + +@once + @push('js') + + @endpush +@endonce 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 + + + + diff --git a/resources/views/data_pokok/pendidikan/cetak.blade.php b/resources/views/data_pokok/pendidikan/cetak.blade.php new file mode 100644 index 000000000..b514be398 --- /dev/null +++ b/resources/views/data_pokok/pendidikan/cetak.blade.php @@ -0,0 +1,70 @@ +@extends('layouts.cetak.index') + +@section('title', 'Data Pendidikan') + +@section('content') + @include('partials.breadcrumbs') +
+ + + + + + + + + + + + + + + +
NoNama {{ config('app.sebutanDesa') }}NIKPekerjaanJabatanJumlah PenghasilanPelatihan
+
+@stop diff --git a/routes/web.php b/routes/web.php index f6b449f9c..9133e78e9 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') @@ -161,6 +160,7 @@ ->group(function () { Route::middleware(['permission:datapokok-ketenagakerjaan-read'])->get('/ketenagakerjaan', 'ketenagakerjaan')->name('pendidikan'); Route::middleware(['permission:datapokok-pendidikan-read'])->get('/pendidikan', 'pendidikan')->name('pendidikan'); + Route::middleware(['permission:datapokok-pendidikan-read'])->get('/pendidikan/cetak', 'cetakPendidikan')->name('pendidikan.cetak'); 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'); Route::middleware(['permission:datapokok-jaminan-sosial-read'])->get('/jaminan-sosial/detail', 'detailJaminanSosial')->name('jaminan-sosial-detail'); @@ -229,7 +229,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 +236,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 +270,6 @@ Route::get('cetak', [App\Http\Controllers\DataPresisiAdatController::class, 'cetak'])->name('data-pokok.data-presisi-adat.cetak'); }) ->middleware(['permission:datapresisi-adat-read']); - }); // Prodeskel From 3b698a748fafaf111b18c963f6d4337600452774 Mon Sep 17 00:00:00 2001 From: ahmad afandi Date: Fri, 15 Aug 2025 09:49:52 +0700 Subject: [PATCH 2/4] Tambahkan kolom nama desa pada beberapa halaman pendidikan di OpenKab --- .../data_pokok/pendidikan/cetak.blade.php | 20 +- .../data_pokok/pendidikan/index.blade.php | 203 +++++++++--------- 2 files changed, 119 insertions(+), 104 deletions(-) diff --git a/resources/views/data_pokok/pendidikan/cetak.blade.php b/resources/views/data_pokok/pendidikan/cetak.blade.php index b514be398..de486b7d5 100644 --- a/resources/views/data_pokok/pendidikan/cetak.blade.php +++ b/resources/views/data_pokok/pendidikan/cetak.blade.php @@ -46,10 +46,12 @@ No Nama {{ config('app.sebutanDesa') }} NIK - Pekerjaan - Jabatan - Jumlah Penghasilan - Pelatihan + Pendidikan
dalam KK + Pendidikan
Sedang Ditempuh + Partisipasi Sekolah + Jenjang
dan Jenis
Pendidikan Tertinggi + Kelas Tertinggi + Ijazah Tertinggi @@ -58,10 +60,12 @@ - - - - + + + + + + diff --git a/resources/views/data_pokok/pendidikan/index.blade.php b/resources/views/data_pokok/pendidikan/index.blade.php index 11396de4b..ce7a7d981 100644 --- a/resources/views/data_pokok/pendidikan/index.blade.php +++ b/resources/views/data_pokok/pendidikan/index.blade.php @@ -42,7 +42,13 @@
-
Data Pendidikan Penduduk dan DTKS
+
Data Pendidikan Penduduk dan DTKS
+
+
+ + +
+
@@ -50,6 +56,7 @@ No + Nama {{ config('app.sebutanDesa') }} NIK Pendidikan dalam KK Pendidikan Sedang Ditempuh @@ -70,106 +77,110 @@ @section('js') @include('data_pokok.pendidikan.chart') - -@endsection \ No newline at end of file +@endsection From 4bfe343e61e65c8f2c594ade2bfbe88c9b987eed Mon Sep 17 00:00:00 2001 From: Abah Roland <59082428+vickyrolanda@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:14:20 +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 64fc31b04..04193cb80 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -9,6 +9,7 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu 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. +8. [#798](https://github.com/OpenSID/OpenKab/issues/798) Penambahan kolom nama desa pada beberapa halaman pendidikan di OpenKab. #### Perbaikan BUG From 160252eafeb11afbdd5850046b1cd538947d3b2a Mon Sep 17 00:00:00 2001 From: Abah Roland <59082428+vickyrolanda@users.noreply.github.com> Date: Mon, 25 Aug 2025 04:02:27 +0700 Subject: [PATCH 4/4] [ci skip] memtuahirkan catatan rilis --- catatan_rilis.md | 1 + 1 file changed, 1 insertion(+) diff --git a/catatan_rilis.md b/catatan_rilis.md index 04193cb80..841b34586 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -10,6 +10,7 @@ Di rilis ini, versi 2508.0.0 berisi penambahan dan perbaikan yang diminta penggu 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. 8. [#798](https://github.com/OpenSID/OpenKab/issues/798) Penambahan kolom nama desa pada beberapa halaman pendidikan di OpenKab. +9. [#798](https://github.com/OpenSID/OpenKab/issues/798) Penambahan kolom nama desa pada beberapa halaman pendidikan di OpenKab. #### Perbaikan BUG