diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php
index 59fdfa7..2fd7be2 100644
--- a/resources/views/penilai/lampiran.blade.php
+++ b/resources/views/penilai/lampiran.blade.php
@@ -155,12 +155,12 @@
                         <div class="flex items-center justify-between mt-5">
                             <div class="grid gap-5">
                                 <h2 class=" font-semibold text-xl">
-                                    {{ $item['nama_objek'] }}
+                                    {{ $item['name_objek'] }}
                                 </h2>
                                 <div class="flex items-center">
 
 
-                                    <img src="{{ Storage::url($item['foto_object']) }}" alt="">
+                                    <img src="{{ Storage::url($item['foto_objek']) }}" alt="">
 
                                 </div>
                             </div>
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index f88589f..4f5a6cf 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -22,13 +22,15 @@
                         Nomor Registrasi
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->nomor_registrasi }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->nomor_registrasi) ? $permohonan->nomor_registrasi : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Nama Debitur
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->debiture->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->debiture->name) ? $permohonan->debiture->name : '' }}</p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -36,16 +38,16 @@
                         Cabang
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->branch->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->branch->name) ? $permohonan->branch->name : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Alamat Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->debiture->address }}, Kel.
-                            {{ $permohonan->debiture->village->name }}, Kec. {{ $permohonan->debiture->district->name }},
-                            {{ ucwords(strtolower($permohonan->debiture->city->name)) }}, Kode Pos.
-                            {{ $permohonan->debiture->postal_code }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ formatAlamat($permohonan->debiture) }}
+                        </p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -53,14 +55,16 @@
                         Nama AO/Pemohon
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->user->name }}</p>
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ isset($permohonan->user->name) ? $permohonan->user->name : '' }}</p>
                     </div>
                     <label class="form-label max-w-56">
                         Fasilitas Kredit
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $permohonan->jenisFasilitasKredit->name }}</p>
+                            {{ isset($permohonan->jenisFasilitasKredit->name) ? $permohonan->jenisFasilitasKredit->name : '' }}
+                        </p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -76,7 +80,7 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $permohonan->debiture->cif }}</p>
+                            {{ isset($permohonan->debiture->cif) ? $permohonan->debiture->cif : '' }}</p>
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -91,173 +95,179 @@
 
             </div>
         </div>
-        @foreach ($permohonan->debiture->documents as $dokumen)
-            <div class="card">
-                <div class="card-body grid gap-5">
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        @php
-                            $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
-                            $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
 
-                        @endphp
-                        <label class="form-label max-w-56">
-                            Surveyor
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $surveyor->userPenilaiTeam->name }}
-                            </p>
+            @foreach ($permohonan->debiture->documents as $dokumen)
+                <div class="card">
+                    <div class="card-body grid gap-5">
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            @php
+                                $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+                                $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}</p>
+                            @endphp
+                            <label class="form-label max-w-56">
+                                Surveyor
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $surveyor->userPenilaiTeam->name }}
+                                </p>
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">{{ $permohonan->region->name }}
+                                </p>
+                            </div>
+                            <label class="form-label max-w-56">
+                                Penilai
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $penilai->userPenilaiTeam->name }}
+                                </p>
+
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $permohonan->region->name }}
+                                </p>
+                            </div>
                         </div>
-                        <label class="form-label max-w-56">
-                            Penilai
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-
-                            <p class="flex w-full text-gray-600 font-medium text-sm">{{ $penilai->userPenilaiTeam->name }}
-                            </p>
-
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ $permohonan->region->name }}
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tujuan Penilaian
+                            </label>
+                            <p class="flex text-gray-600 font-medium text-sm w-full">
+                                {{ $permohonan->tujuanPenilaian->name }}</p>
+                            <label class="form-label max-w-56">
+                                Jenis Jaminan
+                            </label>
+                            <p class="flex text-gray-600 font-medium text-sm w-full">
+                                @foreach ($permohonan->debiture->documents as $document)
+                                    {{ $document->jenisjaminan->name }}
+                                @endforeach
                             </p>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tujuan Penilaian
-                        </label>
-                        <p class="flex text-gray-600 font-medium text-sm w-full">
-                            {{ $permohonan->tujuanPenilaian->name }}</p>
-                        <label class="form-label max-w-56">
-                            Jenis Jaminan
-                        </label>
-                        <p class="flex text-gray-600 font-medium text-sm w-full">
-                            @foreach ($permohonan->debiture->documents as $document)
-                                {{ $document->jenisjaminan->name }}
-                            @endforeach
-                        </p>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tanggal Survei
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tanggal Survei
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                            </div>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Tanggal Laporan
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tanggal Laporan
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ formatTanggalIndonesia($permohonan->created_at) }}</p>
+                            </div>
                         </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            No. Laporan
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
-                                PJ/001/001</p>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                No. Laporan
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                </p>
+                            </div>
                         </div>
+
+
                     </div>
 
 
-                </div>
+                    <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', $permohonan->id) }}">
+                                LAMPIRAN FOTO DAN DOKUMEN
+                            </a>
 
+                            <a class="btn btn-primary" data-modal-toggle="#modal_2">
+                                KERTAS KERJA
+                            </a>
+                            <a class="btn btn-primary" href="#">
+                                PAPARAN
+                            </a>
 
-                <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', $permohonan->id) }}">
-                            LAMPIRAN FOTO DAN DOKUMEN
-                        </a>
+                            <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
+                                <button class="dropdown-toggle btn btn-primary">
+                                    WORKSHEET
+                                </button>
+                                <div class="dropdown-content w-full max-w-56 py-2">
+                                    <div class="menu menu-default flex flex-col w-full">
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="{{ route('penilai.memo', $permohonan->id) }}">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-badge">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    MEMO
+                                                </span>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="{{ route('penilai.resume', $permohonan->id) }}">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-profile-circle">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    RESUME
+                                                </span>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" onclick="seletSederhanaStandart()">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-setting-2">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    LPJ
+                                                </span>
 
-                        <a class="btn btn-primary" data-modal-toggle="#modal_2">
-                            KERTAS KERJA
-                        </a>
-                        <a class="btn btn-primary" href="#">
-                            PAPARAN
-                        </a>
-
-                        <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
-                            <button class="dropdown-toggle btn btn-primary">
-                                WORKSHEET
-                            </button>
-                            <div class="dropdown-content w-full max-w-56 py-2">
-                                <div class="menu menu-default flex flex-col w-full">
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-badge">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                MEMO
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-profile-circle">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                RESUME
-                                            </span>
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" onclick="seletSederhanaStandart()">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-setting-2">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                LPJ
-                                            </span>
-
-                                        </a>
-                                    </div>
-                                    <div class="menu-item">
-                                        <a class="menu-link" href="#">
-                                            <span class="menu-icon">
-                                                <i class="ki-outline ki-message-programming">
-                                                </i>
-                                            </span>
-                                            <span class="menu-title">
-                                                RAP
-                                            </span>
-                                        </a>
+                                            </a>
+                                        </div>
+                                        <div class="menu-item">
+                                            <a class="menu-link" href="#">
+                                                <span class="menu-icon">
+                                                    <i class="ki-outline ki-message-programming">
+                                                    </i>
+                                                </span>
+                                                <span class="menu-title">
+                                                    RAP
+                                                </span>
+                                            </a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
 
-                    <div class="flex justify-end gap-5">
-                        <a class="btn btn-success" href="#">
-                            SAVE
-                        </a>
+                        <div class="flex justify-end gap-5">
+                            <a class="btn btn-success" href="#">
+                                SAVE
+                            </a>
 
-                        <a class="btn btn-success" href="#">
-                            REPORT
-                        </a>
+                            <a class="btn btn-success" href="#">
+                                REPORT
+                            </a>
 
 
-                        <a class="btn btn-success" href="#">
-                            PRINT OUT
-                        </a>
+                            <a class="btn btn-success" href="#">
+                                PRINT OUT
+                            </a>
+                        </div>
+
                     </div>
 
                 </div>
+            @endforeach
 
-            </div>
-        @endforeach
     </div>
 
 
@@ -308,9 +318,9 @@
             denyButtonText: 'No',
         }).then((result) => {
             if (result.isConfirmed) {
-                
+                window.location.href = "{{ route('penilai.standard', $permohonan->id) }}";
             } else if (result.isDenied) {
-                Swal.fire('Changes are not saved', '', 'info')
+                window.location.href = "{{ route('penilai.sederhana', $permohonan->id) }}";
             }
         })
     }