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

Merge branch 'master' into Sprint-3/MS-23

This commit is contained in:
Truong Vo 2024-09-18 13:48:42 +07:00
parent 26282bbe8e 57d85705f0
commit 37c73a2146
3 changed files with 46 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'],
'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,

35
BACKEND/database/migrations/2024_09_12_083311_create_criterias_table.php
View File

@ -2,6 +2,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
@ -18,6 +19,40 @@ return new class extends Migration
$table->string('type');
$table->timestamps();
});
// Insert init data
DB::table('criterias')->insert([
[
'name' => 'Deadline',
'description' => 'Is the sprint progressing on schedule?',
'type' => 'SPRINT',
],
[
'name' => 'Story point',
'description' => 'Is the sprint on track to complete the planned story points?',
'type' => 'SPRINT',
],
[
'name' => 'Demo - Function',
'description' => 'Did the features implemented in the sprint work well during the demo?',
'type' => 'SPRINT',
],
[
'name' => 'Code quality',
'description' => 'Did the code produce any bugs during testing?',
'type' => 'SPRINT',
],
[
'name' => 'Level of task completion',
'description' => 'Is the team member ensuring the task is completed on schedule?',
'type' => 'MEMBER',
],
[
'name' => 'Code quality',
'description' => 'Number of bugs arising from the team member\'s task',
'type' => 'MEMBER',
],
]);
}
/**

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

@ -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'}