Skip to content

Commit

Permalink
change completed to done
Browse files Browse the repository at this point in the history
  • Loading branch information
shubhamsinghbundela committed Oct 30, 2023
1 parent 83f4a06 commit 8a11485
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions app/components/task/holder.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
{{#each this.availabletaskStatusList as |taskStatus|}}
{{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}
<option
data-test-dropdown-option={{taskStatus.displayLabel}}
value={{taskStatus.key}}
selected={{eq taskStatus.key this.status}}
>
Expand Down
2 changes: 1 addition & 1 deletion app/components/task/holder.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default class TasksHolderComponent extends Component {

get taskStyleClass() {
const statusNotOverDueList = [
TASK_KEYS.COMPLETED,
TASK_KEYS.DONE,
TASK_KEYS.VERIFIED,
TASK_KEYS.AVAILABLE,
];
Expand Down
10 changes: 5 additions & 5 deletions app/constants/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const TASK_KEYS = {
IN_PROGRESS: 'IN_PROGRESS',
BLOCKED: 'BLOCKED',
SMOKE_TESTING: 'SMOKE_TESTING',
COMPLETED: 'COMPLETED',
DONE: 'DONE',
NEEDS_REVIEW: 'NEEDS_REVIEW',
IN_REVIEW: 'IN_REVIEW',
APPROVED: 'APPROVED',
Expand All @@ -23,7 +23,7 @@ const {
IN_PROGRESS,
BLOCKED,
SMOKE_TESTING,
COMPLETED,
DONE,
NEEDS_REVIEW,
IN_REVIEW,
APPROVED,
Expand Down Expand Up @@ -60,8 +60,8 @@ const TASK_STATUS_LIST = [
key: SMOKE_TESTING,
},
{
displayLabel: 'Completed',
key: COMPLETED,
displayLabel: 'Done',
key: DONE,
},
{
displayLabel: 'Needs Review',
Expand Down Expand Up @@ -133,7 +133,7 @@ const TABS_TASK_STATUS_LIST = [
];
export const TASK_MESSAGES = {
MARK_DONE:
'This task will be marked as complete and a new task will be assigned to you',
'This task will be marked as done and a new task will be assigned to you',
UPDATE_TASK: 'Updating task',
FIND_TASK: 'Finding new task for you!',
};
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default class TasksController extends Controller {
const taskCompletionPercentage = object.percentCompleted;
if (taskCompletionPercentage) {
if (taskCompletionPercentage === TASK_PERCENTAGE.completedPercentage) {
requestBody.status = 'COMPLETED';
requestBody.status = 'DONE';
}
requestBody.percentCompleted = parseInt(taskCompletionPercentage);
}
Expand Down

0 comments on commit 8a11485

Please sign in to comment.