fix(master-land): fix function read land data

app/Http/Controllers/MasterData/LandController.php

@@ -15,15 +15,19 @@ class LandController extends Controller
 {
     public function index()
     {
-        $lands = Land::orderBy('created_at', 'desc')->get();
+        // $lands = Land::orderBy('created_at', 'desc')->get();
-        if ($lands->isEmpty()) {
+        // if ($lands->isEmpty()) {
+        //     return view('master-data.lahan.index', compact('lands'));
+        // }
+        // $province = Province::where('id', $lands->first()->province_code)->first();
+        // $regency = $province->regency()->where('id', $lands->first()->regency_code)->first();
+        // $district = $regency->district()->where('id', $lands->first()->district_code)->first();
+        // return view('master-data.lahan.index', compact('lands', 'province', 'regency', 'district'));
+
+        $lands = Land::with('province', 'regency')->orderBy('created_at', 'desc')->get();
+
         return view('master-data.lahan.index', compact('lands'));
     }
-        $province = Province::where('id', $lands->first()->province_code)->first();
-        $regency = $province->regency()->where('id', $lands->first()->regency_code)->first();
-        $district = $regency->district()->where('id', $lands->first()->district_code)->first();
-        return view('master-data.lahan.index', compact('lands', 'province', 'regency', 'district'));
-    }
 
     public function create()
     {

app/Models/Land.php

@@ -16,4 +16,19 @@ public function detailLands()
     {
         return $this->hasMany(LandDetails::class, 'land_id', 'id');
     }
+
+    public function province()
+    {
+        return $this->belongsTo(Province::class, 'province_code', 'id');
+    }
+
+    public function regency()
+    {
+        return $this->belongsTo(Regency::class, 'regency_code', 'id');
+    }
+
+    public function district()
+    {
+        return $this->belongsTo(District::class, 'district_code', 'id');
+    }
 }

public/assets/js/pages/customJs/master-data/lahan/create.js

@@ -265,7 +265,7 @@ function onPointerDragend() {
     currentMarker
         .setLatLng(coordinates)
         .bindPopup(
-            `<div class="text-center"><b>Anda berada di sini</b><br />Silahkan priksa lokasi petamu sudah benar.</div>`
+            `<div class="text-center"><b>Anda berada di sini</b><br />Silahkan tentukan petak lahan.<br />Pastikan lokasi anda sudah benar.</div>`
         )
         .openPopup();
 

public/assets/js/pages/customJs/master-data/lahan/index.js

@@ -11,41 +11,6 @@ function deleteData(data) {
     }
 }
 
-function onMapClick(e) {
-    var lat = e.latlng.lat;
-    var lng = e.latlng.lng;
-
-    if (!currentMarkerEdit) {
-        currentMarkerEdit = L.marker(e.latlng).addTo(mapEdit);
-    } else {
-        currentMarkerEdit.setLatLng(e.latlng);
-    }
-    currentMarkerEdit.on("dragend", onPointerDragend);
-
-    currentMarkerEdit
-        .bindPopup(
-            `<div class="text-center"><b>Anda berada di sini</b><br />Silahkan priksa lokasi petamu sudah benar.</div>`
-        )
-        .openPopup();
-
-    latField.value = lat;
-    lngField.value = lng;
-}
-
-function onPointerDragend() {
-    if (!currentMarker) return;
-    var coordinates = currentMarker.getLatLng();
-    currentMarker
-        .setLatLng(coordinates)
-        .bindPopup(
-            `<div class="text-center"><b>Anda berada di sini</b><br />Silahkan priksa lokasi petamu sudah benar.</div>`
-        )
-        .openPopup();
-
-    latField.value = coordinates.lat;
-    lngField.value = coordinates.lng;
-}
-
 var checkAll = document.getElementById("checkAll");
 checkAll &&
     (checkAll.onclick = function () {

public/assets/js/pages/customJs/master-data/lahan/update.js

@@ -178,6 +178,7 @@ function getDistricts(regencyId) {
     addressEditContainer.style.display = "none";
     loadingEdit.style.display = "block";
     mapEditConatiner.style.display = "none";
+    handleDrawDeleted();
 
     const url = "/location/get-district/" + regencyId;
     $.ajax({
@@ -352,6 +353,7 @@ function handleDrawEdited(e) {
 }
 
 function handleDrawDeleted(e) {
+    drawnItems.clearLayers();
     polygonField.value = "";
 }
 

resources/views/master-data/lahan/create.blade.php

@@ -160,6 +160,8 @@
     @push('other-js')
         <script src="{{ asset('assets/js/pages/customJs/master-data/lahan/create.js') }}"></script>
 
+        <script src="{{ asset('assets/js/pages/form-validation.init.js') }}"></script>
+
         <!-- Make sure you put this AFTER Leaflet's CSS -->
         <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
             integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>

resources/views/master-data/lahan/edit.blade.php

@@ -170,6 +170,8 @@ class="btn btn-light">Kembali</a>
     @push('other-js')
         <script src="{{ asset('assets/js/pages/customJs/master-data/lahan/update.js') }}"></script>
 
+        <script src="{{ asset('assets/js/pages/form-validation.init.js') }}"></script>
+
         <!-- Make sure you put this AFTER Leaflet's CSS -->
         <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
             integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>

resources/views/master-data/lahan/index.blade.php

@@ -70,9 +70,9 @@ class="fw-medium link-primary">#VZ2101</a></td>
                                                     </td>
                                                     <td class="status">
                                                         <span class="text-capitalize">{{ $land->address }}, Kecamatan
-                                                            {{ ucwords(strtolower($district->name)) }},
+                                                            {{ ucwords(strtolower($land->district->name)) }},
-                                                            {{ ucwords(strtolower($regency->name)) }}, Provinsi
+                                                            {{ ucwords(strtolower($land->regency->name)) }}, Provinsi
-                                                            {{ ucwords(strtolower($province->name)) }}</span>
+                                                            {{ ucwords(strtolower($land->province->name)) }}</span>
                                                     </td>
                                                     <td>
                                                         <div class="d-flex gap-2 justify-content-center">
@@ -164,10 +164,10 @@ class="btn btn-sm btn-warning edit-item-btn">Edit</a>
         <!-- prismjs plugin -->
         <script src="{{ asset('/assets/libs/prismjs/prism.js') }}"></script>
         <script src="{{ asset('/assets/libs/list.js/list.min.js') }}"></script>
-        <script src="{{ asset('assets/libs/list.pagination.js/list.pagination.min.js') }}"></script>
+        <script src="{{ asset('/assets/libs/list.pagination.js/list.pagination.min.js') }}"></script>
 
         <!-- listjs init -->
-        <script src="{{ asset('assets/js/pages/customJs/master-data/lahan/index.js') }}"></script>
+        <script src="{{ asset('/assets/js/pages/customJs/master-data/lahan/index.js') }}"></script>
 
         <!-- Make sure you put this AFTER Leaflet's CSS -->
         <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"