daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-03-10 11:13:47 +07:00
parent bd801d3235 02d5e88a4e
commit ac667c2862
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/ActivityController.php
View File

@@ -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)

5
resources/views/component/form-penilai.blade.php
View File

@@ -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());
}
}