perbaikan laporan berdasarkan form inspeksi di so dan penilai dan perbaikan tambah data di jenis jaminan

This commit is contained in:
majid
2025-01-08 07:42:10 +07:00
parent fcc53a7111
commit 92ac480c9b
25 changed files with 2569 additions and 1477 deletions

View File

@@ -129,6 +129,16 @@ class PenilaiController extends Controller
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
Penilai::updateOrCreate(
[
'permohonan_id' => $permohonanId,
'dokument_id' => $documentId,
'inspeksi_id' => $inspeksiId,
],
[
'type_penilai' => 'resume',
]
);
$resume = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
@@ -157,6 +167,16 @@ class PenilaiController extends Controller
$penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
$provinces = Province::all();
$basicData = $this->surveyorController->getCommonData();
Penilai::updateOrCreate(
[
'permohonan_id' => $req['permohonanId'],
'dokument_id' => $req['documentId'],
'inspeksi_id' => $request->inspeksiId,
],
[
'type_penilai' => 'memo',
]
);
$formFoto = $formPeta = $cities = $districts = $villages = $memo = null;
if ($inspeksi) {
@@ -236,9 +256,19 @@ class PenilaiController extends Controller
$provinces = Province::all();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
Penilai::updateOrCreate(
[
'permohonan_id' => $permohonanId,
'dokument_id' => $documentId,
'inspeksi_id' => $inspeksiId,
],
[
'type_penilai' => 'rap',
]
);
$resume = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
$lpjData = null;
$rap = null;
$forminspeksi= null;
@@ -468,21 +498,24 @@ class PenilaiController extends Controller
}
public function saveStatusLpj(Request $request)
{
{
Penilai::updateOrCreate(
[
'permohonan_id' => $request->permohonan_id,
'dokument_id' => $request->document_id,
'inspeksi_id' => $request->inspeksi_id,
],
[
'type' => $request->type,
]
);
return response()->json(['success' => true]);
}
Penilai::updateOrCreate(
[
'permohonan_id' => $request->permohonan_id,
'dokument_id' => $request->document_id,
'inspeksi_id' => $request->inspeksi_id,
],
[
'type' => $request->type,
'type_penilai' => $request->type,
]
);
return response()->json(['success' => true]);
}
public function storePenilaian($id)
@@ -661,7 +694,7 @@ class PenilaiController extends Controller
$jaminanId = $request->query('jaminanId');
$permohonanId = $request->query('permohonanId');
$statusLpj = $request->query('statusLpj');
$tipeLaporan = $request->query('tipe');
$tipeLaporan = $request->query('type');
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId,
$documentId,
@@ -730,8 +763,8 @@ class PenilaiController extends Controller
$pdf->setPaper('A4', 'portrait');
return $pdf->stream();
} else {
$pdf = view('lpj::' . $viewLaporan, compact(
// $pdf = PDF::loadView('lpj::' . $viewLaporan, compact(
// $pdf = view('lpj::' . $viewLaporan, compact(
$pdf = PDF::loadView('lpj::' . $viewLaporan, compact(
'permohonan',
'forminspeksi',
'lpjData',
@@ -746,9 +779,8 @@ class PenilaiController extends Controller
'memo'
));
return $pdf;
// $pdf->setPaper('A4', 'portrait');
// return $pdf->download('laporan.pdf');
$pdf->setPaper('A4', 'portrait');
return $pdf->download('Laporan_'. $tipeLaporan . '_' . $permohonan->nomor_registrasi . '_' .$permohonan->debiture->name .'_data.pdf');
}
} catch (\Exception $e) {
@@ -767,7 +799,6 @@ class PenilaiController extends Controller
'memo' => 'penilai.components.print-memo',
'rap' => 'penilai.components.print-rap'
];
return $viewMap[$tipe] ?? 'penilai.components.print-resume';
}
@@ -828,4 +859,29 @@ class PenilaiController extends Controller
'inspeksiId' => $request->query('inspeksiId')
];
}
public function checkPrintOutLaporan(Request $request) {
$permohonanId = $request->query('permohonanId');
$documentId = $request->query('documentId');
$inspeksiId = $request->query('inspeksiId');
// Ambil data berdasarkan ID
$statusLpj = Penilai::where('permohonan_id', $permohonanId)
->where('dokument_id', $documentId)
->where('inspeksi_id', $inspeksiId)
->first();
// Jika data tidak ditemukan, kembalikan status null
if (!$statusLpj) {
return response()->json(['status' => null]);
}
// Tentukan tipe berdasarkan kondisi
$type = $statusLpj->type_penilai ?? null;
// Kembalikan respons dengan tipe yang sesuai
return response()->json(['status' => $type]);
}
}