joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update highlight when not in progress

This commit is contained in:
JOSEPH LE 2024-09-18 09:35:20 +07:00
parent 50106d0d80
commit 309d949faf
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BACKEND/app/Services/JiraService.php
View File

@ -240,7 +240,7 @@ class JiraService
'expand' => ['names', 'schema'], 'expand' => ['names', 'schema'],
'fields' => ['summary', 'status', 'timeoriginalestimate', 'timespent', 'assignee', 'project', 'updated'], 'fields' => ['summary', 'status', 'timeoriginalestimate', 'timespent', 'assignee', 'project', 'updated'],
'jql' => sprintf( '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'] $user['accountId']
), ),
'maxResults' => 50, 'maxResults' => 50,

19
FRONTEND/src/pages/Allocation/Allocation.tsx
View File

@ -3408,15 +3408,16 @@ const Allocation = () => {
> >
<Box style={{ <Box style={{
display: 'flex', display: 'flex',
width: "50%" width: "50%",
}}> backgroundColor: userData.issues?.filter((iss:Issue)=> iss.fields.status.name === 'In Progress')?.length === 0 ? 'yellow' : ''
<Avatar }}>
size={'sm'} <Avatar
src={userData.user.avatarUrls['48x48']} size={'sm'}
/> src={userData.user.avatarUrls['48x48']}
<Text ml={'md'} fw={600}> />
{user} <Text ml={'md'} fw={600}>
</Text> {user}
</Text>
</Box> </Box>
<Box <Box
display={'flex'} display={'flex'}