From 02d5e88a4e9a0d3aeb3dfd13441b9a1b9ff009be Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 10 Mar 2025 11:11:20 +0700 Subject: [PATCH] fix(penilai/so): perbaikkan nilai npw dan team activity pindah user atau region --- app/Http/Controllers/ActivityController.php | 12 ++++++------ resources/views/component/form-penilai.blade.php | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index abc1505..f0ad060 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -98,12 +98,12 @@ class ActivityController extends Controller $permohonan = Permohonan::findOrFail($permohonanId); // Validasi status permohonan - if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey') { - return response()->json([ - 'status' => 'error', - 'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.', - ]); - } + // if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey' && $permohonan->status !== 'survey' && $permohonan->status !== 'proses-laporan') { + // return response()->json([ + // 'status' => 'error', + // 'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.', + // ]); + // } // Ambil tim berdasarkan penilaian_id dan user_id $teams = PenilaianTeam::where('penilaian_id', $penilaianId) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 50824f6..c45ddf4 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -512,7 +512,10 @@ totalNilaiPasarLikuidasi.value = formatCurrency(totalNilaiPasarWajar.toString()); // Perhitungan Likuidasi - const hasilLikuidasi = (persentaseLikuidasi / 100) * totalNilaiPasarWajar; + const hasilLikuidasi = Math.ceil((persentaseLikuidasi / 100) * totalNilaiPasarWajar / 10) * 10; + + console.log('hasilLikuidasi', hasilLikuidasi); + totalLikuidasi.value = formatCurrency(hasilLikuidasi.toString()); } }