From 0fa1563cf3f6a5aaaa253ef27da2cc1f8a21106e Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 23 Jan 2025 07:19:52 +0700 Subject: [PATCH] perbaikan output sederhana, standard --- .../components/print-out-sederhana.blade.php | 192 +++++---- .../components/print-out-standard.blade.php | 388 +++++++++++------- 2 files changed, 361 insertions(+), 219 deletions(-) diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 2545e7b..1e885e3 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -292,32 +292,49 @@ @if (@isset($dokumen)) - @foreach ($dokumen->detail as $details) + @foreach ($dokumen->detail as $detail) - - {{ $details->jenisLegalitasJaminan->name ?? '' }} - - : - - @if (isset($detail->dokumen_jaminan)) - @php - $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) - ? json_decode($detail->dokumen_nomor) - : ($detail->dokumen_nomor - ? [$detail->dokumen_nomor] - : []); - @endphp - @foreach ($dokumen_jaminan as $index => $dokumen) -
- @if (!empty($dokumen_nomor)) - - {{ $dokumen_nomor[$index] }} - @endif -
-
+ @if (isset($detail->dokumen_jaminan)) + + {{ $detail->name ?? '' }} + + : + + @if (isset($detail->dokumen_jaminan)) + @php + $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) + ? json_decode($detail->dokumen_jaminan) + : [$detail->dokumen_jaminan]; + $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) + ? json_decode($detail->dokumen_nomor) + : ($detail->dokumen_nomor + ? [$detail->dokumen_nomor] + : []); + @endphp + + @foreach ($dokumen_jaminan as $index => $dokumen) +
+ @if (!empty($dokumen_nomor[$index])) + {{ $dokumen_nomor[$index] }} + @endif +
+ @endforeach + @endif + + @endif + + + + @if (isset($detail->details)) + @if (json_decode($detail->details)) + @foreach (json_decode($detail->details) as $key => $value) + + {{ ucwords(str_replace('_', ' ', $key)) ?? '' }} + : + {{ $value ?? '' }} m2 @endforeach @endif - + @endif @endforeach @endif @@ -847,7 +864,7 @@ - +
Instansi yang relevanInformasi data pembanding : @php @@ -859,14 +876,13 @@ } $fields = [ - 'nama_nara_sumber' => 'Marketing', - 'nomor_tlp' => 'No Telepon', - 'address' => 'Alamat Data', - 'status_nara_sumber' => 'Status Narasumber', + 'jenis_aset' => 'Jenis properti', + 'harga' => 'Harga Penawaran', + 'telepon' => 'Penjual (HP)', + 'penawaran' => 'Ditawarkan Sejak', 'luas_tanah' => 'Luas Tanah', 'luas_bangunan' => 'Luas Bangunan', - 'harga' => 'Harga', - 'harga_diskon' => 'Indikasi Harga Transaksi', + 'kordinat' => 'Titik Kordinat', ]; @endphp @@ -886,6 +902,16 @@ {{ $data[$key] ?? '-' }} m² @elseif($key == 'harga' || $key == 'harga_diskon') Rp. {{ $data[$key] ?? 0 }} + @elseif($key == 'kordinat') + @php + $lat = $data['kordinat_lat'] ?? null; + $lng = $data['kordinat_lng'] ?? null; + @endphp + @if ($lat && $lng) + {{ $lat }},{{ $lng }} + @else + - + @endif @else {{ $data[$key] ?? '-' }} @endif @@ -985,7 +1011,7 @@ = Rp - {{ $lpjData['likuidasi_nilai_1'] ?? '' }} + {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
@@ -1061,82 +1087,93 @@ Demikian laporan penilai jaminan ini di buat secara objektif, tanpa adanya pengaruh baik intern - maupun extern + maupun ekstern - +
@php use Modules\Usermanagement\Models\User; $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign); + $imagePathPenilai = storage_path( + 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, + ); - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + $soUser = User::where('id', $senior_officer->id)->first(); + $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + $imagePathEO = storage_path( + 'app/public/signatures/' . + User::role('EO Appraisal')->first()->id . + '/' . + User::role('EO Appraisal')->first()->sign, + ); - $imagePathEO = storage_path('app/public/signatures/' . User::role('EO Appraisal')->first()->id . '/'. User::role('EO Appraisal')->first()->sign); - - $imagePathDD = storage_path('app/public/signatures/' . User::role('DD Appraisal')->first()->id . '/'. User::role('DD Appraisal')->first()->sign); + $imagePathDD = storage_path( + 'app/public/signatures/' . + User::role('DD Appraisal')->first()->id . + '/' . + User::role('DD Appraisal')->first()->sign, + ); @endphp - + @if ($permohonan->approval_so != null) - + @endif @if ($permohonan->approval_eo != null) - + @endif @if ($permohonan->approval_dd != null) - + @endif @if ($permohonan->approval_so != null) - + @endif @if ($permohonan->approval_eo != null) - + @endif @if ($permohonan->approval_dd != null) - + @endif
@if (file_exists($imagePathPenilai)) {{ $imagePathPenilai }} @endif - @if (file_exists($imagePathSo)) - {{ $imagePathSo }} - @endif - + @if (file_exists($imagePathSo)) + {{ $imagePathSo }} + @endif + - @if (file_exists($imagePathEO)) - {{ $imagePathEO }} - @endif - + @if (file_exists($imagePathEO)) + {{ $imagePathEO }} + @endif + - @if (file_exists($imagePathDD)) - {{ $imagePathDD }} - @endif - + @if (file_exists($imagePathDD)) + {{ $imagePathDD }} + @endif +
{{ $penilai->userPenilaiTeam->name ?? '' }}
- - {{ ucwords(strtolower('PENILAI'))}} + + {{ ucwords(strtolower('PENILAI')) }}
- {{ $senior_officer->name ?? '' }}
- - {{ ucwords(strtolower('SENIOR OFFICER'))}} - - -
+ {{ $senior_officer->name ?? '' }}
+ + {{ ucwords(strtolower('SENIOR OFFICER')) }} + + +
- {{ User::role('EO Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('EXECUTIVE OFFICER'))}} - -
+ {{ User::role('EO Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + +
- {{ User::role('DD Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('DEPUTY DIRECTOR'))}} - -
+ {{ User::role('DD Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} + +
@@ -1187,7 +1224,8 @@ @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
- {{ $type }}

{{ Str::title(str_replace('_', ' ', $type)) }} diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php index e755eaf..06b1cca 100644 --- a/resources/views/penilai/components/print-out-standard.blade.php +++ b/resources/views/penilai/components/print-out-standard.blade.php @@ -25,6 +25,7 @@ color: #000; } + .container { /* width: 100%; */ padding: 10px; @@ -34,7 +35,7 @@ .header { - margin-bottom: 20px; + margin-bottom: 10px; } .judul { @@ -168,16 +169,7 @@ /* Memperkecil ukuran checkbox */ } - #header { - position: fixed; - top: -100px; - /* Posisi header di luar konten */ - left: 0; - right: 0; - height: 90px; - text-align: center; - padding-bottom: 10px; - } + #footer { position: fixed; @@ -208,8 +200,10 @@ @php $data = ''; + $dokument = null; foreach ($permohonan->debiture->documents as $dokumen) { $data .= $dokumen->jenisJaminan->name . ', '; + $dokument = $dokumen; } $data = rtrim($data, ', '); @endphp @@ -266,7 +260,6 @@

NO: {{ $nomorLaporan }}

-
@@ -470,37 +463,52 @@ @if (@isset($dokumen)) - @foreach ($dokumen->detail as $details) - - - - + @foreach ($dokumen->detail as $detail) + + @if (isset($detail->dokumen_jaminan)) + + + @endif + + + + @if(isset($detail->details)) + @if(json_decode($detail->details)) + @foreach (json_decode($detail->details) as $key => $value) + + + @endforeach + @endif + @endif + + @endforeach +@endif + - + @@ -844,44 +852,73 @@ - @if (isset($basicData['spekKategoriBangunan'])) @foreach ($basicData['spekKategoriBangunan'] as $index => $spesifikasi) - + @@ -890,20 +927,6 @@ @endif - - - - - - @if (isset($forminspeksi['bangunan']['sarana_pelengkap_input'])) -
- @foreach ($forminspeksi['bangunan']['sarana_pelengkap_input'] as $input) - @if ($input !== null) - - @endif - @endforeach -
- @endif
{{ $details->jenisLegalitasJaminan->name ?? '' }} - - @if (isset($detail->dokumen_jaminan)) - @php - $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) - ? json_decode($detail->dokumen_nomor) - : ($detail->dokumen_nomor - ? [$detail->dokumen_nomor] - : []); - @endphp - @foreach ($dokumen_jaminan as $index => $dokumen) -
- @if (!empty($dokumen_nomor)) - - {{ $dokumen_nomor[$index] }} - @endif -
-
- @endforeach - @endif -
{{ $detail->name ?? '' }} + @if (isset($detail->dokumen_jaminan)) + @php + $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) + ? json_decode($detail->dokumen_jaminan) + : [$detail->dokumen_jaminan]; + $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) + ? json_decode($detail->dokumen_nomor) + : ($detail->dokumen_nomor + ? [$detail->dokumen_nomor] + : []); + @endphp + + @foreach ($dokumen_jaminan as $index => $dokumen) +
+ @if (!empty($dokumen_nomor[$index])) + {{ $dokumen_nomor[$index] }} + @endif +
@endforeach @endif +
{{ ucwords(str_replace("_", " ", $key)) ?? "" }}{{ $value ?? "" }} m2
Atas Nama{{ $dokumen->pemilik->name ?? '' }}{{ $dokument->pemilik->name ?? '' }}
{{ $spesifikasi->name }}{{ $spesifikasi->name }} @if (isset($basicData['spekBangunan'])) @php $count = 0; @endphp - + @foreach ($basicData['spekBangunan'] as $kategori) @if ($kategori->spek_kategori_bangunan_id == $spesifikasi->id) + @php + $selectedValues = []; + foreach ( + $forminspeksi['bangunan']['spesifikasi_bangunan'] + as $bangunan + ) { + if ( + isset( + $bangunan['spek_kategori_bangunan'][ + $spesifikasi->name + ], + ) + ) { + $selectedValues = array_merge( + $selectedValues, + array_values( + $bangunan['spek_kategori_bangunan'][ + $spesifikasi->name + ], + ), + ); + } + } + $lainnyaValue = + $forminspeksi['bangunan']['spesifikasi_bangunan'][0][ + 'spek_kategori_bangunan' + ][$spesifikasi->name]['lainnya'] ?? ''; + @endphp + + @php $count++; @endphp @if ($count % 3 == 0) - + @endif @endif @endforeach - + @endif
@@ -1016,8 +1039,6 @@ @endforeach
- -
@@ -1052,6 +1073,45 @@ + + + + + + @@ -1378,14 +1438,13 @@ } $fields = [ - 'nama_nara_sumber' => 'Marketing', - 'nomor_tlp' => 'No Telepon', - 'address' => 'Alamat Data', - 'status_nara_sumber' => 'Status Narasumber', + 'jenis_aset' => 'Jenis properti', + 'harga' => 'Harga Penawaran', + 'telepon' => 'Penjual (HP)', + 'penawaran' => 'Ditawarkan Sejak', 'luas_tanah' => 'Luas Tanah', 'luas_bangunan' => 'Luas Bangunan', - 'harga' => 'Harga', - 'harga_diskon' => 'Indikasi Harga Transaksi', + 'kordinat' => 'Titik Kordinat', ]; @endphp @@ -1405,6 +1464,16 @@ {{ $data[$key] ?? '-' }} m² @elseif($key == 'harga' || $key == 'harga_diskon') Rp. {{ $data[$key] ?? 0 }} + @elseif($key == 'kordinat') + @php + $lat = $data['kordinat_lat'] ?? null; + $lng = $data['kordinat_lng'] ?? null; + @endphp + @if ($lat && $lng) + {{ $lat }},{{ $lng }} + @else + - + @endif @else {{ $data[$key] ?? '-' }} @endif @@ -1494,7 +1563,7 @@ @@ -1524,44 +1593,55 @@
Lebar Perkerasan Jalan {{ $forminspeksi['lingkungan']['lebar_perkerasan_jalan'] ?? 'Tidak Diketahui' }}
Sarana Pelengkap + @if (isset($basicData['saranaPelengkap'])) + + + @foreach ($basicData['saranaPelengkap'] as $index => $item) + @if ($index % 3 == 0 && $index > 0) + + + @endif + + @endforeach + +
+ +
+ @endif +
Lapisan Perkerasan Jalan = Rp - {{ $lpjData['likuidasi_nilai_1'] ?? '' }} + {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
- -
- -
-
    -
  1. PENILAIAN INI DIBUAT BERDASARKAN ATURAN YANG - BERLAKU DI SUBDIT APPRAISAL
  2. -
  3. LAPORAN INI DIBUAT BERDASARKAN DATA FOTOCOPY - DOKUMEN YANG DITERIMA PENILAI DENGAN ASUMSI BAHWA DATA TERSEBUT SESUAI DENGAN - DOKUMEN ASLINYA
  4. -
  5. PENILAI TIDAK MELAKUKAN PEMBUKTIAN LEBIH RINCI ATAU - PENGAKUAN TERTULIS DARI PIHAK YANG DITEMUI SAAT PENILAIAN, ATAS INFORMASI YANG - DIBERIKAN SECARA LISAN SEHUBUNGAN DENGAN IDENTITAS DIRI DAN HUBUNGAN DI ANTARA - PIHAK TERKAIT SAAT MELAKUKAN INSPEKSI OBJEK YANG DINILAI
  6. -
  7. LAPORAN INI DIGUNAKAN HANYA UNTUK KEPENTINGAN - INTERNAL DAN DILARANG MENYEBARKAN KEPADA PIHAK KETIGA
  8. -
-
-
+
+
+ +
+
    +
  1. PENILAIAN INI DIBUAT BERDASARKAN ATURAN YANG + BERLAKU DI SUBDIT APPRAISAL
  2. +
  3. LAPORAN INI DIBUAT BERDASARKAN DATA FOTOCOPY + DOKUMEN YANG DITERIMA PENILAI DENGAN ASUMSI BAHWA DATA TERSEBUT SESUAI DENGAN + DOKUMEN ASLINYA
  4. +
  5. PENILAI TIDAK MELAKUKAN PEMBUKTIAN LEBIH RINCI ATAU + PENGAKUAN TERTULIS DARI PIHAK YANG DITEMUI SAAT PENILAIAN, ATAS INFORMASI YANG + DIBERIKAN SECARA LISAN SEHUBUNGAN DENGAN IDENTITAS DIRI DAN HUBUNGAN DI ANTARA + PIHAK TERKAIT SAAT MELAKUKAN INSPEKSI OBJEK YANG DINILAI
  6. +
  7. LAPORAN INI DIGUNAKAN HANYA UNTUK KEPENTINGAN + INTERNAL DAN DILARANG MENYEBARKAN KEPADA PIHAK KETIGA
  8. +
+
+
-
+ - +
@php - use Modules\Usermanagement\Models\User; + use Modules\Usermanagement\Models\User; - $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign); + $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); + $imagePathPenilai = storage_path( + 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, + ); - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + $soUser = User::where('id', $senior_officer->id)->first(); + $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + $imagePathEO = storage_path( + 'app/public/signatures/' . + User::role('EO Appraisal')->first()->id . + '/' . + User::role('EO Appraisal')->first()->sign, + ); - $imagePathEO = storage_path('app/public/signatures/' . User::role('EO Appraisal')->first()->id . '/'. User::role('EO Appraisal')->first()->sign); - - $imagePathDD = storage_path('app/public/signatures/' . User::role('DD Appraisal')->first()->id . '/'. User::role('DD Appraisal')->first()->sign); - @endphp + $imagePathDD = storage_path( + 'app/public/signatures/' . + User::role('DD Appraisal')->first()->id . + '/' . + User::role('DD Appraisal')->first()->sign, + ); + @endphp @if ($permohonan->approval_so != null) - + @endif @if ($permohonan->approval_eo != null) - + @endif @if ($permohonan->approval_dd != null) - + @endif @if ($permohonan->approval_so != null) - + @endif @if ($permohonan->approval_eo != null) - + @endif @if ($permohonan->approval_dd != null) - + @endif
@if (file_exists($imagePathPenilai)) @@ -1569,58 +1649,58 @@ @endif - @if (file_exists($imagePathSo)) - {{ $imagePathSo }} - @endif - + @if (file_exists($imagePathSo)) + {{ $imagePathSo }} + @endif + - @if (file_exists($imagePathEO)) - {{ $imagePathEO }} - @endif - + @if (file_exists($imagePathEO)) + {{ $imagePathEO }} + @endif + - @if (file_exists($imagePathDD)) - {{ $imagePathDD }} - @endif - + @if (file_exists($imagePathDD)) + {{ $imagePathDD }} + @endif +
{{ $penilai->userPenilaiTeam->name ?? '' }}
- - {{ ucwords(strtolower('PENILAI'))}} + + {{ ucwords(strtolower('PENILAI')) }}
- {{ $senior_officer->name ?? '' }}
- - {{ ucwords(strtolower('SENIOR OFFICER'))}} - - -
+ {{ $senior_officer->name ?? '' }}
+ + {{ ucwords(strtolower('SENIOR OFFICER')) }} + + +
- {{ User::role('EO Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('EXECUTIVE OFFICER'))}} - -
+ {{ User::role('EO Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('EXECUTIVE OFFICER')) }} + +
- {{ User::role('DD Appraisal')->first()->name ?? '' }}
- - {{ ucwords(strtolower('DEPUTY DIRECTOR'))}} - -
+ {{ User::role('DD Appraisal')->first()->name ?? '' }}
+ + {{ ucwords(strtolower('DEPUTY DIRECTOR')) }} + +
@@ -1704,7 +1784,31 @@ console.log(datas); const lpjData = @json($lpjData); console.log(lpjData); + + + document.addEventListener('DOMContentLoaded', function() { + const checkboxes = document.querySelectorAll('.checkbox-lainnya'); + + checkboxes.forEach(checkbox => { + checkbox.addEventListener('change', function() { + const textLainnya = this.closest('label').querySelector('.text-lainnya'); + + if (this.checked && this.value === 'Lainnya') { + textLainnya.style.display = 'inline'; + } else if (this.value === 'Lainnya') { + textLainnya.style.display = 'none'; + } + }); + + // Atur visibilitas awal + if (checkbox.checked && checkbox.value === 'Lainnya') { + const textLainnya = checkbox.closest('label').querySelector('.text-lainnya'); + textLainnya.style.display = 'inline'; + } + }); + }); +