From 713355ce0a11e6aec6d3b772c7924bf71ba07e65 Mon Sep 17 00:00:00 2001
From: althaf <althafrayhan5@gmail.com>
Date: Wed, 22 Jul 2026 10:35:36 +0700
Subject: [PATCH 1/3] add text-heading to adjust icon color theme

---
 .../views/produktivitas/petani/header.blade.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/produktivitas/petani/header.blade.php b/resources/views/produktivitas/petani/header.blade.php
index 15c31de..ce1d371 100644
--- a/resources/views/produktivitas/petani/header.blade.php
+++ b/resources/views/produktivitas/petani/header.blade.php
@@ -79,7 +79,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-user-star icon-22px"></i>
+                                                    <i class="icon-base ti tabler-user-star icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>
@@ -105,7 +105,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-trees icon-22px"></i>
+                                                    <i class="icon-base ti tabler-trees icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>
@@ -127,7 +127,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-books icon-22px"></i>
+                                                    <i class="icon-base ti tabler-books icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>
@@ -181,7 +181,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-seedling icon-22px"></i>
+                                                    <i class="icon-base ti tabler-seedling icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>
@@ -232,7 +232,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-social icon-22px"></i>
+                                                    <i class="icon-base ti tabler-social icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>
@@ -291,7 +291,7 @@
                                             </div>
                                             <span class="avatar">
                                                 <span class="avatar-initial rounded">
-                                                    <i class="icon-base ti tabler-building-store icon-22px"></i>
+                                                    <i class="icon-base ti tabler-building-store icon-22px text-heading"></i>
                                                 </span>
                                             </span>
                                         </div>

From c43483a9f8e40a903f95acba12a72e2d53b36247 Mon Sep 17 00:00:00 2001
From: althaf <althafrayhan5@gmail.com>
Date: Wed, 22 Jul 2026 13:24:39 +0700
Subject: [PATCH 2/3] default profile-iconize & fixed overlapping tab

---
 resources/views/layout/navbar.blade.php       |  4 +-
 .../produktivitas/petani/header.blade.php     | 64 +++++++++++++++----
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index 4423471..9231bfb 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -338,7 +338,7 @@
             href="javascript:void(0);"
             data-bs-toggle="dropdown">
             <div class="avatar avatar-online">
-                <img src="../../assets/img/avatars/1.png" alt class="rounded-circle" />
+                <img src="../../assets/img/avatars/3.jpg" alt class="rounded-circle" />
             </div>
             </a>
             <ul class="dropdown-menu dropdown-menu-end">
@@ -347,7 +347,7 @@
                 <div class="d-flex align-items-center">
                     <div class="flex-shrink-0 me-2">
                     <div class="avatar avatar-online">
-                        <img src="../../assets/img/avatars/1.png" alt class="rounded-circle" />
+                        <img src="../../assets/img/avatars/3.jpg" alt class="rounded-circle" />
                     </div>
                     </div>
                     <div class="flex-grow-1">
diff --git a/resources/views/produktivitas/petani/header.blade.php b/resources/views/produktivitas/petani/header.blade.php
index ce1d371..deb6168 100644
--- a/resources/views/produktivitas/petani/header.blade.php
+++ b/resources/views/produktivitas/petani/header.blade.php
@@ -1,3 +1,39 @@
+            <style>
+              @media (min-width: 768px) {
+                        .nav-pills-custom-spacing {
+                            display: flex;
+                            width: 100%;
+                            gap: 0.5rem;
+                            flex-wrap: nowrap !important;
+                            overflow-x: auto;
+                        }
+                        
+                        .nav-pills-custom-spacing::-webkit-scrollbar {
+                            display: none;
+                        }
+
+                        .nav-pills-custom-spacing .nav-item {
+                            margin-right: 0 !important;
+                            flex: 1;
+                        }
+                        
+                        .nav-pills-custom-spacing .nav-link {
+                            display: flex;
+                            justify-content: center;
+                            align-items: center;
+                            padding-left: 0.5rem !important; 
+                            padding-right: 0.5rem !important;
+                            width: 100%;
+                            white-space: nowrap;
+                            font-size: 0.9375rem !important;
+                        }
+
+                        .nav-pills-custom-spacing .nav-link i {
+                            margin-right: 0.4rem !important; 
+                        }
+                    }
+             </style>
+            
             <div class="row mb-4">
                 
                 <div class="col-md-4 mb-2 mb-md-0">
@@ -306,7 +342,7 @@
             
             <div class="nav-align-top">
                 @if(!$petani)
-                <ul class="nav nav-pills flex-column flex-md-row mb-6 row-gap-2">
+                <ul class="nav nav-pills flex-column flex-md-row mb-6 row-gap-2 nav-pills-custom-spacing">
                     <li class="nav-item">
                         <a class="nav-link active" href="{{ route('petani.create') }}">
                             <i class="icon-base ti tabler-user-check me-1_5 icon-sm"></i>Profil
@@ -314,22 +350,22 @@
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#" disabled data-bs-original-title="Lahan & Tanaman, isi profil terlebih dahulu" data-bs-toggle="tooltip" data-bs-placement="top">
-                          <i class="icon-base ti tabler-trees me-1_5 icon-sm"></i>Lahan & Tanaman
+                        <i class="icon-base ti tabler-trees me-1_5 icon-sm"></i>Lahan & Tanaman
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#" disabled data-bs-original-title="Praktik Budidaya, isi profil terlebih dahulu" data-bs-toggle="tooltip" data-bs-placement="top">
-                          <i class="icon-base ti tabler-seedling me-1_5 icon-sm"></i>Praktik Budidaya
+                        <i class="icon-base ti tabler-seedling me-1_5 icon-sm"></i>Praktik Budidaya
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#" disabled data-bs-original-title="Pendidikan & Pelatihan, isi profil terlebih dahulu" data-bs-toggle="tooltip" data-bs-placement="top">
-                          <i class="icon-base ti tabler-books me-1_5 icon-sm"></i>Pendidikan & Pelatihan
+                        <i class="icon-base ti tabler-books me-1_5 icon-sm"></i>Pendidikan & Pelatihan
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#" disabled data-bs-original-title="Sosial Ekonomi, isi profil terlebih dahulu" data-bs-toggle="tooltip" data-bs-placement="top">
-                          <i class="icon-base ti tabler-social me-1_5 icon-sm"></i>Sosial Ekonomi
+                        <i class="icon-base ti tabler-social me-1_5 icon-sm"></i>Sosial Ekonomi
                         </a>
                     </li>
                     <li class="nav-item">
@@ -344,42 +380,42 @@
                     </li>
                 </ul>
                 @else
-                <ul class="nav nav-pills flex-column flex-md-row mb-6 row-gap-2">
+                <ul class="nav nav-pills flex-column flex-md-row mb-6 row-gap-2 nav-pills-custom-spacing">
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.edit') ? 'active' : '' }}" href="{{ route('petani.edit', $petani->id) }}">
-                            <i class="icon-base ti tabler-user-check me-1_5 icon-sm"></i>Profil
+                            <i class="icon-base ti tabler-user-check icon-sm"></i>Profil
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.lahan-tanaman.*') ? 'active' : '' }}" href="{{ route('petani.lahan-tanaman.index', $petani->id) }}">
-                          <i class="icon-base ti tabler-trees me-1_5 icon-sm"></i>Lahan & Tanaman
+                          <i class="icon-base ti tabler-trees icon-sm"></i>Lahan & Tanaman
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.praktik-budidaya.*') ? 'active' : '' }}" href="{{ route('petani.praktik-budidaya.index', $petani->id) }}">
-                          <i class="icon-base ti tabler-seedling me-1_5 icon-sm"></i>Praktik Budidaya
+                          <i class="icon-base ti tabler-seedling icon-sm"></i>Praktik Budidaya
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.pendidikan-pelatihan.*') ? 'active' : '' }}" href="{{ route('petani.pendidikan-pelatihan.index', $petani->id) }}">
-                          <i class="icon-base ti tabler-books me-1_5 icon-sm"></i>Pendidikan & Pelatihan
+                          <i class="icon-base ti tabler-books icon-sm"></i>Pendidikan & Pelatihan
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.sosial-ekonomi.*') ? 'active' : '' }}" href="{{ route('petani.sosial-ekonomi.index', $petani->id) }}">
-                          <i class="icon-base ti tabler-social me-1_5 icon-sm"></i>Sosial Ekonomi
+                          <i class="icon-base ti tabler-social icon-sm"></i>Sosial Ekonomi
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.akses-pasar.*') ? 'active' : '' }}" href="{{ route('petani.akses-pasar.index', $petani->id) }}">
-                            <i class="icon-base ti tabler-building-store me-1_5 icon-sm"></i>Akses Pasar
+                            <i class="icon-base ti tabler-building-store icon-sm"></i>Akses Pasar
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link {{ request()->routeIs('petani.skor.*') ? 'active' : '' }}" href="{{ route('petani.skor.index', $petani->id) }}">
-                            <i class="icon-base ti tabler-star me-1_5 icon-sm"></i>Kesiapan Adopsi
+                            <i class="icon-base ti tabler-star icon-sm"></i>Kesiapan Adopsi
                         </a>
                     </li>
                 </ul>
-                @endif  
+                @endif
             </div>

From 696c7dede8c126f5ae614147db8dec2ec08359ee Mon Sep 17 00:00:00 2001
From: Irwan Cahyono <irwan.l.cahyono@gmail.com>
Date: Wed, 22 Jul 2026 13:56:55 +0700
Subject: [PATCH 3/3] hama dan penyakit lahan

---
 app/Enums/KeparahanSerangan.php               |   6 +-
 app/Enums/KondisiTanaman.php                  |   8 +-
 app/Models/Pertanian/Lahan.php                |   9 +-
 app/Models/Pertanian/PraktikBudidaya.php      |  15 ++
 app/Models/Pertanian/Tanaman.php              |   5 +
 ...7_22_110145_update_lahan_tanaman_table.php |  37 +++++
 .../produktivitas/petani/header.blade.php     |   2 +-
 .../produktivitas/petani/index.blade.php      |   2 +-
 .../produktivitas/petani/lahan/add.blade.php  | 139 ++++++++++++++++--
 .../produktivitas/petani/lahan/edit.blade.php | 137 +++++++++++++++--
 10 files changed, 323 insertions(+), 37 deletions(-)
 create mode 100644 database/migrations/2026_07_22_110145_update_lahan_tanaman_table.php

diff --git a/app/Enums/KeparahanSerangan.php b/app/Enums/KeparahanSerangan.php
index a030eb9..3fb078a 100644
--- a/app/Enums/KeparahanSerangan.php
+++ b/app/Enums/KeparahanSerangan.php
@@ -11,9 +11,9 @@ enum KeparahanSerangan: string
     public function label(): string
     {
         return match($this) {
-            self::RINGAN => 'Ringan',
-            self::SEDANG => 'Sedang',
-            self::BERAT => 'Berat',
+            self::RINGAN => 'Ringan, hanya beberapa tanaman',
+            self::SEDANG => 'Sedang, sebagian tanaman terdampak',
+            self::BERAT => 'Parah, sebagian besar tanaman terdampak',
         };
     }
 
diff --git a/app/Enums/KondisiTanaman.php b/app/Enums/KondisiTanaman.php
index ae73179..4193e4b 100644
--- a/app/Enums/KondisiTanaman.php
+++ b/app/Enums/KondisiTanaman.php
@@ -13,10 +13,10 @@ enum KondisiTanaman: string
     public function label(): string
     {
         return match($this) {
-            self::BAIK => 'Baik',
-            self::SEDANG => 'Sedang',
-            self::BURUK => 'Buruk',
-            self::MATI => 'Mati',
+            self::BAIK => 'Baik, tumbuh lebat, banyak buah',
+            self::SEDANG => 'Sedang, cukup tumbuh, ada masalah',
+            self::BURUK => 'Buruk, banyak tanaman tua dan lemah/tidak berbuah',
+            self::MATI => 'Mati, tanaman telah mati, tidak dapat tumbuh maupun berbuah',
         };
     }
 
diff --git a/app/Models/Pertanian/Lahan.php b/app/Models/Pertanian/Lahan.php
index c8c57de..8021c23 100644
--- a/app/Models/Pertanian/Lahan.php
+++ b/app/Models/Pertanian/Lahan.php
@@ -56,7 +56,10 @@ class Lahan extends Model
         'komoditas_lain',
         'tanaman_penaung',
 
-        'foto'
+        'foto',
+
+        'jenis_hama',   
+        'jenis_penyakit',
     ];
 
     protected $casts = [
@@ -68,7 +71,9 @@ class Lahan extends Model
         'serangan_hama' => SeranganHama::class,
         'penyakit_tanaman' => PenyakitTanaman::class,
         'keparahan_serangan' => KeparahanSerangan::class,
-        'foto' => 'array'
+        'foto' => 'array',
+        'jenis_hama' => 'array',
+        'jenis_penyakit' => 'array'
     ];
 
     public function profile(): BelongsTo
diff --git a/app/Models/Pertanian/PraktikBudidaya.php b/app/Models/Pertanian/PraktikBudidaya.php
index 0a3782c..ba99cff 100644
--- a/app/Models/Pertanian/PraktikBudidaya.php
+++ b/app/Models/Pertanian/PraktikBudidaya.php
@@ -12,6 +12,8 @@ use Illuminate\Support\Str;
 
 use App\Models\Pertanian\Petani;
 use App\Models\Pertanian\SkorPetani;
+use App\Models\Pertanian\Tanaman;
+use App\Models\Pertanian\Lahan;
 
 class PraktikBudidaya extends Model
 {
@@ -115,6 +117,19 @@ class PraktikBudidaya extends Model
                 'skor_d2_k2_7_penglolaan_air_irigasi' => $praktikBudidaya->kondisi_pengelolaan_air,
                 'skor_d2_k2_8_praktik_konservasi_tanah' => $skor_konservasi_tanah,
             ]);
+
+            Lahan::where('petani_id', $petani->id)->update([
+                'jenis_hama' => $praktikBudidaya->jenis_hama,
+                'jenis_penyakit' => $praktikBudidaya->jenis_penyakit,
+            ]);
+
+            Tanaman::whereIn(
+                'lahan_id',
+                Lahan::where('petani_id', $petani->id)->select('id')
+            )->update([
+                'jenis_hama' => $praktikBudidaya->jenis_hama,
+                'jenis_penyakit' => $praktikBudidaya->jenis_penyakit,
+            ]);
         });
     }
 
diff --git a/app/Models/Pertanian/Tanaman.php b/app/Models/Pertanian/Tanaman.php
index e31a616..72febdf 100644
--- a/app/Models/Pertanian/Tanaman.php
+++ b/app/Models/Pertanian/Tanaman.php
@@ -42,6 +42,9 @@ class Tanaman extends Model
         'serangan_hama',
         'penyakit_tanaman',
         'keparahan_serangan',
+
+        'jenis_hama',   
+        'jenis_penyakit',
     ];
 
     protected $casts = [
@@ -49,6 +52,8 @@ class Tanaman extends Model
         'serangan_hama' => SeranganHama::class,
         'penyakit_tanaman' => PenyakitTanaman::class,
         'keparahan_serangan' => KeparahanSerangan::class,
+        'jenis_hama' => 'array',
+        'jenis_penyakit' => 'array'
     ];
 
     public function komoditas()
diff --git a/database/migrations/2026_07_22_110145_update_lahan_tanaman_table.php b/database/migrations/2026_07_22_110145_update_lahan_tanaman_table.php
new file mode 100644
index 0000000..c3f4a9e
--- /dev/null
+++ b/database/migrations/2026_07_22_110145_update_lahan_tanaman_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('map_lahan', function (Blueprint $table) {
+            $table->jsonb('jenis_hama')->nullable();
+            $table->jsonb('jenis_penyakit')->nullable();
+        });
+
+        Schema::table('map_tanaman', function (Blueprint $table) {
+            $table->jsonb('jenis_hama')->nullable();
+            $table->jsonb('jenis_penyakit')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('map_lahan', function (Blueprint $table) {
+            $table->dropColumn('jenis_hama');
+            $table->dropColumn('jenis_penyakit');
+        });
+
+        Schema::table('map_tanaman', function (Blueprint $table) {
+            $table->dropColumn('jenis_hama');
+            $table->dropColumn('jenis_penyakit');
+        });
+    }
+};
diff --git a/resources/views/produktivitas/petani/header.blade.php b/resources/views/produktivitas/petani/header.blade.php
index 15c31de..8ecf1b9 100644
--- a/resources/views/produktivitas/petani/header.blade.php
+++ b/resources/views/produktivitas/petani/header.blade.php
@@ -90,7 +90,7 @@
                                                 <p class="mb-0 text-muted" style="font-size: 0.75rem;">Lahan & Tanaman</p>
                                                 <h5 class="mb-0">
                                                     @if($lahanPetani->isNotEmpty())
-                                                        {{ number_format($totalLuasLahan, 0, ',', '.') }} m<sup>2</sup>
+                                                        {{ number_format($totalLuasLahan, 0, ',', '.') }} ha
                                                     @else
                                                         -
                                                     @endif
diff --git a/resources/views/produktivitas/petani/index.blade.php b/resources/views/produktivitas/petani/index.blade.php
index 33ae852..b6cb010 100644
--- a/resources/views/produktivitas/petani/index.blade.php
+++ b/resources/views/produktivitas/petani/index.blade.php
@@ -15,7 +15,7 @@
         <div class="w-25">
             <x-summary-card 
                 title="Lahan & Tanaman" 
-                count="{{ number_format($lahan?->sum('luas_lahan'), 0, ',', '.') }}m<sup>2</sup>" 
+                count="{{ number_format($lahan?->sum('luas_lahan'), 0, ',', '.') }}ha" 
                 subtitle="{{ $tanaman?->count() }} tanaman dari {{ $komoditas?->count() }} komoditas utama" 
                 icon="trees" 
                 color="success" 
diff --git a/resources/views/produktivitas/petani/lahan/add.blade.php b/resources/views/produktivitas/petani/lahan/add.blade.php
index 2f0e8a5..45f835e 100644
--- a/resources/views/produktivitas/petani/lahan/add.blade.php
+++ b/resources/views/produktivitas/petani/lahan/add.blade.php
@@ -203,8 +203,8 @@
                                     
                                     <div class="row">
                                         <div class="col-md-3 mb-3 form-control-validation">
-                                            <label class="form-label">Luas Lahan (m2) <span class="text-danger">*</span></label>
-                                            <input type="number" step="0.01" id="luas_lahan" name="luas_lahan" class="form-control @error('luas_lahan') is-invalid @enderror" placeholder="Contoh: 1.5" required />
+                                            <label class="form-label">Luas Lahan (ha) <span class="text-danger">*</span></label>
+                                            <input type="number" id="luas_lahan" name="luas_lahan" class="form-control @error('luas_lahan') is-invalid @enderror" placeholder="Contoh: 1.5" required />
                                             @error('luas_lahan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
                                         <div class="col-md-3 mb-3 form-control-validation">
@@ -247,17 +247,124 @@
                                         </div>
                                     </div>
                                     <div class="row">       
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                        <div class="col-md-6 mb-3 form-control-validation">
                                             <label class="form-label">Kondisi Umum Tanaman <span class="text-danger">*</span></label>
                                             <select id="kondisi_tanaman" name="kondisi_tanaman" class="form-select @error('kondisi_tanaman') is-invalid @enderror">
                                                 <option value="">Pilih Kondisi Tanaman</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::BAIK }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::BAIK ? 'selected' : '' }}>Baik</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::SEDANG ? 'selected' : '' }}>Sedang</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::BURUK }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::BURUK ? 'selected' : '' }}>Buruk</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::BAIK }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::BAIK ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::BAIK->label() }}</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::SEDANG ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::SEDANG->label() }}</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::BURUK }}" {{ old('kondisi_tanaman') == \App\Enums\KondisiTanaman::BURUK ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::BURUK->label() }}</option>
                                             </select>
                                             @error('kondisi_tanaman')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-3 mb-4 form-control-validation">
+                                            <label class="form-label">Jenis Hama</label>
+                                            
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Penggerek buah" 
+                                                    id="jenis-hama-penggerek-buah">
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Penggerek buah</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Penggerek batang" 
+                                                    id="jenis-hama-penggerek-batang">
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Penggerek batang</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Kutu putih/kutu sisik" 
+                                                    id="jenis-hama-kutu">
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Kutu putih/kutu sisik</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Ulat pemakan daun" 
+                                                    id="jenis-hama-ulat">
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Ulat pemakan daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Tikus" 
+                                                    id="jenis-hama-tikus">
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Tikus</label>
+                                            </div>
+                                            <small class="text-muted text-secondary">* Tidak diisi, terisi otomatis</small>
+                                            @error('jenis_hama')
+                                                <div class="error invalid-feedback d-block">{{ $message }}</div>
+                                            @enderror
+                                        </div>
+                                        <div class="col-md-3 mb-4 form-control-validation">
+                                            <label class="form-label">Jenis Penyakit</label>
+                                            
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Karat daun" 
+                                                    id="jenis-penyakit-karat-daun">
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Karat daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Busuk buah/antraknosa" 
+                                                    id="jenis-penyakit-busuk-buah">
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Busuk buah/antraknosa</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Busuk akar" 
+                                                    id="jenis-penyakit-busuk-akar">
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Busuk akar</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Bercak daun" 
+                                                    id="jenis-penyakit-bercak-daun">
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Bercak daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Layu fusarium" 
+                                                    id="jenis-penyakit-layu-fusarium">
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Layu fusarium</label>
+                                            </div>
+                                            <small class="text-muted text-secondary">* Tidak diisi, terisi otomatis</small>
+
+                                            @error('jenis_penyakit')
+                                                <div class="error invalid-feedback d-block">{{ $message }}</div>
+                                            @enderror
+                                        </div>
+                                        <!-- <div class="col-md-3 mb-3 form-control-validation">
                                             <label class="form-label">Serangan Hama</label>
                                             <select id="serangan_hama" name="serangan_hama" class="form-select @error('serangan_hama') is-invalid @enderror">
                                                 <option value="">Pilih Serangan Hama</option>
@@ -276,14 +383,14 @@
                                                 <option value="{{ \App\Enums\PenyakitTanaman::DAUN_BERCAK }}" {{ old('penyakit_tanaman') == \App\Enums\PenyakitTanaman::DAUN_BERCAK ? 'selected' : '' }}>Daun Bercak</option>
                                                 <option value="{{ \App\Enums\PenyakitTanaman::TANAMAN_LAYU }}" {{ old('penyakit_tanaman') == \App\Enums\PenyakitTanaman::TANAMAN_LAYU ? 'selected' : '' }}>Tanaman Layu</option>
                                             </select> 
-                                        </div>
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                        </div> -->
+                                        <div class="col-md-6 mb-3 form-control-validation">
                                             <label class="form-label">Keparahan Serangan Hama/Penyakit</label>
                                             <select id="keparahan_serangan" name="keparahan_serangan" class="form-select @error('keparahan_serangan') is-invalid @enderror">
                                                 <option value="">Pilih Keparahan Serangan</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::RINGAN }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::RINGAN ? 'selected' : '' }}>Ringan</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::SEDANG }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::SEDANG ? 'selected' : '' }}>Sedang</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::BERAT }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::BERAT ? 'selected' : '' }}>Berat</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::RINGAN }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::RINGAN ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::RINGAN->label() }}</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::SEDANG }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::SEDANG ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::SEDANG->label() }}</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::BERAT }}" {{ old('keparahan_serangan') == \App\Enums\KeparahanSerangan::BERAT ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::BERAT->label() }}</option>
                                             </select>
                                             @error('keparahan_serangan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
@@ -657,9 +764,9 @@
 
             let area = L.GeometryUtil.geodesicArea(latlngs);
 
-            console.log(area);
+            let areaHa = area / 10000;
 
-            $('#luas_lahan').val(area.toFixed(2));
+            $('#luas_lahan').val(areaHa.toFixed(4));
         }
 
         const previewTemplate = `
@@ -815,7 +922,7 @@
                 let originalText = submitBtn.html();
                 submitBtn.prop('disabled', true).html('<i class="ti tabler-loader fa-spin me-2"></i> Menyimpan...');
 
-               $.ajax({
+                $.ajax({
                     url: $(form).attr('action'), 
                     type: "POST",
                     data: formData,
@@ -833,7 +940,7 @@
                             showConfirmButton: false,
                             timer: 1500
                         }).then(() => {
-                            window.location.href = "{{ route('petani.index') }}"; 
+                            window.location.href = "{{ route('petani.lahan-tanaman.index', ['petani' => $petani->id]) }}"; 
                         });
                     },
                     error: function(xhr) {
diff --git a/resources/views/produktivitas/petani/lahan/edit.blade.php b/resources/views/produktivitas/petani/lahan/edit.blade.php
index 391dd8e..d0e7d2a 100644
--- a/resources/views/produktivitas/petani/lahan/edit.blade.php
+++ b/resources/views/produktivitas/petani/lahan/edit.blade.php
@@ -73,7 +73,7 @@
                                     
                                     <div class="row">
                                         <div class="col-md-3 mb-3 form-control-validation">
-                                            <label class="form-label">Luas Lahan (m2) <span class="text-danger">*</span></label>
+                                            <label class="form-label">Luas Lahan (ha) <span class="text-danger">*</span></label>
                                             <input type="number" step="0.01" id="luas_lahan" name="luas_lahan" class="form-control @error('luas_lahan') is-invalid @enderror" placeholder="Contoh: 1.5" required 
                                                 value="{{ old('luas_lahan', $lahanSelected->luas_lahan) }}" />
                                             @error('luas_lahan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
@@ -129,17 +129,19 @@
                                     </div>
 
                                     <div class="row">       
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                        <div class="col-md-6 mb-3 form-control-validation">
                                             <label class="form-label">Kondisi Umum Tanaman</label>
                                             <select id="kondisi_tanaman" name="kondisi_tanaman" class="form-select @error('kondisi_tanaman') is-invalid @enderror">
                                                 <option value="">Pilih Kondisi Tanaman</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::BAIK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BAIK ? 'selected' : '' }}>Baik</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::SEDANG ? 'selected' : '' }}>Sedang</option>
-                                                <option value="{{ \App\Enums\KondisiTanaman::BURUK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BURUK ? 'selected' : '' }}>Buruk</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::BAIK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BAIK ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::BAIK->label() }}</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::SEDANG ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::SEDANG->label() }}</option>
+                                                <option value="{{ \App\Enums\KondisiTanaman::BURUK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BURUK ? 'selected' : '' }}>{{ \App\Enums\KondisiTanaman::BURUK->label() }}</option>
                                             </select>
                                             @error('kondisi_tanaman')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                    </div>
+                                    <div class="row">
+                                        <!-- <div class="col-md-3 mb-3 form-control-validation">
                                             <label class="form-label">Serangan Hama</label>
                                             <select id="serangan_hama" name="serangan_hama" class="form-select @error('serangan_hama') is-invalid @enderror">
                                                 <option value="">Pilih Serangan Hama</option>
@@ -158,14 +160,129 @@
                                                 <option value="{{ \App\Enums\PenyakitTanaman::DAUN_BERCAK }}" {{ old('penyakit_tanaman', $lahanSelected->penyakit_tanaman) == \App\Enums\PenyakitTanaman::DAUN_BERCAK ? 'selected' : '' }}>Daun Bercak</option>
                                                 <option value="{{ \App\Enums\PenyakitTanaman::TANAMAN_LAYU }}" {{ old('penyakit_tanaman', $lahanSelected->penyakit_tanaman) == \App\Enums\PenyakitTanaman::TANAMAN_LAYU ? 'selected' : '' }}>Tanaman Layu</option>
                                             </select> 
+                                        </div> -->
+                                        <div class="col-md-3 mb-4 form-control-validation">
+                                            <label class="form-label">Jenis Hama</label>
+                                            
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Penggerek buah" 
+                                                    id="jenis-hama-penggerek-buah"
+                                                    {{ in_array('Penggerek buah', old('jenis_hama', $lahanSelected->jenis_hama ?? [])) ? 'checked' : '' }}>
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Penggerek buah</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Penggerek batang" 
+                                                    id="jenis-hama-penggerek-batang"
+                                                    {{ in_array('Penggerek batang', old('jenis_hama', $lahanSelected->jenis_hama ?? [])) ? 'checked' : '' }}>
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Penggerek batang</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Kutu putih/kutu sisik" 
+                                                    id="jenis-hama-kutu"
+                                                    {{ in_array('Kutu putih/kutu sisik', old('jenis_hama', $lahanSelected->jenis_hama ?? [])) ? 'checked' : '' }}>
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Kutu putih/kutu sisik</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Ulat pemakan daun" 
+                                                    id="jenis-hama-ulat"
+                                                    {{ in_array('Ulat pemakan daun', old('jenis_hama', $lahanSelected->jenis_hama ?? [])) ? 'checked' : '' }}>
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Ulat pemakan daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_hama') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_hama[]" 
+                                                    value="Tikus" 
+                                                    id="jenis-hama-tikus"
+                                                    {{ in_array('Tikus', old('jenis_hama', $lahanSelected->jenis_hama ?? [])) ? 'checked' : '' }}>
+                                                <label class="form-check-label" for="jenis-hama-bentuk">Tikus</label>
+                                            </div>
+                                            <small class="text-muted text-secondary">* Tidak diisi, terisi otomatis</small>
+                                            @error('jenis_hama')
+                                                <div class="error invalid-feedback d-block">{{ $message }}</div>
+                                            @enderror
                                         </div>
-                                        <div class="col-md-3 mb-3 form-control-validation">
+                                        <div class="col-md-3 mb-4 form-control-validation">
+                                            <label class="form-label">Jenis Penyakit</label>
+                                            
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Karat daun" 
+                                                    id="jenis-penyakit-karat-daun"
+                                                    {{ in_array('Karat daun', old('jenis_penyakit', $lahanSelected->jenis_penyakit ?? [])) ? 'checked' : '' }}
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Karat daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Busuk buah/antraknosa" 
+                                                    id="jenis-penyakit-busuk-buah"
+                                                    {{ in_array('Busuk buah/antraknosa', old('jenis_penyakit', $lahanSelected->jenis_penyakit ?? [])) ? 'checked' : '' }}
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Busuk buah/antraknosa</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Busuk akar" 
+                                                    id="jenis-penyakit-busuk-akar"
+                                                    {{ in_array('Busuk akar', old('jenis_penyakit', $lahanSelected->jenis_penyakit ?? [])) ? 'checked' : '' }}
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Busuk akar</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Bercak daun" 
+                                                    id="jenis-penyakit-bercak-daun"
+                                                    {{ in_array('Bercak daun', old('jenis_penyakit', $lahanSelected->jenis_penyakit ?? [])) ? 'checked' : '' }}
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Bercak daun</label>
+                                            </div>
+
+                                            <div class="form-check mt-2">
+                                                <input class="form-check-input @error('jenis_penyakit') is-invalid @enderror" disabled
+                                                    type="checkbox" 
+                                                    name="jenis_penyakit[]" 
+                                                    value="Layu fusarium" 
+                                                    id="jenis-penyakit-layu-fusarium"
+                                                    {{ in_array('Layu fusarium', old('jenis_penyakit', $lahanSelected->jenis_penyakit ?? [])) ? 'checked' : '' }}
+                                                <label class="form-check-label" for="jenis-penyakit-bentuk">Layu fusarium</label>
+                                            </div>
+                                            <small class="text-muted text-secondary">* Tidak diisi, terisi otomatis</small>
+
+                                            @error('jenis_penyakit')
+                                                <div class="error invalid-feedback d-block">{{ $message }}</div>
+                                            @enderror
+                                        </div>
+                                        <div class="col-md-6 mb-3 form-control-validation">
                                             <label class="form-label">Keparahan Serangan Hama/Penyakit</label>
                                             <select id="keparahan_serangan" name="keparahan_serangan" class="form-select @error('keparahan_serangan') is-invalid @enderror">
                                                 <option value="">Pilih Keparahan Serangan</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::RINGAN }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::RINGAN ? 'selected' : '' }}>Ringan</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::SEDANG }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::SEDANG ? 'selected' : '' }}>Sedang</option>
-                                                <option value="{{ \App\Enums\KeparahanSerangan::BERAT }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::BERAT ? 'selected' : '' }}>Berat</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::RINGAN }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::RINGAN ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::RINGAN->label() }}</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::SEDANG }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::SEDANG ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::SEDANG->label() }}</option>
+                                                <option value="{{ \App\Enums\KeparahanSerangan::BERAT }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::BERAT ? 'selected' : '' }}>{{ \App\Enums\KeparahanSerangan::BERAT->label() }}</option>
                                             </select>
                                             @error('keparahan_serangan')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                                         </div>