diff --git a/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php b/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
index e573be1..248413b 100644
--- a/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
+++ b/app/Http/Controllers/Web/Produktivitas/PetaniLahanController.php
@@ -141,7 +141,8 @@ class PetaniLahanController extends Controller
         $lahanCount = Lahan::where('petani_id', $petaniId)
             ->count();
         $lahanUid = strtoupper(Str::random(10));
-       
+        
+        $foto = null;
         if ($request->hasFile('foto')) {
             $foto = [];
             foreach ($request->file('foto') as $file) {
@@ -188,6 +189,14 @@ class PetaniLahanController extends Controller
                 Tanaman::insert($chunk->toArray());
             });
 
+            if ($request->ajax()) {
+                return response()->json([
+                    'success' => true,
+                    'redirect' => route('petani.lahan-tanaman.index', $petaniId),
+                    'message' => 'Lahan berhasil ditambahkan.'
+                ]);
+            }
+
             return redirect()->route('petani.lahan-tanaman.index', $petaniId)->with('success', 'Lahan berhasil ditambahkan.');
         }
     }
diff --git a/resources/views/produktivitas/petani/lahan/add.blade.php b/resources/views/produktivitas/petani/lahan/add.blade.php
index a49106f..3aa8bfe 100644
--- a/resources/views/produktivitas/petani/lahan/add.blade.php
+++ b/resources/views/produktivitas/petani/lahan/add.blade.php
@@ -592,7 +592,9 @@
                     processData: false,
                     contentType: false,
                     success: function(res) {
-                        console.log(res);
+                        if (res.redirect) {
+                            window.location.href = res.redirect;
+                        }
                     }
                 });
 
diff --git a/resources/views/produktivitas/petani/lahan/edit.blade.php b/resources/views/produktivitas/petani/lahan/edit.blade.php
index 03b0f56..ef85fd3 100644
--- a/resources/views/produktivitas/petani/lahan/edit.blade.php
+++ b/resources/views/produktivitas/petani/lahan/edit.blade.php
@@ -320,12 +320,12 @@
                                                     @elseif($item->penyakit_tanaman == \App\Enums\PenyakitTanaman::DAUN_BERCAK)
                                                     <span class="badge bg-label-warning">Daun Bercak</span>
                                                     @elseif($item->penyakit_tanaman == \App\Enums\PenyakitTanaman::TANAMAN_LAYU)
-                                                    <span class="badge bg-label-danger">Tanaman Layu</span>
+                                                    <span class="badge bg-label-info">Tanaman Layu</span>
                                                     @endif
                                                 </td>
                                                 <td class="td-keparahan">
                                                     @if($item->keparahan_serangan == \App\Enums\KeparahanSerangan::RINGAN)
-                                                    <span class="badge bg-label-success">Ringan</span>
+                                                    <span class="badge bg-label-info">Ringan</span>
                                                     @elseif($item->keparahan_serangan == \App\Enums\KeparahanSerangan::SEDANG)
                                                     <span class="badge bg-label-warning">Sedang</span>
                                                     @elseif($item->keparahan_serangan == \App\Enums\KeparahanSerangan::BERAT)
diff --git a/resources/views/produktivitas/petani/lahan/tanaman/edit.blade.php b/resources/views/produktivitas/petani/lahan/tanaman/edit.blade.php
index fd8e49c..b64d2e2 100644
--- a/resources/views/produktivitas/petani/lahan/tanaman/edit.blade.php
+++ b/resources/views/produktivitas/petani/lahan/tanaman/edit.blade.php
@@ -32,40 +32,39 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <div class="col-md-6">
+                        <div class="col-md-6 form-control-validation">
                             <label for="latitude" class="form-label">Latitude</label>
                             <input type="number" class="form-control" id="latitude" name="latitude">
                         </div>
-                        <div class="col-md-6">
+                        <div class="col-md-6 form-control-validation">
                             <label for="longitude" class="form-label">Longitude</label>
                             <input type="number" class="form-control" id="longitude" name="longitude">
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <div class="col-md-6">
+                        <div class="col-md-6 form-control-validation">
                             <label for="kondisi" class="form-label">Kondisi Tanaman</label>
-                            <select class="form-select" id="kondisi" name="kondisi_tanaman" required>
+                            <select class="form-select" id="tnm_kondisi_tanaman" name="kondisi_tanaman" required>
                                 <option value="">Pilih Kondisi Tanaman</option>
-                                <option value="{{ \App\Enums\KondisiTanaman::BAIK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BAIK->value ? 'selected' : '' }}>Baik</option>
-                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::SEDANG->value ? 'selected' : '' }}>Sedang</option>
-                                <option value="{{ \App\Enums\KondisiTanaman::BURUK }}" {{ old('kondisi_tanaman', $lahanSelected->kondisi_tanaman) == \App\Enums\KondisiTanaman::BURUK->value ? 'selected' : '' }}>Buruk</option>
+                                <option value="{{ \App\Enums\KondisiTanaman::BAIK->value }}">Baik</option>
+                                <option value="{{ \App\Enums\KondisiTanaman::SEDANG->value }}">Sedang</option>
+                                <option value="{{ \App\Enums\KondisiTanaman::BURUK->value }}">Buruk</option>
                             </select>
                         </div>
                         <div class="col-md-6 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">
+                            <select id="tnm_serangan_hama" name="serangan_hama" class="form-select">
                                 <option value="">Pilih Serangan Hama</option>
-                                <option value="{{ \App\Enums\SeranganHama::ULAT }}" {{ old('serangan_hama', $lahanSelected->serangan_hama) == \App\Enums\SeranganHama::ULAT->value ? 'selected' : '' }}>Ulat</option>
-                                <option value="{{ \App\Enums\SeranganHama::BELALANG }}" {{ old('serangan_hama', $lahanSelected->serangan_hama) == \App\Enums\SeranganHama::BELALANG->value ? 'selected' : '' }}>Belalang</option>
-                                <option value="{{ \App\Enums\SeranganHama::KUTU }}" {{ old('serangan_hama', $lahanSelected->serangan_hama) == \App\Enums\SeranganHama::KUTU->value ? 'selected' : '' }}>Kutu</option>
+                                <option value="{{ \App\Enums\SeranganHama::ULAT }}">Ulat</option>
+                                <option value="{{ \App\Enums\SeranganHama::BELALANG }}">Belalang</option>
+                                <option value="{{ \App\Enums\SeranganHama::KUTU }}">Kutu</option>
                             </select>
-                            @error('serangan_hama')<div class="error invalid-feedback">{{ $message }}</div>@enderror
                         </div>
                     </div>
                     <div class="row mb-3">
                         <div class="col-md-6 form-control-validation">
                             <label class="form-label">Penyakit Tanaman</label>
-                            <select id="penyakit_tanaman" name="penyakit_tanaman" class="form-select @error('penyakit_tanaman') is-invalid @enderror">
+                            <select id="tnm_penyakit_tanaman" name="penyakit_tanaman">
                                 <option value="">Pilih Penyakit</option>
                                 <option value="{{ \App\Enums\PenyakitTanaman::BUSUK_BUAH }}" {{ old('penyakit_tanaman', $lahanSelected->penyakit_tanaman) == \App\Enums\PenyakitTanaman::BUSUK_BUAH->value ? 'selected' : '' }}>Busuk Buah</option>
                                 <option value="{{ \App\Enums\PenyakitTanaman::DAUN_MENGUNING }}" {{ old('penyakit_tanaman', $lahanSelected->penyakit_tanaman) == \App\Enums\PenyakitTanaman::DAUN_MENGUNING->value ? 'selected' : '' }}>Daun Menguning</option>
@@ -76,7 +75,7 @@
                         </div>
                         <div class="col-md-6 form-control-validation">
                             <label class="form-label">Keparahan Serangan</label>
-                            <select id="keparahan_serangan" name="keparahan_serangan" class="form-select @error('keparahan_serangan') is-invalid @enderror">
+                            <select id="tnm_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->value ? 'selected' : '' }}>Ringan</option>
                                 <option value="{{ \App\Enums\KeparahanSerangan::SEDANG }}" {{ old('keparahan_serangan', $lahanSelected->keparahan_serangan) == \App\Enums\KeparahanSerangan::SEDANG->value ? 'selected' : '' }}>Sedang</option>
@@ -110,15 +109,21 @@
                 type: 'GET',
                 success: function(response) {
                     console.log(response);
+                    $('#tnm_kondisi_tanaman,#tnm_serangan_hama,#tnm_penyakit_tanaman,#tnm_keparahan_serangan')
+                        .val(null)
+                        .trigger('change');
+
                     $('#komoditas').val(response.data.komoditas.nama);
                     $('#jenis_komoditas').val(response.data.jenis_komoditas.nama);
                     $('#varietas').val(response.data.varietas.nama);
                     $('#latitude').val(response.data.latitude);
                     $('#longitude').val(response.data.longitude);
-                    $('#kondisi').val(response.data.kondisi_tanaman);
-                    $('#serangan_hama').val(response.data.serangan_hama);
-                    $('#penyakit_tanaman').val(response.data.penyakit_tanaman);
-                    $('#keparahan_serangan').val(response.data.keparahan_serangan);
+
+                    $('#tnm_kondisi_tanaman').val(response.data.kondisi_tanaman).trigger('change');
+                    $('#tnm_serangan_hama').val(response.data.serangan_hama).trigger('change');
+                    $('#tnm_penyakit_tanaman').val(response.data.penyakit_tanaman).trigger('change');
+                    $('#tnm_keparahan_serangan').val(response.data.keparahan_serangan).trigger('change');
+
                     $('#editTanamanFormId').val(response.data.id);
                     
                     $('#tanamanModal').modal('show');
@@ -129,6 +134,13 @@
             });
         });
 
+        console.log(document.querySelectorAll('#serangan_hama'));
+
+        $('#tnm_kondisi_tanaman,#tnm_serangan_hama,#tnm_penyakit_tanaman,#tnm_keparahan_serangan').select2({
+            dropdownParent: $('#tanamanModal'),
+            width: '100%'
+        });
+
         $('#editTanamanForm').validate({
             rules: {
                 latitude: {
@@ -150,7 +162,6 @@
             },
             submitHandler: function(form) {
                 var url = form.action.replace(':id', $('#editTanamanFormId').val());
-                console.log(url);
 
                 $.ajax({
                     url: url,
@@ -177,6 +188,35 @@
                                     currentRow.find('.td-kondisi').html('<span class="badge bg-label-dark">Mati</span>');
                                 }
                             }
+                            if (response.data.serangan_hama) {
+                                if (response.data.serangan_hama === 'ulat') {
+                                    currentRow.find('.td-hama').html('<span class="badge bg-label-success">Ulat</span>');
+                                } else if (response.data.serangan_hama === 'belalang') {
+                                    currentRow.find('.td-hama').html('<span class="badge bg-label-danger">Belalang</span>');
+                                } else if (response.data.serangan_hama === 'kutu') {
+                                    currentRow.find('.td-hama').html('<span class="badge bg-label-warning">Kutu</span>');
+                                }
+                            }
+                            if (response.data.penyakit_tanaman) {
+                                if (response.data.penyakit_tanaman === 'busuk_buah') {
+                                    currentRow.find('.td-penyakit').html('<span class="badge bg-label-success">Busuk Buah</span>');
+                                } else if (response.data.penyakit_tanaman === 'daun_menguning') {
+                                    currentRow.find('.td-penyakit').html('<span class="badge bg-label-danger">Daun Menguning</span>');
+                                } else if (response.data.penyakit_tanaman === 'daun_bercak') {
+                                    currentRow.find('.td-penyakit').html('<span class="badge bg-label-warning">Daun Bercak</span>');
+                                } else if (response.data.penyakit_tanaman === 'tanaman_layu') {
+                                    currentRow.find('.td-penyakit').html('<span class="badge bg-label-info">Tanaman Layu</span>');
+                                }
+                            }
+                            if (response.data.keparahan_serangan) {
+                                if (response.data.keparahan_serangan === 'baik') {
+                                    currentRow.find('.td-keparahan').html('<span class="badge bg-label-info">Ringan</span>');
+                                } else if (response.data.keparahan_serangan === 'sedang') {
+                                    currentRow.find('.td-keparahan').html('<span class="badge bg-label-warning">Sedang</span>');
+                                } else if (response.data.keparahan_serangan === 'buruk') {
+                                    currentRow.find('.td-keparahan').html('<span class="badge bg-label-danger">Berat</span>');
+                                }
+                            }
                         } else {
                             
                         }