diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 6ff9944a..21674777 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -27,23 +27,23 @@ class _MyRequestsPageState extends State { AllRequestsProvider? _provider; SearchAllRequestsModel? _search; - late List requestsList; + late List requestsList; int selectedRequest = 0; @override Widget build(BuildContext context) { if (_provider == null) { requestsList = [ - context.translation.allWorkOrder, - context.translation.correctiveMaintenance, - context.translation.gasRefill, - context.translation.transferAsset, - context.translation.preventiveMaintenance, + Request(null, context.translation.allWorkOrder), + Request(1, context.translation.correctiveMaintenance), + Request(2, context.translation.gasRefill), + Request(3, context.translation.transferAsset), + Request(4, context.translation.preventiveMaintenance), ]; if (Provider.of(context, listen: false).user!.type != UsersTypes.normal_user) { - requestsList.add(context.translation.recurrentWo); + requestsList.add(Request(5, context.translation.recurrentWo)); } - requestsList.add(context.translation.taskRequest); + requestsList.add(Request(6, context.translation.taskRequest)); _provider = Provider.of(context, listen: false); _provider!.reset(); @@ -129,7 +129,7 @@ class _MyRequestsPageState extends State { ), shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)], ), - child: Text(requestsList[index], style: AppTextStyles.bodyText2.copyWith(height: 1, color: AppColor.filterButtonTextColor(context))), + child: Text(requestsList[index].value, style: AppTextStyles.bodyText2.copyWith(height: 1, color: AppColor.filterButtonTextColor(context))), ).onPress(() { if (snapshot.isAllLoading) { return; @@ -139,8 +139,9 @@ class _MyRequestsPageState extends State { setState(() { selectedRequest = index; }); + _provider!.reset(); - _provider!.getAllRequests(context, typeTransaction: selectedRequest == 0 ? null : selectedRequest); + _provider!.getAllRequests(context, typeTransaction: requestsList[selectedRequest].id); } }), separatorBuilder: (cxt, index) => 8.width, @@ -149,7 +150,7 @@ class _MyRequestsPageState extends State { LazyLoading( nextPage: snapshot.nextPage, onLazyLoad: () async { - snapshot.getAllRequests(context, typeTransaction: selectedRequest == 0 ? null : selectedRequest, search: _search); + snapshot.getAllRequests(context, typeTransaction: requestsList[selectedRequest].id, search: _search); }, child: RequestItemViewList(snapshot.allRequestsAndCount?.requestsDetails ?? [], snapshot.isAllLoading), ).expanded, @@ -173,3 +174,10 @@ class _MyRequestsPageState extends State { return true; } } + +class Request { + int? id; + String value; + + Request(this.id, this.value); +}