From 04da31644023d22b1e7e4e24df6b0fd02d3aff2b Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Sun, 19 Nov 2023 11:15:38 +0300 Subject: [PATCH] Fix Asset Filter Pagination Issue --- lib/controllers/providers/api/devices_provider.dart | 11 ++++++----- .../pages/device_transfer/asset_filter_screen.dart | 2 ++ .../pages/user/requests/comments_bottom_sheet.dart | 2 +- .../equipment/auto_complete_devices_field.dart | 2 +- lib/views/widgets/equipment/single_device_picker.dart | 8 +++++++- .../auto_complete_devices_field.dart | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/controllers/providers/api/devices_provider.dart b/lib/controllers/providers/api/devices_provider.dart index b45dc5ac..1e9e6c80 100644 --- a/lib/controllers/providers/api/devices_provider.dart +++ b/lib/controllers/providers/api/devices_provider.dart @@ -111,9 +111,10 @@ class AssetProvider extends ChangeNotifier { @required String host, @required User user, @required int hospitalId, - String serialNumber, - String number, + // String serialNumber, + // String number, bool addPagination = true, + AssetSearch search, }) async { Response response; try { @@ -121,10 +122,10 @@ class AssetProvider extends ChangeNotifier { // "pageSize": pageItemNumber, // "pageNumber": devices.length ~/ pageItemNumber + 1, // "siteId": hospitalId, - if (serialNumber?.isEmpty == false) "assetSerialNumber": serialNumber, - if (number?.isEmpty == false) "assetNo": number, + // if (serialNumber?.isEmpty == false) "assetSerialNumber": serialNumber, + // if (number?.isEmpty == false) "assetNo": number, }; - + if (search != null) body.addAll(search.toJson()); if (addPagination) { body["pageSize"] = pageItemNumber; body["pageNumber"] = devices.length ~/ pageItemNumber + 1; diff --git a/lib/views/pages/device_transfer/asset_filter_screen.dart b/lib/views/pages/device_transfer/asset_filter_screen.dart index c0fdf9c0..0eb69164 100644 --- a/lib/views/pages/device_transfer/asset_filter_screen.dart +++ b/lib/views/pages/device_transfer/asset_filter_screen.dart @@ -42,6 +42,8 @@ class _AssetFilterScreenState extends State { WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) async { loading = true; setState(() {}); + startDate = filter.supplyDateFrom; + endDate = filter.supplyDateTo; final departmentProvider = Provider.of(context, listen: false); final siteProvider = Provider.of(context, listen: false); if (departmentProvider?.items?.isEmpty ?? true) await departmentProvider.getDate(); diff --git a/lib/views/pages/user/requests/comments_bottom_sheet.dart b/lib/views/pages/user/requests/comments_bottom_sheet.dart index 38d6a899..4db9dde2 100644 --- a/lib/views/pages/user/requests/comments_bottom_sheet.dart +++ b/lib/views/pages/user/requests/comments_bottom_sheet.dart @@ -112,7 +112,7 @@ class _CommentsBottomSheetState extends State { ), ), if (userProvider.user.type == UsersTypes.normal_user) 8.height, - if (userProvider.user.type == UsersTypes.normal_user) // todo its keeps loading when open keyboard or dismiss + if (userProvider.user.type == UsersTypes.normal_user) AppTextFormField( labelText: "Type any comment", backgroundColor: AppColor.neutral30, diff --git a/lib/views/widgets/equipment/auto_complete_devices_field.dart b/lib/views/widgets/equipment/auto_complete_devices_field.dart index 9f9bfb8f..2f177572 100644 --- a/lib/views/widgets/equipment/auto_complete_devices_field.dart +++ b/lib/views/widgets/equipment/auto_complete_devices_field.dart @@ -78,7 +78,7 @@ class _AutoCompleteDeviceFieldState extends State { host: _settingProvider.host, user: _userProvider.user, hospitalId: widget.hospitalId ?? _userProvider.user.clientId, - serialNumber: value, + // serialNumber: value, ); }, itemBuilder: (context, device) { diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index 13774f96..bcda8dcc 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -158,7 +158,13 @@ class _MyAssetsPageState extends State { nextPage: _devicesProvider.nextPage, onLazyLoad: () async { await _devicesProvider.getDevicesList( - user: _userProvider.user, host: _settingProvider.host, hospitalId: _userProvider.user.clientId, serialNumber: snController.text, number: numberController.text); + user: _userProvider.user, + host: _settingProvider.host, + hospitalId: _userProvider.user.clientId, + search: _searchAsset.copyWith(assetSerialNumber: snController.text, assetNo: numberController.text), + // serialNumber: snController.text, + // number: numberController.text, + ); }, child: AnimatedSwitcher( duration: const Duration(milliseconds: 500), diff --git a/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart b/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart index 3e463b49..7b347e74 100644 --- a/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart +++ b/lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart @@ -77,7 +77,7 @@ class _AutoCompleteDeviceNumberFieldState extends State