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

penambahan lampiran foto dokumen dan paparan di so dan ganti unit di jenis jaminan ruko rukan

Browse Source
This commit is contained in:
majid
2025-01-14 09:50:25 +07:00
parent 090bb618b1
commit 76c1a74c3a
18 changed files with 768 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,15 +44,15 @@ class PenilaiController extends Controller
/**
* Show the form for creating a new resource.
*/
public function lampiran(Request $request, $id)
public function lampiran(Request $request)
{
$permohonanId = $request->query('permohonanId');
$documentId = $request->query('documentId');
$jaminanId = $request->query('jaminanId');
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
$inpeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$inpeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
$formFoto = null;
if ($inpeksi) {
@@ -280,6 +280,7 @@ class PenilaiController extends Controller
$jaminanId = $request->query('jaminanId');
$provinces = Province::all();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$noLpRAP = $this->generateNoLaporan($permohonan, $documentId, 'rap');
$inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
Penilai::updateOrCreate(
[
@@ -302,7 +303,7 @@ class PenilaiController extends Controller
$rap = json_decode($resume->rap, true);
}
return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi'));
return view('lpj::penilai.components.rap-penilai', compact('permohonan', 'rap', 'provinces', 'forminspeksi', 'noLpRAP'));
}
@@ -756,6 +757,60 @@ class PenilaiController extends Controller
}
}
public function storeRap(Request $request){
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);
$data =[
'kepada' => $request->input('kepada'),
'dari' => $request->input('dari'),
'nomor_rap' => $request->input('nomor_rap'),
'tanggal' => $request->input('tanggal'),
'perihal' => $request->input('perihal')
];
Penilai::updateOrCreate(
[
'permohonan_id' => $request->permohonanId,
'dokument_id' => $request->documentId,
'inspeksi_id' => $request->inspeksiId,
],
[
'rap' => json_encode($data),
]
);
DB::commit();
return response()->json([
'success' => true,
'message' => 'Berhasil menyimpan LPJ',
'data' => $result
], 200);
} catch (\Throwable $e) {
DB::rollBack();
return response()->json([
'success' => false,
'message' => 'Terjadi kesalahan saat menyimpan LPJ',
'error' => $e->getMessage(),
'trace' => $e->getTraceAsString()
], 500);
}
}
public function print_out(Request $request)
@@ -794,6 +849,7 @@ class PenilaiController extends Controller
$lpjData = json_decode($lpj->lpj, true);
$memo = json_decode($lpj->memo, true);
$resumeData = json_decode($lpj->resume, true);
$rap = json_decode($lpj->rap, true);
}
$inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai'];
@@ -824,7 +880,8 @@ class PenilaiController extends Controller
'nomorLaporan',
'memo',
'resumeData',
'tanggalLaporan'
'tanggalLaporan',
'rap'
));
$pdf->setPaper('A4', 'portrait');
@@ -845,7 +902,8 @@ class PenilaiController extends Controller
'nomorLaporan',
'memo',
'resumeData',
'tanggalLaporan'
'tanggalLaporan',
'rap'
));
// return $pdf;

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

@@ -2763,7 +2763,7 @@ class SurveyorController extends Controller
'sensor_camera_recorder' => $data['sensor_camera_recorder'] ?? null,
'sensor_camera_recorder_input' => $data['sensor_camera_recorder_input'] ?? null,
'lcd' => $data['lcd'] ?? null,
'lcd_innput' => $data['lcd_innput'] ?? null,
'lcd_input' => $data['lcd_input'] ?? null,
'sabuk_keselamatan' => $data['sabuk_keselamatan'] ?? null,
'sabuk_keselamatan_input' => $data['sabuk_keselamatan_input'] ?? null,
'airbag' => $data['airbag'] ?? null,