diff --git a/Views/Main/ReduksiSampahDinas/Index.cshtml b/Views/Main/ReduksiSampahDinas/Index.cshtml
index 7766fd0..cade3a3 100644
--- a/Views/Main/ReduksiSampahDinas/Index.cshtml
+++ b/Views/Main/ReduksiSampahDinas/Index.cshtml
@@ -21,6 +21,154 @@
     </div>
 </div>
 
+<!-- Modal History -->
+<dialog id="modal_history" class="modal">
+  <div class="modal-box w-full">
+    <form method="dialog">
+      <button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
+    </form>
+    <h3 class="text-lg font-bold">History Data</h3>
+    <p class="py-4 text-base font-['Plus_Jakarta_Sans']">Terdapat 30 History perubahan data</p>
+    <div class="px-3 pt-4 pb-8 bg-gray-50">  
+        <div class="flex flex-col gap-4 pl-4 border-l-2 border-gray-300">
+            <div class="flex flex-col gap-1">
+                <div class="text-gray-500 text-xs leading-4">Admin Subandri</div>
+                <div class="text-primary-500 text-base">Current Version</div>
+            </div>
+
+            <div class="flex flex-col gap-1">
+                <div class="text-gray-500 text-xs leading-4">Admin Subandri</div>
+                <div class="text-gray-600 text-base">12:26 pm</div>
+            </div>
+
+            <div class="flex flex-col gap-1">
+                <div class="text-gray-500 text-xs leading-4">Admin Subandri</div>
+                <div class="text-gray-600 text-base">24 Nov 2025, 12:26 pm</div>
+            </div>
+
+            <div class="flex flex-col gap-1">
+                <div class="text-gray-500 text-xs leading-4">Admin Subandri</div>
+                <div class="text-gray-600 text-base">23 Nov 2025, 12:26 pm</div>
+            </div>
+
+            <div class="flex flex-col gap-1">
+                <div class="text-gray-500 text-xs leading-4">Admin Subandri</div>
+                <div class="text-gray-600 text-base">22 Nov 2025, 12:26 pm</div>
+            </div>
+        </div>
+    </div>
+  </div>
+</dialog>
+
+<!-- End Modal History -->
+
+<!-- Modal Tambah/Edit Data -->
+<dialog id="modal_tambah" class="modal modal-bottom sm:modal-middle">
+    <div class="modal-box w-full max-w-2xl p-6 bg-white rounded-2xl">
+        <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Reduksi Sampah</h3>
+        <form id="formTambah" onsubmit="submitForm(event)">
+            <input type="hidden" id="edit_mode" value="false">
+             <input type="hidden" id="reduksi_sampah_id" value="">
+            <div class="flex flex-col gap-6">
+                <!-- Fiel Jenis Lokasi -->
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Jenis Lokasi
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="jenis_lokasi" class="select w-full" required>
+                            <option value="" disabled selected>Pilih salah satu</option>
+                            <option value="Komposting">Komposting</option>
+                            <option value="Maggot">Maggot</option>
+                        </select>
+                    </fieldset>
+                </div>
+                <div id="formDetail" class="hidden flex flex-col gap-6">
+                    <!-- Field Lokasi -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Lokasi<span class="text-red-500">*</span>
+                            </legend>
+                            <select id="lokasi" class="select w-full" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                            </select>
+                        </fieldset>
+                    </div>
+
+                    <!-- Field alamat -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Alamat
+                            </legend>
+                            <textarea id="alamat" rows="4" readonly class="textarea textarea-bordered w-full"></textarea>
+                        </fieldset>
+                    </div>
+
+                    <!-- Field Bukti Kegiatan -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Bukti Kegiatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="file" class="file-input w-full" />
+                            <label class="label">Ukuran Maksimal 5MB</label>
+                        </fieldset>
+                    </div>
+
+                    <!-- Field Keterangan -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Keterangan Kegiatan<span class="text-red-500">*</span>
+                            </legend>
+                            <textarea id="keterangan_kegiatan" rows="4" required placeholder="Keterangan Kegiatan" class="textarea textarea-bordered w-full"></textarea>
+                        </fieldset>
+                    </div>
+
+                    <!-- Field Tanggal Pelaksanaan Kegiatan -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Pelaksanaan Kegiatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_pelaksanaan_kegiatan" class="input w-full" required />
+                        </fieldset>
+                    </div>
+
+                    <!-- Pelaksana kegiatan -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Pelaksana Kegiatan<span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="preview" class="input w-full" placeholder="Pelaksana Kegiatan" required />
+                        </fieldset>
+                    </div>
+                </div>
+                
+                <!-- Buttons -->
+                <div class="flex flex-col sm:flex-row gap-3 justify-end">
+                    <button type="button" class="px-8 py-2.5 bg-white rounded-full outline outline-1 -outline-offset-1 outline-gray-300 text-slate-800 text-base font-semibold font-['Plus_Jakarta_Sans'] leading-6 hover:bg-gray-50 w-full sm:w-auto" onclick="closeModal()">
+                        Batal
+                    </button>
+                    <button type="submit" class="px-8 py-2.5 bg-green-800 rounded-full text-white text-base font-semibold font-['Plus_Jakarta_Sans'] leading-6 hover:bg-green-900 w-full sm:w-auto">
+                        Simpan
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <form method="dialog" class="modal-backdrop">
+        <button>close</button>
+    </form>
+</dialog>
+<!-- /modal tambah/edit -->
+
 <div class="h-6"></div>
 
 <div class="card bg-white shadow-sm">
@@ -52,7 +200,32 @@
 @section Scripts {
     <script type="text/javascript">
         var table;
+        var allLokasi = []; 
+
         $(document).ready(function () {
+            $.ajax({
+                url: '/Master/Lokasi/Table',
+                method: 'GET',
+                success: function (response) {
+
+                    // ambil semua data kecuali 'aksi'
+                    allLokasi = (response.data || []).map(item => {
+                        return {
+                            jenis_lokasi: item.jenis_lokasi,
+                            nama_lokasi: item.nama_lokasi,
+                            kecamatan: item.kecamatan,
+                            kelurahan: item.kelurahan,
+                            detail_alamat: item.detail_alamat,
+                            rt: item.rt,
+                            rw: item.rw
+                        };
+                    });
+                },
+                error: function () {
+                    console.error("Gagal mengambil data lokasi dari /Master/Lokasi/Table");
+                }
+            });
+
             table = new DataTable('#example', {
                 ajax: '/Main/ReduksiSampahDinas/Table',
                 scrollX: true,
@@ -87,6 +260,79 @@
                 e.preventDefault();
                 modal_history.showModal();
             });
+
+            $('#jenis_lokasi').on('change', function() {
+                const jenisLokasi = $(this).val();
+                
+                if (jenisLokasi) {
+                    $('#formDetail').removeClass('hidden').hide().fadeIn(300);
+                    populateNamaLokasiDropdown(jenisLokasi);
+                    // $('#formTambah')[0].reset();
+                } else {
+                    $('#formDetail').fadeOut(300);
+                }
+            });
+
+            // 🔹 Event: ketika nama_lokasi dipilih
+            $('#lokasi').on('change', function () {
+                const nama = $(this).val();
+
+                if (!nama) {
+                    $('#alamat').val(''); // reset jika tidak ada pilihan
+                    return;
+                }
+
+                // cari lokasi yang sesuai
+                const lokasi = allLokasi.find(item => item.nama_lokasi === nama);
+
+                if (lokasi) {
+                    // format: Kecamatan, Kelurahan, RT, RW, Detail Alamat
+                    const formattedAlamat = `${lokasi.kecamatan}, ${lokasi.kelurahan}, RT ${lokasi.rt}, RW ${lokasi.rw}, ${lokasi.detail_alamat}`;
+                    $('#alamat').val(formattedAlamat);
+                }
+            });
+
+            $('#example').on('click', '.btn-edit', function (e) {
+                e.preventDefault();
+    
+                // Get row data
+                var row = table.row($(this).parents('tr')).data();
+    
+                // Set edit mode 
+                $('#edit_mode').val('true');
+                $('#reduksi_sampah_id').val(row.id);
+                $('#jenis_lokasi').val(row.jenis_lokasi).trigger("change");
+                $("#lokasi").val(row.nama_lokasi).trigger("change");
+                $('#modal_title').text('Edit Reduksi Sampah');
+    
+                // Open modal
+                modal_tambah.showModal();
+            });
         });
+
+        function populateNamaLokasiDropdown(jenisLokasi) {
+            let options = '<option value="">Pilih salah satu</option>';
+
+            if (jenisLokasi) {
+                // filter lokasi berdasarkan jenis_lokasi
+                const filtered = allLokasi.filter(item => item.jenis_lokasi === jenisLokasi);
+
+                filtered.forEach(item => {
+                    options += `<option value="${item.nama_lokasi}">${item.nama_lokasi}</option>`;
+                });
+            }
+
+            $('#lokasi').html(options);
+        }
+
+        function closeModal() {
+            // Reset form
+            $('#formTambah')[0].reset();
+            $('#edit_mode').val('false');
+            $('#modal_title').text('Tambah Reduksi Sampah');
+
+            // Close modal
+            modal_tambah.close();
+        }
     </script>
 }
diff --git a/Views/Main/ReduksiSampahSatpel/Index.cshtml b/Views/Main/ReduksiSampahSatpel/Index.cshtml
index 7585132..40c1e07 100644
--- a/Views/Main/ReduksiSampahSatpel/Index.cshtml
+++ b/Views/Main/ReduksiSampahSatpel/Index.cshtml
@@ -186,7 +186,6 @@
                 }
             });
 
-
             table = new DataTable('#example', {
                 ajax: '/Main/ReduksiSampahSatpel/Table',
                 scrollX: true,