From 290cdd2fbf0df5cb2a5ad215e62177841566c823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Mon, 13 Nov 2023 19:32:28 +0100 Subject: [PATCH] Rename activeTime in TaskScheduleStopResponse to workTime to match angular model (Fix NAN minutes in dashboard) --- .../taskSchedule/TaskScheduleStopResponse.java | 12 ++++++------ .../active-schedule/active-schedule.component.ts | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java index 3c35886..14facaa 100644 --- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java +++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java @@ -2,17 +2,17 @@ package core.api.models.timemanager.taskSchedule; public class TaskScheduleStopResponse { - private int activeTime; + private int workTime; public TaskScheduleStopResponse(int activeTime) { - this.activeTime = activeTime; + this.workTime = activeTime; } - public int getActiveTime() { - return activeTime; + public int getWorkTime() { + return workTime; } - public void setActiveTime(int activeTime) { - this.activeTime = activeTime; + public void setWorkTime(int workTime) { + this.workTime = workTime; } } diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts index cd36f86..2acf67c 100644 --- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts +++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts @@ -63,6 +63,7 @@ export class ActiveScheduleComponent implements OnInit{ schedule: this.activeSchedule!, workedMinutes: resp.workTime }) + console.log(resp.workTime) this.activeSchedule = undefined } })