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

Merge pull request 'feature/senior-officer' (#114) from feature/senior-officer into staging

Browse Source 
Reviewed-on: #114
This commit is contained in:
putrakuningan
2025-03-04 07:30:53 +01:00
parent fe3b1bebce cf45ac7cbe
commit 5c7c4ce739
20 changed files with 201 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,6 +763,22 @@ class PenilaiController extends Controller
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::findOrFail($id);
if ($permohonan->status === 'proses-laporan') {
return response()->json([
'success' => false,
'message' => 'Masih proses laporan',
], 400);
}
if ($permohonan->status === 'proses-paparan') {
return response()->json([
'success' => false,
'message' => 'Masih proses paparan',
]);
}
$permohonan->update([ $permohonan->update([
'status' => 'proses-laporan', 'status' => 'proses-laporan',
]); ]);
@@ -1322,7 +1338,7 @@ class PenilaiController extends Controller
public function generateNoLaporan($permohonan, $documentId, $type) public function generateNoLaporan($permohonan, $documentId, $type)
{ {
$typeMapping = ['lpj' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR']; $typeMapping = ['sederhana' => 'LPJ', 'standard' => 'LPJ', 'memo' => 'MAK', 'rap' => 'RAP', 'call-report' => 'CR'];
// Cek apakah data sudah ada // Cek apakah data sudah ada
$laporan = Laporan::where([ $laporan = Laporan::where([
@@ -1593,6 +1609,22 @@ class PenilaiController extends Controller
public function revisiSurveyor(Request $request, $id) public function revisiSurveyor(Request $request, $id)
{ {
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::findOrFail($id);
if ($permohonan->status === 'proses-laporan') {
return response()->json([
'success' => false,
'message' => 'Masih proses laporan',
], 400);
}
if ($permohonan->status === 'proses-paparan') {
return response()->json([
'success' => false,
'message' => 'Masih proses paparan',
], 400);
}
$permohonan->update([ $permohonan->update([
'status' => 'revisi-survey', 'status' => 'revisi-survey',
'keterangan' => $request->message, 'keterangan' => $request->message,

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

@@ -482,14 +482,14 @@ class PenilaianController extends Controller
$permohonan->update([ $permohonan->update([
'status_bayar' => $newStatus, 'status_bayar' => $newStatus,
'keterangan' => $request->message, 'keterangan' => $request->keterangan,
]); ]);
break; break;
case 'pembatalan': case 'pembatalan':
$permohonan->update([ $permohonan->update([
'status' => 'batal', 'status' => 'batal',
'keterangan' => $request->message, 'keterangan' => $request->keterangan,
]); ]);
break; break;
@@ -509,7 +509,7 @@ class PenilaianController extends Controller
} }
if ($approvalField) { if ($approvalField) {
$this->updatePermohonan($permohonan, $status, $approvalField, $request->message); $this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
} }
break; break;
@@ -559,11 +559,12 @@ class PenilaianController extends Controller
'status_so' => '1', 'status_so' => '1',
'approve_so' => Auth::user()->id, 'approve_so' => Auth::user()->id,
'approve_so_at' => now(), 'approve_so_at' => now(),
'keterangan_so' => $request->message, 'keterangan_so' => $request->keterangan,
]); ]);
$permohonan->update([ $permohonan->update([
'tanggal_paparan' => $request->tanggalPaparan 'tanggal_paparan' => $request->tanggalPaparan,
'keterangan' => $request->keterangan
]); ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2'; $status = '2';
@@ -578,7 +579,7 @@ class PenilaianController extends Controller
'status_eo' => '1', 'status_eo' => '1',
'approve_eo' => Auth::user()->id, 'approve_eo' => Auth::user()->id,
'approve_eo_at' => now(), 'approve_eo_at' => now(),
'keterangan_eo' => $request->message, 'keterangan_eo' => $request->keterangan,
]); ]);
} elseif (Auth::user()->roles[0]->name === 'DD Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_dd === null) { } elseif (Auth::user()->roles[0]->name === 'DD Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_dd === null) {
$authorization->update([ $authorization->update([
@@ -586,7 +587,7 @@ class PenilaianController extends Controller
'status_dd' => '1', 'status_dd' => '1',
'approve_dd' => Auth::user()->id, 'approve_dd' => Auth::user()->id,
'approve_dd_at' => now(), 'approve_dd_at' => now(),
'keterangan_dd' => $request->message, 'keterangan_dd' => $request->keterangan,
]); ]);
$permohonan->update([ $permohonan->update([
@@ -893,25 +894,27 @@ class PenilaianController extends Controller
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::findOrFail($id);
$userRole = Auth::user()->roles[0]->name; $userRole = Auth::user()->roles[0]->name;
if ($permohonan->status === 'proses-paparan' && in_array($userRole, ['EO Appraisal', 'DD Appraisal'])) { $authorization = Authorization::where('permohonan_id', $permohonan->id)
Authorization::delete([ ->where('jenis', 'paparan')->first();
'permohonan_id' => $permohonan->id,
'jenis' => 'paparan', if ($permohonan->status === 'proses-paparan') {
'request' => 'paparan', if ($authorization) {
]); $authorization->delete();
}
$status = 'revisi-paparan'; $status = 'revisi-paparan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') { } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
$permohonan->update([ $permohonan->update([
'approve_so' => null, 'approval_so' => 0,
'approve_so_at' => null, 'approval_so_at' => null,
]); ]);
$status = 'revisi-laporan'; $status = 'revisi-laporan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'DD Appraisal') { } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'DD Appraisal') {
$permohonan->update([ $permohonan->update([
'approve_so' => null, 'approval_so' => 0,
'approve_so_at' => null, 'approval_so_at' => null,
'approve_eo' => null, 'approval_eo' => 0,
'approve_eo_at' => null, 'approval_eo_at' => null,
]); ]);
$status = 'revisi-laporan'; $status = 'revisi-laporan';
@@ -925,7 +928,7 @@ class PenilaianController extends Controller
// Perbarui status dan informasi lainnya // Perbarui status dan informasi lainnya
$permohonan->update([ $permohonan->update([
'status' => $status, 'status' => $status,
'keterangan' => $request->message, 'keterangan' => $request->keterangan,
'submitted_at' => now(), 'submitted_at' => now(),
]); ]);

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

@@ -231,7 +231,7 @@ class RegistrasiController extends Controller
{ {
$permohonan = Permohonan::find($id); $permohonan = Permohonan::find($id);
$debitur = Debiture::find($permohonan->debiture_id); $debitur = Debiture::find($permohonan->debiture_id);
$documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); $documents = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur')); return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
} }

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

@@ -2007,7 +2007,21 @@ class SurveyorController extends Controller
'analisa_unit' => 'luas_unit', 'analisa_unit' => 'luas_unit',
}; };
$this->updateDetails($permohonan, $key, $request->input($key));
$jenis_jaminan_mapping = [
'luas_unit' => $request->input('jenis_legalistas_jaminan_unit_id'),
'luas_bangunan' => $request->input('jenis_legalistas_jaminan_bangunan_id'),
'luas_tanah' => $request->input('jenis_legalistas_jaminan_tanah_id'),
];
$jenis_jaminan_id = $jenis_jaminan_mapping[$key] ?? 0;
// dd($jenis_jaminan_id);
$inputValue = $request->input($key);
$cleanedValue = preg_replace('/\D/', '', $inputValue);
$this->updateDetails($permohonan, $key, $cleanedValue, $jenis_jaminan_id);
} }
return response()->json([ return response()->json([
@@ -2031,7 +2045,7 @@ class SurveyorController extends Controller
]); ]);
} }
private function updateDetails($permohonan, $key, $newValue) private function updateDetails($permohonan, $key, $newValue, $jenis_jaminan_id)
{ {
$document = $permohonan->documents->first(); $document = $permohonan->documents->first();
@@ -2039,7 +2053,12 @@ class SurveyorController extends Controller
throw new \Exception("Document not found"); throw new \Exception("Document not found");
} }
$detailsUpdate = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->first(); // dd($jenis_jaminan_id);
$detailsUpdate = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)
->where('jenis_legalitas_jaminan_id', $jenis_jaminan_id)
->first();
// dd($detailsUpdate);
if (!$detailsUpdate) { if (!$detailsUpdate) {
throw new \Exception("DetailDokumenJaminan not found"); throw new \Exception("DetailDokumenJaminan not found");
@@ -2055,7 +2074,7 @@ class SurveyorController extends Controller
if (array_key_exists($key, $datas)) { if (array_key_exists($key, $datas)) {
$datas[$key] = $newValue; $datas[$key] = $newValue;
} else { } else {
throw new \Exception("Key '{$key}' not found in details"); $datas[$key] = $newValue;
} }
// Simpan kembali ke database // Simpan kembali ke database

11
resources/views/laporan/index.blade.php
View File

@@ -194,6 +194,8 @@
let laporanButton = ''; let laporanButton = '';
let resumeButton = ''; let resumeButton = '';
if(data.penilai.resume) { if(data.penilai.resume) {
resumeButton = ` resumeButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-success"> <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-success">
@@ -203,7 +205,7 @@
if(data.nilai_liquidasi==null) { if(data.nilai_liquidasi==null) {
laporanButton = ` laporanButton = `
<a href="laporan/${data.id}" class="btn btn-sm btn-dark"> <a href="laporan/${data.id}" class="btn btn-sm btn-primary">
Laporan Laporan
</a>`; </a>`;
} }
@@ -211,19 +213,20 @@
if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) { if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) {
if(data.penilai.type_penilai=='resume' && !data.penilai.resume){ if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
laporanButton = ` laporanButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-dark"> <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-primary">
Laporan Laporan
</a>`; </a>`;
} else { } else {
laporanButton = ` laporanButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${typePenilaian}" class="btn btn-sm btn-dark"> <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${typePenilaian}" class="btn btn-sm btn-primary">
Laporan Laporan
</a>`; </a>`;
} }
} }
return `${resumeButton} ${laporanButton}`;
return `<div class="flex flex-wrap justify-end gap-1.5"> ${resumeButton} ${laporanButton} </div>`;
}, },
} }
}, },

14
resources/views/penilai/components/call-report.blade.php
View File

@@ -252,7 +252,7 @@
</div> </div>
</div> </div>
<div class="w-full grid grid-cols-1 lg:grid-cols-2 gap-4"> <div class="w-full grid grid-cols-1 lg:grid-cols-1 gap-4">
<!-- Bagian Nilai KJPP --> <!-- Bagian Nilai KJPP -->
<div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md"> <div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md">
@@ -293,7 +293,7 @@
</div> </div>
<!-- Bagian Nilai Internal --> <!-- Bagian Nilai Internal -->
<div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md"> <div class="card border border-agi-100 w-full bg-white rounded-lg shadow-md hidden">
<div class="card-header bg-agi-50"> <div class="card-header bg-agi-50">
<h1 class="text-md font-medium text-gray-900 uppercase">Nilai Internal</h1> <h1 class="text-md font-medium text-gray-900 uppercase">Nilai Internal</h1>
</div> </div>
@@ -505,23 +505,23 @@
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px"> <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()"> <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i> <i class="ki-filled ki-save-2"></i>
<span id="saveButtonText">Save</span> <span id="saveButtonText">Simpan</span>
</button> </button>
@endif @endif
@if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'EO Appraisal', 'DD Appraisal']))
<a class="btn btn-info" <a class="btn btn-info"
href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
LAMPIRAN FOTO DAN DOKUMEN Lampiran Foto dan Dokument
</a> </a>
<a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => request('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}"
class="btn btn-light"> class="btn btn-light">
<i class="ki-filled ki-printer"></i> Hasil Inspeksi <i class="ki-filled ki-printer"></i>Cetak Hasil Inspeksi
</a> </a>
<a class="btn btn-primary" <a class="btn btn-primary"
onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )"> onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
<i class="ki-filled ki-printer"></i> Print Laporan <i class="ki-filled ki-printer"></i> Cetak Laporan
</a> </a>
@endif @endif
</div> </div>

10
resources/views/penilai/components/lpj-sederhana-standard.blade.php
View File

@@ -45,23 +45,23 @@
</div> </div>
<div class="flex card-footer justify-end gap-5"> <div class="flex card-footer justify-end gap-5">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<button type="button" class="btn btn-primary" id="saveButton" onclick="saveLpjSederhanadanStandard()"> <button type="button" class="btn btn-primary" id="saveButton" onclick="saveLpjSederhanadanStandard()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i> <i class="ki-filled ki-save-2"></i>
<span id="saveButtonText">Save</span> <span id="saveButtonText">Simpan</span>
</button> </button>
@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={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
LAMPIRAN FOTO DAN DOKUMEN Lampiran Foto dan Dokument
</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('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
> >
<i class="ki-filled ki-printer"></i> Hasil Inspeksi <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
</a> </a>
<a class="btn btn-success" <a class="btn btn-success"
onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )"> onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
<i class="ki-filled ki-printer"></i> Print Laporan <i class="ki-filled ki-printer"></i> Cetak Laporan
</a> </a>
@endif @endif
</div> </div>

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

@@ -293,7 +293,7 @@
<div class="flex card-footer justify-end gap-5"> <div class="flex card-footer justify-end gap-5">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<a class="btn btn-primary" onclick="saveMemo()"> <a class="btn btn-primary" onclick="saveMemo()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i> <i class="ki-filled ki-save-2"></i>
Simpan Simpan
</a> </a>

8
resources/views/penilai/components/print-out-call-report.blade.php
View File

@@ -161,21 +161,21 @@
<tr> <tr>
<td style="width: 20%; padding: 2px;">Lelang ke</td> <td style="width: 20%; padding: 2px;">Lelang ke</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['lelang'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td> <td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ isset($report['nilai_pasar']) ? formatRupiah($report['nilai_pasar']) : '-' }}</td> <td style="width: 79%; padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;"> <td style="width: 20%; padding: 2px;">
Nilai Likuidasi Nilai Likuidasi
{{ isset($report['persentase_likuidasi']) ? '(' . $report['persentase_likuidasi'] . '%)' : '-' }} {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
</td> </td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;"> <td style="width: 79%; padding: 2px;">
{{ isset($report['hasil_nilai_likuidasi']) ? formatRupiah($report['hasil_nilai_likuidasi']) : '-' }} {{ isset($report['hasil_nilai_likuidasi_kjpp']) ? formatRupiah($report['hasil_nilai_likuidasi_kjpp']) : '-' }}
</td> </td>
</tr> </tr>

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

@@ -66,7 +66,7 @@
</div> </div>
<div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px"> <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()"> <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i> <i class="ki-filled ki-save-2"></i>
<span id="saveButtonText" >Save</span> <span id="saveButtonText" >Save</span>
<div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;" <div class="spinner-border spinner-border-sm text-light" role="status" style="display: none;"
@@ -78,15 +78,15 @@
@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={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1"> href="{{ route('penilai.lampiran') }}?permohonanId={{ request('permohonanId') }}&documentId={{ request('documentId') }}&inspeksiId={{ request('inspeksiId') }}&jaminanId={{ request('jaminanId') }}&statusLpj=1">
LAMPIRAN FOTO DAN DOKUMEN Lampiran Foto dan Dokument
</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('documentId'), 'jenis_jaminan_id' => request('jaminanId')]) }}" class="btn btn-light"
> >
<i class="ki-filled ki-printer"></i> Hasil Inspeksi <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
</a> </a>
<a class="btn btn-success" <a class="btn btn-success"
onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )"> onclick="checkLaporan('{{ $permohonan->id }}', '{{ request('documentId') }}', '{{ request('inspeksiId') }}', {{ request('jaminanId') }}, )">
<i class="ki-filled ki-printer"></i> Print Laporan <i class="ki-filled ki-printer"></i> Cetak Laporan
</a> </a>
@endif @endif
</div> </div>

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

@@ -424,7 +424,7 @@
<div class="flex card-footer justify-end gap-5"> <div class="flex card-footer justify-end gap-5">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator'])) @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<button type="button" class="btn btn-primary" onclick="saveResume()"> <button type="button" class="btn btn-primary" onclick="saveResume()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i> <i class="ki-filled ki-save-2"></i>
Simpan</button> Simpan</button>
@endif @endif

2
resources/views/penilai/index.blade.php
View File

@@ -191,7 +191,7 @@
actions: { actions: {
title: 'Action', title: 'Action',
render: (item, data) => { render: (item, data) => {
if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done') { if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan') {
return ` return `
<div class="flex flex-nowrap justify-center gap-1.5"> <div class="flex flex-nowrap justify-center gap-1.5">
<a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show"> <a class="btn btn-sm btn-outline btn-info" href="penilai/${data.id}/show">

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

@@ -336,9 +336,12 @@
@endforeach @endforeach
<div class="flex justify-start gap-5"> <div class="flex justify-start gap-5">
<a class="btn btn-success" onclick="savePenilai()"> <a class="btn btn-success" onclick="savePenilai()">
<i class="ki-filled ki-paper-plane"></i>
REPORT REPORT
</a> </a>
<a class="btn btn-warning" onclick="revisiSurveyor('{{ $permohonan->id }}', '{{$permohonan->debiture->name }}', '{{$permohonan->nomor_registrasi }}')">
<a class="btn btn-warning" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }} onclick="revisiSurveyor('{{ $permohonan->id }}', '{{$permohonan->debiture->name }}', '{{$permohonan->nomor_registrasi }}')">
<i class="ki-filled ki-arrow-circle-right"></i>
REVISI REVISI
</a> </a>
</div> </div>
@@ -630,6 +633,9 @@
// window.location.reload(); // window.location.reload();
hideLoadingSwal(); hideLoadingSwal();
toastrSuccessBuild(response.message); toastrSuccessBuild(response.message);
}else{
// hideLoadingSwal();
Swal.fire('Perhatian!', response.message, 'warning');
} }
}, },
error: function(xhr, status, error) { error: function(xhr, status, error) {

6
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -268,7 +268,7 @@
if (rejectResult.isConfirmed) { if (rejectResult.isConfirmed) {
handleAjaxRequest( handleAjaxRequest(
`/otorisator/revisi/${dataId}`, { `/otorisator/revisi/${dataId}`, {
message: rejectResult.value keterangan: rejectResult.value
}, },
'Data berhasil ditolak.', 'Data berhasil ditolak.',
'Terjadi kesalahan saat melakukan penolakan.' 'Terjadi kesalahan saat melakukan penolakan.'
@@ -370,10 +370,10 @@
).then((result) => { ).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
const requestData = isPaparanSO ? { const requestData = isPaparanSO ? {
message: result.value.message, keterangan: result.value.message,
tanggalPaparan: result.value.tanggalPaparan tanggalPaparan: result.value.tanggalPaparan
} : { } : {
message: result.value.message keterangan: result.value.message
}; };
handleAjaxRequest( handleAjaxRequest(

2
resources/views/penilaian/paparan-so.blade.php
View File

@@ -240,7 +240,7 @@
title: 'Tanggal Paparan', title: 'Tanggal Paparan',
render: (item, data) => { render: (item, data) => {
if(data.tanggal_paparan) { if(data.tanggal_paparan) {
return ` ${data?.keterangan} | ${window.formatTanggalIndonesia(data.tanggal_paparan)}`; return ` ${data?.authorization?.keterangan_so} | ${window.formatTanggalIndonesia(data.tanggal_paparan)}`;
} }
return "-"; return "-";

18
resources/views/surveyor/components/apartemen-kantor.blade.php
View File

@@ -13,21 +13,27 @@
@if (isset($permohonan->documents)) @if (isset($permohonan->documents))
@foreach ($permohonan->documents as $item) @foreach ($permohonan->documents as $item)
@php @php
$luas_units = 'N/A'; $luas_tanah = 0;
$jenis_legalitas_jaminan_id = 0;
if ($item->detail) { if ($item->detail) {
foreach ($item->detail as $luas) { foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->name === 'Sertifikat') { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) {
$jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
$details = json_decode($luas->details, true); $details = json_decode($luas->details, true);
$luas_units = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A'; $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0;
break; break;
} }
} }
} }
@endphp @endphp
<input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_units }}"> <input type="hidden"
<p class="text-2sm text-gray-700">{{ $luas_units }} m<sup>2</sup></p> id="jenis_legalistas_jaminan_unit_id"
@endforeach name="jenis_legalistas_jaminan_unit_id"
class="input" value="{{ $jenis_legalitas_jaminan_id }}">
<input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_tanah }}">
<p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
@endforeach
@endif @endif
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">

6
resources/views/surveyor/components/bangunan.blade.php
View File

@@ -14,9 +14,11 @@
@foreach ($permohonan->documents as $item) @foreach ($permohonan->documents as $item)
@php @php
$luas_bangunan = 0; $luas_bangunan = 0;
$jenis_legalitas_jaminan_id = 0;
if ($item->detail) { if ($item->detail) {
foreach ($item->detail as $luas) { foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 10) {
$jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
$details = json_decode($luas->details, true); $details = json_decode($luas->details, true);
$luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 0; $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 0;
break; break;
@@ -25,6 +27,10 @@
} }
@endphp @endphp
<input type="hidden"
id="jenis_legalistas_jaminan_bangunan_id"
name="jenis_legalistas_jaminan_bangunan_id"
class="input" value="{{ $jenis_legalitas_jaminan_id }}">
<input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}"> <input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}">
<p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p> <p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p>
@endforeach @endforeach

8
resources/views/surveyor/components/print-out/lingkungan.blade.php
View File

@@ -172,9 +172,9 @@
<td> <td>
<div class="checkbox-item"> <div class="checkbox-item">
<label class="checkbox-label"> <label class="checkbox-label">
<input type="radio" name="disekitar_lokasi" value="ya" <input type="radio" name="disekitar_lokasi" value="Telah ada bangunan"
{{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }}> {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya' ? 'checked' : '' }}>
Ya Telah ada bangunan
@if (($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya') @if (($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'ya')
- Kondisi Bangunan: - Kondisi Bangunan:
{{ $forminspeksi['lingkungan']['kondisi_bagunan_disekitar_lokasi'] ?? '' }} {{ $forminspeksi['lingkungan']['kondisi_bagunan_disekitar_lokasi'] ?? '' }}
@@ -183,9 +183,9 @@
@endif @endif
</label> </label>
<label class="checkbox-label"> <label class="checkbox-label">
<input type="radio" name="disekitar_lokasi" value="tidak" <input type="radio" name="disekitar_lokasi" value="Belum ada bangunan"
{{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak' ? 'checked' : '' }}> {{ ($forminspeksi['lingkungan']['disekitar_lokasi'] ?? '') == 'tidak' ? 'checked' : '' }}>
Tidak Belum ada bangunan
</label> </label>
</div> </div>
</td> </td>

6
resources/views/surveyor/components/tanah.blade.php
View File

@@ -14,9 +14,11 @@
@foreach ($permohonan->documents as $item) @foreach ($permohonan->documents as $item)
@php @php
$luas_tanah = 0; $luas_tanah = 0;
$jenis_legalitas_jaminan_id = 0;
if ($item->detail) { if ($item->detail) {
foreach ($item->detail as $luas) { foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) { if (isset($luas->name) && $luas->jenis_legalitas_jaminan_id === 1) {
$jenis_legalitas_jaminan_id = $luas->jenis_legalitas_jaminan_id;
$details = json_decode($luas->details, true); $details = json_decode($luas->details, true);
$luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0; $luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 0;
break; break;
@@ -24,6 +26,10 @@
} }
} }
@endphp @endphp
<input type="hidden"
id="jenis_legalistas_jaminan_tanah_id"
name="jenis_legalistas_jaminan_tanah_id"
class="input" value="{{ $jenis_legalitas_jaminan_id }}">
<input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}"> <input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}">
<p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p> <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>
@endforeach @endforeach

17
resources/views/surveyor/js/utils.blade.php
View File

@@ -352,9 +352,24 @@
const inputValue = document.getElementById(inputMap[params]).value; const inputValue = document.getElementById(inputMap[params]).value;
const data = { const data = {
[params === 'jenis_asset' ? 'jenis_asset' : params.replace('analisa_', 'luas_')]: inputValue, [params === 'jenis_asset' ? 'jenis_asset' : params.replace('analisa_', 'luas_')]: inputValue,
types: params types: params,
...(document.getElementById('jenis_legalistas_jaminan_bangunan_id') && {
jenis_legalistas_jaminan_bangunan_id: document.getElementById(
'jenis_legalistas_jaminan_bangunan_id').value
}),
...(document.getElementById('jenis_legalistas_jaminan_tanah_id') && {
jenis_legalistas_jaminan_tanah_id: document.getElementById('jenis_legalistas_jaminan_tanah_id')
.value
}),
...(document.getElementById('jenis_legalistas_jaminan_unit_id') && {
jenis_legalistas_jaminan_unit_id: document.getElementById('jenis_legalistas_jaminan_unit_id')
.value
})
}; };
console.log(data);
$.ajax({ $.ajax({
url: '{{ route('surveyor.update_analisa', ['id' => $permohonan->id]) }}', url: '{{ route('surveyor.update_analisa', ['id' => $permohonan->id]) }}',
type: 'POST', type: 'POST',