From ae5a9ce5b7ac192922a500722c45ddbd6cc3e02c Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Mon, 20 Oct 2025 10:47:49 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(signature):=20Tangani=20SO/E?=
 =?UTF-8?q?O=20sama=20&=20perbaiki=20fallback=20tanggal=20migrasi"=20-m=20?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- signature-approval.blade.php: tambahkan kondisi SO==EO → render 1 kolom 'Diperiksa dan Menyetujui' (pakai jabatan EO)
- signature-approval.blade.php: bila SO≠EO → render kolom terpisah 'Diperiksa' (SO) & 'Menyetujui' (EO) seperti sebelumnya
- signature-approval.blade.php: jaga konsistensi label/jabatan & area tanda tangan agar tidak redundan
- PreviewLaporanService: ubah urutan fallback tanggal migrasi → tgl_laporan → tgl_oto → null
- PreviewLaporanService: parsing tanggal migrasi via Carbon::createFromFormat('d/m/Y H:i:s') → 'Y-m-d H:i:s'
- Akurasi tanggal laporan meningkat karena tgl_oto merefleksikan tanggal otorisasi/approval
- Tampilan blok signature lebih rapi pada kasus SO/EO sama; hilangkan duplikasi informasi
- Backward-compatible: perilaku SO≠EO & data non-migrasi tidak berubah
---
 app/Services/PreviewLaporanService.php        |   4 +-
 .../components/signature-approval.blade.php   | 124 +++++++++++-------
 2 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/app/Services/PreviewLaporanService.php b/app/Services/PreviewLaporanService.php
index 6f6f68f..6d5eab4 100644
--- a/app/Services/PreviewLaporanService.php
+++ b/app/Services/PreviewLaporanService.php
@@ -160,8 +160,8 @@ class PreviewLaporanService
          $tanggalLaporan =  $permohonan->is_mig
             ? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
                 ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
-                : ($mig_permohonan->mig_mst_jaminan_tgl_create
-                    ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_create)->format('Y-m-d H:i:s')
+                : ($mig_permohonan->mig_mst_jaminan_tgl_oto
+                    ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s')
                     : null))
             : ($lpj->created_at ?? null);
 
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
index 211ee6f..0762f67 100644
--- a/resources/views/penilai/components/signature-approval.blade.php
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -35,15 +35,24 @@
                 <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>
+                @if($soUser->name==$eoUser->name)
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Diperiksa dan Menyetujui</b>
+                        </td>
+                    @endif
+                @else
+                    @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
                 @endif
                 @if ($permohonan->approval_dd != null)
                     <td style=" padding: 4px;height: 25px">
@@ -58,19 +67,29 @@
                         <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                     @endif
                 </td>
-                @if ($permohonan->approval_so != null)
-                    <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: 75px">
-                        @if (file_exists($imagePathEO))
-                            <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
-                        @endif
-                    </td>
+                @if($soUser->name==$eoUser->name)
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 75px">
+                            @if (file_exists($imagePathSo))
+                                <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
+                            @endif
+                        </td>
+                    @endif
+                @else
+                    @if ($permohonan->approval_so != null)
+                        <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: 75px">
+                            @if (file_exists($imagePathEO))
+                                <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
+                            @endif
+                        </td>
+                    @endif
                 @endif
                 @if ($permohonan->approval_dd != null)
                     <td style=" padding: 4px;height: 75px">
@@ -90,30 +109,45 @@
                         {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
                     </span>
                 </td>
-                @if ($permohonan->approval_so != null)
-                    <td style=" padding: 4px;">
-                        {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
-                        <span>
-                            <b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
-                        </span>
-                         </br>
-                        <span>
-                             {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
-                        </span>
-                    </td>
-                @endif
+                @if($soUser->name==$eoUser->name)
+                    @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;">
+                            {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            <span>
+                                <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
+                            </span>
+                        </br>
+                            <span>
+                                {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
+                            </span>
+                        </td>
+                    @endif
+                @else
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;">
+                            {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
+                            <span>
+                                <b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
+                            </span>
+                            </br>
+                            <span>
+                                {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
+                            </span>
+                        </td>
+                    @endif
 
-                @if ($permohonan->approval_eo != null)
-                    <td style=" padding: 4px;">
-                        {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
-                        <span>
-                            <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
-                        </span>
-                    </br>
-                        <span>
-                            {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
-                        </span>
-                    </td>
+                    @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;">
+                            {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            <span>
+                                <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
+                            </span>
+                        </br>
+                            <span>
+                                {{ isset($permohonan->approval_eo_at) ? formatTanggalIndonesia($permohonan->approval_eo_at) : '' }}
+                            </span>
+                        </td>
+                    @endif
                 @endif
                 @if ($permohonan->approval_dd != null)
                     <td style=" padding: 4px;">