Merge branch 'development' of https://github.com/arieeefajar/Tugas_Akhir into fix/master-rule

app/Http/Controllers/DashboardController.php

@@ -19,7 +19,9 @@ public function admin()
             $query->select('indicator_id')->from('rule');
         })->count();
         $rulesCount = Rule::count();
-        return view('dashboard.admin', compact('userCount', 'landCount', 'indicatorCount', 'rulesCount'));
+
+        $evaluations = Evaluation::with('land.detailLands')->get();
+        return view('dashboard.admin', compact('userCount', 'landCount', 'indicatorCount', 'rulesCount', 'evaluations'));
     }
 
     public function petugas()

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'));
     }
 
@@ -85,6 +75,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;
@@ -173,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();
@@ -185,6 +172,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;

app/Models/LandDetail.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class LandDetail extends Model
+{
+    use HasFactory;
+
+    protected $table = 'land_details';
+    protected $guarded = [];
+}

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');
+        });
     }
 
     /**

database/seeders/LandDetailSeeder.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\LandDetail;
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class LandDetailSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+
+        $lands = [
+            ['land_id' => 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);
+        }
+    }
+}

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'],
+            ['user_id' => 1, 'owner' => 'RIBU', 'province_code' => 35, 'regency_code' => 3509, 'district_code' => 3509190, 'address' => 'Desa TUGUSARI', 'latitude' => -8.25, 'longitude' => 113.65],
-            ['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' => '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) {

public/assets/js/pages/customJs/dashboard/admin.js

@@ -0,0 +1,48 @@
+var map, googleHybrid, marker, polygon;
+
+let evaluationElement = document.getElementById("evaluations");
+let evaluation = JSON.parse(evaluationElement.dataset.evaluations);
+
+document.addEventListener("DOMContentLoaded", function () {
+    initMap();
+    map.invalidateSize();
+    setEvaluationToMap();
+});
+
+function initMap() {
+    map = L.map("map", {
+        attributionControl: false,
+    }).setView([-8.159774548190976, 113.72305183874593], 10);
+
+    googleHybrid = L.tileLayer(
+        "http://{s}.google.com/vt?lyrs=y&x={x}&y={y}&z={z}",
+        {
+            maxZoom: 20,
+            subdomains: ["mt0", "mt1", "mt2", "mt3"],
+        }
+    ).addTo(map);
+}
+
+function setEvaluationToMap() {
+    evaluation.forEach((evaluation) => {
+        let coordinates = evaluation.land.detail_lands.map((detail) => {
+            return [detail.lat, detail.lng];
+        });
+
+        let cfValue = evaluation.cf_value * 100;
+
+        polygon = L.polygon(coordinates, {
+            color: "blue",
+            fillColor: "blue",
+            fillOpacity: 0.5,
+        }).addTo(map);
+
+        marker = L.marker(coordinates[0])
+            .addTo(map)
+            .bindPopup(
+                `<div class="text-center font-semibold"><b> Hasil presentase CF pada lahan <br /> ${
+                    evaluation.land.owner
+                }</br>${cfValue.toFixed(2)} %</b></div>`
+            );
+    });
+}

public/assets/js/pages/customJs/dashboard/petugas.js

@@ -1,13 +1,14 @@
-var map, googleSat, marker, polygon;
+var map, googleHybrid, marker, polygon;
 
 let evaluationElement = document.getElementById("evaluations");
 let evaluation = JSON.parse(evaluationElement.dataset.evaluations);
 
 document.addEventListener("DOMContentLoaded", function () {
+    if (evaluation.length > 0) {
         initMap();
         map.invalidateSize();
-    console.log(evaluation);
         setEvaluationToMap();
+    }
 });
 
 function initMap() {
@@ -15,8 +16,8 @@ function initMap() {
         attributionControl: false,
     }).setView([-8.172495095862395, 113.69876818661332], 10);
 
-    googleSat = L.tileLayer(
+    googleHybrid = L.tileLayer(
-        "http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}",
+        "http://{s}.google.com/vt?lyrs=y&x={x}&y={y}&z={z}",
         {
             maxZoom: 20,
             subdomains: ["mt0", "mt1", "mt2", "mt3"],
@@ -31,7 +32,6 @@ function setEvaluationToMap() {
         });
 
         let cfValue = evaluation.cf_value * 100;
-        console.log(cfValue.toFixed(2));
 
         polygon = L.polygon(coordinates, {
             color: "blue",

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

@@ -1,4 +1,4 @@
-var map, drawnItems, drawControl, googleStreets, 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);
 
-    googleStreets = L.tileLayer(
+    googleHybrid = L.tileLayer(
-        "http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}",
+        "http://{s}.google.com/vt?lyrs=s,h&x={x}&y={y}&z={z}",
         {
             maxZoom: 20,
             subdomains: ["mt0", "mt1", "mt2", "mt3"],

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

@@ -1,4 +1,4 @@
-var mapEdit, drawnItems, drawControl, googleStreets, 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);
 
-    googleStreets = L.tileLayer(
+    googleHybrid = L.tileLayer(
-        "http://{s}.google.com/vt?lyrs=m&x={x}&y={y}&z={z}",
+        "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();

resources/views/dashboard/admin.blade.php

@@ -124,6 +124,7 @@
                         </div>
                         <div class="card-body">
                             <div id="map" style="height: 400px;"></div>
+                            <input type="hidden" id="evaluations" data-evaluations="{{ $evaluations }}">
                         </div>
                     </div>
                 </div>
@@ -135,15 +136,6 @@
     <!-- End Page-content -->
 
     @push('other-js')
-        <script>
+        <script src="{{ asset('assets/js/pages/customJs/dashboard/admin.js') }}"></script>
-            const map = L.map('map', {
-                attributionControl: false,
-            }).setView([-8.172495095862395, 113.69876818661332], 10);
-
-            const googleSat = L.tileLayer('http://{s}.google.com/vt?lyrs=s&x={x}&y={y}&z={z}', {
-                maxZoom: 20,
-                subdomains: ['mt0', 'mt1', 'mt2', 'mt3']
-            }).addTo(map);
-        </script>
     @endpush
 @endsection

resources/views/dashboard/petugas.blade.php

@@ -79,7 +79,13 @@
                         <h4 class="card-title mb-0">Peta Lahan</h4>
                     </div>
                     <div class="card-body">
+                        @if ($evaluations->isEmpty())
+                            <div class="text-center">
+                                <h6 class="text-muted">Belum ada penilaian</h6>
+                            </div>
+                        @else
                             <div id="map" style="height: 400px;"></div>
+                        @endif
                         <input type="hidden" id="evaluations" data-evaluations="{{ $evaluations }}">
                     </div>
                 </div>

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

@@ -144,8 +144,8 @@
                                 </div>
                                 <div class="modal-footer" id="add-footer" style="display: none">
                                     <div class="hstack gap-2 justify-content-end">
-                                        <button type="button" class="btn btn-light"
+                                        <a href="{{ Auth::user()->role == 'admin' ? route('master_data.lahan.index') : route('lahan.index') }}"
-                                            data-bs-dismiss="modal">Tutup</button>
+                                            class="btn btn-light">Kembali</a>
                                         <button type="submit" class="btn btn-success" id="add-btn">Simpan</button>
                                     </div>
                                 </div>

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

@@ -154,7 +154,7 @@
                                 </div>
                                 <div class="modal-footer" id="edit-footer">
                                     <div class="hstack gap-2 justify-content-end">
-                                        <a href="{{ route('master_data.lahan.index') }}"
+                                        <a href="{{ Auth::user()->role == 'admin' ? route('master_data.lahan.index') : route('lahan.index') }}"
                                             class="btn btn-light">Kembali</a>
                                         <button type="submit" class="btn btn-success" id="edit-btn">Update</button>
                                     </div>