From 0e95b32ecb54b49b0d389a172bce1d50c4419703 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Wed, 30 Aug 2023 10:07:56 +0300 Subject: [PATCH] Service Request [Most Recent] --- .../providers/api/service_requests_provider.dart | 7 ------- lib/models/service_request/service_request_search.dart | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index 9440fc68..41e749c0 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -78,7 +78,6 @@ class ServiceRequestsProvider extends ChangeNotifier { List serviceRequestsPage = requestsListJson.map((request) => ServiceRequest.fromJson(request)).toList(); serviceRequests ??= []; serviceRequests.addAll(serviceRequestsPage); - sortMostRecent(serviceRequests); notifyListeners(); if (serviceRequestsPage.length == pageItemNumber) { nextPage = true; @@ -97,12 +96,6 @@ class ServiceRequestsProvider extends ChangeNotifier { } } - void sortMostRecent(List requests) { - requests.sort( - (prev, next) => (search.mostRecent ?? false) ? DateTime.tryParse(next.date).compareTo(DateTime.tryParse(prev.date)) : DateTime.tryParse(prev.date).compareTo(DateTime.tryParse(next.date)), - ); - } - Future getSingleServiceRequest({ @required String requestId, @required String host, diff --git a/lib/models/service_request/service_request_search.dart b/lib/models/service_request/service_request_search.dart index 6df51b1a..f6628672 100644 --- a/lib/models/service_request/service_request_search.dart +++ b/lib/models/service_request/service_request_search.dart @@ -23,12 +23,12 @@ class ServiceRequestSearch { this.deviceName, this.model, this.hospital, - this.mostRecent, this.callId, this.from, this.to, this.assignedEmployee, this.dateOperator, + this.mostRecent = true, }); fromSearch(ServiceRequestSearch newSearch) { @@ -51,6 +51,10 @@ class ServiceRequestSearch { search["assetSerialNumber"] = deviceSerialNumber; } + if (mostRecent != null) { + search["mostRecent"] = mostRecent; + } + if (deviceNumber != null && deviceNumber.isNotEmpty) { search["assetNo"] = deviceNumber; }