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

@@ -17,6 +17,10 @@ use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\Inspeksi;
use Modules\Lpj\Models\Penilai ;
use Modules\Location\Models\Province;
use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Village;
use Modules\Usermanagement\Models\User;
use Modules\Lpj\Http\Controllers\SurveyorController;
// use Modules\Lpj\Http\Controllers\PenilaiController;
@@ -630,9 +634,12 @@ class PenilaianController extends Controller
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
$basicData = $this->surveyorController->getCommonData();
$provinces = Province::all();
$inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
$lpj = Penilai::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
$lpj = Penilai::where('permohonan_id', $id)
->where('dokument_id', $documentId)
->where('inspeksi_id', $inspeksi->id)
->first();
$forminspeksi = null;
$lpjData = null;
@@ -643,8 +650,26 @@ class PenilaianController extends Controller
if ($lpj) {
$lpjData = json_decode($lpj->lpj, true);
}
$viewLaporan = $this->getViewLaporan($lpj->type_penilai);
return view('lpj::penilaian.laporan-so', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData'));
if (empty($viewLaporan)) {
return redirect()->back()->with('error', 'Laporan belum dibuat');
}
return view('lpj::'. $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces'));
}
private function getViewLaporan($tipe)
{
$viewMap = [
'sederhana' => 'penilai.components.lpj-sederhana-standard',
'standard' => 'penilai.components.lpj-sederhana-standard',
'resume' => 'penilai.components.resume',
'memo' => 'penilai.components.memo',
'rap' => 'penilai.components.rap-penilai'
];
return $viewMap[$tipe] ?? '';
}
public function storePenilaiLaporan(Request $request)