fitur petugas

2025-06-22 09:25:58 +07:00
parent c4dd4fdfa2
commit 8284c93aa5
48 changed files with 8688 additions and 3436 deletions
--- a/lib/app/modules/warga/controllers/warga_sewa_controller.dart
+++ b/lib/app/modules/warga/controllers/warga_sewa_controller.dart
@ -12,10 +12,10 @@ class WargaSewaController extends GetxController

  // Get navigation service
  final NavigationService navigationService = Get.find<NavigationService>();
-  
+
  // Get auth provider for user data and sewa_aset queries
  final AuthProvider authProvider = Get.find<AuthProvider>();
-  
+
  // Get aset provider for asset data
  final AsetProvider asetProvider = Get.find<AsetProvider>();

@ -25,33 +25,35 @@ class WargaSewaController extends GetxController
  final acceptedRentals = <Map<String, dynamic>>[].obs;
  final completedRentals = <Map<String, dynamic>>[].obs;
  final cancelledRentals = <Map<String, dynamic>>[].obs;
-  
+  final returnedRentals = <Map<String, dynamic>>[].obs;
+  final activeRentals = <Map<String, dynamic>>[].obs;
+
  // Loading states
  final isLoading = false.obs;
  final isLoadingPending = false.obs;
  final isLoadingAccepted = false.obs;
  final isLoadingCompleted = false.obs;
  final isLoadingCancelled = false.obs;
+  final isLoadingReturned = false.obs;
+  final isLoadingActive = false.obs;
+
+  bool _tabSetFromArgument = false;

  @override
  void onInit() {
    super.onInit();

-    // Ensure tab index is set to Sewa (1)
-    navigationService.setNavIndex(1);
-
-    // Initialize tab controller with 6 tabs
-    tabController = TabController(length: 6, vsync: this);
-
-    // Set initial tab and ensure tab view is updated
-    tabController.index = 0;
+    // Initialize tab controller with 7 tabs
+    tabController = TabController(length: 7, vsync: this);

    // Load real rental data for all tabs
    loadRentalsData();
    loadPendingRentals();
    loadAcceptedRentals();
+    loadActiveRentals();
    loadCompletedRentals();
    loadCancelledRentals();
+    loadReturnedRentals();

    // Listen to tab changes to update state if needed
    tabController.addListener(() {
@ -77,7 +79,9 @@ class WargaSewaController extends GetxController
          }
          break;
        case 3: // Aktif
-          // Add Aktif tab logic when needed
+          if (activeRentals.isEmpty && !isLoadingActive.value) {
+            loadActiveRentals();
+          }
          break;
        case 4: // Selesai
          if (completedRentals.isEmpty && !isLoadingCompleted.value) {
@ -89,6 +93,11 @@ class WargaSewaController extends GetxController
            loadCancelledRentals();
          }
          break;
+        case 6: // Dikembalikan
+          if (returnedRentals.isEmpty && !isLoadingReturned.value) {
+            loadReturnedRentals();
+          }
+          break;
      }
    });
  }
@ -96,9 +105,26 @@ class WargaSewaController extends GetxController
  @override
  void onReady() {
    super.onReady();
-    // Ensure nav index is set to Sewa (1) when the controller is ready
-    // This helps maintain correct state during hot reload
-    navigationService.setNavIndex(1);
+    // Jalankan update nav index dan tab index setelah build selesai
+    Future.delayed(Duration.zero, () {
+      navigationService.setNavIndex(1);
+
+      final args = Get.arguments;
+      int initialTab = 0;
+      if (!_tabSetFromArgument &&
+          args != null &&
+          args is Map &&
+          args['tab'] != null) {
+        initialTab =
+            args['tab'] is int
+                ? args['tab']
+                : int.tryParse(args['tab'].toString()) ?? 0;
+        if (tabController.length > initialTab) {
+          tabController.index = initialTab;
+          _tabSetFromArgument = true;
+        }
+      }
+    });
  }

  @override
@ -111,25 +137,25 @@ class WargaSewaController extends GetxController
  Future<void> loadRentalsData() async {
    try {
      isLoading.value = true;
-      
+
      // Clear existing data
      rentals.clear();
-      
+
      // Get sewa_aset data with status "MENUNGGU PEMBAYARAN" or "PEMBAYARAN DENDA"
      final sewaAsetList = await authProvider.getSewaAsetByStatus([
        'MENUNGGU PEMBAYARAN',
-        'PEMBAYARAN DENDA'
+        'PEMBAYARAN DENDA',
      ]);
-      
+
      debugPrint('Fetched ${sewaAsetList.length} sewa_aset records');
-      
+
      // Process each sewa_aset record
      for (var sewaAset in sewaAsetList) {
        // Get asset details if aset_id is available
        String assetName = 'Aset';
        String? imageUrl;
        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
-        
+
        if (sewaAset['aset_id'] != null) {
          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
          if (asetData != null) {
@ -137,7 +163,7 @@ class WargaSewaController extends GetxController
            imageUrl = asetData.imageUrl;
          }
        }
-        
+
        // Parse waktu mulai and waktu selesai
        DateTime? waktuMulai;
        DateTime? waktuSelesai;
@ -146,20 +172,21 @@ class WargaSewaController extends GetxController
        String jamMulai = '';
        String jamSelesai = '';
        String rentangWaktu = '';
-        
-        if (sewaAset['waktu_mulai'] != null && sewaAset['waktu_selesai'] != null) {
+
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
-          
+
          // Format for display
          final formatTanggal = DateFormat('dd-MM-yyyy');
          final formatWaktu = DateFormat('HH:mm');
          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
-          
+
          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
          jamMulai = formatWaktu.format(waktuMulai);
          jamSelesai = formatWaktu.format(waktuSelesai);
-          
+
          // Format based on satuan waktu
          if (namaSatuanWaktu.toLowerCase() == 'jam') {
            // For hours, show time range on same day
@ -173,12 +200,13 @@ class WargaSewaController extends GetxController
            // Default format
            rentangWaktu = '$jamMulai - $jamSelesai';
          }
-          
+
          // Full time format for waktuSewa
-          waktuSewa = '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
-                     '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
        }
-        
+
        // Format price
        String totalPrice = 'Rp 0';
        if (sewaAset['total'] != null) {
@ -189,7 +217,7 @@ class WargaSewaController extends GetxController
          );
          totalPrice = formatter.format(sewaAset['total']);
        }
-        
+
        // Add to rentals list
        rentals.add({
          'id': sewaAset['id'] ?? '',
@ -208,9 +236,10 @@ class WargaSewaController extends GetxController
          'namaSatuanWaktu': namaSatuanWaktu,
          'waktuMulai': sewaAset['waktu_mulai'],
          'waktuSelesai': sewaAset['waktu_selesai'],
+          'updated_at': sewaAset['updated_at'],
        });
      }
-      
+
      debugPrint('Processed ${rentals.length} rental records');
    } catch (e) {
      debugPrint('Error loading rentals data: $e');
@ -245,28 +274,67 @@ class WargaSewaController extends GetxController
  }

  // Actions
-  void cancelRental(String id) {
-    Get.snackbar(
-      'Info',
-      'Pembatalan berhasil',
-      snackPosition: SnackPosition.BOTTOM,
+  void cancelRental(String id) async {
+    final confirmed = await Get.dialog<bool>(
+      AlertDialog(
+        title: const Text('Konfirmasi Pembatalan'),
+        content: const Text('Apakah Anda yakin ingin membatalkan pesanan ini?'),
+        actions: [
+          TextButton(
+            onPressed: () => Get.back(result: false),
+            child: const Text('Tidak'),
+          ),
+          ElevatedButton(
+            onPressed: () => Get.back(result: true),
+            child: const Text('Ya, Batalkan'),
+          ),
+        ],
+      ),
    );
+    if (confirmed == true) {
+      try {
+        await asetProvider.client
+            .from('sewa_aset')
+            .update({'status': 'DIBATALKAN'})
+            .eq('id', id);
+        Get.snackbar(
+          'Berhasil',
+          'Pesanan berhasil dibatalkan',
+          snackPosition: SnackPosition.BOTTOM,
+          backgroundColor: Colors.green,
+          colorText: Colors.white,
+        );
+        // Refresh data
+        loadRentalsData();
+        loadPendingRentals();
+        loadAcceptedRentals();
+        loadActiveRentals();
+        loadCompletedRentals();
+        loadCancelledRentals();
+        loadReturnedRentals();
+      } catch (e) {
+        Get.snackbar(
+          'Gagal',
+          'Gagal membatalkan pesanan: $e',
+          snackPosition: SnackPosition.BOTTOM,
+          backgroundColor: Colors.red,
+          colorText: Colors.white,
+        );
+      }
+    }
  }

  // Navigate to payment page with the selected rental data
  void viewRentalDetail(Map<String, dynamic> rental) {
    debugPrint('Navigating to payment page with rental ID: ${rental['id']}');
-    
+
    // Navigate to payment page with rental data
    Get.toNamed(
      Routes.PEMBAYARAN_SEWA,
-      arguments: {
-        'orderId': rental['id'],
-        'rentalData': rental,
-      },
+      arguments: {'orderId': rental['id'], 'rentalData': rental},
    );
  }
-  
+
  void payRental(String id) {
    Get.snackbar(
      'Info',
@ -274,27 +342,27 @@ class WargaSewaController extends GetxController
      snackPosition: SnackPosition.BOTTOM,
    );
  }
-  
+
  // Load data for the Selesai tab (status: SELESAI)
  Future<void> loadCompletedRentals() async {
    try {
      isLoadingCompleted.value = true;
-      
+
      // Clear existing data
      completedRentals.clear();
-      
+
      // Get sewa_aset data with status "SELESAI"
      final sewaAsetList = await authProvider.getSewaAsetByStatus(['SELESAI']);
-      
+
      debugPrint('Fetched ${sewaAsetList.length} completed sewa_aset records');
-      
+
      // Process each sewa_aset record
      for (var sewaAset in sewaAsetList) {
        // Get asset details if aset_id is available
        String assetName = 'Aset';
        String? imageUrl;
        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
-        
+
        if (sewaAset['aset_id'] != null) {
          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
          if (asetData != null) {
@ -302,7 +370,7 @@ class WargaSewaController extends GetxController
            imageUrl = asetData.imageUrl;
          }
        }
-        
+
        // Parse waktu mulai and waktu selesai
        DateTime? waktuMulai;
        DateTime? waktuSelesai;
@ -311,20 +379,21 @@ class WargaSewaController extends GetxController
        String jamMulai = '';
        String jamSelesai = '';
        String rentangWaktu = '';
-        
-        if (sewaAset['waktu_mulai'] != null && sewaAset['waktu_selesai'] != null) {
+
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
-          
+
          // Format for display
          final formatTanggal = DateFormat('dd-MM-yyyy');
          final formatWaktu = DateFormat('HH:mm');
          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
-          
+
          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
          jamMulai = formatWaktu.format(waktuMulai);
          jamSelesai = formatWaktu.format(waktuSelesai);
-          
+
          // Format based on satuan waktu
          if (namaSatuanWaktu.toLowerCase() == 'jam') {
            // For hours, show time range on same day
@ -338,12 +407,13 @@ class WargaSewaController extends GetxController
            // Default format
            rentangWaktu = '$jamMulai - $jamSelesai';
          }
-          
+
          // Full time format for waktuSewa
-          waktuSewa = '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
-                     '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
        }
-        
+
        // Format price
        String totalPrice = 'Rp 0';
        if (sewaAset['total'] != null) {
@ -354,7 +424,7 @@ class WargaSewaController extends GetxController
          );
          totalPrice = formatter.format(sewaAset['total']);
        }
-        
+
        // Add to completed rentals list
        completedRentals.add({
          'id': sewaAset['id'] ?? '',
@ -374,35 +444,39 @@ class WargaSewaController extends GetxController
          'waktuSelesai': sewaAset['waktu_selesai'],
        });
      }
-      
-      debugPrint('Processed ${completedRentals.length} completed rental records');
+
+      debugPrint(
+        'Processed ${completedRentals.length} completed rental records',
+      );
    } catch (e) {
      debugPrint('Error loading completed rentals data: $e');
    } finally {
      isLoadingCompleted.value = false;
    }
  }
-  
+
  // Load data for the Dibatalkan tab (status: DIBATALKAN)
  Future<void> loadCancelledRentals() async {
    try {
      isLoadingCancelled.value = true;
-      
+
      // Clear existing data
      cancelledRentals.clear();
-      
+
      // Get sewa_aset data with status "DIBATALKAN"
-      final sewaAsetList = await authProvider.getSewaAsetByStatus(['DIBATALKAN']);
-      
+      final sewaAsetList = await authProvider.getSewaAsetByStatus([
+        'DIBATALKAN',
+      ]);
+
      debugPrint('Fetched ${sewaAsetList.length} cancelled sewa_aset records');
-      
+
      // Process each sewa_aset record
      for (var sewaAset in sewaAsetList) {
        // Get asset details if aset_id is available
        String assetName = 'Aset';
        String? imageUrl;
        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
-        
+
        if (sewaAset['aset_id'] != null) {
          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
          if (asetData != null) {
@ -410,7 +484,7 @@ class WargaSewaController extends GetxController
            imageUrl = asetData.imageUrl;
          }
        }
-        
+
        // Parse waktu mulai and waktu selesai
        DateTime? waktuMulai;
        DateTime? waktuSelesai;
@ -419,20 +493,21 @@ class WargaSewaController extends GetxController
        String jamMulai = '';
        String jamSelesai = '';
        String rentangWaktu = '';
-        
-        if (sewaAset['waktu_mulai'] != null && sewaAset['waktu_selesai'] != null) {
+
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
-          
+
          // Format for display
          final formatTanggal = DateFormat('dd-MM-yyyy');
          final formatWaktu = DateFormat('HH:mm');
          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
-          
+
          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
          jamMulai = formatWaktu.format(waktuMulai);
          jamSelesai = formatWaktu.format(waktuSelesai);
-          
+
          // Format based on satuan waktu
          if (namaSatuanWaktu.toLowerCase() == 'jam') {
            // For hours, show time range on same day
@ -446,12 +521,13 @@ class WargaSewaController extends GetxController
            // Default format
            rentangWaktu = '$jamMulai - $jamSelesai';
          }
-          
+
          // Full time format for waktuSewa
-          waktuSewa = '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
-                     '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
        }
-        
+
        // Format price
        String totalPrice = 'Rp 0';
        if (sewaAset['total'] != null) {
@ -462,7 +538,7 @@ class WargaSewaController extends GetxController
          );
          totalPrice = formatter.format(sewaAset['total']);
        }
-        
+
        // Add to cancelled rentals list
        cancelledRentals.add({
          'id': sewaAset['id'] ?? '',
@ -483,35 +559,40 @@ class WargaSewaController extends GetxController
          'alasanPembatalan': sewaAset['alasan_pembatalan'] ?? '-',
        });
      }
-      
-      debugPrint('Processed ${cancelledRentals.length} cancelled rental records');
+
+      debugPrint(
+        'Processed ${cancelledRentals.length} cancelled rental records',
+      );
    } catch (e) {
      debugPrint('Error loading cancelled rentals data: $e');
    } finally {
      isLoadingCancelled.value = false;
    }
  }
-  
+
  // Load data for the Pending tab (status: PERIKSA PEMBAYARAN)
  Future<void> loadPendingRentals() async {
    try {
      isLoadingPending.value = true;
-      
+
      // Clear existing data
      pendingRentals.clear();
-      
-      // Get sewa_aset data with status "PERIKSA PEMBAYARAN"
-      final sewaAsetList = await authProvider.getSewaAsetByStatus(['PERIKSA PEMBAYARAN']);
-      
+
+      // Get sewa_aset data with status 'PERIKSA PEMBAYARAN' dan 'PERIKSA PEMBAYARAN DENDA'
+      final sewaAsetList = await authProvider.getSewaAsetByStatus([
+        'PERIKSA PEMBAYARAN',
+        'PERIKSA PEMBAYARAN DENDA',
+      ]);
+
      debugPrint('Fetched ${sewaAsetList.length} pending sewa_aset records');
-      
+
      // Process each sewa_aset record
      for (var sewaAset in sewaAsetList) {
        // Get asset details if aset_id is available
        String assetName = 'Aset';
        String? imageUrl;
        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
-        
+
        if (sewaAset['aset_id'] != null) {
          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
          if (asetData != null) {
@ -519,7 +600,7 @@ class WargaSewaController extends GetxController
            imageUrl = asetData.imageUrl;
          }
        }
-        
+
        // Parse waktu mulai and waktu selesai
        DateTime? waktuMulai;
        DateTime? waktuSelesai;
@ -528,20 +609,21 @@ class WargaSewaController extends GetxController
        String jamMulai = '';
        String jamSelesai = '';
        String rentangWaktu = '';
-        
-        if (sewaAset['waktu_mulai'] != null && sewaAset['waktu_selesai'] != null) {
+
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
-          
+
          // Format for display
          final formatTanggal = DateFormat('dd-MM-yyyy');
          final formatWaktu = DateFormat('HH:mm');
          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
-          
+
          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
          jamMulai = formatWaktu.format(waktuMulai);
          jamSelesai = formatWaktu.format(waktuSelesai);
-          
+
          // Format based on satuan waktu
          if (namaSatuanWaktu.toLowerCase() == 'jam') {
            // For hours, show time range on same day
@ -555,12 +637,13 @@ class WargaSewaController extends GetxController
            // Default format
            rentangWaktu = '$jamMulai - $jamSelesai';
          }
-          
+
          // Full time format for waktuSewa
-          waktuSewa = '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
-                     '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
        }
-        
+
        // Format price
        String totalPrice = 'Rp 0';
        if (sewaAset['total'] != null) {
@ -571,7 +654,7 @@ class WargaSewaController extends GetxController
          );
          totalPrice = formatter.format(sewaAset['total']);
        }
-        
+
        // Add to pending rentals list
        pendingRentals.add({
          'id': sewaAset['id'] ?? '',
@ -591,7 +674,7 @@ class WargaSewaController extends GetxController
          'waktuSelesai': sewaAset['waktu_selesai'],
        });
      }
-      
+
      debugPrint('Processed ${pendingRentals.length} pending rental records');
    } catch (e) {
      debugPrint('Error loading pending rentals data: $e');
@ -599,27 +682,27 @@ class WargaSewaController extends GetxController
      isLoadingPending.value = false;
    }
  }
-  
+
  // Load data for the Diterima tab (status: DITERIMA)
  Future<void> loadAcceptedRentals() async {
    try {
      isLoadingAccepted.value = true;
-      
+
      // Clear existing data
      acceptedRentals.clear();
-      
+
      // Get sewa_aset data with status "DITERIMA"
      final sewaAsetList = await authProvider.getSewaAsetByStatus(['DITERIMA']);
-      
+
      debugPrint('Fetched ${sewaAsetList.length} accepted sewa_aset records');
-      
+
      // Process each sewa_aset record
      for (var sewaAset in sewaAsetList) {
        // Get asset details if aset_id is available
        String assetName = 'Aset';
        String? imageUrl;
        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
-        
+
        if (sewaAset['aset_id'] != null) {
          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
          if (asetData != null) {
@ -627,7 +710,7 @@ class WargaSewaController extends GetxController
            imageUrl = asetData.imageUrl;
          }
        }
-        
+
        // Parse waktu mulai and waktu selesai
        DateTime? waktuMulai;
        DateTime? waktuSelesai;
@ -636,20 +719,21 @@ class WargaSewaController extends GetxController
        String jamMulai = '';
        String jamSelesai = '';
        String rentangWaktu = '';
-        
-        if (sewaAset['waktu_mulai'] != null && sewaAset['waktu_selesai'] != null) {
+
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
-          
+
          // Format for display
          final formatTanggal = DateFormat('dd-MM-yyyy');
          final formatWaktu = DateFormat('HH:mm');
          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
-          
+
          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
          jamMulai = formatWaktu.format(waktuMulai);
          jamSelesai = formatWaktu.format(waktuSelesai);
-          
+
          // Format based on satuan waktu
          if (namaSatuanWaktu.toLowerCase() == 'jam') {
            // For hours, show time range on same day
@ -663,12 +747,13 @@ class WargaSewaController extends GetxController
            // Default format
            rentangWaktu = '$jamMulai - $jamSelesai';
          }
-          
+
          // Full time format for waktuSewa
-          waktuSewa = '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
-                     '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
        }
-        
+
        // Format price
        String totalPrice = 'Rp 0';
        if (sewaAset['total'] != null) {
@ -679,7 +764,7 @@ class WargaSewaController extends GetxController
          );
          totalPrice = formatter.format(sewaAset['total']);
        }
-        
+
        // Add to accepted rentals list
        acceptedRentals.add({
          'id': sewaAset['id'] ?? '',
@ -699,7 +784,7 @@ class WargaSewaController extends GetxController
          'waktuSelesai': sewaAset['waktu_selesai'],
        });
      }
-      
+
      debugPrint('Processed ${acceptedRentals.length} accepted rental records');
    } catch (e) {
      debugPrint('Error loading accepted rentals data: $e');
@ -707,4 +792,166 @@ class WargaSewaController extends GetxController
      isLoadingAccepted.value = false;
    }
  }
+
+  Future<void> loadReturnedRentals() async {
+    try {
+      isLoadingReturned.value = true;
+      returnedRentals.clear();
+      final sewaAsetList = await authProvider.getSewaAsetByStatus([
+        'DIKEMBALIKAN',
+      ]);
+      for (var sewaAset in sewaAsetList) {
+        String assetName = 'Aset';
+        String? imageUrl;
+        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
+        if (sewaAset['aset_id'] != null) {
+          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
+          if (asetData != null) {
+            assetName = asetData.nama;
+            imageUrl = asetData.imageUrl;
+          }
+        }
+        DateTime? waktuMulai;
+        DateTime? waktuSelesai;
+        String waktuSewa = '';
+        String tanggalSewa = '';
+        String jamMulai = '';
+        String jamSelesai = '';
+        String rentangWaktu = '';
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
+          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
+          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
+          final formatTanggal = DateFormat('dd-MM-yyyy');
+          final formatWaktu = DateFormat('HH:mm');
+          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
+          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
+          jamMulai = formatWaktu.format(waktuMulai);
+          jamSelesai = formatWaktu.format(waktuSelesai);
+          if (namaSatuanWaktu.toLowerCase() == 'jam') {
+            rentangWaktu = '$jamMulai - $jamSelesai';
+          } else if (namaSatuanWaktu.toLowerCase() == 'hari') {
+            final tanggalMulai = formatTanggalLengkap.format(waktuMulai);
+            final tanggalSelesai = formatTanggalLengkap.format(waktuSelesai);
+            rentangWaktu = '$tanggalMulai - $tanggalSelesai';
+          } else {
+            rentangWaktu = '$jamMulai - $jamSelesai';
+          }
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+        }
+        String totalPrice = 'Rp 0';
+        if (sewaAset['total'] != null) {
+          final formatter = NumberFormat.currency(
+            locale: 'id',
+            symbol: 'Rp ',
+            decimalDigits: 0,
+          );
+          totalPrice = formatter.format(sewaAset['total']);
+        }
+        returnedRentals.add({
+          'id': sewaAset['id'] ?? '',
+          'name': assetName,
+          'imageUrl': imageUrl ?? 'assets/images/gambar_pendukung.jpg',
+          'jumlahUnit': sewaAset['kuantitas'] ?? 0,
+          'waktuSewa': waktuSewa,
+          'duration': '${sewaAset['durasi'] ?? 0} ${namaSatuanWaktu}',
+          'status': sewaAset['status'] ?? 'DIKEMBALIKAN',
+          'totalPrice': totalPrice,
+          'tanggalSewa': tanggalSewa,
+          'jamMulai': jamMulai,
+          'jamSelesai': jamSelesai,
+          'rentangWaktu': rentangWaktu,
+          'namaSatuanWaktu': namaSatuanWaktu,
+          'waktuMulai': sewaAset['waktu_mulai'],
+          'waktuSelesai': sewaAset['waktu_selesai'],
+        });
+      }
+    } catch (e) {
+      debugPrint('Error loading returned rentals data: $e');
+    } finally {
+      isLoadingReturned.value = false;
+    }
+  }
+
+  Future<void> loadActiveRentals() async {
+    try {
+      isLoadingActive.value = true;
+      activeRentals.clear();
+      final sewaAsetList = await authProvider.getSewaAsetByStatus(['AKTIF']);
+      for (var sewaAset in sewaAsetList) {
+        String assetName = 'Aset';
+        String? imageUrl;
+        String namaSatuanWaktu = sewaAset['nama_satuan_waktu'] ?? 'jam';
+        if (sewaAset['aset_id'] != null) {
+          final asetData = await asetProvider.getAsetById(sewaAset['aset_id']);
+          if (asetData != null) {
+            assetName = asetData.nama;
+            imageUrl = asetData.imageUrl;
+          }
+        }
+        DateTime? waktuMulai;
+        DateTime? waktuSelesai;
+        String waktuSewa = '';
+        String tanggalSewa = '';
+        String jamMulai = '';
+        String jamSelesai = '';
+        String rentangWaktu = '';
+        if (sewaAset['waktu_mulai'] != null &&
+            sewaAset['waktu_selesai'] != null) {
+          waktuMulai = DateTime.parse(sewaAset['waktu_mulai']);
+          waktuSelesai = DateTime.parse(sewaAset['waktu_selesai']);
+          final formatTanggal = DateFormat('dd-MM-yyyy');
+          final formatWaktu = DateFormat('HH:mm');
+          final formatTanggalLengkap = DateFormat('dd MMMM yyyy', 'id_ID');
+          tanggalSewa = formatTanggalLengkap.format(waktuMulai);
+          jamMulai = formatWaktu.format(waktuMulai);
+          jamSelesai = formatWaktu.format(waktuSelesai);
+          if (namaSatuanWaktu.toLowerCase() == 'jam') {
+            rentangWaktu = '$jamMulai - $jamSelesai';
+          } else if (namaSatuanWaktu.toLowerCase() == 'hari') {
+            final tanggalMulai = formatTanggalLengkap.format(waktuMulai);
+            final tanggalSelesai = formatTanggalLengkap.format(waktuSelesai);
+            rentangWaktu = '$tanggalMulai - $tanggalSelesai';
+          } else {
+            rentangWaktu = '$jamMulai - $jamSelesai';
+          }
+          waktuSewa =
+              '${formatTanggal.format(waktuMulai)} | ${formatWaktu.format(waktuMulai)} - '
+              '${formatTanggal.format(waktuSelesai)} | ${formatWaktu.format(waktuSelesai)}';
+        }
+        String totalPrice = 'Rp 0';
+        if (sewaAset['total'] != null) {
+          final formatter = NumberFormat.currency(
+            locale: 'id',
+            symbol: 'Rp ',
+            decimalDigits: 0,
+          );
+          totalPrice = formatter.format(sewaAset['total']);
+        }
+        activeRentals.add({
+          'id': sewaAset['id'] ?? '',
+          'name': assetName,
+          'imageUrl': imageUrl ?? 'assets/images/gambar_pendukung.jpg',
+          'jumlahUnit': sewaAset['kuantitas'] ?? 0,
+          'waktuSewa': waktuSewa,
+          'duration': '${sewaAset['durasi'] ?? 0} ${namaSatuanWaktu}',
+          'status': sewaAset['status'] ?? 'AKTIF',
+          'totalPrice': totalPrice,
+          'tanggalSewa': tanggalSewa,
+          'jamMulai': jamMulai,
+          'jamSelesai': jamSelesai,
+          'rentangWaktu': rentangWaktu,
+          'namaSatuanWaktu': namaSatuanWaktu,
+          'waktuMulai': sewaAset['waktu_mulai'],
+          'waktuSelesai': sewaAset['waktu_selesai'],
+        });
+      }
+    } catch (e) {
+      debugPrint('Error loading active rentals data: $e');
+    } finally {
+      isLoadingActive.value = false;
+    }
+  }
 }