From fa6b1b4fa1ee7936ee893c128b9e712f7b23c478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Mon, 13 Nov 2023 19:28:43 +0100
Subject: [PATCH 1/2] Display Running For counter independently of scheduletype

---
 backend/.idea/workspace.xml                                  | 5 +----
 .../dashboard/active-schedule/active-schedule.component.html | 2 +-
 frontend/src/app/dashboard/dashboard.component.ts            | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

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 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Edit and Delete in Draggable Scheduler">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" afterDir="false" />
-    </list>
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Edit and Delete in Draggable Scheduler" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
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 @@
   </mat-card-header>
   <mat-card-content>
     <span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span>
-    <p class="gray-text" *ngIf="activeSchedule!.scheduleType==='BASIC'">Running for {{displayTime}}</p>
+    <p class="gray-text">Running for {{displayTime}}</p>
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button class="grayBtn" (click)="stopTask(false)">Stop</button>
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
 

From 290cdd2fbf0df5cb2a5ad215e62177841566c823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= <uqpko@student.kit.edu>
Date: Mon, 13 Nov 2023 19:32:28 +0100
Subject: [PATCH 2/2] 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
       }
     })