dashboard multiple filter cont

lib/dashboard_latest/dashboard_provider.dart

@@ -3,8 +3,10 @@ import 'dart:developer';
 
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/api_routes/api_manager.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/enum_extensions.dart';
 import 'package:test_sa/models/enums/user_types.dart';
@@ -45,12 +47,22 @@ class DashBoardProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  int _currentListIndex = 0;
+  List<int> listIndex = [];
 
-  int get currentListIndex => _currentListIndex;
+  int? _currentListIndex;
 
-  set currentListIndex(int value) {
+  int? get currentListIndex => _currentListIndex;
+
+  set currentListIndex(int? value) {
     _currentListIndex = value;
+    if (value == null) {
+      listIndex.clear();
+    }
+    else if (listIndex.contains(value)) {
+      listIndex.remove(value);
+    } else {
+      listIndex.add(value);
+    }
     notifyListeners();
   }
 
@@ -114,7 +126,13 @@ class DashBoardProvider extends ChangeNotifier {
     setTabs(userType: userType, context: context);
     getDashBoardCount(usersType: userType);
     resetRequestDataList();
-    getRequestDetail(usersType: userType, status: tabs[currentListIndex].tag, tabId: tabs[currentListIndex].id);
+    if (listIndex.isEmpty) {
+      Provider.of<AllRequestsProvider>(context, listen: false)
+        ..reset()
+        ..getAllRequests(context);
+    } else {
+      getRequestDetail(usersType: userType, status: tabs[currentListIndex!].tag, tabId: tabs[currentListIndex!].id);
+    }
     // notifyListeners();
   }
 

lib/dashboard_latest/dashboard_view.dart

@@ -6,6 +6,7 @@ import 'package:nfc_manager/nfc_manager.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/notification/firebase_notification_manger.dart';
 import 'package:test_sa/controllers/notification/notification_manger.dart';
+import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@@ -57,13 +58,17 @@ class _DashboardViewState extends State<DashboardView> {
     _dashBoardProvider.setTabs(userType: userProvider.user!.type!, context: context);
     _dashBoardProvider.getDashBoardCount(usersType: userProvider.user!.type!);
     _dashBoardProvider.resetRequestDataList();
-    _dashBoardProvider.currentListIndex = 0;
+    _dashBoardProvider.currentListIndex = null;
-    _dashBoardProvider.getRequestDetail(
+    Provider.of<AllRequestsProvider>(context, listen: false)
-        usersType: userProvider.user!.type!,
+      ..reset()
-        status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag,
+      ..getAllRequests(context);
-        tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id,
+
-        isHighPriority: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isHighPriority,
+    // _dashBoardProvider.getRequestDetail(
-        isOverdue: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isOverDue);
+    //     usersType: userProvider.user!.type!,
+    //     status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag,
+    //     tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id,
+    //     isHighPriority: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isHighPriority,
+    //     isOverdue: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isOverDue);
   }
 
   void getInitialData() {
@@ -94,8 +99,14 @@ class _DashboardViewState extends State<DashboardView> {
     _scrollController.addListener(() async {
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent && !_dashBoardProvider.isDetailLoading) {
         _dashBoardProvider.pageNum = _dashBoardProvider.pageNum + 1;
+        if (_dashBoardProvider.currentListIndex == null) {
+        } else {
           _dashBoardProvider.getRequestDetail(
-            usersType: user.type!, showLoader: false, status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag, tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id);
+              usersType: user.type!,
+              showLoader: false,
+              status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex!].tag,
+              tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex!].id);
+        }
       }
     });
   }

lib/dashboard_latest/widgets/app_bar_widget.dart

@@ -194,7 +194,10 @@ class _AppBarWidgetState extends State<AppBarWidget> with TickerProviderStateMix
                                     dashBoardProvider.setTabs(userType: settingProvider.user!.type!, context: context);
                                     dashBoardProvider.getDashBoardCount(usersType: settingProvider.user!.type!);
                                     dashBoardProvider.resetRequestDataList();
-                                dashBoardProvider.getRequestDetail(usersType: settingProvider.user!.type!, status: dashBoardProvider.tabs[dashBoardProvider.currentListIndex].tag);
+                                    if (dashBoardProvider.currentListIndex == null) {
+                                    } else {
+                                      dashBoardProvider.getRequestDetail(usersType: settingProvider.user!.type!, status: dashBoardProvider.tabs[dashBoardProvider.currentListIndex!].tag);
+                                    }
                                   });
                                 } else {
                                   ApiManager.instance.assetGroup = tempGroup;

lib/dashboard_latest/widgets/request_category_fragment.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/dashboard_latest/dashboard_provider.dart';
 import 'package:test_sa/dashboard_latest/widgets/request_category_list.dart';
@@ -15,6 +16,8 @@ import 'package:test_sa/new_views/common_widgets/tab_button.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 
+import '../../new_views/pages/land_page/widgets/request_item_view_list.dart';
+
 class RequestCategoryFragment extends StatefulWidget {
   const RequestCategoryFragment({Key? key}) : super(key: key);
 
@@ -75,14 +78,17 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
 
     // Reload data with new sort order
     dashboardProvider.resetRequestDataList();
+    if (dashboardProvider.currentListIndex == null) {
+    } else {
       dashboardProvider.getRequestDetail(
         usersType: userType ?? UsersTypes.normal_user,
         showLoader: true,
-      status: tabs[dashboardProvider.currentListIndex].tag,
+        status: tabs[dashboardProvider.currentListIndex!].tag,
-      tabId: tabs[dashboardProvider.currentListIndex].id,
+        tabId: tabs[dashboardProvider.currentListIndex!].id,
         isAscending: isAscending,
       );
     }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -104,31 +110,34 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
           opacity: _headerFadeAnimation,
           child: SlideTransition(
             position: _headerSlideAnimation,
-            child: !isNurse && dashboardProvider.tabs.isNotEmpty && dashboardProvider.tabs[dashboardProvider.currentListIndex].tag == 0
+            child:
-                ? Column(
+                // !isNurse && dashboardProvider.tabs.isNotEmpty
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                //     //&& dashboardProvider.tabs[dashboardProvider.currentListIndex].tag == 0
-                    children: [
+                //     ? Column(
-                      Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))),
+                //         crossAxisAlignment: CrossAxisAlignment.start,
-                      // Row(
-                      //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 //         children: [
-                      //     context.translation.allWorkOrder.heading4(context),
+                //           Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))),
-                      //     GestureDetector(
+                //           // Row(
-                      //         onTap: () {
+                //           //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      //           dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar;
+                //           //   children: [
-                      //         },
+                //           //     context.translation.allWorkOrder.heading4(context),
-                      //         child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset())
+                //           //     GestureDetector(
+                //           //         onTap: () {
+                //           //           dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar;
+                //           //         },
+                //           //         child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset())
+                //           //   ],
+                //           // ),
+                //           dashboardProvider.isShowDashBoardCalendar
+                //               ? Padding(
+                //                   padding: EdgeInsets.only(top: 12.toScreenHeight),
+                //                   child: const WeeklyCalendarFragment(),
+                //                 )
+                //               : const SizedBox(),
                 //         ],
-                      // ),
+                //       ).paddingOnly(start: 14, end: 12)
-                      dashboardProvider.isShowDashBoardCalendar
+                //     :
-                          ? Padding(
+                Row(
-                              padding: EdgeInsets.only(top: 12.toScreenHeight),
-                              child: const WeeklyCalendarFragment(),
-                            )
-                          : const SizedBox(),
-                    ],
-                  ).paddingOnly(start: 14, end: 12)
-                : Row(
               spacing: 16,
               children: [
                 Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))).expanded,
@@ -137,6 +146,18 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
                 //   'search'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
                 //     Navigator.of(context).pushNamed('/cleaner_search');
                 //   }),
+
+                if (dashboardProvider.listIndex.isNotEmpty)
+                  Text(
+                    'Clear Filters',
+                    style: AppTextStyles.bodyText2.copyWith(color: AppColor.red30),
+                  ).onPress(() {
+                    dashboardProvider.resetRequestDataList();
+                    dashboardProvider.currentListIndex = null;
+                    Provider.of<AllRequestsProvider>(context, listen: false)
+                      ..reset()
+                      ..getAllRequests(context);
+                  }),
                 Transform.flip(
                   flipY: isAscending,
                   child: 'dashboard/sort_descending'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
@@ -159,8 +180,15 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
         //             ],
         //           ).paddingOnly(start: 16, end: 16)
         //         : context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16),
-
+        (dashboardProvider.currentListIndex == null)
-        dashboardProvider.isDetailLoading
+            ? Consumer<AllRequestsProvider>(builder: (context, snapshot, _) {
+                return RequestItemViewList(
+                  snapshot.allRequestsAndCount?.requestsDetails ?? [],
+                  snapshot.isAllLoading,
+                  key: ValueKey('request_list_'), // Key changes on every tab click
+                );
+              })
+            : dashboardProvider.isDetailLoading
                 ? Column(
                     mainAxisSize: MainAxisSize.max,
                     children: List.generate(3, (index) {