From de6e7ad7326845942ae9a07424f96d8e469c611b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Mon, 10 Mar 2025 10:37:19 +0700
Subject: [PATCH 1/2] feat(permohonan): tambahkan relasi laporanExternal dan
 perbarui query show

- Menambahkan method laporanExternal pada model Permohonan untuk mendefinisikan relasi dengan LaporanExternal.
- Memperbarui query pada method show di PenilaiController untuk menyertakan relasi jenisPenilaian dan laporanExternal.
---
 app/Http/Controllers/PenilaiController.php |   2 +-
 app/Models/Permohonan.php                  |   5 +
 resources/views/penilai/show.blade.php     | 115 ++++++++++++++-------
 3 files changed, 82 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 0afcc21..5d32d87 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -305,7 +305,7 @@ class PenilaiController extends Controller
      */
     public function show($id)
     {
-        $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi'])->find($id);
+        $permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian', 'documents.inspeksi','jenisPenilaian','laporanExternal'])->find($id);
 
 
         // return response()->json(['permohonan' => $permohonan]);
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index b3e881c..dc08b61 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -235,4 +235,9 @@
         {
             return $this->hasMany(LampiranDokumen::class);
         }
+
+        public function laporanExternal()
+        {
+            return $this->belongsTo(LaporanExternal::class,'id','permohonan_id');
+        }
     }
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index c8d856a..cb3ea4e 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -85,7 +85,6 @@
                     </div>
 
 
-
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                     <label class="form-label max-w-56">
@@ -224,7 +223,7 @@
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full  card-footer mt-2 ">
                     <div class="flex  gap-5">
                         <a class="btn btn-primary"
-                            href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}">
+                           href="{{ route('penilai.lampiran') }}?permohonanId={{ $permohonan->id }}&documentId={{ $dokumen->id }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $dokumen->jenis_jaminan_id }}">
                             Lampiran Foto dan Dokumen
                         </a>
                         @if (strtolower($permohonan->tujuanPenilaian->name) != 'rap')
@@ -233,7 +232,7 @@
                             </a>
                         @endif
                         <a class="btn btn-primary"
-                            onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
+                           onclick="paparan({{ $permohonan->id }}, {{ $dokumen->id }}, {{ $inspeksiId }}, {{ $dokumen->jenis_jaminan_id }})">
                             Paparan
                         </a>
 
@@ -248,7 +247,7 @@
                                     @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
                                         <div class="menu-item">
                                             <a class="menu-link"
-                                                onclick="rap('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
+                                               onclick="rap('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
                                                 <span class="menu-icon">
                                                     <i class="ki-outline ki-message-programming">
                                                     </i>
@@ -264,7 +263,7 @@
                                         {{-- existing di  --}}
                                         <div class="menu-item">
                                             <a class="menu-link"
-                                                onclick="memo('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
+                                               onclick="memo('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
                                                 <span class="menu-icon">
                                                     <i class="ki-outline ki-badge">
                                                     </i>
@@ -278,7 +277,7 @@
                                             @if ($permohonan->status_bayar === 'belum_bayar')
                                                 <div class="menu-item">
                                                     <a class="menu-link"
-                                                        onclick="resume('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
+                                                       onclick="resume('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
                                                         <span class="menu-icon">
                                                             <i class="ki-outline ki-profile-circle">
                                                             </i>
@@ -294,7 +293,7 @@
 
                                             <div class="menu-item">
                                                 <a class="menu-link"
-                                                    onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')">
+                                                   onclick="seletSederhanaStandart('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, '{{ $permohonan->jenisFasilitasKredit->name }}', '{{ $permohonan->status_bayar }}')">
                                                     <span class="menu-icon">
                                                         <i class="ki-outline ki-setting-2"></i>
                                                     </span>
@@ -304,7 +303,7 @@
                                         @endif
                                         <div class="menu-item">
                                             <a class="menu-link"
-                                                onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
+                                               onclick="callReport('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }})">
                                                 <span class="menu-icon">
                                                     <i class="ki-outline ki-profile-circle">
                                                     </i>
@@ -323,23 +322,62 @@
                                 </div>
                             </div>
                         </div>
+
+                        @if($permohonan->jenisPenilaian->name=="External")
+                            @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
+                                <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
+                                    <button class="dropdown-toggle btn btn-primary">
+                                        Laporan External
+                                    </button>
+                                    <div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]">
+                                        <div class="menu menu-default flex flex-col w-full">
+                                            @if(isset($permohonan->laporanExternal->file_resume) && !empty($permohonan->laporanExternal->file_resume))
+                                                <div class="menu-item">
+                                                    <a class="menu-link" onclick="viewPDF('{{ Storage::url($permohonan->laporanExternal->file_resume) }}')">
+                                                    <span class="menu-icon">
+                                                        <i class="ki-outline ki-badge"></i>
+                                                    </span>
+                                                        <span class="menu-title">
+                                                        Resume
+                                                    </span>
+                                                    </a>
+                                                </div>
+                                            @endif
+                                            @if(isset($permohonan->laporanExternal->file_laporan) && !empty($permohonan->laporanExternal->file_laporan))
+
+                                                <div class="menu-item">
+                                                    <a class="menu-link" onclick="viewPDF('{{ Storage::url($permohonan->laporanExternal->file_laporan) }}')">
+                                                    <span class="menu-icon">
+                                                        <i class="ki-outline ki-setting-2"></i>
+                                                    </span>
+                                                        <span class="menu-title">
+                                                        Laporan
+                                                    </span>
+                                                    </a>
+                                                </div>
+                                            @endif
+                                        </div>
+                                    </div>
+                                </div>
+                            @endif
+                        @endif
                     </div>
 
                     <div class="flex justify-end gap-5">
 
                         <a href="{{ route('surveyor.print_out_inspeksi', ['permohonan_id' => $permohonan->id, 'dokument_id' => $dokumen->id, 'jenis_jaminan_id' => $dokumen->jenis_jaminan_id]) }}"
-                            class="btn btn-light">
+                           class="btn btn-light">
                             <i class="ki-filled ki-printer"></i> Cetak Hasil Inspeksi
                         </a>
 
                         <a class="btn btn-outline btn-info "
-                            onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 1 )">
+                           onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 1 )">
                             <i class="ki-filled ki-eye"></i>
                             Lihat Laporan
                         </a>
 
                         <a class="btn btn-success"
-                            onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
+                           onclick="checkLaporan('{{ $permohonan->id }}', '{{ $dokumen->id }}', '{{ $inspeksiId }}', {{ $dokumen->jenis_jaminan_id }}, 0 )">
                             <i class="ki-filled ki-printer"></i>
                             Cetak Laporan
                         </a>
@@ -354,16 +392,14 @@
             </a>
 
             <a class="btn btn-warning"
-                {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' ? 'disabled' : '' }}
-                onclick="revisiSurveyor('{{ $permohonan->id }}', '{{ $permohonan->debiture->name }}', '{{ $permohonan->nomor_registrasi }}')">
+               {{ $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
             </a>
         </div>
 
 
-
-
     </div>
 
 
@@ -412,13 +448,14 @@
                     <div class="flex justify-center items-center gap-2">
                         <input type="file" id="kertas_kerja" class="file-input">
                         <button type="button" class="btn btn-outline btn-success"
-                            onclick="uploadKertasKerja({{ $permohonan->id }}, '{{ $documentId }}', '{{ $inspeksiId }}', '{{ $jenisJaminanId }}')">Upload</button>
+                                onclick="uploadKertasKerja({{ $permohonan->id }}, '{{ $documentId }}', '{{ $inspeksiId }}', '{{ $jenisJaminanId }}')">Upload
+                        </button>
                     </div>
                 </div>
                 <div class="flex justify-between items-center">
                     @if (isset($permohonan->penilai) && isset($permohonan->penilai->kertas_kerja) && $permohonan->penilai->kertas_kerja)
                         <span data-modal-dismiss="true" class="btn btn-warning btn-outline"
-                            onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
+                              onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
                                 class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
                     @endif
                 </div>
@@ -448,8 +485,8 @@
 
         } else {
             fetch(
-                    `{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}`
-                )
+                `{{ url('/penilai/check-status-lpj') }}?permohonanId=${permohonanId}&documentId=${documentId}&inspeksiId=${inspeksiId}`
+            )
                 .then(response => response.json())
                 .then(data => {
                     if (data.status) {
@@ -505,18 +542,18 @@
 
     function saveStatusLpj(permohonanId, documentId, inspeksiId, type, jaminanId) {
         fetch(`{{ url('/penilai/save-status-lpj') }}`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'X-CSRF-TOKEN': '{{ csrf_token() }}',
-                },
-                body: JSON.stringify({
-                    permohonan_id: permohonanId,
-                    document_id: documentId,
-                    inspeksi_id: inspeksiId,
-                    type: type,
-                }),
-            }).then(response => response.json())
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-CSRF-TOKEN': '{{ csrf_token() }}',
+            },
+            body: JSON.stringify({
+                permohonan_id: permohonanId,
+                document_id: documentId,
+                inspeksi_id: inspeksiId,
+                type: type,
+            }),
+        }).then(response => response.json())
             .then(data => {
                 if (data.success) {
                     if (type === 'standard') {
@@ -552,12 +589,12 @@
         formData.append('kertas_kerja', kertasKerja);
 
         fetch(`{{ url('/penilai/import/kertas-kerja') }}`, {
-                method: 'POST',
-                headers: {
-                    'X-CSRF-TOKEN': '{{ csrf_token() }}',
-                },
-                body: formData,
-            })
+            method: 'POST',
+            headers: {
+                'X-CSRF-TOKEN': '{{ csrf_token() }}',
+            },
+            body: formData,
+        })
             .then(response => response.json()) // Pastikan respons diurai menjadi JSON
             .then(data => {
                 if (data.success) {
@@ -641,7 +678,7 @@
             headers: {
                 'X-CSRF-TOKEN': '{{ csrf_token() }}'
             },
-            success: function(response) {
+            success: function (response) {
                 if (response.success) {
                     // window.location.reload();
                     hideLoadingSwal();
@@ -651,7 +688,7 @@
                     Swal.fire('Perhatian!', response.message, 'warning');
                 }
             },
-            error: function(xhr, status, error) {
+            error: function (xhr, status, error) {
                 console.log('Error checking button status:', error, status, xhr);
                 if (xhr.responseJSON.message) {
                     // window.location.reload();

From 3dcf83303551d7e117474a8430fa20f58f4a363b Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Mon, 10 Mar 2025 10:40:19 +0700
Subject: [PATCH 2/2] fix(penilai) : perbaikan nomor laporan dan tanggal
 laporan

---
 app/Helpers/Lpj.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 7049c2a..0855bb3 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -380,6 +380,11 @@ function getNomorLaporan($permohonanId, $documentId, $type = 'nomor_laporan')
         'permohonan_id' => $permohonanId,
         'dokumen_jaminan_id' => $documentId,
     ])->first();
+
+    if (!$laporan) {
+        return $type == 'nomor_laporan' ? '-' : null;
+    }
+
     return $type == 'nomor_laporan' ? $laporan->nomor_laporan : $laporan->created_at;
 }