From 309d949fafefab48994e73dc52a00d6850dc94bf Mon Sep 17 00:00:00 2001
From: JOSEPH LE <joseph.le@apactech.io>
Date: Wed, 18 Sep 2024 09:35:20 +0700
Subject: [PATCH] update highlight when not in progress

---
 BACKEND/app/Services/JiraService.php         |  2 +-
 FRONTEND/src/pages/Allocation/Allocation.tsx | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/BACKEND/app/Services/JiraService.php b/BACKEND/app/Services/JiraService.php
index ddbf8b5..9032c62 100644
--- a/BACKEND/app/Services/JiraService.php
+++ b/BACKEND/app/Services/JiraService.php
@@ -240,7 +240,7 @@ class JiraService
                 'expand' => ['names', 'schema'],
                 'fields' => ['summary', 'status', 'timeoriginalestimate', 'timespent', 'assignee', 'project', 'updated'],
                 'jql' => sprintf(
-                    "assignee = '%s' AND status IN ('to do', 'in progress') ORDER BY updated DESC",
+                    "assignee = '%s' AND status IN ('to do', 'todo', 'in progress') ORDER BY updated DESC",
                     $user['accountId']
                 ),
                 'maxResults' => 50,
diff --git a/FRONTEND/src/pages/Allocation/Allocation.tsx b/FRONTEND/src/pages/Allocation/Allocation.tsx
index 121b1ab..4a987e5 100644
--- a/FRONTEND/src/pages/Allocation/Allocation.tsx
+++ b/FRONTEND/src/pages/Allocation/Allocation.tsx
@@ -3408,15 +3408,16 @@ const Allocation = () => {
                                 >
                                   <Box  style={{
                                     display: 'flex',
-                                    width: "50%"
-                                  }}>
-                                  <Avatar
-                                    size={'sm'}
-                                    src={userData.user.avatarUrls['48x48']}
-                                  />
-                                  <Text ml={'md'} fw={600}>
-                                    {user}
-                                  </Text>
+                                    width: "50%",
+                                    backgroundColor: userData.issues?.filter((iss:Issue)=> iss.fields.status.name === 'In Progress')?.length === 0 ? 'yellow' : ''
+                                    }}>
+                                    <Avatar
+                                      size={'sm'}
+                                      src={userData.user.avatarUrls['48x48']}
+                                    />
+                                    <Text ml={'md'} fw={600}>
+                                      {user}
+                                    </Text>
                                   </Box>
                                   <Box
                                     display={'flex'}