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

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-05-21 10:59:40 +07:00
parent 320dba9d9c 79e66226b0
commit 0e4c8760f8
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ class PenilaiController extends Controller
public function sederhana(Request $request, $id) public function sederhana(Request $request, $id)
{ {
$documentId = $request->query('documentId'); $documentId = $request->query('dokument');
$jaminanId = $request->query('jaminanId'); $jaminanId = $request->query('jaminanId');
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
$basicData = $this->surveyorController->getCommonData(); $basicData = $this->surveyorController->getCommonData();
@@ -148,7 +148,7 @@ class PenilaiController extends Controller
public function standar(Request $request, $id) public function standar(Request $request, $id)
{ {
$documentId = $request->query('documentId'); $documentId = $request->query('dokument');
$jaminanId = $request->query('jaminanId'); $jaminanId = $request->query('jaminanId');
$permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId); $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
@@ -401,7 +401,7 @@ class PenilaiController extends Controller
{ {
$permohonanId = $request->query('permohonanId'); $permohonanId = $request->query('permohonanId');
$documentId = $request->query('documentId'); $documentId = $request->query('dokument');
$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);

6
resources/views/penilai/components/lpj-sederhana-standar.blade.php
View File

@@ -23,7 +23,7 @@
@include('lpj::assetsku.includenya') @include('lpj::assetsku.includenya')
<form id="form-lpj" method="post" class="w-full grid gap-5"> <form id="form-lpj" method="post" class="w-full grid gap-5">
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}"> <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
<input type="hidden" name="dokument_id" value="{{ request('documentId') }}"> <input type="hidden" name="dokument_id" value="{{ request('dokument') }}">
<input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}"> <input type="hidden" name="nomor_registrasi" value="{{ $permohonan->nomor_registrasi }}">
<input type="hidden" id="lpj-data" value="{{ json_encode($lpjData ?? []) }}" /> <input type="hidden" id="lpj-data" value="{{ json_encode($lpjData ?? []) }}" />
@include('lpj::component.form-penilai') @include('lpj::component.form-penilai')
@@ -52,10 +52,10 @@
@endif @endif
@if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal', 'administrator']))
<a class="btn btn-info" <a class="btn btn-info"
href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('documentId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ request('dokument') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
Lampiran Foto dan Dokumen Lampiran Foto dan Dokumen
</a> </a>
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light" <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('dokument'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
> >
<i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
</a> </a>

10
resources/views/penilai/show.blade.php
View File

@@ -493,11 +493,11 @@
if (data.status === 'standar') { if (data.status === 'standar') {
showLoadingSwal('Tunggu ...'); showLoadingSwal('Tunggu ...');
window.location.href = window.location.href =
`{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
} else if (data.status === 'sederhana') { } else if (data.status === 'sederhana') {
showLoadingSwal('Tunggu ...'); showLoadingSwal('Tunggu ...');
window.location.href = window.location.href =
`{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
} }
} else { } else {
if (fasilitasKredit.toUpperCase() === 'KPR KERJASAMA') { if (fasilitasKredit.toUpperCase() === 'KPR KERJASAMA') {
@@ -556,10 +556,10 @@
if (data.success) { if (data.success) {
if (type === 'standar') { if (type === 'standar') {
window.location.href = window.location.href =
`{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; `{{ route('penilai.standar', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
} else if (type === 'sederhana') { } else if (type === 'sederhana') {
window.location.href = window.location.href =
`{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&jaminanId=${jaminanId}`; `{{ route('penilai.sederhana', $permohonan->id) }}?dokument=${documentId}&jaminanId=${jaminanId}`;
} }
} }
}); });
@@ -640,7 +640,7 @@
function rap(permohonanId, documentId, jaminanId) { function rap(permohonanId, documentId, jaminanId) {
showLoadingSwal('Tunggu ...'); showLoadingSwal('Tunggu ...');
window.location.href = window.location.href =
`{{ route('penilai.rap') }}?permohonanId=${permohonanId}&documentId=${documentId}&jaminanId=${jaminanId}`; `{{ route('penilai.rap') }}?permohonanId=${permohonanId}&dokument=${documentId}&jaminanId=${jaminanId}`;
} }