diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index b3c498f..3f21f73 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -82,7 +82,7 @@ class PenilaiController extends Controller public function sederhana(Request $request, $id) { - $documentId = $request->query('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $basicData = $this->surveyorController->getCommonData(); @@ -148,10 +148,15 @@ class PenilaiController extends Controller public function standar(Request $request, $id) { - $documentId = $request->query('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $basicData = $this->surveyorController->getCommonData(); $noLpSederhana = $this->generateNoLaporan($permohonan, $documentId, 'lpj'); @@ -218,6 +223,11 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'resume'); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); $noLpresume = $this->generateNoLaporan($permohonan, $documentId, 'resume'); @@ -253,6 +263,9 @@ class PenilaiController extends Controller $data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']); $permohonan = $data['permohonan']; + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } $nomorLaporan = $this->generateNoLaporan($permohonan, $req['documentId'], 'memo'); $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); @@ -388,10 +401,15 @@ class PenilaiController extends Controller { $permohonanId = $request->query('permohonanId'); - $documentId = $request->query('documentId'); + $documentId = $request->query('dokument'); $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } + $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'rap'); $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); @@ -470,6 +488,9 @@ class PenilaiController extends Controller $jaminanId = $request->query('jaminanId'); $provinces = Province::all(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); + if ($permohonan->status == 'proses-laporan') { + return redirect()->back()->with('error', 'Masih dalam proses laporan'); + } $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'call-report'); $basicData = $this->surveyorController->getCommonData(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 12b2cee..946ca13 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -36,7 +36,7 @@ Informasi dan pembanding