From d1f5093ad9c133fff2a6045a9da104652021ecb8 Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 5 Dec 2024 14:32:05 +0700 Subject: [PATCH] perbaikan alamat di menu show penilai --- resources/views/penilai/lampiran.blade.php | 4 +- resources/views/penilai/show.blade.php | 314 +++++++++++---------- 2 files changed, 164 insertions(+), 154 deletions(-) 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 @@

- {{ $item['nama_objek'] }} + {{ $item['name_objek'] }}

- +
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
-

{{ $permohonan->nomor_registrasi }}

+

+ {{ isset($permohonan->nomor_registrasi) ? $permohonan->nomor_registrasi : '' }}

-

{{ $permohonan->debiture->name }}

+

+ {{ isset($permohonan->debiture->name) ? $permohonan->debiture->name : '' }}

@@ -36,16 +38,16 @@ Cabang
-

{{ $permohonan->branch->name }}

+

+ {{ isset($permohonan->branch->name) ? $permohonan->branch->name : '' }}

-

{{ $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 }}

+

+ {{ formatAlamat($permohonan->debiture) }} +

@@ -53,14 +55,16 @@ Nama AO/Pemohon
-

{{ $permohonan->user->name }}

+

+ {{ isset($permohonan->user->name) ? $permohonan->user->name : '' }}

- {{ $permohonan->jenisFasilitasKredit->name }}

+ {{ isset($permohonan->jenisFasilitasKredit->name) ? $permohonan->jenisFasilitasKredit->name : '' }} +

@@ -76,7 +80,7 @@

- {{ $permohonan->debiture->cif }}

+ {{ isset($permohonan->debiture->cif) ? $permohonan->debiture->cif : '' }}

@@ -91,173 +95,179 @@
- @foreach ($permohonan->debiture->documents as $dokumen) -
-
-
- @php - $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); - $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); - @endphp - -
-

{{ $surveyor->userPenilaiTeam->name }} -

+ @foreach ($permohonan->debiture->documents as $dokumen) +
+
+
+ @php + $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first(); + $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); -

{{ $permohonan->region->name }}

+ @endphp + +
+ +

+ {{ $surveyor->userPenilaiTeam->name }} +

+ +

{{ $permohonan->region->name }} +

+
+ +
+ +

+ {{ $penilai->userPenilaiTeam->name }} +

+ +

+ {{ $permohonan->region->name }} +

+
- -
- -

{{ $penilai->userPenilaiTeam->name }} -

- -

- {{ $permohonan->region->name }} +

+ +

+ {{ $permohonan->tujuanPenilaian->name }}

+ +

+ @foreach ($permohonan->debiture->documents as $document) + {{ $document->jenisjaminan->name }} + @endforeach

-
-
- -

- {{ $permohonan->tujuanPenilaian->name }}

- -

- @foreach ($permohonan->debiture->documents as $document) - {{ $document->jenisjaminan->name }} - @endforeach -

-
-
- -
-

- {{ formatTanggalIndonesia($permohonan->created_at) }}

+
+ +
+

+ {{ formatTanggalIndonesia($permohonan->created_at) }}

+
-
-
- -
-

- {{ formatTanggalIndonesia($permohonan->created_at) }}

+
+ +
+

+ {{ formatTanggalIndonesia($permohonan->created_at) }}

+
-
-
- -
-

- PJ/001/001

+
+ +
+

+

+
+ +
-
+
+
+ + LAMPIRAN FOTO DAN DOKUMEN + + + KERTAS KERJA + + + PAPARAN + -
-
- - LAMPIRAN FOTO DAN DOKUMEN - +
+ +
+
+
+ + + + + + + MEMO + + +
+
+ + + + + + + RESUME + + +
+
+ + + + + + + LPJ + - - KERTAS KERJA - - - PAPARAN - - -
- -
-
-
- - - - - - - MEMO - - -
-
- - - - - - - RESUME - - -
-
- - - - - - - LPJ - - - -
-
- - - - - - - RAP - - + +
+
+ + + + + + + RAP + + +
-
-
- - SAVE - +
+ + SAVE + - - REPORT - + + REPORT + - - PRINT OUT - + + PRINT OUT + +
+
+ @endforeach -
- @endforeach
@@ -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) }}"; } }) }