From 7cc687814f05ffc2acb69d4b3692adaa6ed22802 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 18 Mar 2025 08:17:30 +0700
Subject: [PATCH 1/9] feat(bank-data): tambahkan tombol untuk mendapatkan
 petunjuk arah

- Menambahkan tombol "Get Directions" di tampilan data bank.
- Mengimplementasikan fungsi getDirections untuk membuka Google Maps dengan rute dari lokasi pengguna ke lokasi tujuan.
- Menggunakan geolocation API untuk mendapatkan lokasi pengguna saat ini.
---
 resources/views/bank-data/index.blade.php | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/resources/views/bank-data/index.blade.php b/resources/views/bank-data/index.blade.php
index 00b184f..360e3c7 100644
--- a/resources/views/bank-data/index.blade.php
+++ b/resources/views/bank-data/index.blade.php
@@ -320,6 +320,12 @@
                                             </span>
                                         </div>
                                     </div>
+                                    <div class="border-t border-gray-300 border-dashed"></div>
+                                    <div class='flex justify-end mt-3'>
+                                        <button onclick="getDirections(${lat}, ${lng})" class='btn btn-sm btn-primary'>
+                                            Get Directions
+                                        </button>
+                                    </div>
                                 </div>
                             </div>
                         `;
@@ -354,6 +360,26 @@
             }
         }
 
+
+        function getDirections(lat, lng) {
+            console.log('Getting directions to:', lat, lng);
+            if (navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(
+                    (position) => {
+                        const origin = position.coords.latitude + ',' + position.coords.longitude;
+                        const destination = lat + ',' + lng;
+                        const url = `https://www.google.com/maps/dir/?api=1&origin=${origin}&destination=${destination}`;
+                        window.open(url, '_blank');
+                    },
+                    () => {
+                        alert('Unable to get your current location. Please enable location services.');
+                    }
+                );
+            } else {
+                alert('Geolocation is not supported by your browser.');
+            }
+        }
+
         function initializeDataTable() {
             const element = document.querySelector('#bank-data-table');
             const searchInput = document.getElementById('search');

From ea2f303ea44854c08371fb614868347daf5253e4 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 18 Mar 2025 08:45:31 +0700
Subject: [PATCH 2/9] feat(bank-data): tambahkan fitur galeri foto dan modal
 untuk gambar

- Menambahkan dukungan untuk menampilkan foto objek bank.
- Menambahkan modal untuk memperbesar gambar saat diklik.
- Memperbarui tampilan untuk menampilkan foto utama dan thumbnail.
- Memperbaiki lebar konten info window untuk menyesuaikan dengan gambar.
---
 app/Http/Controllers/BankDataController.php |  3 +-
 resources/views/bank-data/index.blade.php   | 46 ++++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php
index ac94545..4662338 100644
--- a/app/Http/Controllers/BankDataController.php
+++ b/app/Http/Controllers/BankDataController.php
@@ -148,7 +148,8 @@ class BankDataController extends Controller
                 'harga'         => $item->harga,
                 'nilai_pasar'   => $item->nilai_pasar,
                 'location'      => $item->kordinat_lat . ', ' . $item->kordinat_lng,
-                'address'       => formatAlamat($item)
+                'address'       => formatAlamat($item),
+                'photos' => json_decode($item->foto_objek, true) ?: [$item->foto_objek],
                 // Add more fields as needed
             ];
         });
diff --git a/resources/views/bank-data/index.blade.php b/resources/views/bank-data/index.blade.php
index 360e3c7..547f6ac 100644
--- a/resources/views/bank-data/index.blade.php
+++ b/resources/views/bank-data/index.blade.php
@@ -166,6 +166,13 @@
             </div>
         </div>
     </div>
+
+    <div id="imageModal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
+        <div class="bg-white p-4 rounded-lg max-w-3xl max-h-[100vh] overflow-auto">
+            <img id="modalImage" src="" alt="Zoomed Image" class="max-w-full h-auto">
+            <button id="closeModal" class="mt-4 px-4 py-2 bg-red-300 text-gray-800 rounded hover:bg-red-400" onclick="closeImageModal()">Close</button>
+        </div>
+    </div>
 @endsection
 
 @push('scripts')
@@ -183,6 +190,26 @@
             });
         }
 
+        function openImageModal(src) {
+            const modal = document.getElementById('imageModal');
+            const modalImage = document.getElementById('modalImage');
+            modalImage.src = src;
+            modal.classList.remove('hidden');
+            modal.classList.add('flex');
+        }
+
+        function closeImageModal() {
+            const modal = document.getElementById('imageModal');
+            modal.classList.remove('flex');
+            modal.classList.add('hidden');
+        }
+
+        function changeMainPhoto(thumbnail, index) {
+            const mainPhoto = thumbnail.closest('.photo-gallery').querySelector('.main-photo img');
+            mainPhoto.src = thumbnail.src;
+            mainPhoto.alt = thumbnail.alt;
+        }
+
         function updateMapMarkers(data) {
             // Clear existing markers
             markers.forEach(marker => marker.setMap(null));
@@ -218,7 +245,7 @@
 
                         // Create info window content
                         const contentString = `
-                            <div id='content' style='width: 500px; max-width: 100%;'>
+                            <div id='content' style='width: 550px; max-width: 100%;'>
                                 <div id='siteNotice'></div>
                                 <h2 class='card-title mb-5'>
                                     ${item.jenis_aset}
@@ -320,6 +347,23 @@
                                             </span>
                                         </div>
                                     </div>
+                                    ${item.photos && item.photos.length > 0 ? `
+                                        <div class="photo-gallery mb-5">
+                                            <div class="main-photo mb-2">
+                                                <img src="storage/${item.photos[0]}" alt="${item.jenis_aset}"
+                                                     style="width: 100%; height: auto; object-fit: cover; cursor: pointer;"
+                                                     onclick="openImageModal(this.src)">
+                                            </div>
+                                            <div class="thumbnail-container flex gap-2 overflow-x-auto">
+                                                ${item.photos.map((photo, index) => `
+                                                    <img src="storage/${photo}" alt="${item.jenis_aset} ${index + 1}"
+                                                         class="thumbnail cursor-pointer"
+                                                         style="width: 60px; height: 60px; object-fit: cover;"
+                                                         onclick="changeMainPhoto(this, ${index})">
+                                                `).join('')}
+                                            </div>
+                                        </div>
+                                    ` : ''}
                                     <div class="border-t border-gray-300 border-dashed"></div>
                                     <div class='flex justify-end mt-3'>
                                         <button onclick="getDirections(${lat}, ${lng})" class='btn btn-sm btn-primary'>

From 1cb38ba9ddec101a5112511b4bfabc3742336524 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 18 Mar 2025 09:39:10 +0700
Subject: [PATCH 3/9] feat(bank-data): tambahkan logika untuk memasukkan data
 pembanding

- Mengambil data inspeksi dan memproses data pembanding.
- Memvalidasi koordinat sebelum menyimpan ke dalam database.
- Menggunakan metode updateOrCreate untuk menyimpan data bank.
- Menambahkan logging untuk koordinat yang tidak valid.
---
 app/Http/Controllers/BankDataController.php | 64 ++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php
index 4662338..ed4127f 100644
--- a/app/Http/Controllers/BankDataController.php
+++ b/app/Http/Controllers/BankDataController.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Modules\Lpj\Http\Requests\BankDataRequest;
 use Modules\Lpj\Models\BankData;
+use Modules\Lpj\Models\Inspeksi;
 use Modules\Lpj\Models\JenisJaminan;
 use Modules\Lpj\Services\BankDataService;
 use Modules\Location\Models\Province;
@@ -25,6 +26,67 @@ class BankDataController extends Controller
         $provinces = Province::all();
         $jenisJaminan = JenisJaminan::all();
 
+        //insert data pembanding
+
+        $inspeksi = Inspeksi::all();
+
+        foreach ($inspeksi as $item) {
+            if(isset($item->data_pembanding)){
+                $data_pembanding = json_decode($item->data_pembanding);
+                foreach ($data_pembanding->data_pembanding as $dataPembanding) {
+                    $lat = trim($dataPembanding->kordinat_lat);
+                    $lng = trim($dataPembanding->kordinat_lng);
+
+                    if (!empty($lat) && !empty($lng)) {
+                        $lat = floatval($lat);
+                        $lng = floatval($lng);
+
+                        if ($lat >= -90 && $lat <= 90 && $lng >= -180 && $lng <= 180) {
+                            $data = [
+                                'address'            => $dataPembanding->address,
+                                'village_code'       => $dataPembanding->village_code,
+                                'district_code'      => $dataPembanding->district_code,
+                                'city_code'          => $dataPembanding->city_code,
+                                'province_code'      => $dataPembanding->province_code,
+                                'tahun'              => $dataPembanding->tahun,
+                                'luas_tanah'         => $dataPembanding->luas_tanah,
+                                'luas_bangunan'      => $dataPembanding->luas_bangunan,
+                                'tahun_bangunan'     => $dataPembanding->tahun_bangunan,
+                                'status_nara_sumber' => $dataPembanding->status_nara_sumber,
+                                'harga'              => $dataPembanding->harga,
+                                'harga_diskon'       => $dataPembanding->harga_diskon,
+                                'diskon'             => str_replace(',','.',$dataPembanding->diskon),
+                                'total'              => $dataPembanding->total,
+                                'nama_nara_sumber'   => $dataPembanding->nama_nara_sumber,
+                                'peruntukan'         => $dataPembanding->peruntukan,
+                                'penawaran'          => $dataPembanding->penawaran,
+                                'telepon'            => $dataPembanding->telepon,
+                                'hak_properti'       => $dataPembanding->hak_properti,
+                                'jenis_aset'         => $dataPembanding->jenis_aset,
+                                'foto_objek'         => $dataPembanding->foto_objek,
+                                'tanggal'            => $dataPembanding->tanggal,
+                                'harga_penawaran'    => $dataPembanding->harga_penawaran,
+                            ];
+
+                            $data['kordinat_lat'] = $lat;
+                            $data['kordinat_lng'] = $lng;
+
+                            BankData::updateOrCreate(
+                                [
+                                    'kordinat_lat' => $data['kordinat_lat'],
+                                    'kordinat_lng' => $data['kordinat_lng']
+                                ],
+                                $data
+                            );
+                        }
+                    }else{
+                        // Invalid coordinates
+                        \Log::warning("Invalid coordinates: Lat: $lat, Lng: $lng");// Do something to handle this situation, such as logging an error or skipping the record
+                    }
+                }
+            }
+        }
+
         return view('lpj::bank-data.index', compact('provinces', 'jenisJaminan'  ));
     }
 
@@ -141,7 +203,7 @@ class BankDataController extends Controller
             return [
                 'id'            => $item->id,
                 'jenis_aset'    => $item->jenis_aset,
-                'tanggal'       => $item->tanggal->format('d-m-Y'),
+                'tanggal'       => $item->tanggal ? $item->tanggal->format('d-m-Y') : '-',
                 'tahun'         => $item->tahun,
                 'luas_tanah'    => $item->luas_tanah,
                 'luas_bangunan' => $item->luas_bangunan,

From 8647063b4bd4c0395dfff47d45ee612aae86e23b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 18 Mar 2025 10:54:52 +0700
Subject: [PATCH 4/9] fix(bank-data): perbaiki logika pemanggilan tanggal
 pencarian

- Memperbaiki kesalahan dalam pemanggilan parameter tanggal mulai pada metode betweenDates.
- Menggunakan nilai yang benar dari $search['start_date'] untuk memastikan pencarian tanggal berfungsi dengan baik.
---
 app/Http/Controllers/BankDataController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php
index ed4127f..57def0c 100644
--- a/app/Http/Controllers/BankDataController.php
+++ b/app/Http/Controllers/BankDataController.php
@@ -163,7 +163,7 @@ class BankDataController extends Controller
                 }
 
                 if ($search['start_date'] && $search['end_date']) {
-                    $query->betweenDates($request->start_date, $search['end_date']);
+                    $query->betweenDates($search['start_date'], $search['end_date']);
                 }
             } else{
                 $search = $request->get('search');

From 644cd75522a797cd35307e3f851a7870096b2e3e Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Tue, 18 Mar 2025 12:10:32 +0700
Subject: [PATCH 5/9] fix(bank-data): perbaiki logika koordinat dan pembaruan
 pagination

- Memperbaiki pemanggilan koordinat dengan menggunakan variabel lokal.
- Menambahkan fungsi untuk memperbarui informasi pagination pada tampilan.
- Memastikan halaman saat ini tidak melebihi jumlah halaman yang tersedia.
---
 app/Http/Controllers/BankDataController.php | 11 ++++++-----
 resources/views/bank-data/index.blade.php   | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php
index 57def0c..133f7a4 100644
--- a/app/Http/Controllers/BankDataController.php
+++ b/app/Http/Controllers/BankDataController.php
@@ -68,13 +68,10 @@ class BankDataController extends Controller
                                 'harga_penawaran'    => $dataPembanding->harga_penawaran,
                             ];
 
-                            $data['kordinat_lat'] = $lat;
-                            $data['kordinat_lng'] = $lng;
-
                             BankData::updateOrCreate(
                                 [
-                                    'kordinat_lat' => $data['kordinat_lat'],
-                                    'kordinat_lng' => $data['kordinat_lng']
+                                    'kordinat_lat' => $lat,
+                                    'kordinat_lng' => $lng
                                 ],
                                 $data
                             );
@@ -222,6 +219,10 @@ class BankDataController extends Controller
         // Calculate the current page number
         $currentPage = $request->get('page', 1);
 
+        // Ensure current page doesn't exceed page count
+        $currentPage = min($currentPage, $pageCount);
+
+
         // Return the response data as a JSON object
         return response()->json([
             'draw' => $request->get('draw'),
diff --git a/resources/views/bank-data/index.blade.php b/resources/views/bank-data/index.blade.php
index 547f6ac..15d718b 100644
--- a/resources/views/bank-data/index.blade.php
+++ b/resources/views/bank-data/index.blade.php
@@ -492,6 +492,7 @@
             dataTable.on('draw', () => {
                 const data = dataTable._data;
                 updateMapMarkers(data);
+                updatePagination(data);
             })
             // Custom search functionality
             searchInput.addEventListener('input', function () {
@@ -515,6 +516,20 @@
             dataTable.reload();
         });
 
+        function updatePagination(response) {
+            const paginationInfo = document.querySelector('[data-datatable-info="true"]');
+
+            if (paginationInfo) {
+                if (response.recordsFiltered > 0) {
+                    const start = (response.page - 1) * response.pageSize + 1;
+                    const end = Math.min(start + response.pageSize - 1, response.recordsFiltered);
+                    paginationInfo.textContent = `Showing ${start} to ${end} of ${response.recordsFiltered} entries`;
+                } else {
+                    paginationInfo.textContent = 'No entries to show';
+                }
+            }
+        }
+
         function initializeEverything() {
             initMap();
             initializeDataTable();

From 0a25a32fc84f7171ad3442571860fcf86ffdee59 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 19 Mar 2025 08:51:12 +0700
Subject: [PATCH 6/9] fix(surveyor): perbaikkan back halaman inspeksi dan otor
 paparan

---
 app/Http/Controllers/PenilaianController.php         | 8 ++++----
 resources/views/penilaian/otorisator/show.blade.php  | 4 ++--
 resources/views/surveyor/components/header.blade.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index ab5897b..cde7ca9 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -514,10 +514,10 @@ class PenilaianController extends Controller
                     $status = 'done';
                 }
 
-                if($status=='done'){
+                if ($status == 'done') {
                     $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
 
-                    if(isset($_permohonan->penilai->lpj)){
+                    if (isset($_permohonan->penilai->lpj)) {
                         $npw = json_decode($_permohonan->penilai->lpj, true);
                         $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
                     }
@@ -559,7 +559,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator'  && $authorization->approve_so && $authorization->approve_eo === null) {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
+                    if (!in_array($permohonan->nilai_plafond_id, [1, 2])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -603,7 +603,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1,4])) {
+                    if (!in_array($permohonan->nilai_plafond_id, [1,2])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index f71ccb0..da74054 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -216,7 +216,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null)
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2]))
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null)
+                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [1, 4]))
                             <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 2434668..d10e7bf 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -21,12 +21,12 @@
                         class="btn btn-xs btn-info">
                         <i class="ki-filled ki-exit-left"></i> Back
                     </a>
-                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai']))
                     @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
                         <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
-                    @else
+                    @elseif (Request::is('penilai/*/*'))
                         <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>

From 39c52140759ed01aa0bdff777808ef39e88b279f Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 19 Mar 2025 09:26:52 +0700
Subject: [PATCH 7/9] fix(surveyor/penilai): perbaikan satuan luas tanah,
 bangunan dan penambahan total luas di denah

---
 .../component/print-out-dokument.blade.php    |  2 +-
 .../analisa/apartement-kantor.blade.php       |  2 +-
 .../components/analisa/bangunan.blade.php     |  2 +-
 .../components/analisa/tanah.blade.php        |  2 +-
 .../components/print-out-sederhana.blade.php  |  4 +-
 .../views/surveyor/components/denah.blade.php | 43 +++++++++++++++++--
 6 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 11d37b7..8cb86f0 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -27,7 +27,7 @@
                                         @else
                                             {{ $item }}
                                             @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                                <sup>m2</sup>
+                                            <span>m²</span>
                                             @endif
                                         @endif
                                     </td>
diff --git a/resources/views/penilai/components/analisa/apartement-kantor.blade.php b/resources/views/penilai/components/analisa/apartement-kantor.blade.php
index 78227a7..de20f71 100644
--- a/resources/views/penilai/components/analisa/apartement-kantor.blade.php
+++ b/resources/views/penilai/components/analisa/apartement-kantor.blade.php
@@ -18,7 +18,7 @@
         @endphp
         <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td>
         <td style="width: 1%; padding: 2px; vertical-align: top;">:</td>
-        <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td>
+        <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}     <span>m²</span></td>
     </tr>
     <tr>
         <td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td>
diff --git a/resources/views/penilai/components/analisa/bangunan.blade.php b/resources/views/penilai/components/analisa/bangunan.blade.php
index 9725588..ab8fa6d 100644
--- a/resources/views/penilai/components/analisa/bangunan.blade.php
+++ b/resources/views/penilai/components/analisa/bangunan.blade.php
@@ -22,7 +22,7 @@
                         : '-');
             @endphp
 
-            {{ $output }} <sup>m2</sup>
+            {{ $output }} <span>m²</span>
         </td>
 
     </tr>
diff --git a/resources/views/penilai/components/analisa/tanah.blade.php b/resources/views/penilai/components/analisa/tanah.blade.php
index 8c50a6a..d34790c 100644
--- a/resources/views/penilai/components/analisa/tanah.blade.php
+++ b/resources/views/penilai/components/analisa/tanah.blade.php
@@ -16,7 +16,7 @@
             @endphp
             <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td>
             <td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
-            <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
+            <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}    <span>m²</span></td>
         </tr>
         <tr>
             @php
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index fbb0b38..3ebc2f9 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -270,7 +270,7 @@
                                             @endphp
                                             <td style="padding: 2px; vertical-align: top;">Luas Tanah</td>
                                             <td style="padding: 2px; vertical-align: top;">:</td>
-                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
+                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
                                         </tr>
                                         <tr>
                                             <td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
@@ -373,7 +373,7 @@
                                                             : '-');
                                                 @endphp
 
-                                                {{ $output }} <sup>m2</sup>
+                                                {{ $output }}     <span>m²</span>
                                             </td>
 
                                         </tr>
diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php
index b8aff28..6dbe2f9 100644
--- a/resources/views/surveyor/components/denah.blade.php
+++ b/resources/views/surveyor/components/denah.blade.php
@@ -94,7 +94,7 @@
                                             <div class="flex flex-wrap gap-4">
                                                 <div class="flex w-full items-center justify-center gap-4">
                                                     <label class="form-label max-w-56">
-                                                        <span class="form-label">Total Luas</span>
+                                                        <span class="form-label"> Luas</span>
                                                     </label>
                                                     <input type="text" name="luas_denah[]"
                                                         class="input w-full number-format"
@@ -151,7 +151,7 @@
                                         <div class="flex flex-wrap gap-4">
                                             <div class="flex w-full items-center justify-center gap-4">
                                                 <label class="form-label max-w-56">
-                                                    <span class="form-label">Total Luas</span>
+                                                    <span class="form-label"> Luas</span>
                                                 </label>
                                                 <input type="text" name="luas_denah[]" class="input w-full number-format"
                                                     onkeyup="formatNumber(this)">
@@ -164,6 +164,17 @@
                     </div>
 
 
+                    <div class="w-full p-4">
+                        <div class="flex flex-wrap gap-4">
+                            <div class="flex w-full items-center justify-center gap-4">
+                                <label class="form-label max-w-56">
+                                    <span class="form-label">Total Luas</span>
+                                </label>
+                                <input type="text" name="total_luas" id="totalLuas" class="input w-full number-format" readonly>
+
+                            </div>
+                        </div>
+                    </div>
                     <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                         <button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
                             <span id="saveButtonText">Save</span>
@@ -229,6 +240,32 @@
             });
         });
 
+        function calculateTotalLuas() {
+            let totalLuas = 0;
+
+            const luasInputs = document.querySelectorAll('input[name="luas_denah[]"]');
+            luasInputs.forEach(input => {
+                const value = parseFloat(input.value.replace(/[^0-9.]/g, ''));
+                if (!isNaN(value)) {
+                    totalLuas += value;
+                }
+            });
+
+            const totalLuasInput = document.getElementById('totalLuas');
+            totalLuasInput.value = totalLuas ? `${totalLuas.toLocaleString()} m²` : '';
+        }
+
+        // Tambahkan event listener untuk setiap input luas_denah[]
+        document.addEventListener('input', function (e) {
+            if (e.target && e.target.name === 'luas_denah[]') {
+                calculateTotalLuas();
+            }
+        });
+
+        // Jalankan hitung ulang saat halaman dimuat (jika ada nilai default)
+        document.addEventListener('DOMContentLoaded', calculateTotalLuas);
+
+
         function createDenahElement(index) {
             const denahItem = document.createElement('div');
             denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded';
@@ -267,7 +304,7 @@
                     <div class="flex flex-wrap gap-4">
                         <div class="flex w-full items-center justify-center gap-4">
                             <label class="form-label max-w-56">
-                                <span class="form-label">Total Luas</span>
+                                <span class="form-label"> Luas</span>
                             </label>
                             <input type="text" name="luas_denah[]"
                                 class="input w-full number-format"

From 343042374964814b012e7bcfea32bc0e2281ea24 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 19 Mar 2025 11:07:43 +0700
Subject: [PATCH 8/9] fix(laporan) perbaikkan output laporan

---
 app/Exports/LaporanPenilaiJaminanExport.php | 77 +++++++++++++++++----
 app/Models/Permohonan.php                   | 11 +++
 2 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/app/Exports/LaporanPenilaiJaminanExport.php b/app/Exports/LaporanPenilaiJaminanExport.php
index 64e8165..d2330ab 100644
--- a/app/Exports/LaporanPenilaiJaminanExport.php
+++ b/app/Exports/LaporanPenilaiJaminanExport.php
@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Builder;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use Modules\Lpj\Models\Debiture;
 use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Helpers\Lpj;
 
 class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMapping, ShouldAutoSize
 {
@@ -30,7 +31,7 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
     public function query()
     {
         $query = Permohonan::query()
-            ->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai']);
+            ->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai', 'inspeksi']);
 
         // Filter by date range if provided
         if ($this->tanggalAwal && $this->tanggalAkhir) {
@@ -41,6 +42,7 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
         // Filter by status if provided
         if ($this->status) {
             $types = is_array($this->status) ? $this->status : [$this->status];
+            $types = array_map('strtolower', $types);
             $query->whereHas('penilai', function (Builder $query) use ($types) {
                 $query->whereIn('type_penilai', $types);
             });
@@ -59,10 +61,22 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
 
     public function map($row): array
     {
-        $fieldPenilai = ['sederhana', 'standar', 'resume', 'memo', 'rap', 'call-report'];
+
+        // ambil data alamat dari inspeksi
+        $alamat_inspeksi = null;
+
+        if ($row->inspeksi) {
+            $alamat_inspeksi = json_decode($row->inspeksi->data_form, true) ?? null;
+            $alamat_inspeksi = $alamat_inspeksi['asset']['alamat']['sesuai'] ?? $alamat_inspeksi['asset']['alamat']['tidak sesuai'] ?? [];
+        }
+        $alamat_inspeksi = $alamat_inspeksi['address'] ?? '-';
+
+
+        // ambil data dari table penilai
+        $fieldPenilai = ['lpj', 'resume', 'memo', 'rap', 'call-report'];
         $penilaiCek = null;
 
-        // Find the first available field in the array
+        // Cari field yang tersedia
         foreach ($fieldPenilai as $value) {
             if (!empty($row->penilai->$value)) {
                 $penilaiCek = $row->penilai->$value;
@@ -71,6 +85,39 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
         }
 
         $decodePenilai = json_decode($penilaiCek, true) ?? [];
+        // Ambil nilai utama
+        $luasTanah = $decodePenilai['luas_tanah'] ?? 0;
+        $nilaiTanah1 = $decodePenilai['nilai_tanah_1'] ?? 0;
+        $luasBangunan = $decodePenilai['luas_bangunan'] ?? 0;
+        $nilaiBangunan1 = $decodePenilai['nilai_bangunan_1'] ?? 0;
+        $totalNilaiPasar = $decodePenilai['total_nilai_pasar_wajar'] ?? 0;
+        $likuidasi = $decodePenilai['likuidasi'] ?? 0;
+
+        // Ambil data npw_tambahan jika ada
+        $npwTambahan = $decodePenilai['npw_tambahan'] ?? [];
+        $tambahanDetails = [];
+        foreach ($npwTambahan as $tambahan) {
+            $tambahanDetails[] = sprintf(
+                '%s: Luas: %s, Nilai 1: %s, Nilai 2: %s',
+                $tambahan['name'] ?? '-',
+                $tambahan['luas'] ?? 0,
+                $tambahan['nilai_1'] ?? 0,
+                $tambahan['nilai_2'] ?? 0
+            );
+        }
+        $tambahanSummary = implode("; ", $tambahanDetails);
+
+        // Ambil data penilaian dari table penilaian
+        $user_penilai =  $row->penilaian->userPenilai ?? null;
+        $user_penilai_name = null;
+        foreach ($user_penilai as $value) {
+            if ($value->role == 'penilai') {
+                $user_penilai_name = $value->user->name;
+                $nik_penilai = $value->user->nik ?? '-';
+                break;
+            }
+        }
+
 
         return [
             $row->id,
@@ -80,27 +127,28 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
             $row->tujuanPenilaian->name,
             $row->debiture->name,
             $row->penilai->type_penilai ?? '-',
-             '-',
-            $decodePenilai['luas_tanah'] ?? 0,
-            $decodePenilai['luas_bangunan'] ?? 0,
-            $decodePenilai['nilai_tanah_1'] ?? 0,
-            $decodePenilai['nilai_bangunan_1'] ?? 0,
-            $decodePenilai['total_nilai_pasar_wajar'] ?? 0,
-            $decodePenilai['likuidasi'] ?? 0,
-            $row->authorized_at,
-            $row->authorized_status ?? '-',
-            $row->authorized_by ?? '-',
+            $alamat_inspeksi ?? '-',
+            $luasTanah,
+            $luasBangunan,
+            $nilaiTanah1,
+            $nilaiBangunan1,
+            $totalNilaiPasar,
+            $likuidasi,
+            $row->laporan->created_at ?? '-',
+            $user_penilai_name,
+            $nik_penilai,
             $row->created_at,
         ];
     }
 
+
     public function headings(): array
     {
         return [
             'ID',
             'Nomor Registrasi',
             'User Pemohon',
-            'Branch Pemohon',
+            'Cabang',
             'Tujuan Penilaian',
             'Debitur',
             'Jenis Laporan',
@@ -114,6 +162,7 @@ class LaporanPenilaiJaminanExport implements FromQuery, WithHeadings, WithMappin
             'Tanggal Laporan',
             'Nama Penilai',
             'Nik Penilai',
+            'Created At',
         ];
     }
     public function columnFormats(): array
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index 0759b17..5644430 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -248,4 +248,15 @@
         {
             return $this->belongsTo(LaporanExternal::class,'id','permohonan_id');
         }
+
+
+        public function laporan()
+        {
+            return $this->belongsTo(Laporan::class,'id','permohonan_id');
+        }
+
+        public function inspeksi(){
+            return $this->belongsTo(Inspeksi::class, 'permohonan_id');
+        }
+
     }

From 5e50138d8e36ad8b9b0a830ecb5fb97188d5622b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 19 Mar 2025 15:35:50 +0700
Subject: [PATCH 9/9] fix(otorisator): perbaikan kondisi approval pada tampilan
 otorisator

- Mengubah kondisi untuk memeriksa status approval dari `null` menjadi `0` untuk:
  - Senior Officer
  - EO Appraisal
  - DD Appraisal
---
 resources/views/penilaian/otorisator/show.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index da74054..45bfc0a 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -162,7 +162,7 @@
                             href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
                             Lihat Laporan
                         </a>
-                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == null)
+                        @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == 0)
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -171,7 +171,7 @@
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
                                 $permohonan->approval_so &&
-                                $permohonan->approval_eo == null &&
+                                $permohonan->approval_eo == 0 &&
                                 in_array($permohonan->nilai_plafond_id, [1, 2]))
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -181,7 +181,7 @@
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
                                 $permohonan->approval_eo &&
-                                $permohonan->approval_dd == null &&
+                                $permohonan->approval_dd == 0 &&
                                 in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>