From fd439a4f46353b0d4fbfa3b5bbef2ae9e564d6f0 Mon Sep 17 00:00:00 2001
From: zaid_daoud <zaid.daoud@cloudsolutions.com.sa>
Date: Wed, 30 Aug 2023 10:37:27 +0300
Subject: [PATCH] Track Asset Transfer [Most Recent]

---
 .../providers/api/device_transfer_provider.dart           | 8 --------
 lib/models/device/device_transfer_search.dart             | 5 ++++-
 .../widgets/search/asset_transfer_search_dialog.dart      | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart
index 289fd413..2c6e2b37 100644
--- a/lib/controllers/providers/api/device_transfer_provider.dart
+++ b/lib/controllers/providers/api/device_transfer_provider.dart
@@ -83,7 +83,6 @@ class DeviceTransferProvider extends ChangeNotifier {
         List<DeviceTransfer> itemsPage = listJson.map((request) => DeviceTransfer.fromJson(request)).toList();
         items ??= [];
         items.addAll(itemsPage.toSet().toList());
-        sortMostRecent(items, deviceTransferSearch.mostRecent);
         notifyListeners();
         if (itemsPage.length == pageItemNumber) {
           nextPage = true;
@@ -102,13 +101,6 @@ class DeviceTransferProvider extends ChangeNotifier {
     }
   }
 
-  void sortMostRecent(List<DeviceTransfer> transfer, bool mostRecent) {
-    if (mostRecent != null) {
-      transfer.sort((prev, next) =>
-          (mostRecent ?? false) ? DateTime.tryParse(next.createdOn).compareTo(DateTime.tryParse(prev.createdOn)) : DateTime.tryParse(prev.createdOn).compareTo(DateTime.tryParse(next.createdOn)));
-    }
-  }
-
   Future<DeviceTransfer> getRequestById({int assetTransferId}) async {
     Response response;
     try {
diff --git a/lib/models/device/device_transfer_search.dart b/lib/models/device/device_transfer_search.dart
index 8a7a24f4..218e838d 100644
--- a/lib/models/device/device_transfer_search.dart
+++ b/lib/models/device/device_transfer_search.dart
@@ -22,7 +22,7 @@ class DeviceTransferSearch {
     this.department,
     this.room,
     this.title,
-    this.mostRecent,
+    this.mostRecent = true,
   });
 
   Map<String, dynamic> toMap() {
@@ -33,6 +33,9 @@ class DeviceTransferSearch {
     if (device != null) {
       search["assetId"] = device.id;
     }
+    if (mostRecent != null) {
+      search["mostRecent"] = mostRecent;
+    }
     if (hospital?.id != null) {
       search["destSiteId"] = hospital.id;
     }
diff --git a/lib/views/widgets/search/asset_transfer_search_dialog.dart b/lib/views/widgets/search/asset_transfer_search_dialog.dart
index 20a88ece..6bcbb3da 100644
--- a/lib/views/widgets/search/asset_transfer_search_dialog.dart
+++ b/lib/views/widgets/search/asset_transfer_search_dialog.dart
@@ -179,7 +179,7 @@ class AssetTransferSearchDialogState extends State<AssetTransferSearchDialog> wi
                 ),
                 SizedBox(height: 16.0 * AppStyle.getScaleFactor(context)),
                 Visibility(
-                  visible: _search.toMap().isNotEmpty,
+                  visible: (_search.toMap()?.remove("mostRecent"))?.isNotEmpty,
                   child: Padding(
                     padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                     child: AButton(