From 9a424d3420248d6ad3a4ca7dfde8c4499e660104 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Tue, 22 Apr 2025 14:28:49 +0700 Subject: [PATCH] fix(master-land): add user in data land --- app/Http/Controllers/MasterData/LandController.php | 2 +- app/Models/Land.php | 5 +++++ .../assets/js/pages/customJs/master-data/lahan/index.js | 9 ++++++++- resources/views/master-data/lahan/index.blade.php | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MasterData/LandController.php b/app/Http/Controllers/MasterData/LandController.php index e324ea0..3cf7aa5 100644 --- a/app/Http/Controllers/MasterData/LandController.php +++ b/app/Http/Controllers/MasterData/LandController.php @@ -15,7 +15,7 @@ class LandController extends Controller { public function index() { - $lands = Land::with('province', 'regency')->orderBy('created_at', 'desc')->get(); + $lands = Land::with('province', 'regency', 'user')->orderBy('created_at', 'desc')->get(); return view('master-data.lahan.index', compact('lands')); } diff --git a/app/Models/Land.php b/app/Models/Land.php index 075fd65..7e2f7ca 100644 --- a/app/Models/Land.php +++ b/app/Models/Land.php @@ -31,4 +31,9 @@ public function district() { return $this->belongsTo(District::class, 'district_code', 'id'); } + + public function user() + { + return $this->belongsTo(User::class); + } } diff --git a/public/assets/js/pages/customJs/master-data/lahan/index.js b/public/assets/js/pages/customJs/master-data/lahan/index.js index 1a6ea78..53404f9 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/index.js +++ b/public/assets/js/pages/customJs/master-data/lahan/index.js @@ -29,7 +29,14 @@ checkAll && }); var perPage = 10, options = { - valueNames: ["id", "land_name", "owner", "rental_price", "status"], + valueNames: [ + "id", + "land_name", + "owner", + "rental_price", + "user", + "status", + ], page: perPage, pagination: !0, plugins: [ListPagination({ left: 2, right: 2 })], diff --git a/resources/views/master-data/lahan/index.blade.php b/resources/views/master-data/lahan/index.blade.php index f536039..f8dccfb 100644 --- a/resources/views/master-data/lahan/index.blade.php +++ b/resources/views/master-data/lahan/index.blade.php @@ -49,6 +49,7 @@ class="ri-add-line align-bottom me-1"> No Pemilik Alamat + Petugas Action @@ -66,6 +67,7 @@ class="fw-medium link-primary">#VZ2101 {{ ucwords(strtolower($land->regency->name)) }}, Provinsi {{ ucwords(strtolower($land->province->name)) }} + {{ $land->user->username }}