diff --git a/lib/models/search_all_requests_model.dart b/lib/models/search_all_requests_model.dart index 5b6c7f7b..e2b21950 100644 --- a/lib/models/search_all_requests_model.dart +++ b/lib/models/search_all_requests_model.dart @@ -12,6 +12,7 @@ class SearchAllRequestsModel { List statuses; List typeTransaction; DateTime startDate, endDate; + bool isArchived; SearchAllRequestsModel({ this.requestNumber, @@ -24,6 +25,7 @@ class SearchAllRequestsModel { this.typeTransaction, this.startDate, this.endDate, + this.isArchived = false, }); void resetSearchValues() { @@ -34,6 +36,7 @@ class SearchAllRequestsModel { manufacture?.controller?.text = ""; sn?.controller?.text = ""; model?.controller?.text = ""; + isArchived = false; } } diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index d3c0686c..995aa701 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -45,12 +45,17 @@ class _AllRequestsFilterPageState extends State { Widget build(BuildContext context) { if (search == null) { search = SearchAllRequestsModel( - requestNumber: SearchByRequestNumberModel(context, controller: TextEditingController()), - assetName: SearchByAssetNameModel(context, controller: TextEditingController()), - assetNo: SearchByAssetNoModel(context, controller: TextEditingController()), - manufacture: SearchByManufactureModel(context, controller: TextEditingController()), + requestNumber: SearchByRequestNumberModel(context, + controller: TextEditingController()), + assetName: SearchByAssetNameModel(context, + controller: TextEditingController()), + assetNo: + SearchByAssetNoModel(context, controller: TextEditingController()), + manufacture: SearchByManufactureModel(context, + controller: TextEditingController()), sn: SearchBySNModel(context, controller: TextEditingController()), - model: SearchByRequestModel(context, controller: TextEditingController()), + model: + SearchByRequestModel(context, controller: TextEditingController()), ); search.searchBySelectedValue = search.requestNumber; } @@ -77,9 +82,11 @@ class _AllRequestsFilterPageState extends State { children: [ Text( context.translation.reset, - style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), + style: AppTextStyles.bodyText2 + .copyWith(color: AppColor.blueStatus(context)), ).paddingAll(8).onPress(() { - Provider.of(context, listen: false).searchedModel = null; + Provider.of(context, listen: false) + .searchedModel = null; setState(() { search.statuses?.clear(); search.typeTransaction?.clear(); @@ -152,19 +159,47 @@ class _AllRequestsFilterPageState extends State { ).expanded, ], ), + 16.height, + "Archived Requests".heading5(context), + // 8.height, + Row( + children: [ + Checkbox( + value: search.isArchived, + activeColor: AppColor.blueStatus(context), + onChanged: (value) { + // if (search.isArchived != value) { + // search.isArchived = value; + // } + // setState(() {}); + }), + "View Archived Requests".bodyText(context).expanded, + ], + ).onPress(() { + + search.isArchived = !search.isArchived; + + setState(() {}); + }), ], ).paddingOnly(start: 16, end: 16), ).expanded, - AppFilledButton(onPressed: _search, label: context.translation.applyFilter).paddingOnly(start: 16, end: 16), + AppFilledButton( + onPressed: _search, label: context.translation.applyFilter) + .paddingOnly(start: 16, end: 16), ], ).paddingOnly(top: 16, bottom: 16), ); } void _search() async { - final requestsProvider = Provider.of(context, listen: false); + final requestsProvider = + Provider.of(context, listen: false); if (search.startDate != null) search.endDate ??= DateTime.now(); - showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + showDialog( + context: context, + barrierDismissible: false, + builder: (context) => const AppLazyLoading()); requestsProvider.reset(); requestsProvider.searchedModel = search; await requestsProvider.getAllRequests(context, search: search); @@ -173,6 +208,9 @@ class _AllRequestsFilterPageState extends State { } bool _showResetButton() { - return (search.statuses?.isNotEmpty ?? false) || (search.typeTransaction?.isNotEmpty ?? false) || (search.startDate != null) || (search.endDate != null); + return (search.statuses?.isNotEmpty ?? false) || + (search.typeTransaction?.isNotEmpty ?? false) || + (search.startDate != null) || + (search.endDate != null); } }