✨(ui-penilai): Konsolidasi tampilan migrasi, fallback user, dan label tanggal penilaian

- Menyesuaikan tampilan & logika untuk data permohonan hasil migrasi (is_mig)
- Tambahkan fallback user untuk SO, EO, dan DD agar nama tetap muncul meski data tidak lengkap
- Ubah label 'Tanggal Survei' menjadi 'Tanggal Penilaian' untuk konsistensi di seluruh halaman
- Perbaiki struktur & border tabel tanda tangan approval, tambahkan bold pada jabatan
- Sesuaikan kondisi tombol laporan agar hanya bergantung pada status_bayar
- Tambahkan logika decode mig_permohonan di print-out-sederhana untuk data migrasi
- Tambahkan fallback AO name dari data migrasi dan perhitungan hari kerja khusus is_mig
- Perbaiki struktur HTML, indentasi, dan formatting di semua view terkait
- File diubah: laporan/index, analisa/informasi, signature-approval, show, print-out-sederhana

resources/views/laporan/index.blade.php

@@ -256,16 +256,10 @@
                         </a>`;
                         }
 
-                        if (data.nilai_liquidasi == null) {
-                            laporanButton = `
-                            <a href="laporan/${data.id}" class="btn btn-sm btn-primary">
-                                Laporan
-                            </a>`;
-                        }
 
-                        if ((data.status_bayar == "sudah_bayar" || data.status_bayar == "tidak_bayar") && data
+
-                            .nilai_liquidasi > 0) {
+                        if ((data.status_bayar == "sudah_bayar" || data.status_bayar == "tidak_bayar")) {
-                            if (data.penilai.type_penilai == 'resume' && !data.penilai.resume) {
+                            if (data.penilai?.type_penilai == 'resume' && !data.penilai?.resume) {
                                 laporanButton = `
                             <a href="penilai/print-out-laporan/${data.id}/${dokumenID}/${jenisJaminanID}" class="btn btn-sm btn-primary">
                                 Laporan

resources/views/penilai/components/analisa/informasi.blade.php

@@ -1,5 +1,22 @@
 <div class="no-break">
 <table style="width: 100%">
+    @if($permohonan->is_mig)
+        @if (!empty($forminspeksi['fakta']['keterangan']))
+            @foreach ($forminspeksi['fakta']['keterangan'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            {{ $key }}
+                        </td>
+                    </tr>
+                </table>
+                @foreach ($item as $data_)
+                    {!! nl2br(e($data_)) !!}
+                @endforeach
+            @endforeach
+        @endif
+    @else
+
         <tr>
         <td width="25%" style="vertical-align: top;">Informasi Dinas Tata Ruang
         </td>
@@ -34,31 +51,6 @@
         </td>
     </tr>
 
-
-    @if (!empty($forminspeksi['fakta']['keterangan']))
-        <tr>
-            <td width="25%" style="vertical-align: top;">Catatan yang Perlu
-                Diperhatikan</td>
-            <td width="1%" style="vertical-align: top;">:</td>
-            <td style="vertical-align: top;">
-                @php
-                    $keterangan = $forminspeksi['fakta']['keterangan'] ?? '';
-                    if (is_array($keterangan)) {
-                        $keterangan = implode(', ', array_filter($keterangan));
-                    }
-                @endphp
-
-                @if (!empty($keterangan))
-                    <table style="width: 100%; border-collapse: collapse;">
-                        <tr>
-                            <td>{!! nl2br(e($keterangan)) !!}</td>
-
-                        </tr>
-                    </table>
-                @endif
-            </td>
-
-        </tr>
     @endif
 </table>
 </div>

resources/views/penilai/components/footer.blade.php

@@ -68,7 +68,7 @@
                     @endphp
                     @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
                         <tr>
-                            <td style="width: 100%; vertical-align: top; text-align: center" class="photo-item border">
+                            <td style="width: 100%; vertical-align: top; text-align: center" class="border photo-item">
                                 <p style="margin: 0; font-size: 10px; text-align: center;">
                                     {{ $customLabels[$type] ?? '' }}
                                 </p>

resources/views/penilai/components/print-out-sederhana.blade.php

@@ -6,6 +6,9 @@
         $jenisAset = $dokumen->jenisJaminan->name;
     }
     $data = rtrim($data, ', ');
+
+    $permohonan_migrasi = json_decode($permohonan->mig_permohonan);
+
 @endphp
 
 <main class="content">
@@ -43,7 +46,7 @@
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Permintaan (AO)</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? '-' }}</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? $permohonan_migrasi->mig_mst_jaminan_nama_ao ?? '-' }}</td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">No Order</td>
@@ -62,13 +65,6 @@
                         <td style="padding: 2px; vertical-align: top;">
                             {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
                     </tr>
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">User</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? '' }}</td>
-                    </tr>
-
-
                     @php
                         $senior_officer = null;
                         if ($permohonan->debiture && $permohonan->documents) {
@@ -97,6 +93,11 @@
                         }
 
                     @endphp
+                    <tr>
+                        <td style="padding: 2px; vertical-align: top;">User</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ $penilai->user->name ?? '' }}</td>
+                    </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Pemeriksa</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
@@ -107,17 +108,32 @@
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">{{ $permohonan->approveSo->name ?? '' }}</td>
                     </tr>
+                     @if($permohonan->is_mig)
+                     <tr>
+                        <td style="padding: 2px; vertical-align: top;">No Laporan</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">
+                           {{  $permohonan_migrasi->mig_mst_lpj_nomor_lpj ?? '-' }}
+                        </td>
+                    </tr>
+                    @endif
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Tanggal Laporan</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">
-                            {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
+                            {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}
+                        </td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Waktu Penyelesaian</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">
+                        <td>
-                            {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}</td>
+                            @if($permohonan->is_mig)
+                            {{ floor(\Carbon\Carbon::parse($permohonan->penilaian->tanggal_kunjungan)->diffInDays(\Carbon\Carbon::parse($tanggalLaporan))) }}
+                            @else
+                            {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}
+                            @endif
+                            </td>
                     </tr>
                 </table>
             </td>
@@ -448,7 +464,7 @@
                 </tr>
             @endforeach
         </table>
-    @else
+    @endif
         @foreach ($permohonan->documents as $dokumen)
             @if ($dokumen->jenisJaminan)
                 @php
@@ -460,20 +476,19 @@
                         $kategoriUnik = array_unique($kategoriArray);
                     @endphp
 
+                    @if(!$permohonan->is_mig)
                         @foreach ($kategoriUnik as $kategori)
-                        @if ($kategori !== 'lingkungan')
                             @include(
                                 'lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori),
                                     [
                                         'dokumen' => $dokumen,
                                     ]
                                 )
-                        @endif
                         @endforeach
                     @endif
                 @endif
-        @endforeach
             @endif
+        @endforeach
 
     <div class="no-break">
         <table style="width: 100%">
@@ -483,7 +498,9 @@
                 </td>
             </tr>
         </table>
+        @if(isset($dataPembanding))
             @include('lpj::penilai.components.print-pembanding')
+        @endif
     </div>
     <div class="no-break">
         <table style="width: 100%">
@@ -502,6 +519,7 @@
                             </td>
                         </tr>
                         @php
+                            $totalNilaiPasarWajar = 0;
                             $labelNilai = [
                                 'bangunan' => 'Luas Bangunan',
                                 'tanah' => 'Luas Tanah',
@@ -532,6 +550,7 @@
                                         {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
                                     </td>
                                 </tr>
+                                @php $totalNilaiPasarWajar += $lpjData['nilai_' . $key . '_2']; @endphp
                             @endif
                         @endforeach
                         @if (isset($lpjData['npw_tambahan']))
@@ -549,6 +568,7 @@
                                         {{ $npw['nilai_2'] }}
                                     </td>
                                 </tr>
+                                @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
                             @endforeach
                         @endif
                         <tr>
@@ -557,12 +577,11 @@
                             <td style="padding: 3px; text-align: left; font-weight: bold; width: 40%;">
                                 <span style="padding-left: 20px; padding-right: 20px;">=</span>
                                 <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
-                                    Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                                    Rp {{ number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
                                 </div>
                             </td>
                         </tr>
 
-                        @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
                             <tr>
                                 <td colspan="3" style="padding: 8px; text-align: left; font-weight: bold;">
                                     b. Total Nilai Likuidasi
@@ -581,12 +600,19 @@
                                     {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
                                 </td>
                             </tr>
-                        @endif
                     </table>
                 </td>
             </tr>
         </table>
     </div>
+    @if($permohonan->is_mig)
+        @include(
+            'lpj::penilai.components.analisa.informasi',
+            [
+                'dokumen' => $dokumen,
+            ]
+        )
+    @endif
     <div class="no-break">
         <table style="width: 100%;">
             <tr>

resources/views/penilai/components/print-out-standar.blade.php

@@ -274,7 +274,9 @@
                 </td>
             </tr>
         </table>
+        @if(isset($dataPembanding))
         @include('lpj::penilai.components.print-pembanding')
+        @endif
     </div>
 
     <div class="no-break">

resources/views/penilai/components/signature-approval.blade.php

@@ -1,4 +1,4 @@
-<table style="width: 100%; border-collapse: collapse; text-align: center;">
+<table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
             @php
                 use Modules\Usermanagement\Models\User;
 
@@ -17,7 +17,6 @@
                     ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign)
                     : null;
 
-
                 $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null;
                 $imagePathDD = $ddUser && $ddUser->sign
                     ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign)
@@ -33,27 +32,48 @@
                 );
             @endphp
             <tr>
-                <td style=" padding: 4px;height: 50px">
+                <td style=" padding: 4px;height: 25px">
+                    <b>Penilaian Dibuat</b>
+                </td>
+                @if ($permohonan->approval_so != null)
+                    <td style=" padding: 4px;height: 25px">
+                        <b>Diperiksa</b>
+                    </td>
+                @endif
+                @if ($permohonan->approval_eo != null)
+                    <td style=" padding: 4px;height: 25px">
+                        <b>Menyetujui</b>
+                    </td>
+                @endif
+                @if ($permohonan->approval_dd != null)
+                    <td style=" padding: 4px;height: 25px">
+                        <b>Menyetujui</b>
+                    </td>
+                @endif
+            </tr>
+
+            <tr>
+                <td style=" padding: 4px;height: 75px">
                     @if (file_exists($imagePathPenilai))
                         <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                     @endif
                 </td>
                 @if ($permohonan->approval_so != null)
-                    <td style=" padding: 4px;height: 50px">
+                    <td style=" padding: 4px;height: 75px">
                         @if (file_exists($imagePathSo))
                             <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
                         @endif
                     </td>
                 @endif
                 @if ($permohonan->approval_eo != null)
-                    <td style=" padding: 4px;height: 50px">
+                    <td style=" padding: 4px;height: 75px">
                         @if (file_exists($imagePathEO))
                             <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
                         @endif
                     </td>
                 @endif
                 @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;height: 50px">
+                    <td style=" padding: 4px;height: 75px">
                         @if (file_exists($imagePathDD))
                             <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
                         @endif
@@ -63,7 +83,7 @@
             <tr>
                 <td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
                     <span>
-                        {{ ucwords(strtolower('PENILAI')) }}
+                        <b>{{ ucwords(strtolower('PENILAI')) }}</b>
                     </span>
                 </br>
                     <span>
@@ -72,9 +92,9 @@
                 </td>
                 @if ($permohonan->approval_so != null)
                     <td style=" padding: 4px;">
-                        {{ $senior_officer->name ?? '' }}</br>
+                        {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
                         <span>
-                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                            <b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
                         </span>
                          </br>
                         <span>
@@ -85,9 +105,9 @@
 
                 @if ($permohonan->approval_eo != null)
                     <td style=" padding: 4px;">
-                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                        {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
                         <span>
-                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                            <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
                         </span>
                     </br>
                         <span>
@@ -97,9 +117,9 @@
                 @endif
                 @if ($permohonan->approval_dd != null)
                     <td style=" padding: 4px;">
-                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                        {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
                         <span>
-                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                            <b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
                         </span>
                          </br>
                         <span>

resources/views/penilai/show.blade.php

@@ -95,7 +95,6 @@
                             {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) ?? '' }}</p>
                     </div>
                     @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang']))
-
                         <label class="form-label max-w-56 ">
                             Status Bayar
                         </label>
@@ -105,7 +104,6 @@
                                 {{ str_replace('_', ' ', $permohonan->status_bayar) }}
                             </span>
                         </div>
-
                     @endif
                 </div>
             </div>
@@ -164,7 +162,7 @@
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Tanggal Survei
+                            Tanggal Penilaian
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <p class="flex w-full text-gray-600 font-medium text-sm">
@@ -321,15 +319,15 @@
                                 </div>
                             </div>
 
-                        {{-- @if($permohonan->jenisPenilaian->name=="Eksternal")
+                            {{-- @if ($permohonan->jenisPenilaian->name == 'Eksternal')
-                            @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
+                            @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 Eksternal
                                     </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))
+                                            @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">
@@ -341,7 +339,7 @@
                                                     </a>
                                                 </div>
                                             @endif
-                                            @if(isset($permohonan->laporanExternal->file_laporan) && !empty($permohonan->laporanExternal->file_laporan))
+                                            @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) }}')">
@@ -429,7 +427,6 @@
 
                         // Ambil ID inspeksi pertama (jika ada)
 
-
                         // Ambil jenis jaminan jika ada
                         if ($firstDocument->jenisjaminan) {
                             $jenisJaminanId = $firstDocument->jenisjaminan->id;
@@ -675,7 +672,7 @@
             headers: {
                 'X-CSRF-TOKEN': '{{ csrf_token() }}'
             },
-            success: function (response) {
+            success: function(response) {
                 if (response.success) {
                     // window.location.reload();
                     hideLoadingSwal();
@@ -685,7 +682,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();