From de5b7a0854da7f298b2760107bfa03b9dad6aecb Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Thu, 13 Mar 2025 15:41:10 +0700 Subject: [PATCH 1/4] fix(master-land): add field user id --- app/Http/Controllers/MasterData/LandController.php | 2 ++ database/migrations/2025_01_28_065420_create_land_table.php | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/app/Http/Controllers/MasterData/LandController.php b/app/Http/Controllers/MasterData/LandController.php index ccb8e2d..1030e7f 100644 --- a/app/Http/Controllers/MasterData/LandController.php +++ b/app/Http/Controllers/MasterData/LandController.php @@ -85,6 +85,7 @@ public function store(Request $request) DB::beginTransaction(); try { $land = new Land(); + $land->user_id = Auth::user()->id; $land->owner = $request->owner; $land->province_code = $request->province_id; $land->regency_code = $request->regency_id; @@ -185,6 +186,7 @@ public function update(Request $request, $id) DB::beginTransaction(); try { $land = Land::findOrFail($id); + $land->user_id = Auth::user()->id; $land->owner = $request->owner; $land->province_code = $request->province_id; $land->regency_code = $request->regency_id; diff --git a/database/migrations/2025_01_28_065420_create_land_table.php b/database/migrations/2025_01_28_065420_create_land_table.php index b287d21..abfee23 100644 --- a/database/migrations/2025_01_28_065420_create_land_table.php +++ b/database/migrations/2025_01_28_065420_create_land_table.php @@ -13,6 +13,7 @@ public function up(): void { Schema::create('land', function (Blueprint $table) { $table->id(); + $table->unsignedBigInteger('user_id'); $table->string('owner'); $table->string('province_code'); $table->string('regency_code'); @@ -22,6 +23,10 @@ public function up(): void $table->string('longitude'); $table->timestamps(); }); + + Schema::table('land', function (Blueprint $table) { + $table->foreign('user_id')->references('id')->on('users'); + }); } /** From 73d6748d68be21b53a09b79019003c3a9456b5ab Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Fri, 14 Mar 2025 16:58:35 +0700 Subject: [PATCH 2/4] fix(master-land): change layer map to googleSat --- app/Http/Controllers/MasterData/LandController.php | 14 -------------- .../js/pages/customJs/master-data/lahan/create.js | 6 +++--- .../js/pages/customJs/master-data/lahan/update.js | 6 +++--- resources/views/master-data/lahan/create.blade.php | 4 ++-- resources/views/master-data/lahan/edit.blade.php | 2 +- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/MasterData/LandController.php b/app/Http/Controllers/MasterData/LandController.php index 1030e7f..e324ea0 100644 --- a/app/Http/Controllers/MasterData/LandController.php +++ b/app/Http/Controllers/MasterData/LandController.php @@ -15,17 +15,7 @@ class LandController extends Controller { public function index() { - // $lands = Land::orderBy('created_at', 'desc')->get(); - // 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')); } @@ -174,10 +164,6 @@ public function update(Request $request, $id) $polygon = json_decode($request->polygon, true); - // if (isset($polygon[0])) { - // $polygon = $polygon[0]; // Ambil array pertama jika ada - // } - if ($validator->fails()) { toast($validator->messages()->all()[0], 'error')->position('top')->autoclose(3000); return redirect()->back()->withInput(); diff --git a/public/assets/js/pages/customJs/master-data/lahan/create.js b/public/assets/js/pages/customJs/master-data/lahan/create.js index 38bba45..12c1cca 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/create.js +++ b/public/assets/js/pages/customJs/master-data/lahan/create.js @@ -1,4 +1,4 @@ -var map, drawnItems, drawControl, googleStreets, iconMarker; +var map, drawnItems, drawControl, googleSat, iconMarker; var currentMarker = null; function initMap() { @@ -6,8 +6,8 @@ function initMap() { attributionControl: false, }).setView([-8.157416852745705, 113.72281580436439], 16); - googleStreets = L.tileLayer( - "http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}", + googleSat = L.tileLayer( + "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}", { maxZoom: 20, subdomains: ["mt0", "mt1", "mt2", "mt3"], diff --git a/public/assets/js/pages/customJs/master-data/lahan/update.js b/public/assets/js/pages/customJs/master-data/lahan/update.js index c2df7fd..748465c 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/update.js +++ b/public/assets/js/pages/customJs/master-data/lahan/update.js @@ -1,4 +1,4 @@ -var mapEdit, drawnItems, drawControl, googleStreets, iconMarker; +var mapEdit, drawnItems, drawControl, googleSat, iconMarker; var currentMarkerEdit = null; var formEdit = document.getElementById("edit-form"); @@ -40,8 +40,8 @@ function initMapEdit() { attributionControl: false, }).setView([-8.157416852745705, 113.72281580436439], 16); - googleStreets = L.tileLayer( - "http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}", + googleSat = L.tileLayer( + "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}", { maxZoom: 20, subdomains: ["mt0", "mt1", "mt2", "mt3"], diff --git a/resources/views/master-data/lahan/create.blade.php b/resources/views/master-data/lahan/create.blade.php index 51feb05..7a8adc2 100644 --- a/resources/views/master-data/lahan/create.blade.php +++ b/resources/views/master-data/lahan/create.blade.php @@ -144,8 +144,8 @@ diff --git a/resources/views/master-data/lahan/edit.blade.php b/resources/views/master-data/lahan/edit.blade.php index 1a33e19..f7e8aea 100644 --- a/resources/views/master-data/lahan/edit.blade.php +++ b/resources/views/master-data/lahan/edit.blade.php @@ -154,7 +154,7 @@
+
@@ -135,15 +136,6 @@ @push('other-js') - + @endpush @endsection diff --git a/resources/views/dashboard/petugas.blade.php b/resources/views/dashboard/petugas.blade.php index 9d085eb..df6bb91 100644 --- a/resources/views/dashboard/petugas.blade.php +++ b/resources/views/dashboard/petugas.blade.php @@ -79,7 +79,13 @@

Peta Lahan

-
+ @if ($evaluations->isEmpty()) +
+
Belum ada penilaian
+
+ @else +
+ @endif
From 368bd3f001891ee63d19bd0925a81c669d9d4769 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Thu, 20 Mar 2025 20:20:04 +0700 Subject: [PATCH 4/4] fix(master-land): create land seeder --- app/Models/LandDetail.php | 14 +++ database/seeders/LandDetailSeeder.php | 28 ++++++ database/seeders/LandSeeder.php | 96 ++++++++++++++++++- .../customJs/master-data/lahan/create.js | 6 +- .../customJs/master-data/lahan/update.js | 7 +- 5 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 app/Models/LandDetail.php create mode 100644 database/seeders/LandDetailSeeder.php diff --git a/app/Models/LandDetail.php b/app/Models/LandDetail.php new file mode 100644 index 0000000..23110ab --- /dev/null +++ b/app/Models/LandDetail.php @@ -0,0 +1,14 @@ + 1, 'lat' => -8.1568135761461, 'lng' => 113.72213107346], + ['land_id' => 1, 'lat' => -8.1569410196838, 'lng' => 113.72253481549], + ['land_id' => 1, 'lat' => -8.1570286370925, 'lng' => 113.72250664744], + ['land_id' => 1, 'lat' => -8.1568985385091, 'lng' => 113.72210156407], + ]; + + foreach ($lands as $land) { + LandDetail::create($land); + } + } +} diff --git a/database/seeders/LandSeeder.php b/database/seeders/LandSeeder.php index 6e22fd5..8c0a50f 100644 --- a/database/seeders/LandSeeder.php +++ b/database/seeders/LandSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\Land; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; class LandSeeder extends Seeder @@ -14,8 +13,99 @@ class LandSeeder extends Seeder public function run(): void { $lands = [ - ['land_name' => 'Lahan 1', 'owner' => 'Pak Lahan 1', 'no_hp' => '08123456789', 'rental_price' => '2000000', 'rental_start' => '2025-01-01', 'rental_until' => '2025-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], - ['land_name' => 'Lahan 2', 'owner' => 'Pak Lahan 2', 'no_hp' => '08123456789', 'rental_price' => '1500000', 'rental_start' => '2025-01-01', 'rental_until' => '2025-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], + ['user_id' => 1, 'owner' => 'RIBU', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'TO 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'TO 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ERFAN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ZAENAL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa KLOMPANGAN', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HARIS', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa KARANGREJO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'H. SURACHMAD 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'H. SURACHMAD 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HAFIZ', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa KARANGSONO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ROHIM', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa KARANGSONO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SABAR', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'TO 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'BUANG', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'PATMO', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'MO', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SUTIK 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'H. ROM', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SATIMIN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'MISLU 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ZAENAL 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KUSNADI 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KUSNADI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'RUDI 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'RUDI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SULIMAN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'AZIZ', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'NONO', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'FAUZI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KEROK', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'RIBUT 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HERUD', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SAMSU', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'BANGUN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa Bangsalsari', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'AXIS', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SABAR 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'BU IN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SOLEHAN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIS 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa ANTIROGO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIS 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa ANTIROGO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIS 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa ANTIROGO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'P. DUL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KUS', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIS 4', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa ANTIROGO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'TOMO', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'RIBUT 20', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HERI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'PAK SOL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YAHMAN_R.R', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YAYUK 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YAYUK 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'DIKA', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Yudi B', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa TEGAL GEDE', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Sipot', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa TEGAL GEDE', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Arip', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa TEGAL GEDE', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'H.rifai', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa MANGARAN', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Janam 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TISNOGAMBAR', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Janam 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TISNOGAMBAR', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Janam 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TISNOGAMBAR', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Hadi 1', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TISNOGAMBAR', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'AMIN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa KERANJINGAN', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Poltek', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa TEGAL GEDE', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KUSTINA', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'NUR', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SEWAL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'JUS', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Abu 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa BANGSALSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Samsul', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa AJUNG', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Dika (R)', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Yayuk 1(R)', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'AMIN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa SUMBERSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ABU 3', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa BANGSALSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Box Joss', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Yahman 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Toyan', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'KEBONSARI', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'IMAM', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'NABIL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'Mukles', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509140, 'address' => 'Desa Umbulsari', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HERUL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'P SOL', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIK', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'RUSDI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa ROWO INDAH', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'HOLIK', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YAHMAN/YUDI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'DODIK', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509180, 'address' => 'Desa TANGGUL KULON', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'SISEH', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509720, 'address' => 'Desa KERANJINGAN', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ZAN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509140, 'address' => 'SUKORENO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ZAN 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509140, 'address' => 'SUKORENO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'TUKIMIN', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509150, 'address' => 'Desa PONDOK JOYO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'KHOLES', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509140, 'address' => 'SUKORENO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'BOX JOSS', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'ADIT', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YULI', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], + ['user_id' => 1, 'owner' => 'YAHMAN/BOX JOS 2', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509110, 'address' => 'Desa WIROWONGSO', 'latitude' => -8.25, 'longitude' => 113.65], ]; foreach ($lands as $land) { diff --git a/public/assets/js/pages/customJs/master-data/lahan/create.js b/public/assets/js/pages/customJs/master-data/lahan/create.js index 12c1cca..1012b87 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/create.js +++ b/public/assets/js/pages/customJs/master-data/lahan/create.js @@ -1,4 +1,4 @@ -var map, drawnItems, drawControl, googleSat, iconMarker; +var map, drawnItems, drawControl, googleHybrid, iconMarker; var currentMarker = null; function initMap() { @@ -6,8 +6,8 @@ function initMap() { attributionControl: false, }).setView([-8.157416852745705, 113.72281580436439], 16); - googleSat = L.tileLayer( - "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}", + googleHybrid = L.tileLayer( + "http://{s}.google.com/vt?lyrs=s,h&x={x}&y={y}&z={z}", { maxZoom: 20, subdomains: ["mt0", "mt1", "mt2", "mt3"], diff --git a/public/assets/js/pages/customJs/master-data/lahan/update.js b/public/assets/js/pages/customJs/master-data/lahan/update.js index 748465c..fccef97 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/update.js +++ b/public/assets/js/pages/customJs/master-data/lahan/update.js @@ -1,4 +1,4 @@ -var mapEdit, drawnItems, drawControl, googleSat, iconMarker; +var mapEdit, drawnItems, drawControl, googleHybrid, iconMarker; var currentMarkerEdit = null; var formEdit = document.getElementById("edit-form"); @@ -40,8 +40,8 @@ function initMapEdit() { attributionControl: false, }).setView([-8.157416852745705, 113.72281580436439], 16); - googleSat = L.tileLayer( - "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}", + googleHybrid = L.tileLayer( + "http://{s}.google.com/vt?lyrs=s,h&x={x}&y={y}&z={z}", { maxZoom: 20, subdomains: ["mt0", "mt1", "mt2", "mt3"], @@ -188,6 +188,7 @@ function getDistricts(regencyId) { if (response.success) { loadingEdit.style.display = "none"; const data = response.data; + console.log(data); districtEditVal.clearStore(); districtEditVal.clearChoices();