From a1b9b7af8631a660f67ba43a5dfb3a244a589f55 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 26 Sep 2025 10:55:27 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20refactor(ui):=20perbaikan=20styl?= =?UTF-8?q?ing=20form=20penilai=20&=20optimasi=20dashboard=20role-based?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Form Penilai: hapus spasi ganda di class CSS input currency/currency-format - Konsistensi class Tailwind: gunakan "w-full currency" & "w-full currency-format" - Hapus console.log tidak perlu, tambah debug log untuk parsing luas - Optimasi parsing input luas dengan parseFloat + regex sanitasi numerik - Dashboard: tambahkan pembatasan akses berdasarkan role (!penilai, !surveyor, !pemohon-ao, !pemohon-eo) - Perbaiki struktur HTML & urutan class Tailwind (grid, flex, spacing, alignment) - Optimalkan layout header, stats cards, & tabel dengan class yang konsisten - Hapus class CSS redundan & perbaiki konsistensi penamaan - Tingkatkan keamanan & UX dengan role-based access + struktur HTML lebih maintainable --- .../views/component/form-penilai.blade.php | 19 +- resources/views/dashboard/index.blade.php | 490 +++++++++--------- resources/views/debitur/index.blade.php | 112 ++-- .../views/laporan_permohonan/index.blade.php | 26 +- resources/views/permohonan/index.blade.php | 125 ++--- .../views/surveyor/components/tanah.blade.php | 117 +++-- 6 files changed, 452 insertions(+), 437 deletions(-) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index f0f7029..6e6c8f3 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -142,7 +142,7 @@ @@ -167,7 +167,7 @@
@@ -278,7 +278,7 @@ @@ -358,7 +358,7 @@ { - console.log(item); - const kategori = item.id.replace('luas_', ''); const luasInput = document.getElementById(`luas_${kategori}`); const nilaiInput = document.querySelector(`input[name="nilai_${kategori}_1"]`); const outputElement = document.querySelector(`input[name="nilai_${kategori}_2"]`); if (luasInput && nilaiInput && outputElement) { - const luas = parseInput(luasInput.value); + const luas = parseFloat(luasInput.value.replace(/[^0-9.]/g, '')) || 0; + console.log("a", luas); const nilai = parseInput(nilaiInput.value); const hasil = luas * nilai; diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 5b71ae7..d0e6e7e 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -1,139 +1,142 @@ @extends('layouts.main') @section('content') -
- -
-
-

- Dashboard -

-
- - Selamat datang, {{ auth()->user()->name }} -
-
-
-
- - -
- -
-
- - -
- - @foreach ($dashboard['count_resume'] as $status => $count) - @php - - $gradientFrom = $status === 'batal' ? 'from-red-50' : 'from-amber-50'; - $gradientTo = $status === 'batal' ? 'to-red-100' : 'to-amber-100'; - $borderColor = $status === 'batal' ? 'border-red-200' : 'border-amber-200'; - $iconBg = $status === 'batal' ? 'bg-red-500' : 'bg-amber-500'; - $iconColor = $status === 'batal' ? 'text-red-500' : 'text-amber-500'; - $textColor = $status === 'batal' ? 'text-red-800' : 'text-amber-800'; - $cardTitle = $status === 'batal' ? 'Batal dari Cabang' : 'Menunggu Keputusan Cabang'; - @endphp - -
-
-
-
- -
-

{{ $cardTitle }}

-
+ @if (!Auth::user()->hasRole(['penilai', 'surveyor', 'pemohon-ao', 'pemohon-eo'])) +
+ +
+
+

+ Dashboard +

+
+ + Selamat datang, {{ auth()->user()->name }}
-
-
-
-
-
-

Jabodetabek

- - {{ $count['jabodetabek']['count_report'] ?? 0 }} - -
-
- +
+
+
+ + +
+ +
+
+ + +
+ + @foreach ($dashboard['count_resume'] as $status => $count) + @php + + $gradientFrom = $status === 'batal' ? 'from-red-50' : 'from-amber-50'; + $gradientTo = $status === 'batal' ? 'to-red-100' : 'to-amber-100'; + $borderColor = $status === 'batal' ? 'border-red-200' : 'border-amber-200'; + $iconBg = $status === 'batal' ? 'bg-red-500' : 'bg-amber-500'; + $iconColor = $status === 'batal' ? 'text-red-500' : 'text-amber-500'; + $textColor = $status === 'batal' ? 'text-red-800' : 'text-amber-800'; + $cardTitle = $status === 'batal' ? 'Batal dari Cabang' : 'Menunggu Keputusan Cabang'; + @endphp + +
+
+
+
+ +
+

{{ $cardTitle }}

+
+
+
+
+
+
+
+

Jabodetabek

+ + {{ $count['jabodetabek']['count_report'] ?? 0 }} + +
+
+ +
-
-
-
-
-

Luar Jabodetabek

- - {{ $count['non-jabodetabek']['count_report'] ?? 0 }} - -
-
- +
+
+
+

Luar Jabodetabek

+ + {{ $count['non-jabodetabek']['count_report'] ?? 0 }} + +
+
+ +
-
- @endforeach + @endforeach -
- -
-
-
-
-
- -
-

Pendapatan Appraisal

-
- -
-
-
- + +
+
+
+
+
+ +
+

Pendapatan Appraisal

+
+ +
+
+
+
+
@foreach ($dashboard['count_pendapatan'] as $month => $data) - + - - @@ -141,153 +144,156 @@
+ class="px-4 py-3 text-xs font-semibold tracking-wider text-left text-gray-700 uppercase border-r border-gray-200"> Bulan + class="px-4 py-3 text-xs font-semibold tracking-wider text-center text-gray-700 uppercase border-r border-gray-200"> Jumlah + class="px-4 py-3 text-xs font-semibold tracking-wider text-center text-gray-700 uppercase"> Akumulasi
{{ ucfirst($month) }} + {{ $data['total_jumlah'] ?? '-' }} + {{ $data['total_akumulasi'] ?? '-' }}
+
+
+
+ + +
+ +
+
+
+
+ +
+

Laporan Internal

+
+
+
+
+ + + + + + + + + + + + + + + + @foreach ($dashboard['count_lpj_internal'] as $month => $regions) + + + + + + + + @endforeach + + +
+ Bulan + + Jabodetabek + + Luar Jabodetabek +
+ Laporan + + Debitur + + Laporan + + Debitur +
+ {{ ucfirst($month) }} + + {{ $regions['jabodetabek']['total_laporan'] ?? '-' }} + + {{ $regions['jabodetabek']['total_debiture'] ?? '-' }} + + {{ $regions['non-jabodetabek']['total_laporan'] ?? '-' }} + + {{ $regions['non-jabodetabek']['total_debiture'] ?? '-' }} +
+
+
+
+ + +
+
+
+
+ +
+

Laporan Eksternal

+
+
+
+
+ + + + + + + + + + @foreach ($dashboard['count_lpj_eksternal'] as $month => $data) + + + + + + + + + + + @endforeach + + +
+ Bulan + + Laporan + + Debitur +
+ {{ ucfirst($month) }} + + {{ $data['total_laporan'] ?? '-' }} + + {{ $data['total_debiture'] ?? '-' }} +
+
+
- -
- -
-
-
-
- -
-

Laporan Internal

-
-
-
-
- - - - - - - - - - - - - - - - @foreach ($dashboard['count_lpj_internal'] as $month => $regions) - - - - - - - - @endforeach - - -
- Bulan - - Jabodetabek - - Luar Jabodetabek -
- Laporan - - Debitur - - Laporan - - Debitur -
- {{ ucfirst($month) }} - - {{ $regions['jabodetabek']['total_laporan'] ?? '-' }} - - {{ $regions['jabodetabek']['total_debiture'] ?? '-' }} - - {{ $regions['non-jabodetabek']['total_laporan'] ?? '-' }} - - {{ $regions['non-jabodetabek']['total_debiture'] ?? '-' }} -
-
-
-
- - -
-
-
-
- -
-

Laporan Eksternal

-
-
-
-
- - - - - - - - - - @foreach ($dashboard['count_lpj_eksternal'] as $month => $data) - - - - - - - - - - - @endforeach - - -
- Bulan - - Laporan - - Debitur -
- {{ ucfirst($month) }} - - {{ $data['total_laporan'] ?? '-' }} - - {{ $data['total_debiture'] ?? '-' }} -
-
-
-
-
-
- - - - - - + + + + + @endif @endsection diff --git a/resources/views/debitur/index.blade.php b/resources/views/debitur/index.blade.php index aac8381..28a44fa 100644 --- a/resources/views/debitur/index.blade.php +++ b/resources/views/debitur/index.blade.php @@ -6,8 +6,9 @@ @section('content')
-
-
+
+

Daftar Debitur

@@ -20,7 +21,7 @@
Export to Excel - @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao'])) + @if (auth()->user()->hasAnyRole(['administrator', 'pemohon-ao'])) Tambah Debitur @endif
@@ -28,59 +29,57 @@
- +
- - - - - - - - - - - - - + + + + + + + + + + + +
- - - Cif - - - Nomor Rekening - - - Debitur - - - Cabang - - - Nomor ID - - - NPWP - - - Email - - - Phone - - - Alamat - - Action
+ + + Cif + + + Nomor Rekening + + + Debitur + + + Cabang + + + Nomor ID + + + NPWP + + + Phone + + + Alamat KTP + + Action
-
-
+
+
Show - per page + per page
-
+
@@ -97,9 +96,10 @@ @endpush - diff --git a/resources/views/laporan_permohonan/index.blade.php b/resources/views/laporan_permohonan/index.blade.php index 011e0f0..4de2700 100644 --- a/resources/views/laporan_permohonan/index.blade.php +++ b/resources/views/laporan_permohonan/index.blade.php @@ -5,9 +5,9 @@ @endsection @section('content') -
-
-
+
+
+

Laporan Permohonan

@@ -56,7 +56,7 @@
- +
+
@@ -66,6 +66,10 @@ Nomor Registrasi + Debitur + + Tanggal Permohonan @@ -98,13 +102,13 @@
-
-
+
+
Show - per + per page
-
+
@@ -144,6 +148,12 @@ nomor_registrasi: { title: 'Nomor Registrasi', }, + debiture: { + title: 'Debitur', + render: (item, data) => { + return data.debiture ? `${data.debiture.name} ${data.debiture.cif ? `(${data.debiture.cif})` : ''}` : ''; + }, + }, tanggal_permohonan: { title: 'Tanggal Permohonan', render: (item, data) => { diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index 7bc48de..54edaa9 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -5,11 +5,11 @@ @endsection @section('content') -
+
-
-
+
+

Daftar Permohonan

@@ -22,69 +22,70 @@
Export to Excel - @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao'])) - Tambah Permohonan + @if (auth()->user()->hasAnyRole(['administrator', 'pemohon-ao'])) + Tambah Permohonan + @endif
- +
- - - + + - + - + - + - + - + - + - + - + - - + + +
- - +
+ + Nomor Registrasi - + Nomor LPJ Lama - + Tanggal Permohonan - + User Pemohon - + Cabang Pemohon - + Debitur - + Tujuan Penilaian - + Status - + Keterangan - Action
Action
-
+ class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm"> +
Show - per page + per page
-
+
@@ -193,9 +194,9 @@ title: 'Status', render: (item, data) => { if (data.documents > 0) { - return `${data.status}`; + return `${data.status}`; } - return `Lengkapi Aset Jaminan`; + return `Lengkapi Aset Jaminan`; } }, @@ -215,7 +216,7 @@ actions: { title: 'Actions', render: (item, data) => { - let actionHtml = `
`; + let actionHtml = `
`; const hasRole = (roles) => roles.some(role => userRoles.includes(role)); if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') { @@ -259,13 +260,17 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" `; } - if (data.status !== 'done' && data.status !== 'batal' && hasRole(['administrator', 'pemohon-ao'])) { + if (data.status !== 'done' && data.status !== 'batal' && hasRole(['administrator', + 'pemohon-ao' + ])) { actionHtml += ` `; } - if (data.status === 'order' && hasRole(['administrator', 'pemohon-ao'])) { + if (data.status !== 'done' && data.status !== 'batal' && hasRole(['administrator', + 'pemohon-ao' + ])) { actionHtml += ` @@ -283,7 +288,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" let dataTable = new KTDataTable(element, dataTableOptions); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('input', function() { const searchValue = this.value.trim(); dataTable.search(searchValue, true); @@ -328,7 +333,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" cache: false, data: input_data, dataType: "json", - success: function (response) { + success: function(response) { console.log(response); if ('success' == response.status) { swal.fire('Sukses Menyetujui!', response.message, 'success').then( @@ -340,7 +345,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" } }, - error: function (response, textStatus, errorThrown) { + error: function(response, textStatus, errorThrown) { // var errors = response.responseJSON.errors; // console.log(errors); console.log(response); @@ -351,7 +356,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" Swal.fire({ title: 'Reschedule Jadwal Kunjungan', html: ` -
+

Yakin akan Reschedule Jadwal Kunjungan @@ -363,15 +368,15 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}"

- + + class="block px-4 py-2 w-full rounded-lg border border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm">
- +
@@ -418,7 +423,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" cache: false, data: data, dataType: "json", - success: function (response) { + success: function(response) { if (response.status === 'success') { Swal.fire('Sukses Reschedule!', response.message, 'success').then(() => { @@ -428,7 +433,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" Swal.fire('Error!', response.message, 'error'); } }, - error: function (response) { + error: function(response) { console.log(response); } }); @@ -460,7 +465,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" Swal.fire({ title: 'Reschedule Jadwal Kunjungan', html: ` -
+

Yakin akan Reschedule Jadwal Kunjungan @@ -472,20 +477,20 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}"

- + + class="block px-4 py-2 w-full rounded-lg border border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm">
- +
${note ? ` -

Catatan Reject: ${note}

- ` : ''} +

Catatan Reject: ${note}

+ ` : ''}
`, @@ -532,7 +537,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" cache: false, data: data, dataType: "json", - success: function (response) { + success: function(response) { if (response.status === 'success') { Swal.fire('Sukses Reschedule!', response.message, 'success').then( () => { @@ -542,7 +547,7 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}" Swal.fire('Error!', response.message, 'error'); } }, - error: function (response) { + error: function(response) { const errorMessage = response.responseJSON?.message || 'Terjadi kesalahan saat memproses data.'; Swal.fire('Error!', errorMessage, 'error'); diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php index 431532c..c47ab07 100644 --- a/resources/views/surveyor/components/tanah.blade.php +++ b/resources/views/surveyor/components/tanah.blade.php @@ -1,24 +1,23 @@ -
+
-

+

Analisa Tanah

-
+
@if (isset($permohonan->documents)) @foreach ($permohonan->documents as $item) @php - // 27 $total_luas_tanah = 0; $jenis_legalitas_jaminan_id = 0; - if (isset($item->detail)) { - $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3); + if (isset($item->details)) { + $total_luas_tanah = calculateTotalLuas($item->details, 'luas_tanah', 1, 27, 3); } @endphp -

{{ $total_luas_tanah }} m2

+

{{ $total_luas_tanah }} m2

@endforeach @endif
-
-
-
+
-
-
-
+
-
+
@if (isset($basicData['konturTanah'])) @foreach ($basicData['konturTanah'] as $item) -
- +
-
+
-
+
@if (isset($basicData['ketinggianTanah'])) @foreach ($basicData['ketinggianTanah'] as $item)
-
- +
-
+
-
-
-
+
-
+
@if (isset($basicData['posisiKavling'])) @php $selectedPosisiKavling = old( @@ -245,7 +244,7 @@ @endphp @foreach ($basicData['posisiKavling'] as $item)
-
- +
-
+
-
-
-
+
-
-
-
+
-
+
@if (isset($basicData['kondisiFisikTanah'])) @foreach ($basicData['kondisiFisikTanah'] as $item) -
- +