From 2db123a386e499a9e975757661464717feab43ff Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 10 Nov 2025 17:27:23 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=A9=20feat(penilaian,=20otorisator):?= =?UTF-8?q?=20gunakan=20ambang=20NPW=20untuk=20approval=20dan=20rapikan=20?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Terapkan logika berbasis NPW (total_nilai_pasar_wajar) dari JSON LPJ untuk menentukan status approval pada PenilaianController (sekitar baris 517–533). - Senior Officer: status selesai jika NPW ≤ 1.000.000.000, selain itu masuk proses-laporan. - EO Appraisal: status selesai jika NPW ≤ 5.000.000.000, selain itu masuk proses-laporan. - DD Appraisal: tetap status selesai. - Ambil NPW dari json_decode($permohonan->penilaian->lpj) dan hilangkan pemisah ribuan dengan str_replace('.', '', $npw) . - Tampilkan tombol Otorisator di tampilan resources/views/penilaian/otorisator/show.blade.php berdasarkan ambang NPW: - EO: tombol muncul jika NPW > 1.000.000.000. - DD: tombol muncul jika NPW > 5.000.000.000. - Rapikan kelas Tailwind pada komponen card, header, body, grid dan fleksibelitas layout agar konsisten (reorder class, penyesuaian urutan dan semantik). - Perbaiki urutan icon dan teks pada tombol aksi agar konsisten (mis. mr-2 ki-filled ki-eye ). --- app/Http/Controllers/PenilaianController.php | 10 ++++- .../views/penilaian/otorisator/show.blade.php | 43 +++++++++++-------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 24a60bf..142dea2 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -517,12 +517,18 @@ class PenilaianController extends Controller $role = Auth::user()->roles[0]->name; $status = 'done'; $approvalField = null; + + $lpj_ = optional(json_decode($permohonan->penilaian->lpj)); + $npw = $lpj_->total_nilai_pasar_wajar ?? 0; + $npw = str_replace('.', '', $npw); + + if ($role === 'senior-officer') { $approvalField = 'approval_so'; - $status = in_array($permohonan->nilai_plafond_id, [3]) ? 'done' : 'proses-laporan'; + $status = $npw <=1000000000 ? 'done' : 'proses-laporan'; } elseif ($role === 'EO Appraisal') { $approvalField = 'approval_eo'; - $status = in_array($permohonan->nilai_plafond_id, [2, 1]) ? 'done' : 'proses-laporan'; + $status = $npw <=5000000000 ? 'done' : 'proses-laporan'; } elseif ($role === 'DD Appraisal') { $approvalField = 'approval_dd'; $status = 'done'; diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index ca79239..7930683 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -
+
@php $dataHeader = strtolower($header ?? ''); @@ -14,15 +14,15 @@ @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index']) @foreach ($permohonan->documents as $dokumen) -
+

Team

-
-
+
+
@php $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); @@ -33,11 +33,11 @@
-

+

{{ $surveyor->userPenilaiTeam->name }}

-

+

{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}

@@ -46,11 +46,11 @@
-

+

{{ $penilai->userPenilaiTeam->name }}

-

+

{{ checkRegionUserName($penilai->userPenilaiTeam->id) }}

@@ -65,7 +65,7 @@ @if ($permohonan->approval_so) -
+