diff --git a/Controllers/Main/BankSampahController.cs b/Controllers/Main/BankSampahController.cs index 5decd1c..1f0045c 100644 --- a/Controllers/Main/BankSampahController.cs +++ b/Controllers/Main/BankSampahController.cs @@ -25,6 +25,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Ciracas", status_validasi = "
Disetujui
", catatan = "Perhatikan kebersihan", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -40,6 +41,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Cilandak", status_validasi = "
Disetujui
", catatan = "Perlu dicek ulang", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -55,6 +57,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Cempaka Putih", status_validasi = "
Disetujui
", catatan = "Perlu ditingkatkan", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -70,6 +73,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Cakung", status_validasi = "
Disetujui
", catatan = "Kualitas baik", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -85,6 +89,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Duren Sawit", status_validasi = "
Belum Disetujui
", catatan = "Cukup baik", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -100,6 +105,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Grogol Petamburan", status_validasi = "
Belum Disetujui
", catatan = "Bagus", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -115,6 +121,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Kebayoran Baru", status_validasi = "
Disetujui
", catatan = "Sangat baik", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -130,6 +137,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Tebet", status_validasi = "
Disetujui
", catatan = "Kondisi bagus", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -145,6 +153,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Menteng", status_validasi = "
Disetujui
", catatan = "Sesuai standar", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -160,6 +169,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Senen", status_validasi = "
Disetujui
", catatan = "Aman untuk proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -175,6 +185,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Pasar Minggu", status_validasi = "
Belum Disetujui
", catatan = "Perlu verifikasi", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -190,6 +201,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Jagakarsa", status_validasi = "
Disetujui
", catatan = "Siap olah", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -205,6 +217,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Tanah Abang", status_validasi = "
Disetujui
", catatan = "Kondisi bersih", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -220,6 +233,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Kemayoran", status_validasi = "
Disetujui
", catatan = "Layak proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -235,6 +249,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Kelapa Gading", status_validasi = "
Belum Disetujui
", catatan = "Butuh pemilahan ulang", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -250,6 +265,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Pulo Gadung", status_validasi = "
Disetujui
", catatan = "Siap didistribusi", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -265,6 +281,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Matraman", status_validasi = "
Disetujui
", catatan = "Hati-hati proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -280,6 +297,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Kramat Jati", status_validasi = "
Belum Disetujui
", catatan = "Perlu penanganan khusus", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -295,6 +313,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Jatinegara", status_validasi = "
Disetujui
", catatan = "Kualitas premium", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -310,6 +329,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Cipayung", status_validasi = "
Disetujui
", catatan = "Sangat layak", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -325,6 +345,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Pancoran", status_validasi = "
Disetujui
", catatan = "Proses lancar", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -340,6 +361,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Condet", status_validasi = "
Belum Disetujui
", catatan = "Kondisi kurang baik", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -355,6 +377,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Kebun Jeruk", status_validasi = "
Disetujui
", catatan = "Cocok kompos", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -370,6 +393,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Rawamangun", status_validasi = "
Disetujui
", catatan = "Sudah tersortir", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -385,6 +409,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Halim", status_validasi = "
Disetujui
", catatan = "Bersih dan rapi", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -400,6 +425,7 @@ namespace BankSampahApp.Controllers.Main asal_sampah = "Mampang", status_validasi = "
Belum Disetujui
", catatan = "Ada pecahan", + catatan_validasi = "", aksi = "
" + "" + "" + diff --git a/Controllers/Main/CompostingController.cs b/Controllers/Main/CompostingController.cs index d40851f..3f158b9 100644 --- a/Controllers/Main/CompostingController.cs +++ b/Controllers/Main/CompostingController.cs @@ -25,6 +25,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 14, status_validasi = "
Disetujui
", catatan = "Perhatikan kebersihan", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -40,6 +41,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 21, status_validasi = "
Disetujui
", catatan = "Perlu dicek ulang", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -55,6 +57,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 30, status_validasi = "
Disetujui
", catatan = "Perlu ditingkatkan", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -70,6 +73,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 7, status_validasi = "
Disetujui
", catatan = "Kualitas baik", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -85,6 +89,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 28, status_validasi = "
Belum Disetujui
", catatan = "Cukup baik", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -100,6 +105,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 21, status_validasi = "
Belum Disetujui
", catatan = "Bagus", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -115,6 +121,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 18, status_validasi = "
Disetujui
", catatan = "Sangat baik", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -130,6 +137,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 25, status_validasi = "
Disetujui
", catatan = "Kondisi bagus", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -145,6 +153,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 35, status_validasi = "
Disetujui
", catatan = "Sesuai standar", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -160,6 +169,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 12, status_validasi = "
Disetujui
", catatan = "Aman untuk proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -175,6 +185,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 45, status_validasi = "
Belum Disetujui
", catatan = "Perlu verifikasi", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -190,6 +201,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 16, status_validasi = "
Disetujui
", catatan = "Siap olah", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -205,6 +217,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 19, status_validasi = "
Disetujui
", catatan = "Kondisi bersih", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -220,6 +233,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 28, status_validasi = "
Disetujui
", catatan = "Layak proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -235,6 +249,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 8, status_validasi = "
Belum Disetujui
", catatan = "Butuh pemilahan ulang", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -250,6 +265,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 22, status_validasi = "
Disetujui
", catatan = "Siap didistribusi", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -265,6 +281,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 10, status_validasi = "
Disetujui
", catatan = "Hati-hati proses", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -280,6 +297,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 15, status_validasi = "
Belum Disetujui
", catatan = "Perlu penanganan khusus", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -295,6 +313,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 20, status_validasi = "
Disetujui
", catatan = "Kualitas premium", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -310,6 +329,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 40, status_validasi = "
Disetujui
", catatan = "Sangat layak", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -325,6 +345,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 11, status_validasi = "
Disetujui
", catatan = "Proses lancar", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -340,6 +361,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 17, status_validasi = "
Belum Disetujui
", catatan = "Kondisi kurang baik", + catatan_validasi = "", aksi = "
" + "" + "" + @@ -355,6 +377,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 23, status_validasi = "
Disetujui
", catatan = "Cocok kompos", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -370,6 +393,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 32, status_validasi = "
Disetujui
", catatan = "Sudah tersortir", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -385,6 +409,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 9, status_validasi = "
Disetujui
", catatan = "Bersih dan rapi", + catatan_validasi = "
Tervalidasi
", aksi = "
" + "" + "" + @@ -400,6 +425,7 @@ namespace BankSampahApp.Controllers.Main lama_proses = 26, status_validasi = "
Belum Disetujui
", catatan = "Ada pecahan", + catatan_validasi = "", aksi = "
" + "" + "" + diff --git a/Views/Main/BankSampah/Index.cshtml b/Views/Main/BankSampah/Index.cshtml index ae010f8..bbb777b 100644 --- a/Views/Main/BankSampah/Index.cshtml +++ b/Views/Main/BankSampah/Index.cshtml @@ -165,6 +165,62 @@ + + + + + + +
@@ -184,6 +240,7 @@ Asal Sampah Status Validasi Catatan + Validasi Aksi @@ -218,6 +275,7 @@ { data: 'asal_sampah' }, { data: 'status_validasi' }, { data: 'catatan' }, + { data: 'catatan_validasi' }, { data: 'aksi' }, ] }); @@ -261,17 +319,17 @@ // Edit button handler $('#example').on('click', '.p-2.bg-amber-500', function (e) { e.preventDefault(); - + // Get row data var row = table.row($(this).parents('tr')).data(); - + // Set edit mode $('#edit_mode').val('true'); $('#modal_title').text('Edit Data Pemilahan'); - + // Convert date format from "15 Mar 2024" to "2024-03-15" var tglPemilahan = convertDateToInput(row.tgl_pemilahan); - + // Populate form with row data $('#tgl_pemilahan').val(tglPemilahan); $('#nama_bank_sampah').val(row.nama_bank_sampah); @@ -280,16 +338,35 @@ $('#kategori_sampah').val(row.kategori_sampah); $('#jumlah').val(row.jumlah); $('#asal_sampah').val(row.asal_sampah); - + // Extract status from HTML badge var statusText = $(row.status_validasi).text().trim(); $('#status_validasi').val(statusText); - + $('#catatan').val(row.catatan); - + // Open modal modal_tambah.showModal(); }); + + // Validasi button handler + $('#example').on('click', '.btn-validasi', function (e) { + e.preventDefault(); + + // Get row data + var row = table.row($(this).parents('tr')).data(); + + // Store current row reference + window.currentValidationRow = row; + + // Populate validation modal with data + $('#val_tgl_pemilahan').text(row.tgl_pemilahan); + $('#val_nama_bank_sampah').text(row.nama_bank_sampah); + $('#val_nama_penanggung_jawab').text(row.nama_penanggung_jawab); + + // Open validation modal + modal_validasi.showModal(); + }); }); // Function to convert date format "15 Mar 2024" to "2024-03-15" @@ -320,9 +397,9 @@ function submitForm(e) { e.preventDefault(); - + var isEditMode = $('#edit_mode').val() === 'true'; - + // TODO: Implement form submission logic Swal.fire({ title: 'Berhasil!', @@ -335,10 +412,47 @@ }, }).then(() => { closeModal(); - + // Reload table table.ajax.reload(); }); } + + function closeValidasiModal() { + window.currentValidationRow = null; + modal_validasi.close(); + } + + function toggleDetail() { + // TODO: Implement show more details functionality + var btn = $('#btn_lebih_lengkap span'); + var icon = $('#icon_lebih_lengkap'); + + if (btn.text() === 'Lebih Lengkap') { + btn.text('Lebih Sedikit'); + icon.removeClass('ph-caret-down').addClass('ph-caret-up'); + // Show additional fields + } else { + btn.text('Lebih Lengkap'); + icon.removeClass('ph-caret-up').addClass('ph-caret-down'); + // Hide additional fields + } + } + + function confirmValidasi() { + // TODO: Implement actual validation API call + closeValidasiModal(); + + // Reload table + table.ajax.reload(); + } + + function confirmTolakValidasi() { + // TODO: Implement actual rejection API call + closeValidasiModal(); + + // Reload table + table.ajax.reload(); + } } diff --git a/Views/Main/Composting/Index.cshtml b/Views/Main/Composting/Index.cshtml index 74dd36d..5680312 100644 --- a/Views/Main/Composting/Index.cshtml +++ b/Views/Main/Composting/Index.cshtml @@ -178,6 +178,62 @@ + + + + + + +
@@ -197,6 +253,7 @@ Lama Proses (Hari) Status Validasi Catatan + Validasi Aksi @@ -231,6 +288,7 @@ { data: 'lama_proses' }, { data: 'status_validasi' }, { data: 'catatan' }, + { data: 'catatan_validasi' }, { data: 'aksi' }, ] }); @@ -265,7 +323,26 @@ // Show modal modal_tambah.showModal(); }); - + + // Validasi button handler + $('#example').on('click', '.btn-validasi', function (e) { + e.preventDefault(); + + // Get row data + var row = table.row($(this).parents('tr')).data(); + + // Store current row reference + window.currentValidationRow = row; + + // Populate validation modal with data + $('#val_tgl_pencatatan').text(row.tgl_pencatatan); + $('#val_nama_bank_sampah').text(row.nama_bank_sampah); + $('#val_nama_penanggung_jawab').text(row.nama_penanggung_jawab); + + // Open validation modal + modal_validasi.showModal(); + }); + // Delete button handler $('#example').on('click', '.p-2.bg-red-500', function (e) { e.preventDefault(); @@ -333,12 +410,12 @@ function submitForm(e) { e.preventDefault(); - + var isEditMode = $('#edit_mode').val() === 'true'; - + // TODO: Implement actual save/update API call here // For now, just show success message - + Swal.fire({ title: 'Berhasil!', text: isEditMode ? 'Data berhasil diperbarui.' : 'Data berhasil ditambahkan.', @@ -351,10 +428,47 @@ buttonsStyling: false }).then(() => { closeModal(); - + // Reload table table.ajax.reload(); }); } + + function closeValidasiModal() { + window.currentValidationRow = null; + modal_validasi.close(); + } + + function toggleDetail() { + // TODO: Implement show more details functionality + var btn = $('#btn_lebih_lengkap span'); + var icon = $('#icon_lebih_lengkap'); + + if (btn.text() === 'Lebih Lengkap') { + btn.text('Lebih Sedikit'); + icon.removeClass('ph-caret-down').addClass('ph-caret-up'); + // Show additional fields + } else { + btn.text('Lebih Lengkap'); + icon.removeClass('ph-caret-up').addClass('ph-caret-down'); + // Hide additional fields + } + } + + function confirmValidasi() { + // TODO: Implement actual validation API call + closeValidasiModal(); + + // Reload table + table.ajax.reload(); + } + + function confirmTolakValidasi() { + // TODO: Implement actual rejection API call + closeValidasiModal(); + + // Reload table + table.ajax.reload(); + } } diff --git a/Views/Shared/_SidebarUnified.cshtml b/Views/Shared/_SidebarUnified.cshtml index d47bc96..303cc10 100644 --- a/Views/Shared/_SidebarUnified.cshtml +++ b/Views/Shared/_SidebarUnified.cshtml @@ -152,7 +152,7 @@
  • - Profil + Profil Bank Sampah