diff --git a/lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart index cdd685bd..289fd413 100644 --- a/lib/controllers/providers/api/device_transfer_provider.dart +++ b/lib/controllers/providers/api/device_transfer_provider.dart @@ -74,10 +74,7 @@ class DeviceTransferProvider extends ChangeNotifier { body["pageSize"] = pageItemNumber; body.addAll(deviceTransferSearch.toMap()); - response = await ApiManager.instance.post( - URLs.getDeviceTransfer, - body: body, - ); + response = await ApiManager.instance.post(URLs.getDeviceTransfer, body: body); stateCode = response.statusCode; if (stateCode >= 200 && stateCode < 300) { @@ -87,8 +84,7 @@ class DeviceTransferProvider extends ChangeNotifier { items ??= []; items.addAll(itemsPage.toSet().toList()); sortMostRecent(items, deviceTransferSearch.mostRecent); - - print(listJson); + notifyListeners(); if (itemsPage.length == pageItemNumber) { nextPage = true; } else { diff --git a/lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart index 40a96203..52379983 100644 --- a/lib/controllers/providers/api/gas_refill_provider.dart +++ b/lib/controllers/providers/api/gas_refill_provider.dart @@ -77,6 +77,7 @@ class GasRefillProvider extends ChangeNotifier { } items.addAll(itemsPage); sortMostRecent(items, mostRecent); + notifyListeners(); if (itemsPage.length == pageItemNumber) { nextPage = true; } else { diff --git a/lib/controllers/providers/api/regular_visits_provider.dart b/lib/controllers/providers/api/regular_visits_provider.dart index 25e330f7..66883477 100644 --- a/lib/controllers/providers/api/regular_visits_provider.dart +++ b/lib/controllers/providers/api/regular_visits_provider.dart @@ -13,7 +13,7 @@ import 'package:test_sa/models/visits/visits_search.dart'; class RegularVisitsProvider extends ChangeNotifier { // number of items call in each request - final pageItemNumber = 20; + final pageItemNumber = 12; //reset provider data void reset() { @@ -52,7 +52,7 @@ class RegularVisitsProvider extends ChangeNotifier { }) async { if (isLoading == true) return -2; isLoading = true; - if (visits == null) notifyListeners(); + if (visits?.isEmpty ?? true) notifyListeners(); Response response; //userId = 397.toString(); // testing id to view data @@ -77,11 +77,12 @@ class RegularVisitsProvider extends ChangeNotifier { // client's request was successfully received try { List requestsListJson = json.decode(response.body)["data"]; - List _visits = requestsListJson.map((request) => Visit.fromJson(request)).toList(); - visits ??= []; - sortMostRecent(_visits); - visits.addAll(_visits); - if (_visits.length == pageItemNumber) { + List visits = requestsListJson.map((request) => Visit.fromJson(request)).toList(); + this.visits ??= []; + this.visits.addAll(visits); + sortMostRecent(this.visits); + notifyListeners(); + if (visits.length == pageItemNumber) { nextPage = true; } else { nextPage = false; diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index ea03c7ee..54dbee7d 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -57,7 +57,7 @@ class ServiceRequestsProvider extends ChangeNotifier { Future getRequests({@required int hospitalId}) async { if (isLoading == true) return -2; isLoading = true; - if (serviceRequests == null) notifyListeners(); + if (serviceRequests?.isEmpty ?? false) notifyListeners(); Response response; try { Map body = {}; @@ -76,8 +76,9 @@ class ServiceRequestsProvider extends ChangeNotifier { List requestsListJson = json.decode(response.body)["data"]; List serviceRequestsPage = requestsListJson.map((request) => ServiceRequest.fromJson(request)).toList(); serviceRequests ??= []; - sortMostRecent(serviceRequestsPage); serviceRequests.addAll(serviceRequestsPage); + sortMostRecent(serviceRequests); + notifyListeners(); if (serviceRequestsPage.length == pageItemNumber) { nextPage = true; } else {