diff --git a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
index 80663a2..00e0e2c 100644
--- a/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
+++ b/resources/views/surveyor/components/print-out/apartement-kantor.blade.php
@@ -1,5 +1,5 @@
-<div class="no-break" style="margin: 0; padding: 0">
-    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+<div class="no-break">
+    <table style="width: 100%; border-top: 1px solid #000; border: 1px solid #000; border-collapse: collapse; ">
 
         <tr>
             <td style="text-align: center; margin-top: 5px;">
diff --git a/resources/views/surveyor/components/print-out/bangunan.blade.php b/resources/views/surveyor/components/print-out/bangunan.blade.php
index 06503df..1b62c61 100644
--- a/resources/views/surveyor/components/print-out/bangunan.blade.php
+++ b/resources/views/surveyor/components/print-out/bangunan.blade.php
@@ -1,5 +1,5 @@
-<div class="no-break" style="border-bottom: 1px solid #000;">
-    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+<div class="no-break">
+    <table style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
         <tr>
             <td style="text-align: center; margin-top: 5px;">
diff --git a/resources/views/surveyor/components/print-out/fakta.blade.php b/resources/views/surveyor/components/print-out/fakta.blade.php
index 72216e8..164e81f 100644
--- a/resources/views/surveyor/components/print-out/fakta.blade.php
+++ b/resources/views/surveyor/components/print-out/fakta.blade.php
@@ -1,5 +1,5 @@
-<div class="no-break" style="border-bottom: 1px solid #000;">
-    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+<div class="no-break" >
+    <table style="width: 100%;  border: 1px solid #000; border-collapse: collapse;">
 
 
         <tr>
diff --git a/resources/views/surveyor/components/print-out/informasi.blade.php b/resources/views/surveyor/components/print-out/informasi.blade.php
index 680a015..f1b2a27 100644
--- a/resources/views/surveyor/components/print-out/informasi.blade.php
+++ b/resources/views/surveyor/components/print-out/informasi.blade.php
@@ -1,8 +1,6 @@
-<div class="no-break" style="border-bottom: 1px solid #000;">
+<div class="no-break" >
     <table
-        style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
-
-
+        style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
         <tr>
             <td style="text-align: center; margin-top: 5px;">
                 <h2 style="text-transform: uppercase; text-align: center; margin: 0;">Informasi Dinas Tata Ruang</h2>
diff --git a/resources/views/surveyor/components/print-out/lingkungan.blade.php b/resources/views/surveyor/components/print-out/lingkungan.blade.php
index 889b231..2c1dd76 100644
--- a/resources/views/surveyor/components/print-out/lingkungan.blade.php
+++ b/resources/views/surveyor/components/print-out/lingkungan.blade.php
@@ -1,5 +1,5 @@
-<div class="no-break" style="border-bottom: 1px solid #000;">
-    <table style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+<div class="no-break">
+    <table style="width: 100%;  border: 1px solid #000; border-collapse: collapse; ">
 
         <tr>
              <td style="text-align: center; margin-top: 5px;">
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index 008b754..e7401a4 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -168,6 +168,7 @@
     if ($permohonan->debiture && $permohonan->documents) {
         foreach ($permohonan->documents as $dokumen) {
             $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+            $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
             $teams = $permohonan->region->teams;
 
             if ($teams) {
@@ -188,6 +189,8 @@
             }
         }
     }
+    use Modules\Usermanagement\Models\User;
+    $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first();
 @endphp
 
 <body style="width: 90%; margin: auto">
@@ -199,9 +202,13 @@
                 </td>
                 <td style="text-align: right;">
                     <div style="">
-                        <p style="margin: 0; padding:0; font-size:10px;">Tanggal: {{ date('Y-m-d') }}</p>
-                        <p style="margin: 0; padding:0;  font-size:10px;">Waktu: {{ date('H:i:s') }}</p>
-                        <p style="margin: 0; padding:0;  font-size:10px;">User: {{ Auth::user()->name }}</p>
+                        <p style="margin: 0; padding:0; font-size:10px;">
+                            Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }}
+                        </p>
+                        <p style="margin: 0; padding:0; font-size:10px;">
+                            Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
+                        </p>
+                        <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
                     </div>
                 </td>
             </tr>
@@ -212,9 +219,9 @@
         <h1 style="font-size: 14px;">
             FORM INSPEKSI {{ $data ?? '' }}
         </h1></div>
-    <div style="border: 1px solid #000;">
+    <div >
         <table
-            style="width: 100%; border-top: none; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px; ">
@@ -282,7 +289,7 @@
         </table>
 
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px; ">
@@ -301,7 +308,7 @@
         </table>
 
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%;  border: 1px solid #000; border-collapse: collapse;">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px; ">
@@ -360,7 +367,7 @@
         </table>
 
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%;  border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px; ">
@@ -382,9 +389,9 @@
                 </td>
             </tr>
         </table>
-        <div class="no-break" style="border-bottom: 1px solid #000;">
+        <div class="no-break" >
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%;  border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px; ">
@@ -503,7 +510,7 @@
     <div class="no-break">
         <table style="width: 100%; border-collapse: collapse;">
             <tr>
-                <td style="border: 1px solid #000;">
+                <td>
                     <table>
                         <tr>
                             <td>
diff --git a/resources/views/surveyor/components/print-out/rap.blade.php b/resources/views/surveyor/components/print-out/rap.blade.php
index 63c12c7..a2fb575 100644
--- a/resources/views/surveyor/components/print-out/rap.blade.php
+++ b/resources/views/surveyor/components/print-out/rap.blade.php
@@ -1,6 +1,6 @@
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px;">
@@ -35,9 +35,9 @@
         </table>
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px;">
@@ -77,9 +77,9 @@
         </table>
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         <table
-            style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+            style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
             <tr>
                 <td style="text-align: center; margin-top: 5px;">
@@ -150,10 +150,10 @@
 
 
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['partisi'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -183,11 +183,11 @@
             </table>
         @endisset
     </div>
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['jumlah_unit'])
 
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -211,11 +211,11 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['batas_batas_perumahan'])
 
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -238,10 +238,10 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['fasus_fasum'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -264,10 +264,10 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['progres_penjualan'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -291,10 +291,10 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['harga_unit'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -316,10 +316,10 @@
                 </table>
             @endisset
     </div>
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['target_market'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -342,10 +342,10 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['kerjasama_dengan_bank'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -369,10 +369,10 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['rute_menuju_lokasi'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -393,10 +393,10 @@
             </table>
         @endisset
     </div>
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['properti_sejenis'])
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -419,11 +419,11 @@
         @endisset
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta']))
 
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
@@ -467,12 +467,12 @@
         @endif
     </div>
 
-    <div class="no-break" style="border-bottom: 1px solid #000;">
+    <div class="no-break" >
         @isset($forminspeksi['fakta']['keterangan'])
 
 
             <table
-                style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+                style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
                 <tr>
                     <td style="text-align: center; margin-top: 5px;">
diff --git a/resources/views/surveyor/components/print-out/tanah.blade.php b/resources/views/surveyor/components/print-out/tanah.blade.php
index ace5938..1654c21 100644
--- a/resources/views/surveyor/components/print-out/tanah.blade.php
+++ b/resources/views/surveyor/components/print-out/tanah.blade.php
@@ -1,6 +1,6 @@
-<div class="no-break" style="border-bottom: 1px solid #000;">
+<div class="no-break" >
     <table
-        style="width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #000; border-collapse: collapse; border-left: none; border-right: none;">
+        style="width: 100%; border: 1px solid #000; border-collapse: collapse; ">
 
         <tr>
             <td></td>
@@ -96,7 +96,7 @@
                     {{ isset($forminspeksi['tanah']['bentuk_tanah']['lainnya']) ? ' (' . $forminspeksi['tanah']['bentuk_tanah']['lainnya'] . ')' : '' }}
                 @endif
                 </label>
-                
+
             </td>
             @endforeach
         </tr>