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

fix: update dokumentId and fix save penilai rap

Browse Source
This commit is contained in:
majid
2025-05-21 10:30:18 +07:00
committed by putrakuningan
parent 79e66226b0
commit 8fbc02bfff
13 changed files with 57 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ class PenilaiController extends Controller
public function sederhana(Request $request, $id)
{
$documentId = $request->query('dokument');
$documentId = $request->query('documentId');
$jaminanId = $request->query('jaminanId');
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
$basicData = $this->surveyorController->getCommonData();
@@ -148,7 +148,7 @@ class PenilaiController extends Controller
public function standar(Request $request, $id)
{
$documentId = $request->query('dokument');
$documentId = $request->query('documentId');
$jaminanId = $request->query('jaminanId');
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
@@ -401,7 +401,7 @@ class PenilaiController extends Controller
{
$permohonanId = $request->query('permohonanId');
$documentId = $request->query('dokument');
$documentId = $request->query('documentId');
$jaminanId = $request->query('jaminanId');
$provinces = Province::all();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
@@ -1153,20 +1153,9 @@ class PenilaiController extends Controller
{
DB::beginTransaction();
try {
$formRequest = new FormSurveyorRequest();
$formRequest->setContainer(app());
$formRequest->initialize(
$request->all(),
$request->query->all(),
$request->attributes->all(),
$request->cookies->all(),
$request->files->all(),
$request->server->all(),
$request->getContent()
);
$validated = $formRequest->validateResolved();
$result = $this->surveyorController->store($formRequest);
$validatedData = $request->all();
$result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request);
$data = [
'kepada' => $request->input('kepada'),
@@ -1431,7 +1420,7 @@ class PenilaiController extends Controller
}
// pengunaan request query by id permohonan, dokument, jaminan , inspeksi
// pengunaan request query by id permohonan, documentId, jaminan , inspeksi
protected function getRequestQueryId(Request $request)
{
return [

16
app/Http/Controllers/SurveyorController.php
View File

@@ -1556,11 +1556,11 @@ class SurveyorController extends Controller
{
$validated = $request->validate([
'dokument' => 'required',
'documentId' => 'required',
'jenis_jaminan' => 'required'
]);
$dokumentId = $validated['dokument'];
$dokumentId = $validated['documentId'];
$jaminanId = $validated['jenis_jaminan'];
$permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1644,11 +1644,11 @@ class SurveyorController extends Controller
public function denah(Request $request, $id)
{
$validated = $request->validate([
'dokument' => 'required',
'documentId' => 'required',
'jenis_jaminan' => 'required'
]);
$dokumentId = $validated['dokument'];
$dokumentId = $validated['documentId'];
$jaminanId = $validated['jenis_jaminan'];
$permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1672,11 +1672,11 @@ class SurveyorController extends Controller
public function foto(Request $request, $id)
{
$validated = $request->validate([
'dokument' => 'required',
'documentId' => 'required',
'jenis_jaminan' => 'required'
]);
$dokumentId = $validated['dokument'];
$dokumentId = $validated['documentId'];
$jaminanId = $validated['jenis_jaminan'];
$fotoObjekJaminan = FotoObjekJaminan::all();
@@ -1707,11 +1707,11 @@ class SurveyorController extends Controller
// Ambil data permohonan dengan eager loading
$validated = $request->validate([
'dokument' => 'required',
'documentId' => 'required',
'jenis_jaminan' => 'required'
]);
$dokumentId = $validated['dokument'];
$dokumentId = $validated['documentId'];
$jaminanId = $validated['jenis_jaminan'];
$permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);

2
app/Services/SaveFormInspesksiService.php
View File

@@ -122,7 +122,7 @@ class SaveFormInspesksiService
}
if ($hasFactaData) {
$rules = array_merge($rules, $this->getFactData($data, $request));
$rules = array_merge($rules, $this->getFactData($data, $request, $inspeksi));
}
return $rules;