diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php
index 220c55f..fe01afb 100644
--- a/resources/views/activity/activitydetail.blade.php
+++ b/resources/views/activity/activitydetail.blade.php
@@ -38,7 +38,7 @@
Pemohon:
- {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+ {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }}
@@ -85,7 +85,7 @@
Hasil Inspeksi
-
+
Print Laporan
@@ -100,4 +100,4 @@
@endsection
-@include('lpj::surveyor.js.utils')
+{{-- @include('lpj::surveyor.js.utils') --}}
diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php
index 57cc962..6ce66a6 100644
--- a/resources/views/activity/index.blade.php
+++ b/resources/views/activity/index.blade.php
@@ -208,11 +208,11 @@
title: 'Tanggal Permohonan'
},
user_id: {
- title: 'User Pemohon',
- render: (item, data) => {
- return data.user && data.user.name ? `${data.user.name}` : '-';
- },
- },
+ title: 'User Pemohon',
+ render: (item, data) => {
+ return data?.user?.name ?? data?.mig_nama_ao ?? '-';
+ }},
+
branch_id: {
title: 'Cabang Pemohon',
@@ -275,10 +275,10 @@
['survey', 'done', 'proses-laporan', 'laporan', 'paparan'].includes(status) ?
dokumenjaminan.map(dokumen => {
return `
-
-
-
- `;
+
+
+
+ `;
}).join('') : ''
}
diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index 9575154..679ae5e 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -9,7 +9,7 @@
- {!! $customlink ?? '' !!}
+ {!! $customlink ?? "" !!}
@if (isset($id))
@php
$parameters = isset($id) ? ['id' => $id] : [];
@@ -46,18 +46,18 @@
Pemohon:
- {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+ {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }}
- @if (isset($penawaran))
+ @if(isset($penawaran))
Nomor Penawaran:
- {{ $penawaran->code }}
-
+ {{ $penawaran->code }}
+
@@ -65,17 +65,18 @@
Nomor Penawaran:
- {{ $penawaran->tujuanPenilaianKjpp->name }}
-
+ {{ $penawaran->tujuanPenilaianKjpp->name }}
+
@else
+
Tujan Permohonan:
- {{ $permohonan->tujuanPenilaian->name }}
-
+ {{ $permohonan->tujuanPenilaian->name }}
+
@@ -83,8 +84,8 @@
Nilai Plafond:
- {{ $permohonan->nilaiPlafond->name }}
-
+ {{ $permohonan->nilaiPlafond->name ?? '' }}
+
@@ -93,8 +94,8 @@
- {{ str_replace('_', ' ', $permohonan->status_bayar) }}
-
+ {{ str_replace('_', ' ', $permohonan->status_bayar) }}
+
@endif
diff --git a/resources/views/component/detail-lokasi.blade.php b/resources/views/component/detail-lokasi.blade.php
new file mode 100644
index 0000000..8c2ef39
--- /dev/null
+++ b/resources/views/component/detail-lokasi.blade.php
@@ -0,0 +1,33 @@
+@if (is_array($details) && count($details) > 0)
+ @php $currentKey = ''; @endphp
+ @foreach ($details as $value)
+ @foreach ($value as $key => $item)
+
+ @if (!empty($item))
+
+ |
+ @if ($currentKey !== $key)
+ {{ formatLabel($key) }}
+ @endif
+ @php
+ if ($currentKey !== $key) {
+ $currentKey = $key;
+ }
+ @endphp
+ |
+ : |
+
+ @if (strpos(strtolower($key), 'tanggal') !== false)
+ {{ formatTanggalIndonesia($item) }}
+ @else
+ {{ $item }}
+ @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+ m²
+ @endif
+ @endif
+ |
+
+ @endif
+ @endforeach
+ @endforeach
+@endif
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index 6e6c8f3..d3103aa 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -76,24 +76,17 @@
@foreach ($kategoriUnik as $item)
@php
+ $luas = match ($item) {
+ 'bangunan' => $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ??
+ $forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null,
+ 'tanah' => $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ??
+ $forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null,
+ 'apartemen-kantor' => $forminspeksi['luas_unit']['sesuai'] ??
+ $forminspeksi['luas_unit']['tidak sesuai'] ?? null,
+ default => null,
+ };
- if ($item === 'bangunan') {
- $luas =
- $forminspeksi['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ??
- ($forminspeksi['bangunan']['luas_tanah_bagunan']['sesuai'] ?? null);
- } elseif ($item === 'tanah') {
- $luas =
- $forminspeksi['tanah']['luas_tanah']['tidak sesuai'] ??
- ($forminspeksi['tanah']['luas_tanah']['sesuai'] ?? null);
- } elseif ($item === 'apartemen-kantor') {
- $luas =
- $forminspeksi['luas_unit']['sesuai'] ??
- ($forminspeksi['luas_unit']['tidak sesuai'] ?? null);
- } else {
- $luas = null;
- }
$luas = old('luas_' . $item, $lpjData['luas_' . $item] ?? $luas);
-
$luasKey = 'luas_' . $item;
$nilaiKey1 = 'nilai_' . $item . '_1';
$nilaiKey2 = 'nilai_' . $item . '_2';
@@ -122,7 +115,8 @@
@@ -477,7 +471,6 @@
if (luasInput && nilaiInput && outputElement) {
const luas = parseFloat(luasInput.value.replace(/[^0-9.]/g, '')) || 0;
- console.log("a", luas);
const nilai = parseInput(nilaiInput.value);
const hasil = luas * nilai;
@@ -620,24 +613,4 @@
input.value = formattedValue;
}
-
- function showLoadingSwal(message, duration = 5000) {
- Swal.fire({
- title: message,
- allowOutsideClick: false,
- didOpen: () => {
- Swal.showLoading();
- },
- timer: duration, // Durasi dalam milidetik
- timerProgressBar: true, // Menampilkan progres bar timer
- }).then((result) => {
- if (result.dismiss === Swal.DismissReason.timer) {
- console.log("Dialog loading otomatis ditutup.");
- }
- });
- }
-
- function hideLoadingSwal() {
- Swal.close();
- }
diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 8cb86f0..d98d64d 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -1,41 +1,11 @@
@if (@isset($dokumen))
@foreach ($dokumen->detail as $detail)
- @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
-
- | {{ $detail->name ?? '' }} |
-
- @endif
-
- @if (isset($detail->details))
- @php
- $details = json_decode($detail->details, true);
- @endphp
-
- @if (is_array($details) && count($details) > 0)
- @foreach ($details as $value)
- @if (is_array($value))
- @foreach ($value as $key => $item)
- @if (!empty($item))
-
- |
- {{ formatLabel($key) }}
- |
- : |
-
- @if (strpos(strtolower($key), 'tanggal') !== false)
- {{ formatTanggalIndonesia($item) }}
- @else
- {{ $item }}
- @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
- m²
- @endif
- @endif
- |
-
- @endif
- @endforeach
- @endif
- @endforeach
+ @if ($detail->name != 'LOKASI JAMINAN')
+ @if (isset($detail->details))
+ @php
+ $details = json_decode($detail->details, true);
+ @endphp
+ @include('lpj::component.detail-lokasi', ['details' => $details])
@endif
@endif
@endforeach
diff --git a/resources/views/component/show-laporan-inspeksi.blade.php b/resources/views/component/show-laporan-inspeksi.blade.php
new file mode 100644
index 0000000..517b6cf
--- /dev/null
+++ b/resources/views/component/show-laporan-inspeksi.blade.php
@@ -0,0 +1,132 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+ {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} --}}
+@endsection
+
+@section('content')
+
+
+
+
+
+ @php
+ $permohonan_id = request()->segment(3);
+ $dokumen_id = request()->segment(4);
+ $jenis_jaminan_id = request()->segment(5);
+ @endphp
+
+
+
+
+ @php
+ $laporan = [
+ 'sederhana' => 'lpj::penilai.components.print-out-sederhana',
+ 'standar' => 'lpj::penilai.components.print-out-standar',
+ 'resume' => 'lpj::penilai.components.print-resume',
+ 'memo' => 'lpj::penilai.components.print-memo',
+ 'rap' => 'lpj::penilai.components.print-out-rap',
+ 'call-report' => 'penilai.components.print-out-call-report',
+ ];
+ @endphp
+ @if (array_key_exists($lpj->type_penilai, $laporan))
+ @include($laporan[$lpj->type_penilai])
+ @else
+
Tipe laporan tidak ditemukan.
+ @endif
+
+
+
+ @include('lpj::surveyor.components.print-out.main')
+
+
+
+
+
+
+
+ {{-- @include('lpj::surveyor.js.utils') --}}
+ @endsection
diff --git a/resources/views/daftar-pustaka/create.blade.php b/resources/views/daftar-pustaka/create.blade.php
index f35d03d..b245c3c 100644
--- a/resources/views/daftar-pustaka/create.blade.php
+++ b/resources/views/daftar-pustaka/create.blade.php
@@ -5,7 +5,7 @@
@endsection
@section('content')
-