diff --git a/app/Http/Controllers/DataPresisiJaminanSosialController.php b/app/Http/Controllers/DataPresisiJaminanSosialController.php new file mode 100644 index 00000000..c042c817 --- /dev/null +++ b/app/Http/Controllers/DataPresisiJaminanSosialController.php @@ -0,0 +1,25 @@ +filled('judul') ? htmlspecialchars(strip_tags($request->input('judul'))) : ''; + $colomn = ''; + + $filter = $request->input('filter'); + if (isset($filter['tipe'], $filter['nilai']) && $filter['tipe'] !== '' && $filter['nilai'] !== '') { + $colomn = $filter['tipe'] . ':' . $filter['nilai']; + } + + return view('data_pokok.data_presisi.jaminan_sosial.detail_data', [ + 'title' => $title, + 'colomn' => $colomn, + ]); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/StatistikJaminanSosialController.php b/app/Http/Controllers/StatistikJaminanSosialController.php index 02534e85..877ac224 100644 --- a/app/Http/Controllers/StatistikJaminanSosialController.php +++ b/app/Http/Controllers/StatistikJaminanSosialController.php @@ -2,12 +2,14 @@ namespace App\Http\Controllers; +use Illuminate\View\View; + class StatistikJaminanSosialController extends Controller { - public function index() + public function index(): View { return view('presisi.statistik.jaminan-sosial', [ - 'detailLink' => url(''), + 'detailLink' => url('data-presisi/jaminan-sosial/detail_data'), 'judul' => 'Jaminan Sosial' ]); } diff --git a/app/Http/Requests/DetailDataJaminanSosialRequest.php b/app/Http/Requests/DetailDataJaminanSosialRequest.php new file mode 100644 index 00000000..860223e6 --- /dev/null +++ b/app/Http/Requests/DetailDataJaminanSosialRequest.php @@ -0,0 +1,23 @@ + 'nullable|string', + 'filter' => 'nullable|array', + 'filter.tipe' => 'nullable|string', + 'filter.nilai' => 'nullable|string', + ]; + } +} \ No newline at end of file diff --git a/catatan_rilis.md b/catatan_rilis.md index 4105748d..cfc64a97 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -8,9 +8,10 @@ Di rilis ini, versi 2605.0.1 berisi penambahan dan perbaikan yang diminta penggu 4. [#1002](https://github.com/OpenSID/OpenKab/issues/1002) Buat Halaman Detail Pendidikan di Statistik Presisi 5. [#1001](https://github.com/OpenSID/OpenKab/issues/1001) Buat Halaman Detail Ketenagakerjaan di Statistik Presisi 6. [#1000](https://github.com/OpenSID/OpenKab/issues/1000) Buat Halaman Detail Keagamaan di Statistik Presisi -7. [#1021](https://github.com/OpenSID/OpenKab/issues/1021) Ubah field isi artikel menjadi rich editor -8. [#1025](https://github.com/OpenSID/OpenKab/issues/1025) Arahkan/Infokan pembuatan kategori artikel ketika kategori kosong saat membuat artikel opensid -9. [#1031](https://github.com/OpenSID/OpenKab/issues/1031) Arahkan/Infokan pembuatan kategori artikel ketika kategori kosong saat membuat artikel di pengaturan web -> artikel +7. [#1000](https://github.com/OpenSID/OpenKab/issues/1000) Buat Halaman Detail Jaminan Sosial di Statistik Presisi +8. [#1021](https://github.com/OpenSID/OpenKab/issues/1021) Ubah field isi artikel menjadi rich editor +9. [#1025](https://github.com/OpenSID/OpenKab/issues/1025) Arahkan/Infokan pembuatan kategori artikel ketika kategori kosong saat membuat artikel opensid +10. [#1031](https://github.com/OpenSID/OpenKab/issues/1031) Arahkan/Infokan pembuatan kategori artikel ketika kategori kosong saat membuat artikel di pengaturan web -> artikel diff --git a/resources/views/data_pokok/data_presisi/jaminan_sosial/detail_data.blade.php b/resources/views/data_pokok/data_presisi/jaminan_sosial/detail_data.blade.php new file mode 100644 index 00000000..c74310b3 --- /dev/null +++ b/resources/views/data_pokok/data_presisi/jaminan_sosial/detail_data.blade.php @@ -0,0 +1,143 @@ +@extends('layouts.index') + +@section('title', $title) + +@section('content_header') +

{{ $title }}

+@stop + +@section('content') +@include('partials.breadcrumbs') + +
+
+
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + +
NONIKNOMOR KKNAMAJENIS BANTUAN SOSIAL YANG PERNAH DITERIMAJENIS GANGGUAN MENTAL YANG DIDERITAJENIS PENANGANAN PENDERITA GANGGUAN MENTALTANGGAL PENGISIANSTATUS PENGISIAN
+
+
+
+
+
+@endsection + +@section('js') + +@endsection \ No newline at end of file diff --git a/resources/views/presisi/statistik/jaminan-sosial.blade.php b/resources/views/presisi/statistik/jaminan-sosial.blade.php index 23000126..29007785 100644 --- a/resources/views/presisi/statistik/jaminan-sosial.blade.php +++ b/resources/views/presisi/statistik/jaminan-sosial.blade.php @@ -9,366 +9,365 @@ @stop @section('content') - @include('partials.breadcrumbs') -
-
-
-
-

Statistik {{ $judul }}

-
- -
-
-
- +@include('partials.breadcrumbs') +
+
+
+
+

Statistik {{ $judul }}

+
+
+
+ +
-
-
-
-
-

+
+
+
+
+
+

+
+
+ + +
+
-
- - -
- -
-
- -
-
- -
+
+ +
+
+
-
-
-
-
-
- -
-
+
+
+
+
+
+
+
+
+
-
-
- -
-
+
+
+
+
+
-
- - - - - - - - - -
NoNilaiJumlah
-
+
+ + + + + + + + + +
NoNilaiJumlah
+
@endsection @section('js') - - @include('statistik.chart') - +@include('statistik.chart') + + }); + @endsection @push('css') - + @endpush \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 0b78f135..77d3ab16 100644 --- a/routes/web.php +++ b/routes/web.php @@ -318,6 +318,10 @@ }) ->middleware(['permission:datapresisi-ketenagakerjaan-read']); + Route::prefix('jaminan-sosial')->group(function () { + Route::get('/detail_data', [App\Http\Controllers\DataPresisiJaminanSosialController::class, 'detailData'])->name('data-pokok.data-presisi-jaminan-sosial.detail_data'); + }) + ->middleware(['permission:datapresisi-jaminan-sosial-read']); Route::prefix('aktivitas-keagamaan')->group(function () { Route::get('detail_data', [App\Http\Controllers\DataPresisiAktivitasKeagamaanController::class, 'detailData'])->name('data-pokok.data-presisi-aktivitas-keagamaan.detail_data'); }) diff --git a/tests/Feature/DataPresisiJaminanSosialControllerTest.php b/tests/Feature/DataPresisiJaminanSosialControllerTest.php new file mode 100644 index 00000000..f8bb37e4 --- /dev/null +++ b/tests/Feature/DataPresisiJaminanSosialControllerTest.php @@ -0,0 +1,72 @@ +get('/data-presisi/jaminan-sosial/detail_data'); + + $response->assertStatus(200); + $response->assertViewIs('data_pokok.data_presisi.jaminan_sosial.detail_data'); + $response->assertViewHas('title', ''); + $response->assertViewHas('colomn', ''); + } + + public function testDetailDataWithJudul() + { + $judul = ''; + $response = $this->get('/data-presisi/jaminan-sosial/detail_data?judul=' . urlencode($judul)); + + $response->assertStatus(200); + $response->assertViewIs('data_pokok.data_presisi.jaminan_sosial.detail_data'); + $response->assertViewHas('title', htmlspecialchars(strip_tags($judul))); + $response->assertViewHas('colomn', ''); + } + + public function testDetailDataWithFilter() + { + $filter = ['tipe' => 'status', 'nilai' => 'aktif']; + $response = $this->get('/data-presisi/jaminan-sosial/detail_data?filter[tipe]=' . $filter['tipe'] . '&filter[nilai]=' . $filter['nilai']); + + $response->assertStatus(200); + $response->assertViewIs('data_pokok.data_presisi.jaminan_sosial.detail_data'); + $response->assertViewHas('title', ''); + $response->assertViewHas('colomn', $filter['tipe'] . ':' . $filter['nilai']); + } + + public function testDetailDataWithBothParameters() + { + $judul = 'Test Title & More'; + $filter = ['tipe' => 'jenis', 'nilai' => 'BPJS']; + $response = $this->get('/data-presisi/jaminan-sosial/detail_data?judul=' . urlencode($judul) . '&filter[tipe]=' . $filter['tipe'] . '&filter[nilai]=' . $filter['nilai']); + + $response->assertStatus(200); + $response->assertViewIs('data_pokok.data_presisi.jaminan_sosial.detail_data'); + $response->assertViewHas('title', htmlspecialchars(strip_tags($judul))); + $response->assertViewHas('colomn', $filter['tipe'] . ':' . $filter['nilai']); + } + + public function testDetailDataWithEmptyFilter() + { + $response = $this->get('/data-presisi/jaminan-sosial/detail_data?filter[tipe]=&filter[nilai]='); + + $response->assertStatus(200); + $response->assertViewIs('data_pokok.data_presisi.jaminan_sosial.detail_data'); + $response->assertViewHas('title', ''); + $response->assertViewHas('colomn', ''); + } +} \ No newline at end of file