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

Merge pull request 'update personnel allocation' (#85) from joseph.update_navbar_permissions into master 

Reviewed-on: #85
This commit is contained in:
joseph 2024-09-24 14:20:57 +10:00
parent a7015ceedc a9e93d84d1
commit 5b7ad04a0f
3 changed files with 341 additions and 3470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ class JiraService
$users_data[$user['displayName']]['total_spent'] = 0; $users_data[$user['displayName']]['total_spent'] = 0;
$users_data[$user['displayName']]['total_est'] = 0; $users_data[$user['displayName']]['total_est'] = 0;
$body = [ $body = [
'expand' => ['names', 'schema'], 'expand' => ['names', 'schema','changelog'],
'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', 'todo', 'in progress') ORDER BY updated DESC", "assignee = '%s' AND status IN ('to do', 'todo', 'in progress') ORDER BY updated DESC",

4
FRONTEND/src/pages/Allocation/Allocation.module.css
View File

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

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

File diff suppressed because it is too large Load Diff