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

fix(so): perbaikan assigment bisa pindah region, dan perbaikan call report dan revisi dokumen admin dari so

Browse Source
This commit is contained in:
majid
2025-02-20 16:54:39 +07:00
parent 61c5690e38
commit 28295f5b85
14 changed files with 631 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/Http/Controllers/PenilaiController.php
View File

@@ -407,26 +407,26 @@ class PenilaiController extends Controller
$nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'call-report');
$basicData = $this->surveyorController->getCommonData();
$inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
// Penilai::updateOrCreate(
// [
// 'permohonan_id' => $permohonanId,
// 'dokument_id' => $documentId,
// 'inspeksi_id' => $inspeksiId,
// ],
// [
// 'type_penilai' => 'call-report',
// ]
// );
Penilai::updateOrCreate(
[
'permohonan_id' => $permohonanId,
'dokument_id' => $documentId,
'inspeksi_id' => $inspeksiId,
],
[
'type_penilai' => 'call-report',
]
);
// $resume = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
$call = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
// $lpjData = null;
// $rap = null;
// $forminspeksi = null;
// if ($resume) {
$forminspeksi = json_decode($inspeksi->data_form, true);
// $rap = json_decode($resume->rap, true);
// }
$callReport = null;
$forminspeksi = null;
if ($forminspeksi) {
$forminspeksi = json_decode($inspeksi->data_form, true);
$callReport = json_decode($call->call_report, true);
}
// Default: gunakan data dari debitur
$debitur = Debiture::find($permohonan->debiture_id);
@@ -460,10 +460,8 @@ class PenilaiController extends Controller
}
}
// return view('lpj::penilai.components.call-report', compact('permohonan', 'rap', 'provinces', 'cities',
// 'districts',
// 'villages','forminspeksi', 'noLpRAP', 'basicData','cekAlamat'));
return view('lpj::penilai.components.call-report', compact('permohonan', 'basicData', 'nomorLaporan', 'forminspeksi', 'cities', 'districts', 'villages', 'cekAlamat'));
return view('lpj::penilai.components.call-report', compact('permohonan', 'basicData', 'nomorLaporan', 'forminspeksi', 'cities', 'districts', 'villages', 'cekAlamat', 'callReport'));
}
/**
@@ -992,34 +990,34 @@ class PenilaiController extends Controller
{
try {
// DB::beginTransaction();
$validated = $request->validate([
'permohonan_id' => 'required|exists:permohonan,id',
'dokument_id' => 'required|exists:dokument,id',
'inspeksi_id' => 'required|exists:inspeksi,id',
'dokument_id' => 'required',
'inspeksi_id' => 'required',
'data' => 'required'
]);
DB::beginTransaction();
$data = $request->input('data');
Penilai::updateOrCreate(
[
'permohonan_id' => $request->permohonanId,
'dokument_id' => $request->documentId,
'inspeksi_id' => $request->inspeksiId,
'permohonan_id' => $validated['permohonan_id'],
'dokument_id' => $validated['dokument_id'],
'inspeksi_id' => $validated['inspeksi_id'],
],
[
'call-report' => json_encode($data),
'call_report' => json_encode($validated['data']),
]
);
DB::commit();
// DB::commit();
return response()->json([
'success' => true,
'message' => 'Berhasil menyimpan data',
'data' => $result
'data' => $data
], 200);
} catch (\Throwable $e) {
DB::rollBack();
// DB::rollBack();
return response()->json([
'success' => false,
'message' => 'Terjadi kesalahan saat menyimpan data',