Merge pull request 'master' (#86) from master into dev

Reviewed-on: #86

BACKEND/Modules/Admin/routes/api.php

@@ -107,8 +107,8 @@ Route::middleware('api')
                 Route::get('/fetch-issues', [JiraController::class, 'fetchAllIssues']);
                 Route::get('/all-project', [JiraController::class, 'getAllProject']);
                 Route::get('/get-detail-project-by-id', [JiraController::class, 'getDetailsProjectsById']);
-                Route::get('/get-all-board-by-id-project', [JiraController::class, 'getAllBoardByIdProjects']);
+                Route::get('/get-all-board-by-id-project', [JiraController::class, 'getAllBoardByIdProjects'])->middleware('check.permission:admin.tester');
-                Route::get('/get-all-sprint-by-id-board', [JiraController::class, 'getAllSprintByIdBoard']);
+                Route::get('/get-all-sprint-by-id-board', [JiraController::class, 'getAllSprintByIdBoard'])->middleware('check.permission:admin.tester');
                 Route::get('/get-all-issue-by-id-sprint', [JiraController::class, 'getAllIssueByIdSprint']);
 
                 Route::get('/all-issue-by-project', [JiraController::class, 'fetchIssuesByProject']);
@@ -168,9 +168,9 @@ Route::middleware('api')
                 Route::get('/getAll', [CriteriasController::class, 'getAllCriterias'])->middleware('check.permission:admin');
                 Route::post('/sprints/{sprintId}', [CriteriasController::class, 'updateCriteriasForSprint'])->middleware('check.permission:admin');
 
-                Route::get('/test-cases/getAll/{sprintId}', [TestCaseForSprintController::class, 'getAllReportsForSprint'])->middleware('check.permission:admin,tester');
+                Route::get('/test-cases/getAll/{sprintId}', [TestCaseForSprintController::class, 'getAllReportsForSprint'])->middleware('check.permission:admin.tester');
-                Route::post('/test-cases/{sprintId}', [TestCaseForSprintController::class, 'createTestReport'])->middleware('check.permission:admin,tester');
+                Route::post('/test-cases/{sprintId}', [TestCaseForSprintController::class, 'createTestReport'])->middleware('check.permission:admin.tester');
-                Route::get('/test-cases/delete', [TestCaseForSprintController::class, 'deleteTestReport'])->middleware('check.permission:admin,tester');
+                Route::get('/test-cases/delete', [TestCaseForSprintController::class, 'deleteTestReport'])->middleware('check.permission:admin.tester');
 
                 Route::get('/profiles-data', [ProfileController::class, 'getProfilesData'])->middleware('check.permission:admin.hr.staff.tester');
                 Route::post('/profiles-data/update', [ProfileController::class, 'updateProfilesData'])->middleware('check.permission:admin.hr.staff.tester');

BACKEND/app/Services/JiraService.php

@@ -236,7 +236,7 @@ class JiraService
             $users_data[$user['displayName']]['total_spent'] = 0;
             $users_data[$user['displayName']]['total_est'] = 0;
             $body = [
-                'expand' => ['names', 'schema'],
+                'expand' => ['names', 'schema','changelog'],
                 'fields' => ['summary', 'status', 'timeoriginalestimate', 'timespent', 'assignee', 'project', 'updated'],
                 'jql' => sprintf(
                     "assignee = '%s' AND status IN ('to do', 'todo', 'in progress') ORDER BY updated DESC",

FRONTEND/src/pages/Allocation/Allocation.module.css

@@ -5,13 +5,13 @@
   
   @keyframes blinkBackground {
     0% {
-      background-color: #ffa200; /* Màu vàng */
+      background-color: #ff5100; /* Màu vàng */
     }
     50% {
       background-color: #ffffff; /* Màu xanh */
       color: rgb(0, 0, 0);
     }
     100% {
-      background-color: #ffa200; /* Màu vàng */
+      background-color: #ff5100; /* Màu vàng */
     }
   }

FRONTEND/src/pages/UsersManagement/UsersManagement.tsx

@@ -209,7 +209,7 @@ const UsersManagement = () => {
             <MultiSelect
               label={'Permission(s)'}
               required
-              data={['staff', 'admin', 'hr']}
+              data={['staff', 'admin', 'hr', 'tester']}
               value={
                 typeof form.values.permission === 'string'
                   ? form.values.permission