diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml index 5c2bae0..e1c6a0d 100644 --- a/backend/.idea/workspace.xml +++ b/backend/.idea/workspace.xml @@ -4,10 +4,7 @@ - - - - + 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.html b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html index a7d1ee1..ff04003 100644 --- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.html +++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html @@ -10,7 +10,7 @@ {{taskgroupPath.taskgroupName}} / - Running for {{displayTime}} + Running for {{displayTime}} Stop 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 } }) diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index d3a1283..0fec900 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -18,7 +18,7 @@ import {TaskOverviewData} from "./taskgroup-overview/taskgroup-overview.componen }) export class DashboardComponent implements OnInit{ - missedSchedules: boolean = true + missedSchedules: boolean = false schedules: ScheduleInfo[] = [] workedMinutesToday: number = 0
Running for {{displayTime}}