diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index dc66a26..569f067 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -41,7 +41,7 @@ function formatRupiah($number,$decimals = 0) function formatAlamat($alamat) { - return ($alamat->address ? $alamat->address . ', ' : '') . (isset($alamat->village) ? $alamat->village->name . ', ' : '') . (isset($alamat->city) ? $alamat->city->name . ', ' : '') . (isset($alamat->province) ? $alamat->province->name . ', ' : '') . ($alamat->postal_code ?? ''); + return ($alamat->address ? $alamat->address . ', ' : '') . (isset($alamat->village) ? $alamat->village->name . ', ' : '') . (isset($alamat->city) ? $alamat->city->name . ', ' : '') . (isset($alamat->province) ? $alamat->province->name . ', ' : '') . ($alamat->village->postal_code ?? ''); } // andy add diff --git a/app/Http/Controllers/BankDataController.php b/app/Http/Controllers/BankDataController.php index f9d7fd9..ac94545 100644 --- a/app/Http/Controllers/BankDataController.php +++ b/app/Http/Controllers/BankDataController.php @@ -139,15 +139,16 @@ class BankDataController extends Controller // Format the data as needed $formattedData = $data->map(function ($item) { return [ - 'id' => $item->id, - 'jenis_aset' => $item->jenis_aset, - 'tanggal' => $item->tanggal->format('d-m-Y'), - 'tahun' => $item->tahun, - 'luas_tanah' => $item->luas_tanah, + 'id' => $item->id, + 'jenis_aset' => $item->jenis_aset, + 'tanggal' => $item->tanggal->format('d-m-Y'), + 'tahun' => $item->tahun, + 'luas_tanah' => $item->luas_tanah, 'luas_bangunan' => $item->luas_bangunan, - 'harga' => $item->harga, - 'nilai_pasar' => $item->nilai_pasar, - 'location' => $item->kordinat_lat . ', ' . $item->kordinat_lng, + 'harga' => $item->harga, + 'nilai_pasar' => $item->nilai_pasar, + 'location' => $item->kordinat_lat . ', ' . $item->kordinat_lng, + 'address' => formatAlamat($item) // Add more fields as needed ]; }); diff --git a/app/Models/BankData.php b/app/Models/BankData.php index 437cdd1..b7b992b 100644 --- a/app/Models/BankData.php +++ b/app/Models/BankData.php @@ -1,6 +1,10 @@ whereBetween('tanggal', [$startDate, $endDate]); } + public function village() + { + return $this->belongsTo(Village::class, 'village_code', 'code'); + } + + public function district() + { + return $this->belongsTo(District::class, 'district_code', 'code'); + } + + public function city() + { + return $this->belongsTo(City::class, 'city_code', 'code'); + } + + public function province() + { + return $this->belongsTo(Province::class, 'province_code', 'code'); + } + } diff --git a/resources/views/bank-data/index.blade.php b/resources/views/bank-data/index.blade.php index dc6b59b..00b184f 100644 --- a/resources/views/bank-data/index.blade.php +++ b/resources/views/bank-data/index.blade.php @@ -218,16 +218,111 @@ // Create info window content const contentString = ` -
-

${item.jenis_aset}

-

Tanggal: ${item.tanggal}

-

Tahun: ${item.tahun}

-

Luas Tanah: ${item.luas_tanah} m²

-

Luas Bangunan: ${item.luas_bangunan} m²

-

Harga: ${window.formatRupiah(item.harga)}

-

Nilai Pasar: ${window.formatRupiah(item.nilai_pasar)}

-
- `; +
+
+

+ ${item.jenis_aset} +

+
+
+
+ + Tanggal Penilaian + +
+
+ + ${window.formatTanggalIndonesia(item.tanggal)} + +
+
+
+
+
+ + Tahun + +
+
+ + ${item.tahun} + +
+
+
+
+
+ + Luas Tanah + +
+
+ + ${item.luas_tanah} m² + +
+
+
+
+
+ + Luas Bangunan + +
+
+ + ${item.luas_bangunan} m² + +
+
+
+
+
+ + Harga + +
+
+ + ${window.formatRupiah(item.harga)} + +
+
+
+
+
+ + Nilai Pasar + +
+
+ + ${window.formatRupiah(item.nilai_pasar)} + +
+
+
+
+
+ + Location + +
+
+ + ${item.address.split(' ').reduce((acc, word, index, array) => { + if (index > 0 && index % 7 === 0) { + acc += '
'; + } + acc += word + (index < array.length - 1 ? ' ' : ''); + return acc; + }, '')} + +
+
+
+
+ `; // Create info window const infoWindow = new google.maps.InfoWindow({ @@ -349,6 +444,7 @@ // Reload the table to apply the new filters dataTable.reload(); }); + function initializeEverything() { initMap(); initializeDataTable();