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

perbaikan nomor laporan di memo dan rap

Browse Source
This commit is contained in:
majid
2025-01-24 16:08:33 +07:00
parent 76209b31b5
commit 99fb76c5bc
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ class PenilaiController extends Controller
$data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']); $data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']);
$permohonan = $data['permohonan']; $permohonan = $data['permohonan'];
$noLpmemo = $this->generateNoLaporan($permohonan, $req['documentId'], 'memo'); $nomorLaporan = $this->generateNoLaporan($permohonan, $req['documentId'], 'memo');
$inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
$penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first(); $penilai = Penilai::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
$provinces = Province::all(); $provinces = Province::all();
@@ -323,7 +323,7 @@ class PenilaiController extends Controller
$jaminanId = $request->query('jaminanId'); $jaminanId = $request->query('jaminanId');
$provinces = Province::all(); $provinces = Province::all();
$permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
$noLpRAP = $this->generateNoLaporan($permohonan, $documentId, 'rap'); $nomorLaporan = $this->generateNoLaporan($permohonan, $documentId, 'rap');
$basicData = $this->surveyorController->getCommonData(); $basicData = $this->surveyorController->getCommonData();
$inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
Penilai::updateOrCreate( Penilai::updateOrCreate(

6
app/Http/Controllers/PenilaianController.php
View File

@@ -729,7 +729,9 @@ class PenilaianController extends Controller
if ($inspeksi) { if ($inspeksi) {
$forminspeksi = json_decode($inspeksi->data_form, true); $forminspeksi = json_decode($inspeksi->data_form, true);
} }
$noLpmemo = $this->penilaiController->generateNoLaporan($permohonan, $documentId, 'memo'); $nomorLaporan = $this->penilaiController->generateNoLaporan($permohonan, $documentId, $lpj->type_penilai);
$formFoto = $formPeta = $cities = $districts = $villages = $memo = null; $formFoto = $formPeta = $cities = $districts = $villages = $memo = null;
if ($lpj) { if ($lpj) {
@@ -762,7 +764,7 @@ class PenilaianController extends Controller
return redirect()->back()->with('error', 'Laporan belum dibuat'); return redirect()->back()->with('error', 'Laporan belum dibuat');
} }
return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','noLpmemo')); return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan'));
} }
private function getViewLaporan($tipe) private function getViewLaporan($tipe)

2
resources/views/penilai/components/memo.blade.php
View File

@@ -38,7 +38,7 @@
<label class="form-label max-w-56">Nomor Memo</label> <label class="form-label max-w-56">Nomor Memo</label>
<div class="flex flex-wrap items-base line w-full"> <div class="flex flex-wrap items-base line w-full">
<input type="text" name="nomor_memo" class="input w-full" placeholder="Masukkan..." <input type="text" name="nomor_memo" class="input w-full" placeholder="Masukkan..."
value="{{ $noLpmemo ?? '' }}" @readonly(true)> value="{{ $nomorLaporan ?? '' }}" @readonly(true)>
</div> </div>
</div> </div>
{{-- 250109828129/ --}} {{-- 250109828129/ --}}

2
resources/views/penilai/components/rap-penilai.blade.php
View File

@@ -42,7 +42,7 @@
<label class="form-label max-w-56">Nomor RAP</label> <label class="form-label max-w-56">Nomor RAP</label>
<div class="flex flex-wrap items-base line w-full"> <div class="flex flex-wrap items-base line w-full">
<input type="text" name="nomor_rap" class="input w-full" placeholder="Masukkan..." <input type="text" name="nomor_rap" class="input w-full" placeholder="Masukkan..."
value="{{ $noLpRAP ?? '' }}" @readonly(true)> value="{{ $nomorLaporan ?? '' }}" @readonly(true)>
</div> </div>
</div> </div>
{{-- 250109828129/ --}} {{-- 250109828129/ --}}