From 56a7047bad5a7cce6863dad4ae8e75d8fca4583a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Fri, 15 Mar 2024 07:22:03 +0100 Subject: [PATCH] Use TaskStatus Service for Status Determination in Detail Overview of Task --- .../task-detail-overview.component.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts index ef2179b..e28a744 100644 --- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts +++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts @@ -16,6 +16,7 @@ import {TaskEditorComponent} from "../task-editor/task-editor.component"; import {TaskEditorData} from "../task-editor/TaskEditorData"; import * as moment from "moment"; import {ScheduleDashboardComponent} from "../../schedules/schedule-dashboard/schedule-dashboard.component"; +import {TaskStatusService} from "../task-status.service"; @Component({ selector: 'app-task-detail-overview', @@ -53,7 +54,8 @@ export class TaskDetailOverviewComponent implements OnInit { private taskService: TaskService, private dialog: MatDialog, private scheduleService: ScheduleService, - private router: Router) { + private router: Router, + private taskStatusService: TaskStatusService) { } ngOnInit(): void { @@ -102,13 +104,8 @@ export class TaskDetailOverviewComponent implements OnInit { } getStatusOfTask(task: TaskEntityInfo ) { - if(moment(task.deadline, 'YYYY-MM-DDTHH:mm:ss.SSSZ').isBefore(moment())) { - return "🔴"; - } else if(this.schedules.length == 0 && this.schedulesLoaded){ - return "🟠"; - } else { - return "🟢"; - } + const taskStatus = this.taskStatusService.computeTaskStatus(task); + return this.taskStatusService.convertTaskStatusToColor(taskStatus); } calcProgress() {