From 375a4eab84d84be1c56ef1672c7f44b35a7d0635 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Tue, 2 Jan 2024 12:24:01 +0300
Subject: [PATCH] progress view improvement

---
 .../progress_fragment.dart                    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
index b19dac6d..4866cf96 100644
--- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
+++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
@@ -13,20 +13,27 @@ import '../../../../controllers/providers/api/user_provider.dart';
 import '../../../../models/enums/user_types.dart';
 
 class ProgressFragment extends StatelessWidget {
-   ProgressFragment({Key key}) : super(key: key);
+  ProgressFragment({Key key}) : super(key: key);
 
   UserProvider _userProvider;
+
   @override
   Widget build(BuildContext context) {
     _userProvider = Provider.of<UserProvider>(context);
+    bool isCurrentUserNotEngineer = (_userProvider.user.type != UsersTypes.engineer);
     return Consumer<AllRequestsProvider>(
       builder: (context, snapshot, _) {
         Map<String, double> statuses = {
           "Completed": snapshot.completedRequests?.requestsDetails?.length?.toDouble() ?? 0.0,
           "In Progress": snapshot.inProgressRequests?.requestsDetails?.length?.toDouble() ?? 0.0,
-          "Open": snapshot.openRequests?.requestsDetails?.length?.toDouble() ?? 0.0,
+          // "Open": snapshot.openRequests?.requestsDetails?.length?.toDouble() ?? 0.0,
         };
-        int total = (snapshot.completedRequests?.requestsDetails?.length ?? 0) + (snapshot.inProgressRequests?.requestsDetails?.length ?? 0) + (snapshot.openRequests?.requestsDetails?.length ?? 0);
+        if (isCurrentUserNotEngineer) {
+          statuses["Open"] = snapshot.openRequests?.requestsDetails?.length?.toDouble() ?? 0.0;
+        }
+        int total = (snapshot.completedRequests?.requestsDetails?.length ?? 0) +
+            (snapshot.inProgressRequests?.requestsDetails?.length ?? 0) +
+            (isCurrentUserNotEngineer ? (snapshot.openRequests?.requestsDetails?.length ?? 0) : 0);
 
         return Column(
           children: [
@@ -68,7 +75,7 @@ class ProgressFragment extends StatelessWidget {
               ).toShimmer(isShow: snapshot.isOpenLoading || snapshot.isInProgressLoading || snapshot.isCompleteLoading, radius: 300).paddingAll(12).toShadowContainer(context),
             ).paddingOnly(start: 16, end: 16, bottom: 16),
             DefaultTabController(
-              length: 3,
+              length: isCurrentUserNotEngineer ? 3 : 2,
               child: Column(
                 children: <Widget>[
                   Container(
@@ -87,8 +94,7 @@ class ProgressFragment extends StatelessWidget {
                         // setState(() {});
                       },
                       tabs: [
-                        if(_userProvider.user.type != UsersTypes.engineer)
-                        Tab(text: context.translation.open, height: 57.toScreenHeight),
+                        if (isCurrentUserNotEngineer) Tab(text: context.translation.open, height: 57.toScreenHeight),
                         Tab(text: context.translation.inProgress, height: 57.toScreenHeight),
                         Tab(text: context.translation.completed, height: 57.toScreenHeight),
                       ],
@@ -97,8 +103,7 @@ class ProgressFragment extends StatelessWidget {
                   8.height,
                   TabBarView(
                     children: [
-                      if(_userProvider.user.type != UsersTypes.engineer)
-                      RequestItemViewList(snapshot.openRequests?.requestsDetails ?? [], snapshot.isOpenLoading),
+                      if (isCurrentUserNotEngineer) RequestItemViewList(snapshot.openRequests?.requestsDetails ?? [], snapshot.isOpenLoading),
                       RequestItemViewList(snapshot.inProgressRequests?.requestsDetails ?? [], snapshot.isInProgressLoading),
                       RequestItemViewList(snapshot.completedRequests?.requestsDetails ?? [], snapshot.isCompleteLoading),
                     ],