semua fitur selesai

lib/app/modules/petugas_bumdes/controllers/petugas_akun_bank_controller.dart

@@ -0,0 +1,113 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import '../../../data/providers/aset_provider.dart';
+
+class PetugasAkunBankController extends GetxController {
+  final AsetProvider asetProvider = Get.find<AsetProvider>();
+
+  // Observable variables
+  final isLoading = true.obs;
+  final bankAccounts = <Map<String, dynamic>>[].obs;
+  final errorMessage = ''.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    loadBankAccounts();
+  }
+
+  // Load bank accounts from the database
+  Future<void> loadBankAccounts() async {
+    try {
+      isLoading.value = true;
+      errorMessage.value = '';
+
+      debugPrint('🏦 Loading bank accounts...');
+
+      // Fetch all bank accounts from the database
+      final response = await asetProvider.client
+          .from('akun_bank')
+          .select('id, nama_bank, nama_akun, no_rekening')
+          .order('nama_bank', ascending: true);
+
+      if (response is List) {
+        bankAccounts.value = List<Map<String, dynamic>>.from(response);
+        debugPrint('✅ Loaded ${bankAccounts.length} bank accounts');
+      } else {
+        bankAccounts.value = [];
+        errorMessage.value = 'Failed to load bank accounts';
+        debugPrint('❌ Failed to load bank accounts: Invalid response format');
+      }
+    } catch (e) {
+      errorMessage.value = 'Error loading bank accounts: $e';
+      debugPrint('❌ Error loading bank accounts: $e');
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  // Add a new bank account
+  Future<bool> addBankAccount(Map<String, dynamic> accountData) async {
+    try {
+      debugPrint('🏦 Adding new bank account: ${accountData['nama_bank']}');
+
+      final response = await asetProvider.client
+          .from('akun_bank')
+          .insert(accountData)
+          .select('id');
+
+      if (response is List && response.isNotEmpty) {
+        debugPrint('✅ Bank account added successfully');
+        await loadBankAccounts(); // Reload the list
+        return true;
+      } else {
+        debugPrint('❌ Failed to add bank account: No response');
+        return false;
+      }
+    } catch (e) {
+      debugPrint('❌ Error adding bank account: $e');
+      return false;
+    }
+  }
+
+  // Update an existing bank account
+  Future<bool> updateBankAccount(
+    String id,
+    Map<String, dynamic> accountData,
+  ) async {
+    try {
+      debugPrint('🏦 Updating bank account ID: $id');
+
+      final response = await asetProvider.client
+          .from('akun_bank')
+          .update(accountData)
+          .eq('id', id);
+
+      debugPrint('✅ Bank account updated successfully');
+      await loadBankAccounts(); // Reload the list
+      return true;
+    } catch (e) {
+      debugPrint('❌ Error updating bank account: $e');
+      return false;
+    }
+  }
+
+  // Delete a bank account
+  Future<bool> deleteBankAccount(String id) async {
+    try {
+      debugPrint('🏦 Deleting bank account ID: $id');
+
+      final response = await asetProvider.client
+          .from('akun_bank')
+          .delete()
+          .eq('id', id);
+
+      debugPrint('✅ Bank account deleted successfully');
+      await loadBankAccounts(); // Reload the list
+      return true;
+    } catch (e) {
+      debugPrint('❌ Error deleting bank account: $e');
+      return false;
+    }
+  }
+}

lib/app/modules/petugas_bumdes/controllers/petugas_aset_controller.dart

@@ -222,8 +222,63 @@ class PetugasAsetController extends GetxController {
   }
 
   // Delete an asset
-  void deleteAset(String id) {
-    asetList.removeWhere((aset) => aset['id'] == id);
-    applyFilters();
+  Future<bool> deleteAset(String id) async {
+    try {
+      debugPrint('🗑️ Starting deletion process for asset ID: $id');
+
+      // Show loading indicator
+      Get.dialog(
+        const Center(child: CircularProgressIndicator()),
+        barrierDismissible: false,
+      );
+
+      // Call the provider to delete the asset
+      final success = await _asetProvider.deleteAset(id);
+
+      // Close the loading dialog
+      Get.back();
+
+      if (success) {
+        // Remove the asset from our local list
+        asetList.removeWhere((aset) => aset['id'] == id);
+        // Apply filters to update the UI
+        applyFilters();
+
+        // Show success message
+        Get.snackbar(
+          'Sukses',
+          'Aset berhasil dihapus',
+          snackPosition: SnackPosition.TOP,
+          backgroundColor: Colors.green,
+          colorText: Colors.white,
+        );
+        return true;
+      } else {
+        // Show error message
+        Get.snackbar(
+          'Gagal',
+          'Terjadi kesalahan saat menghapus aset',
+          snackPosition: SnackPosition.BOTTOM,
+          backgroundColor: Colors.red,
+          colorText: Colors.white,
+        );
+        return false;
+      }
+    } catch (e) {
+      // Close the loading dialog if still open
+      if (Get.isDialogOpen ?? false) {
+        Get.back();
+      }
+
+      // Show error message
+      Get.snackbar(
+        'Error',
+        'Gagal menghapus aset: ${e.toString()}',
+        snackPosition: SnackPosition.BOTTOM,
+        backgroundColor: Colors.red,
+        colorText: Colors.white,
+      );
+      return false;
+    }
   }
 }

lib/app/modules/petugas_bumdes/controllers/petugas_bumdes_dashboard_controller.dart

@@ -5,6 +5,8 @@ import '../../../services/sewa_service.dart';
 import '../../../services/service_manager.dart';
 import '../../../data/models/pembayaran_model.dart';
 import '../../../services/pembayaran_service.dart';
+import '../../../data/providers/aset_provider.dart';
+import '../../../data/providers/pesanan_provider.dart';
 
 class PetugasBumdesDashboardController extends GetxController {
   AuthProvider? _authProvider;
@@ -16,38 +18,45 @@ class PetugasBumdesDashboardController extends GetxController {
   final userName = ''.obs;
 
   // Revenue Statistics
-  final totalPendapatanBulanIni = 'Rp 8.500.000'.obs;
-  final totalPendapatanBulanLalu = 'Rp 7.200.000'.obs;
-  final persentaseKenaikan = '18%'.obs;
+  final totalPendapatanBulanIni = ''.obs;
+  final totalPendapatanBulanLalu = ''.obs;
+  final persentaseKenaikan = ''.obs;
   final isKenaikanPositif = true.obs;
 
   // Revenue by Category
-  final pendapatanSewa = 'Rp 5.200.000'.obs;
-  final persentaseSewa = 100.obs;
+  final pendapatanSewa = ''.obs;
+  final persentaseSewa = 0.obs;
 
   // Revenue Trends (last 6 months)
   final trendPendapatan = <double>[].obs; // 6 bulan terakhir
 
   // Status Counters for Sewa Aset
-  final terlaksanaCount = 5.obs;
-  final dijadwalkanCount = 1.obs;
-  final aktifCount = 1.obs;
-  final dibatalkanCount = 3.obs;
+  final terlaksanaCount = 0.obs;
+  final dijadwalkanCount = 0.obs;
+  final aktifCount = 0.obs;
+  final dibatalkanCount = 0.obs;
 
   // Additional Sewa Aset Status Counters
-  final menungguPembayaranCount = 2.obs;
-  final periksaPembayaranCount = 1.obs;
-  final diterimaCount = 3.obs;
-  final pembayaranDendaCount = 1.obs;
+  final menungguPembayaranCount = 0.obs;
+  final periksaPembayaranCount = 0.obs;
+  final diterimaCount = 0.obs;
+  final pembayaranDendaCount = 0.obs;
   final periksaPembayaranDendaCount = 0.obs;
-  final selesaiCount = 4.obs;
+  final selesaiCount = 0.obs;
 
   // Status counts for Sewa
-  final pengajuanSewaCount = 5.obs;
-  final pemasanganCountSewa = 3.obs;
-  final sewaAktifCount = 10.obs;
-  final tagihanAktifCountSewa = 7.obs;
-  final periksaPembayaranCountSewa = 2.obs;
+  final pengajuanSewaCount = 0.obs;
+  final pemasanganCountSewa = 0.obs;
+  final sewaAktifCount = 0.obs;
+  final tagihanAktifCountSewa = 0.obs;
+  final periksaPembayaranCountSewa = 0.obs;
+
+  // Tenant (Penyewa) Statistics
+  final penyewaPendingCount = 0.obs;
+  final penyewaActiveCount = 0.obs;
+  final penyewaSuspendedCount = 0.obs;
+  final penyewaTotalCount = 0.obs;
+  final isPenyewaStatsLoading = true.obs;
 
   // Statistik pendapatan
   final totalPendapatan = 0.obs;
@@ -76,6 +85,7 @@ class PetugasBumdesDashboardController extends GetxController {
     print('\u2705 PetugasBumdesDashboardController initialized successfully');
     countSewaByStatus();
     fetchPembayaranStats();
+    fetchPenyewaStats();
   }
 
   Future<void> countSewaByStatus() async {
@@ -172,6 +182,55 @@ class PetugasBumdesDashboardController extends GetxController {
     }
   }
 
+  Future<void> fetchPenyewaStats() async {
+    isPenyewaStatsLoading.value = true;
+    try {
+      if (_authProvider == null || _authProvider!.client == null) {
+        print('Auth provider or client is null');
+        return;
+      }
+
+      final data = await _authProvider!.client
+          .from('warga_desa')
+          .select('status, user_id')
+          .not('user_id', 'is', null);
+
+      if (data != null) {
+        final List<dynamic> penyewaList = data as List<dynamic>;
+
+        // Count penyewa by status
+        penyewaPendingCount.value =
+            penyewaList
+                .where(
+                  (p) => p['status']?.toString().toLowerCase() == 'pending',
+                )
+                .length;
+
+        penyewaActiveCount.value =
+            penyewaList
+                .where((p) => p['status']?.toString().toLowerCase() == 'active')
+                .length;
+
+        penyewaSuspendedCount.value =
+            penyewaList
+                .where(
+                  (p) => p['status']?.toString().toLowerCase() == 'suspended',
+                )
+                .length;
+
+        penyewaTotalCount.value = penyewaList.length;
+
+        print(
+          'Penyewa stats - Pending: ${penyewaPendingCount.value}, Active: ${penyewaActiveCount.value}, Suspended: ${penyewaSuspendedCount.value}, Total: ${penyewaTotalCount.value}',
+        );
+      }
+    } catch (e) {
+      print('Error fetching penyewa stats: $e');
+    } finally {
+      isPenyewaStatsLoading.value = false;
+    }
+  }
+
   void changeTab(int index) {
     try {
       currentTabIndex.value = index;
@@ -194,6 +253,10 @@ class PetugasBumdesDashboardController extends GetxController {
           // Navigate to Sewa page
           navigateToSewa();
           break;
+        case 4:
+          // Navigate to Penyewa page
+          navigateToPenyewa();
+          break;
       }
     } catch (e) {
       print('Error changing tab: $e');
@@ -224,11 +287,42 @@ class PetugasBumdesDashboardController extends GetxController {
     }
   }
 
+  void navigateToPenyewa() {
+    try {
+      Get.offAllNamed(Routes.PETUGAS_PENYEWA);
+    } catch (e) {
+      print('Error navigating to Penyewa: $e');
+    }
+  }
+
   void logout() async {
     try {
+      // Clear providers data
       if (_authProvider != null) {
+        // Sign out from Supabase
         await _authProvider!.signOut();
+
+        // Clear auth provider data
+        _authProvider!.clearAuthData();
+
+        // Clear aset provider data
+        try {
+          final asetProvider = Get.find<AsetProvider>();
+          asetProvider.clearCache();
+        } catch (e) {
+          print('Error clearing AsetProvider: $e');
+        }
+
+        // Clear pesanan provider data
+        try {
+          final pesananProvider = Get.find<PesananProvider>();
+          pesananProvider.clearCache();
+        } catch (e) {
+          print('Error clearing PesananProvider: $e');
+        }
       }
+
+      // Navigate to login screen
       Get.offAllNamed(Routes.LOGIN);
     } catch (e) {
       print('Error during logout: $e');

lib/app/modules/petugas_bumdes/controllers/petugas_detail_penyewa_controller.dart

@@ -0,0 +1,232 @@
+import 'package:get/get.dart';
+import '../../../data/providers/auth_provider.dart';
+
+class PetugasDetailPenyewaController extends GetxController {
+  final AuthProvider _authProvider = Get.find<AuthProvider>();
+
+  final isLoading = true.obs;
+  final penyewaDetail = Rx<Map<String, dynamic>>({});
+  final sewaHistory = <Map<String, dynamic>>[].obs;
+  final userId = ''.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    if (Get.arguments != null && Get.arguments['userId'] != null) {
+      userId.value = Get.arguments['userId'];
+      fetchPenyewaDetail();
+      fetchSewaHistory();
+    } else {
+      Get.back();
+      Get.snackbar(
+        'Error',
+        'Data penyewa tidak ditemukan',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    }
+  }
+
+  Future<void> fetchPenyewaDetail() async {
+    try {
+      isLoading.value = true;
+
+      final data =
+          await _authProvider.client
+              .from('warga_desa')
+              .select('*')
+              .eq('user_id', userId.value)
+              .single();
+
+      if (data != null) {
+        penyewaDetail.value = Map<String, dynamic>.from(data);
+        print('Penyewa detail fetched: ${penyewaDetail.value}');
+      }
+    } catch (e) {
+      print('Error fetching penyewa detail: $e');
+      Get.snackbar(
+        'Error',
+        'Gagal memuat data penyewa',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  Future<void> fetchSewaHistory() async {
+    try {
+      final data = await _authProvider.client
+          .from('sewa_aset')
+          .select('*')
+          .eq('user_id', userId.value)
+          .order('created_at', ascending: false);
+
+      if (data != null) {
+        sewaHistory.value = List<Map<String, dynamic>>.from(data);
+        print('Sewa history fetched: ${sewaHistory.length} items');
+
+        // Process data for each item
+        for (int i = 0; i < sewaHistory.length; i++) {
+          final item = sewaHistory[i];
+
+          // Fetch tagihan data for this sewa_aset
+          try {
+            final tagihanResponse =
+                await _authProvider.client
+                    .from('tagihan_sewa')
+                    .select('tagihan_awal, denda, tagihan_dibayar')
+                    .eq('sewa_aset_id', item['id'])
+                    .maybeSingle();
+
+            if (tagihanResponse != null) {
+              // Add tagihan data to the item
+              sewaHistory[i] = {...item, 'tagihan_sewa': tagihanResponse};
+            }
+          } catch (e) {
+            print('Error fetching tagihan for sewa_aset ${item['id']}: $e');
+          }
+
+          // Get the updated item after adding tagihan data
+          final updatedItem = sewaHistory[i];
+
+          // If this is a package rental (aset_id is null and paket_id exists)
+          if (updatedItem['aset_id'] == null &&
+              updatedItem['paket_id'] != null) {
+            final String paketId = updatedItem['paket_id'];
+
+            try {
+              // Get package name from paket table
+              final paketResponse =
+                  await _authProvider.client
+                      .from('paket')
+                      .select('nama')
+                      .eq('id', paketId)
+                      .maybeSingle();
+
+              // Get package photo from foto_aset table
+              final fotoResponse =
+                  await _authProvider.client
+                      .from('foto_aset')
+                      .select('foto_aset')
+                      .eq('id_paket', paketId)
+                      .limit(1)
+                      .maybeSingle();
+
+              // Create a synthetic aset object for paket
+              Map<String, dynamic> syntheticAset = {};
+
+              if (paketResponse != null) {
+                syntheticAset['nama'] = paketResponse['nama'] ?? 'Paket';
+              }
+
+              if (fotoResponse != null) {
+                syntheticAset['foto_utama'] = fotoResponse['foto_aset'];
+              }
+
+              // Update the item with the synthetic aset
+              sewaHistory[i] = {
+                ...updatedItem,
+                'aset': syntheticAset,
+                'tipe_pesanan': 'paket',
+              };
+            } catch (e) {
+              print('Error fetching package details: $e');
+            }
+          }
+          // If this is an asset rental (aset_id exists and paket_id is null)
+          else if (updatedItem['aset_id'] != null &&
+              updatedItem['paket_id'] == null) {
+            final String asetId = updatedItem['aset_id'];
+
+            try {
+              // Get asset name from aset table
+              final asetResponse =
+                  await _authProvider.client
+                      .from('aset')
+                      .select('nama')
+                      .eq('id', asetId)
+                      .maybeSingle();
+
+              // Get asset photo from foto_aset table using id_aset
+              final fotoResponse =
+                  await _authProvider.client
+                      .from('foto_aset')
+                      .select('foto_aset')
+                      .eq('id_aset', asetId)
+                      .limit(1)
+                      .maybeSingle();
+
+              // Create aset object for individual asset
+              Map<String, dynamic> asetData = {};
+
+              if (asetResponse != null) {
+                asetData['nama'] = asetResponse['nama'] ?? 'Aset';
+              }
+
+              if (fotoResponse != null) {
+                asetData['foto_utama'] = fotoResponse['foto_aset'];
+              }
+
+              // Update the item with the aset data
+              sewaHistory[i] = {
+                ...updatedItem,
+                'aset': asetData,
+                'tipe_pesanan': 'aset',
+              };
+            } catch (e) {
+              print('Error fetching asset details: $e');
+            }
+          }
+        }
+      }
+    } catch (e) {
+      print('Error fetching sewa history: $e');
+    }
+  }
+
+  Future<void> updatePenyewaStatus(String status, String keterangan) async {
+    try {
+      isLoading.value = true;
+
+      await _authProvider.client
+          .from('warga_desa')
+          .update({
+            'status': status,
+            'keterangan': keterangan,
+            'updated_at': DateTime.now().toIso8601String(),
+          })
+          .eq('user_id', userId.value);
+
+      // Refresh data
+      await fetchPenyewaDetail();
+
+      Get.snackbar(
+        'Berhasil',
+        'Status penyewa berhasil diperbarui',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    } catch (e) {
+      print('Error updating penyewa status: $e');
+      Get.snackbar(
+        'Error',
+        'Gagal memperbarui status penyewa',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  String getStatusLabel(String? status) {
+    switch (status?.toLowerCase()) {
+      case 'active':
+        return 'Aktif';
+      case 'pending':
+        return 'Menunggu Verifikasi';
+      case 'suspended':
+        return 'Dinonaktifkan';
+      default:
+        return 'Tidak diketahui';
+    }
+  }
+}

lib/app/modules/petugas_bumdes/controllers/petugas_paket_controller.dart

@@ -8,7 +8,7 @@ import 'package:bumrent_app/app/data/providers/aset_provider.dart';
 class PetugasPaketController extends GetxController {
   // Dependencies
   final AsetProvider _asetProvider = Get.find<AsetProvider>();
-  
+
   // State
   final RxBool isLoading = false.obs;
   final RxString searchQuery = ''.obs;
@@ -16,7 +16,7 @@ class PetugasPaketController extends GetxController {
   final RxString sortBy = 'Terbaru'.obs;
   final RxList<PaketModel> packages = <PaketModel>[].obs;
   final RxList<PaketModel> filteredPackages = <PaketModel>[].obs;
-  
+
   // Sort options for the dropdown
   final List<String> sortOptions = [
     'Terbaru',
@@ -26,18 +26,19 @@ class PetugasPaketController extends GetxController {
     'Nama A-Z',
     'Nama Z-A',
   ];
-  
+
   // For backward compatibility
   final RxList<Map<String, dynamic>> paketList = <Map<String, dynamic>>[].obs;
-  final RxList<Map<String, dynamic>> filteredPaketList = <Map<String, dynamic>>[].obs;
-  
+  final RxList<Map<String, dynamic>> filteredPaketList =
+      <Map<String, dynamic>>[].obs;
+
   // Logger
   late final Logger _logger;
-  
+
   @override
   void onInit() {
     super.onInit();
-    
+
     // Initialize logger
     _logger = Logger(
       printer: PrettyPrinter(
@@ -47,39 +48,42 @@ class PetugasPaketController extends GetxController {
         printEmojis: true,
       ),
     );
-    
+
     // Load initial data
     fetchPackages();
   }
-  
+
   /// Fetch packages from the API
   Future<void> fetchPackages() async {
     try {
       isLoading.value = true;
       _logger.i('🔄 [fetchPackages] Fetching packages...');
-      
+
       final result = await _asetProvider.getAllPaket();
-      
+
       if (result.isEmpty) {
         _logger.w('ℹ️ [fetchPackages] No packages found');
         packages.clear();
         filteredPackages.clear();
         return;
       }
-      
+
       packages.assignAll(result);
       filteredPackages.assignAll(result);
-      
+
       // Update legacy list for backward compatibility
       _updateLegacyPaketList();
-      
-      _logger.i('✅ [fetchPackages] Successfully loaded ${result.length} packages');
-      
+
+      _logger.i(
+        '✅ [fetchPackages] Successfully loaded ${result.length} packages',
+      );
     } catch (e, stackTrace) {
-      _logger.e('❌ [fetchPackages] Error fetching packages', 
-                error: e, 
-                stackTrace: stackTrace);
-                
+      _logger.e(
+        '❌ [fetchPackages] Error fetching packages',
+        error: e,
+        stackTrace: stackTrace,
+      );
+
       Get.snackbar(
         'Error',
         'Gagal memuat data paket. Silakan coba lagi.',
@@ -91,97 +95,113 @@ class PetugasPaketController extends GetxController {
       isLoading.value = false;
     }
   }
-  
+
   /// Update legacy paketList for backward compatibility
   void _updateLegacyPaketList() {
     try {
       _logger.d('🔄 [_updateLegacyPaketList] Updating legacy paketList...');
-      
-      final List<Map<String, dynamic>> legacyList = packages.map((pkg) {
-        return {
-          'id': pkg.id,
-          'nama': pkg.nama,
-          'deskripsi': pkg.deskripsi,
-          'harga': pkg.harga,
-          'kuantitas': pkg.kuantitas,
-          'status': pkg.status, // Add status to legacy mapping
-          'foto': pkg.foto,
-          'foto_paket': pkg.foto_paket,
-          'images': pkg.images,
-          'satuanWaktuSewa': pkg.satuanWaktuSewa,
-          'created_at': pkg.createdAt,
-          'updated_at': pkg.updatedAt,
-        };
-      }).toList();
-      
+
+      final List<Map<String, dynamic>> legacyList =
+          packages.map((pkg) {
+            return {
+              'id': pkg.id,
+              'nama': pkg.nama,
+              'deskripsi': pkg.deskripsi,
+              'harga': pkg.harga,
+              'kuantitas': pkg.kuantitas,
+              'status': pkg.status, // Add status to legacy mapping
+              'foto': pkg.foto,
+              'foto_paket': pkg.foto_paket,
+              'images': pkg.images,
+              'satuanWaktuSewa': pkg.satuanWaktuSewa,
+              'created_at': pkg.createdAt,
+              'updated_at': pkg.updatedAt,
+            };
+          }).toList();
+
       paketList.assignAll(legacyList);
       filteredPaketList.assignAll(legacyList);
-      
-      _logger.d('✅ [_updateLegacyPaketList] Updated ${legacyList.length} packages');
-      
+
+      _logger.d(
+        '✅ [_updateLegacyPaketList] Updated ${legacyList.length} packages',
+      );
     } catch (e, stackTrace) {
-      _logger.e('❌ [_updateLegacyPaketList] Error updating legacy list', 
-                error: e, 
-                stackTrace: stackTrace);
+      _logger.e(
+        '❌ [_updateLegacyPaketList] Error updating legacy list',
+        error: e,
+        stackTrace: stackTrace,
+      );
     }
   }
-  
+
   /// For backward compatibility
   Future<void> loadPaketData() async {
     _logger.d('ℹ️ [loadPaketData] Using fetchPackages() instead');
     await fetchPackages();
   }
-  
+
   /// Filter packages based on search query and category
   void filterPaket() {
     try {
       _logger.d('🔄 [filterPaket] Filtering packages...');
-      
+
       if (searchQuery.value.isEmpty && selectedCategory.value == 'Semua') {
         filteredPackages.value = List.from(packages);
         filteredPaketList.value = List.from(paketList);
       } else {
         // Filter new packages
-        filteredPackages.value = packages.where((paket) {
-          final matchesSearch = searchQuery.value.isEmpty ||
-              paket.nama.toLowerCase().contains(searchQuery.value.toLowerCase());
-          
-          // For now, we're not using categories in the new model
-          // You can add category filtering if needed
-          final matchesCategory = selectedCategory.value == 'Semua';
-          
-          return matchesSearch && matchesCategory;
-        }).toList();
-        
+        filteredPackages.value =
+            packages.where((paket) {
+              final matchesSearch =
+                  searchQuery.value.isEmpty ||
+                  paket.nama.toLowerCase().contains(
+                    searchQuery.value.toLowerCase(),
+                  );
+
+              // For now, we're not using categories in the new model
+              // You can add category filtering if needed
+              final matchesCategory = selectedCategory.value == 'Semua';
+
+              return matchesSearch && matchesCategory;
+            }).toList();
+
         // Also update legacy list for backward compatibility
-        filteredPaketList.value = paketList.where((paket) {
-          final matchesSearch = searchQuery.value.isEmpty ||
-              (paket['nama']?.toString() ?? '').toLowerCase()
-                  .contains(searchQuery.value.toLowerCase());
-          
-          // For legacy support, check if category exists
-          final matchesCategory = selectedCategory.value == 'Semua' ||
-              (paket['kategori']?.toString() ?? '') == selectedCategory.value;
-          
-          return matchesSearch && matchesCategory;
-        }).toList();
+        filteredPaketList.value =
+            paketList.where((paket) {
+              final matchesSearch =
+                  searchQuery.value.isEmpty ||
+                  (paket['nama']?.toString() ?? '').toLowerCase().contains(
+                    searchQuery.value.toLowerCase(),
+                  );
+
+              // For legacy support, check if category exists
+              final matchesCategory =
+                  selectedCategory.value == 'Semua' ||
+                  (paket['kategori']?.toString() ?? '') ==
+                      selectedCategory.value;
+
+              return matchesSearch && matchesCategory;
+            }).toList();
       }
-      
+
       sortFilteredList();
-      _logger.d('✅ [filterPaket] Filtered to ${filteredPackages.length} packages');
-      
+      _logger.d(
+        '✅ [filterPaket] Filtered to ${filteredPackages.length} packages',
+      );
     } catch (e, stackTrace) {
-      _logger.e('❌ [filterPaket] Error filtering packages', 
-                error: e, 
-                stackTrace: stackTrace);
+      _logger.e(
+        '❌ [filterPaket] Error filtering packages',
+        error: e,
+        stackTrace: stackTrace,
+      );
     }
   }
-  
+
   /// Sort the filtered list based on the selected sort option
   void sortFilteredList() {
     try {
       _logger.d('🔄 [sortFilteredList] Sorting packages by ${sortBy.value}');
-      
+
       // Sort new packages
       switch (sortBy.value) {
         case 'Terbaru':
@@ -203,44 +223,63 @@ class PetugasPaketController extends GetxController {
           filteredPackages.sort((a, b) => b.nama.compareTo(a.nama));
           break;
       }
-      
+
       // Also sort legacy list for backward compatibility
       switch (sortBy.value) {
         case 'Terbaru':
-          filteredPaketList.sort((a, b) =>
-              ((b['created_at'] ?? '') as String).compareTo((a['created_at'] ?? '') as String));
+          filteredPaketList.sort(
+            (a, b) => ((b['created_at'] ?? '') as String).compareTo(
+              (a['created_at'] ?? '') as String,
+            ),
+          );
           break;
         case 'Terlama':
-          filteredPaketList.sort((a, b) =>
-              ((a['created_at'] ?? '') as String).compareTo((b['created_at'] ?? '') as String));
+          filteredPaketList.sort(
+            (a, b) => ((a['created_at'] ?? '') as String).compareTo(
+              (b['created_at'] ?? '') as String,
+            ),
+          );
           break;
         case 'Harga Tertinggi':
-          filteredPaketList.sort((a, b) => 
-              ((b['harga'] ?? 0) as int).compareTo((a['harga'] ?? 0) as int));
+          filteredPaketList.sort(
+            (a, b) =>
+                ((b['harga'] ?? 0) as int).compareTo((a['harga'] ?? 0) as int),
+          );
           break;
         case 'Harga Terendah':
-          filteredPaketList.sort((a, b) => 
-              ((a['harga'] ?? 0) as int).compareTo((b['harga'] ?? 0) as int));
+          filteredPaketList.sort(
+            (a, b) =>
+                ((a['harga'] ?? 0) as int).compareTo((b['harga'] ?? 0) as int),
+          );
           break;
         case 'Nama A-Z':
-          filteredPaketList.sort((a, b) => 
-              ((a['nama'] ?? '') as String).compareTo((b['nama'] ?? '') as String));
+          filteredPaketList.sort(
+            (a, b) => ((a['nama'] ?? '') as String).compareTo(
+              (b['nama'] ?? '') as String,
+            ),
+          );
           break;
         case 'Nama Z-A':
-          filteredPaketList.sort((a, b) => 
-              ((b['nama'] ?? '') as String).compareTo((a['nama'] ?? '') as String));
+          filteredPaketList.sort(
+            (a, b) => ((b['nama'] ?? '') as String).compareTo(
+              (a['nama'] ?? '') as String,
+            ),
+          );
           break;
       }
-      
-      _logger.d('✅ [sortFilteredList] Sorted ${filteredPackages.length} packages');
-      
+
+      _logger.d(
+        '✅ [sortFilteredList] Sorted ${filteredPackages.length} packages',
+      );
     } catch (e, stackTrace) {
-      _logger.e('❌ [sortFilteredList] Error sorting packages', 
-                error: e, 
-                stackTrace: stackTrace);
+      _logger.e(
+        '❌ [sortFilteredList] Error sorting packages',
+        error: e,
+        stackTrace: stackTrace,
+      );
     }
   }
-  
+
   // Set search query dan filter paket
   void setSearchQuery(String query) {
     searchQuery.value = query;
@@ -263,7 +302,7 @@ class PetugasPaketController extends GetxController {
   Future<void> addPaket(Map<String, dynamic> paketData) async {
     try {
       isLoading.value = true;
-      
+
       // Convert to PaketModel
       final newPaket = PaketModel.fromJson({
         ...paketData,
@@ -271,12 +310,12 @@ class PetugasPaketController extends GetxController {
         'created_at': DateTime.now().toIso8601String(),
         'updated_at': DateTime.now().toIso8601String(),
       });
-      
+
       // Add to the list
       packages.add(newPaket);
       _updateLegacyPaketList();
       filterPaket();
-      
+
       Get.back();
       Get.snackbar(
         'Sukses',
@@ -285,12 +324,13 @@ class PetugasPaketController extends GetxController {
         backgroundColor: Colors.green,
         colorText: Colors.white,
       );
-      
     } catch (e, stackTrace) {
-      _logger.e('❌ [addPaket] Error adding package', 
-                error: e, 
-                stackTrace: stackTrace);
-                
+      _logger.e(
+        '❌ [addPaket] Error adding package',
+        error: e,
+        stackTrace: stackTrace,
+      );
+
       Get.snackbar(
         'Error',
         'Gagal menambahkan paket. Silakan coba lagi.',
@@ -307,23 +347,28 @@ class PetugasPaketController extends GetxController {
   Future<void> editPaket(String id, Map<String, dynamic> updatedData) async {
     try {
       isLoading.value = true;
-      
+
       final index = packages.indexWhere((pkg) => pkg.id == id);
       if (index >= 0) {
         // Update the package
         final updatedPaket = packages[index].copyWith(
           nama: updatedData['nama']?.toString() ?? packages[index].nama,
-          deskripsi: updatedData['deskripsi']?.toString() ?? packages[index].deskripsi,
-          kuantitas: (updatedData['kuantitas'] is int) 
-              ? updatedData['kuantitas'] 
-              : (int.tryParse(updatedData['kuantitas']?.toString() ?? '0') ?? packages[index].kuantitas),
+          deskripsi:
+              updatedData['deskripsi']?.toString() ?? packages[index].deskripsi,
+          kuantitas:
+              (updatedData['kuantitas'] is int)
+                  ? updatedData['kuantitas']
+                  : (int.tryParse(
+                        updatedData['kuantitas']?.toString() ?? '0',
+                      ) ??
+                      packages[index].kuantitas),
           updatedAt: DateTime.now(),
         );
-        
+
         packages[index] = updatedPaket;
         _updateLegacyPaketList();
         filterPaket();
-        
+
         Get.back();
         Get.snackbar(
           'Sukses',
@@ -334,10 +379,12 @@ class PetugasPaketController extends GetxController {
         );
       }
     } catch (e, stackTrace) {
-      _logger.e('❌ [editPaket] Error updating package', 
-                error: e, 
-                stackTrace: stackTrace);
-                
+      _logger.e(
+        '❌ [editPaket] Error updating package',
+        error: e,
+        stackTrace: stackTrace,
+      );
+
       Get.snackbar(
         'Error',
         'Gagal memperbarui paket. Silakan coba lagi.',
@@ -353,39 +400,76 @@ class PetugasPaketController extends GetxController {
   // Hapus paket
   Future<void> deletePaket(String id) async {
     try {
-      isLoading.value = true;
-      
-      // Remove from the main list
-      packages.removeWhere((pkg) => pkg.id == id);
-      _updateLegacyPaketList();
-      filterPaket();
-      
-      Get.back();
-      Get.snackbar(
-        'Sukses',
-        'Paket berhasil dihapus',
-        snackPosition: SnackPosition.BOTTOM,
-        backgroundColor: Colors.green,
-        colorText: Colors.white,
+      _logger.i(
+        '🔄 [deletePaket] Starting deletion process for package ID: $id',
       );
-      
+
+      // Show a loading dialog
+      Get.dialog(
+        const Center(child: CircularProgressIndicator()),
+        barrierDismissible: false,
+      );
+
+      // Call the provider to delete the package and all related data from Supabase
+      final success = await _asetProvider.deletePaket(id);
+
+      // Close the loading dialog
+      Get.back();
+
+      if (success) {
+        _logger.i('✅ [deletePaket] Package deleted successfully from database');
+
+        // Remove the package from the UI lists
+        packages.removeWhere((pkg) => pkg.id == id);
+        _updateLegacyPaketList();
+        filterPaket();
+
+        // Show success message
+        Get.snackbar(
+          'Sukses',
+          'Paket berhasil dihapus dari sistem',
+          snackPosition: SnackPosition.TOP,
+          backgroundColor: Colors.green,
+          colorText: Colors.white,
+          duration: const Duration(seconds: 3),
+        );
+      } else {
+        _logger.e('❌ [deletePaket] Failed to delete package from database');
+
+        // Show error message
+        Get.snackbar(
+          'Gagal',
+          'Terjadi kesalahan saat menghapus paket',
+          snackPosition: SnackPosition.BOTTOM,
+          backgroundColor: Colors.red,
+          colorText: Colors.white,
+          duration: const Duration(seconds: 3),
+        );
+      }
     } catch (e, stackTrace) {
-      _logger.e('❌ [deletePaket] Error deleting package', 
-                error: e, 
-                stackTrace: stackTrace);
-                
+      _logger.e(
+        '❌ [deletePaket] Error deleting package',
+        error: e,
+        stackTrace: stackTrace,
+      );
+
+      // Close the loading dialog if still open
+      if (Get.isDialogOpen ?? false) {
+        Get.back();
+      }
+
+      // Show error message
       Get.snackbar(
         'Error',
-        'Gagal menghapus paket. Silakan coba lagi.',
+        'Gagal menghapus paket: ${e.toString()}',
         snackPosition: SnackPosition.BOTTOM,
         backgroundColor: Colors.red,
         colorText: Colors.white,
+        duration: const Duration(seconds: 3),
       );
-    } finally {
-      isLoading.value = false;
     }
   }
-  
+
   /// Format price to Rupiah currency
   String formatPrice(num price) {
     return 'Rp ${NumberFormat('#,##0', 'id_ID').format(price)}';

lib/app/modules/petugas_bumdes/controllers/petugas_penyewa_controller.dart

@@ -0,0 +1,196 @@
+import 'package:get/get.dart';
+import '../../../data/providers/auth_provider.dart';
+
+class PetugasPenyewaController extends GetxController {
+  final AuthProvider _authProvider = Get.find<AuthProvider>();
+
+  // Reactive variables
+  final isLoading = true.obs;
+  final penyewaList = <Map<String, dynamic>>[].obs;
+  final filteredPenyewaList = <Map<String, dynamic>>[].obs;
+  final filterStatus = 'all'.obs;
+  final currentTabIndex = 0.obs;
+  final searchQuery = ''.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    fetchPenyewaList();
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+    // Refresh data when the page is first loaded
+    refreshData();
+  }
+
+  // Method to refresh data when returning to the page
+  void refreshData() {
+    fetchPenyewaList();
+  }
+
+  void changeTab(int index) {
+    currentTabIndex.value = index;
+    applyFilters();
+  }
+
+  void updateSearchQuery(String query) {
+    searchQuery.value = query;
+    applyFilters();
+  }
+
+  void applyFilters() {
+    if (penyewaList.isEmpty) return;
+
+    // First apply status filter based on current tab
+    String statusFilter;
+    switch (currentTabIndex.value) {
+      case 0: // Verifikasi
+        statusFilter = 'pending';
+        break;
+      case 1: // Aktif
+        statusFilter = 'active';
+        break;
+      case 2: // Ditangguhkan
+        statusFilter = 'suspended';
+        break;
+      default:
+        statusFilter = 'all';
+    }
+
+    // Filter by status
+    var result =
+        statusFilter == 'all'
+            ? penyewaList
+            : penyewaList
+                .where((p) => p['status']?.toLowerCase() == statusFilter)
+                .toList();
+
+    // Then apply search filter if there's a query
+    if (searchQuery.value.isNotEmpty) {
+      final query = searchQuery.value.toLowerCase();
+      result =
+          result
+              .where(
+                (p) =>
+                    (p['nama_lengkap']?.toString().toLowerCase().contains(
+                          query,
+                        ) ??
+                        false) ||
+                    (p['email']?.toString().toLowerCase().contains(query) ??
+                        false),
+              )
+              .toList();
+    }
+
+    filteredPenyewaList.value = result;
+  }
+
+  Future<void> fetchPenyewaList() async {
+    try {
+      isLoading.value = true;
+
+      // Get all penyewa data without filtering
+      final data =
+          await _authProvider.client
+                  .from('warga_desa')
+                  .select(
+                    'user_id, nama_lengkap, email, nik, no_hp, avatar, status, keterangan',
+                  )
+              as List<dynamic>;
+
+      // Filter out rows where user_id is null
+      final filteredData = data.where((row) => row['user_id'] != null).toList();
+
+      // Get total sewa count for each user
+      final enrichedData = await _enrichWithSewaCount(filteredData);
+
+      penyewaList.value = enrichedData;
+
+      // Apply filters to update filteredPenyewaList
+      applyFilters();
+    } catch (e) {
+      print('Error fetching penyewa list: $e');
+      penyewaList.value = [];
+      filteredPenyewaList.value = [];
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  Future<List<Map<String, dynamic>>> _enrichWithSewaCount(
+    List<dynamic> penyewaData,
+  ) async {
+    final result = <Map<String, dynamic>>[];
+
+    for (var penyewa in penyewaData) {
+      final userId = penyewa['user_id'];
+
+      // Count total sewa for this user
+      final sewaCount = await _countUserSewa(userId);
+
+      // Create a new map with all the original data plus the total_sewa count
+      final enrichedPenyewa = Map<String, dynamic>.from(penyewa);
+      enrichedPenyewa['total_sewa'] = sewaCount;
+
+      result.add(enrichedPenyewa);
+    }
+
+    return result;
+  }
+
+  Future<int> _countUserSewa(String userId) async {
+    try {
+      final response = await _authProvider.client
+          .from('sewa_aset')
+          .select('id')
+          .eq('user_id', userId);
+
+      return (response as List).length;
+    } catch (e) {
+      print('Error counting sewa for user $userId: $e');
+      return 0;
+    }
+  }
+
+  void viewPenyewaDetail(String userId) {
+    // Navigate to penyewa detail page (to be implemented)
+    print('View detail for penyewa with ID: $userId');
+
+    // Get.toNamed(Routes.PETUGAS_PENYEWA_DETAIL, arguments: {'user_id': userId});
+  }
+
+  void updatePenyewaStatus(
+    String userId,
+    String newStatus,
+    String keterangan,
+  ) async {
+    try {
+      isLoading.value = true;
+
+      await _authProvider.client
+          .from('warga_desa')
+          .update({'status': newStatus, 'keterangan': keterangan})
+          .eq('user_id', userId);
+
+      // Refresh the list
+      await fetchPenyewaList();
+
+      Get.snackbar(
+        'Berhasil',
+        'Status penyewa berhasil diperbarui',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    } catch (e) {
+      print('Error updating penyewa status: $e');
+      Get.snackbar(
+        'Gagal',
+        'Terjadi kesalahan saat memperbarui status penyewa',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    } finally {
+      isLoading.value = false;
+    }
+  }
+}

lib/app/modules/petugas_bumdes/controllers/petugas_sewa_controller.dart

@@ -50,22 +50,24 @@ class PetugasSewaController extends GetxController {
   void _updateFilteredList() {
     filteredSewaList.value =
         sewaList.where((sewa) {
-          final query = searchQuery.value.toLowerCase();
-          // Apply search filter: nama warga, id pesanan, atau asetId
-          final matchesSearch =
-              sewa.wargaNama.toLowerCase().contains(query) ||
-              sewa.id.toLowerCase().contains(query) ||
-              (sewa.asetId != null &&
-                  sewa.asetId!.toLowerCase().contains(query));
+            final query = searchQuery.value.toLowerCase();
+            // Apply search filter: nama warga, id pesanan, atau asetId
+            final matchesSearch =
+                sewa.wargaNama.toLowerCase().contains(query) ||
+                sewa.id.toLowerCase().contains(query) ||
+                (sewa.asetId != null &&
+                    sewa.asetId!.toLowerCase().contains(query));
 
-          // Apply status filter if not 'Semua'
-          final matchesStatus =
-              selectedStatusFilter.value == 'Semua' ||
-              sewa.status.toUpperCase() ==
-                  selectedStatusFilter.value.toUpperCase();
+            // Apply status filter if not 'Semua'
+            final matchesStatus =
+                selectedStatusFilter.value == 'Semua' ||
+                sewa.status.toUpperCase() ==
+                    selectedStatusFilter.value.toUpperCase();
 
-          return matchesSearch && matchesStatus;
-        }).toList();
+            return matchesSearch && matchesStatus;
+          }).toList()
+          // Sort filtered results by tanggal_pemesanan in descending order (newest first)
+          ..sort((a, b) => b.tanggalPemesanan.compareTo(a.tanggalPemesanan));
   }
 
   // Load sewa data (mock data for now)
@@ -74,6 +76,8 @@ class PetugasSewaController extends GetxController {
 
     try {
       final data = await SewaService().fetchAllSewa();
+      // Sort data by tanggal_pemesanan in descending order (newest first)
+      data.sort((a, b) => b.tanggalPemesanan.compareTo(a.tanggalPemesanan));
       sewaList.assignAll(data);
     } catch (e) {
       print('Error loading sewa data: $e');
@@ -101,23 +105,27 @@ class PetugasSewaController extends GetxController {
   void resetFilters() {
     selectedStatusFilter.value = 'Semua';
     searchQuery.value = '';
-    filteredSewaList.value = sewaList;
+    // Assign a sorted copy of sewaList to filteredSewaList
+    filteredSewaList.value = List<SewaModel>.from(sewaList)
+      ..sort((a, b) => b.tanggalPemesanan.compareTo(a.tanggalPemesanan));
   }
 
   void applyFilters() {
     filteredSewaList.value =
         sewaList.where((sewa) {
-          bool matchesStatus =
-              selectedStatusFilter.value == 'Semua' ||
-              sewa.status.toUpperCase() ==
-                  selectedStatusFilter.value.toUpperCase();
-          bool matchesSearch =
-              searchQuery.value.isEmpty ||
-              sewa.wargaNama.toLowerCase().contains(
-                searchQuery.value.toLowerCase(),
-              );
-          return matchesStatus && matchesSearch;
-        }).toList();
+            bool matchesStatus =
+                selectedStatusFilter.value == 'Semua' ||
+                sewa.status.toUpperCase() ==
+                    selectedStatusFilter.value.toUpperCase();
+            bool matchesSearch =
+                searchQuery.value.isEmpty ||
+                sewa.wargaNama.toLowerCase().contains(
+                  searchQuery.value.toLowerCase(),
+                );
+            return matchesStatus && matchesSearch;
+          }).toList()
+          // Sort filtered results by tanggal_pemesanan in descending order (newest first)
+          ..sort((a, b) => b.tanggalPemesanan.compareTo(a.tanggalPemesanan));
   }
 
   // Format price to rupiah