daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-03-18 09:08:20 +07:00
parent 45a8fac8e1 ea2f303ea4
commit 9d93979a8b
4 changed files with 211 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Lpj.php
View File

@@ -41,7 +41,7 @@ function formatRupiah($number,$decimals = 0)
function formatAlamat($alamat) 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 // andy add

18
app/Http/Controllers/BankDataController.php
View File

@@ -139,15 +139,17 @@ class BankDataController extends Controller
// Format the data as needed // Format the data as needed
$formattedData = $data->map(function ($item) { $formattedData = $data->map(function ($item) {
return [ return [
'id' => $item->id, 'id' => $item->id,
'jenis_aset' => $item->jenis_aset, 'jenis_aset' => $item->jenis_aset,
'tanggal' => $item->tanggal->format('d-m-Y'), 'tanggal' => $item->tanggal->format('d-m-Y'),
'tahun' => $item->tahun, 'tahun' => $item->tahun,
'luas_tanah' => $item->luas_tanah, 'luas_tanah' => $item->luas_tanah,
'luas_bangunan' => $item->luas_bangunan, 'luas_bangunan' => $item->luas_bangunan,
'harga' => $item->harga, 'harga' => $item->harga,
'nilai_pasar' => $item->nilai_pasar, 'nilai_pasar' => $item->nilai_pasar,
'location' => $item->kordinat_lat . ', ' . $item->kordinat_lng, 'location' => $item->kordinat_lat . ', ' . $item->kordinat_lng,
'address' => formatAlamat($item),
'photos' => json_decode($item->foto_objek, true) ?: [$item->foto_objek],
// Add more fields as needed // Add more fields as needed
]; ];
}); });

24
app/Models/BankData.php
View File

@@ -1,6 +1,10 @@
<?php <?php
namespace Modules\Lpj\Models; namespace Modules\Lpj\Models;
use Modules\Location\Models\City;
use Modules\Location\Models\District;
use Modules\Location\Models\Province;
use Modules\Location\Models\Village;
class BankData extends Base class BankData extends Base
{ {
@@ -77,4 +81,24 @@
return $query->whereBetween('tanggal', [$startDate, $endDate]); return $query->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');
}
} }

186
resources/views/bank-data/index.blade.php
View File

@@ -166,6 +166,13 @@
</div> </div>
</div> </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 @endsection
@push('scripts') @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) { function updateMapMarkers(data) {
// Clear existing markers // Clear existing markers
markers.forEach(marker => marker.setMap(null)); markers.forEach(marker => marker.setMap(null));
@@ -218,16 +245,134 @@
// Create info window content // Create info window content
const contentString = ` const contentString = `
<div> <div id='content' style='width: 550px; max-width: 100%;'>
<h3>${item.jenis_aset}</h3> <div id='siteNotice'></div>
<p>Tanggal: ${item.tanggal}</p> <h2 class='card-title mb-5'>
<p>Tahun: ${item.tahun}</p> ${item.jenis_aset}
<p>Luas Tanah: ${item.luas_tanah} m²</p> </h2>
<p>Luas Bangunan: ${item.luas_bangunan} m²</p> <div class="grid gap-3">
<p>Harga: ${window.formatRupiah(item.harga)}</p> <div class='flex items-center justify-between flex-wrap gap-1.5'>
<p>Nilai Pasar: ${window.formatRupiah(item.nilai_pasar)}</p> <div class='flex items-center gap-1.5'>
</div> <span class='text-sm font-normal text-gray-900'>
`; Tanggal Penilaian
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${window.formatTanggalIndonesia(item.tanggal)}
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-center justify-between flex-wrap gap-1.5'>
<div class='flex items-center gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Tahun
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${item.tahun}
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-center justify-between flex-wrap gap-1.5'>
<div class='flex items-center gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Luas Tanah
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${item.luas_tanah} m²
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-center justify-between flex-wrap gap-1.5'>
<div class='flex items-center gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Luas Bangunan
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${item.luas_bangunan} m²
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-center justify-between flex-wrap gap-1.5'>
<div class='flex items-center gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Harga
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${window.formatRupiah(item.harga)}
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-center justify-between flex-wrap gap-1.5'>
<div class='flex items-center gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Nilai Pasar
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='lg:text-right'>
${window.formatRupiah(item.nilai_pasar)}
</span>
</div>
</div>
<div class="border-t border-gray-300 border-dashed"></div>
<div class='flex items-start justify-between flex-wrap gap-1.5'>
<div class='flex items-start gap-1.5'>
<span class='text-sm font-normal text-gray-900'>
Location
</span>
</div>
<div class='flex items-center text-sm font-medium text-gray-800 gap-6'>
<span class='text-right whitespace-normal break-words'>
${item.address.split(' ').reduce((acc, word, index, array) => {
if (index > 0 && index % 7 === 0) {
acc += '<br>';
}
acc += word + (index < array.length - 1 ? ' ' : '');
return acc;
}, '')}
</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'>
Get Directions
</button>
</div>
</div>
</div>
`;
// Create info window // Create info window
const infoWindow = new google.maps.InfoWindow({ const infoWindow = new google.maps.InfoWindow({
@@ -259,6 +404,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() { function initializeDataTable() {
const element = document.querySelector('#bank-data-table'); const element = document.querySelector('#bank-data-table');
const searchInput = document.getElementById('search'); const searchInput = document.getElementById('search');
@@ -349,6 +514,7 @@
// Reload the table to apply the new filters // Reload the table to apply the new filters
dataTable.reload(); dataTable.reload();
}); });
function initializeEverything() { function initializeEverything() {
initMap(); initMap();
initializeDataTable(); initializeDataTable();