Merge pull request 'update highlight when not in progress' (#30) from joseph.Update_personnel_allocation into master
Reviewed-on: #30
This commit is contained in:
commit
4657ac0ac9
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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'}
|
||||
|
|
|
|||
Loading…
Reference in New Issue