From 3fbafa0784974e867fda92c6ed901117e4ef6090 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sun, 22 Oct 2023 14:05:12 +0200
Subject: [PATCH 01/50] Define Entity BasicTaskSchedule and Taskcontroller

---
 backend/.idea/misc.xml                        |  1 -
 backend/.idea/workspace.xml                   | 18 ++---
 .../api/controller/ScheduleController.java    | 31 ++++++++
 .../timemanager/BasicTaskSchedule.java        | 78 +++++++++++++++++++
 .../entities/timemanager/ScheduleType.java    |  8 ++
 .../java/core/entities/timemanager/Task.java  |  4 +
 6 files changed, 126 insertions(+), 14 deletions(-)
 create mode 100644 backend/src/main/java/core/api/controller/ScheduleController.java
 create mode 100644 backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
 create mode 100644 backend/src/main/java/core/entities/timemanager/ScheduleType.java

diff --git a/backend/.idea/misc.xml b/backend/.idea/misc.xml
index 82ab2cc..7f2836b 100644
--- a/backend/.idea/misc.xml
+++ b/backend/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index b9a3db5..0a3a9ee 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,20 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete and clear Tasks (Frontend)">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupDetailInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupShortInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <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/api/controller/TaskgroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupEntityInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupEntityInfo.java" 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" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/taskgroup.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/taskgroup.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/taskgroups/taskgroup-dashboard/taskgroup-dashboard.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -103,6 +94,7 @@
       <workItem from="1697923629354" duration="3164000" />
       <workItem from="1697958018921" duration="91000" />
       <workItem from="1697958118995" duration="5749000" />
+      <workItem from="1697969480767" duration="6039000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
new file mode 100644
index 0000000..2c2e03b
--- /dev/null
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -0,0 +1,31 @@
+package core.api.controller;
+
+import core.entities.timemanager.ScheduleType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@CrossOrigin(origins = "*", maxAge = 3600)
+@RestController
+@RequestMapping("/api")
+public class ScheduleController {
+
+    @GetMapping("/schedules/{taskID}/{scheduleType}")
+    public ResponseEntity<?> loadSchedulesOfTask(@PathVariable long taskID, @PathVariable ScheduleType scheduleType) {
+        return null;
+    }
+
+    @PutMapping("/schedules/{taskID}")
+    public ResponseEntity<?> scheduleTask(@PathVariable long taskID) {
+        return null;
+    }
+
+    @PostMapping("/schedules/{scheduleID}/{scheduleType}")
+    public ResponseEntity<?> editScheduledTask(@PathVariable long scheduleID, @PathVariable ScheduleType scheduleType) {
+        return null;
+    }
+
+    @PostMapping("/schedules/{scheduleID}/{scheduleType}")
+    public ResponseEntity<?> deleteScheduledTask(@PathVariable long scheduleID, @PathVariable ScheduleType scheduleType) {
+        return null;
+    }
+}
diff --git a/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
new file mode 100644
index 0000000..d9e0f6a
--- /dev/null
+++ b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
@@ -0,0 +1,78 @@
+package core.entities.timemanager;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "basic_schedules")
+public class BasicTaskSchedule {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long scheduleID;
+
+    @ManyToOne
+    @JoinColumn(referencedColumnName = "taskID", name = "task")
+    private Task task;
+
+    private LocalDate scheduleDate;
+    private LocalDateTime startTime;
+    private LocalDateTime finishedTime;
+
+    public BasicTaskSchedule(Task task, LocalDate scheduleDate) {
+        this.task = task;
+        this.scheduleDate = scheduleDate;
+    }
+
+    public BasicTaskSchedule() {
+    }
+
+    public void start() {
+        this.startTime = LocalDateTime.now();
+    }
+
+    public void end() {
+        this.finishedTime = LocalDateTime.now();
+    }
+
+    public long getScheduleID() {
+        return scheduleID;
+    }
+
+    public void setScheduleID(long scheduleID) {
+        this.scheduleID = scheduleID;
+    }
+
+    public Task getTask() {
+        return task;
+    }
+
+    public void setTask(Task task) {
+        this.task = task;
+    }
+
+    public LocalDate getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(LocalDate scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getFinishedTime() {
+        return finishedTime;
+    }
+
+    public void setFinishedTime(LocalDateTime finishedTime) {
+        this.finishedTime = finishedTime;
+    }
+}
diff --git a/backend/src/main/java/core/entities/timemanager/ScheduleType.java b/backend/src/main/java/core/entities/timemanager/ScheduleType.java
new file mode 100644
index 0000000..30b8677
--- /dev/null
+++ b/backend/src/main/java/core/entities/timemanager/ScheduleType.java
@@ -0,0 +1,8 @@
+package core.entities.timemanager;
+
+public enum ScheduleType {
+
+    BASIC,
+    MODERATE,
+    ADVANCED;
+}
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index 8c17c7c..dc39e91 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -3,6 +3,7 @@ package core.entities.timemanager;
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.util.Objects;
+import java.util.Set;
 
 @Entity
 @Table(name = "tasks")
@@ -25,6 +26,9 @@ public class Task {
 
     private boolean finished;
 
+    @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private Set<BasicTaskSchedule> basicTaskSchedules;
+
     public Task(Taskgroup taskgroup, String taskName, LocalDate startDate, LocalDate deadline, int eta) {
         this.taskgroup = taskgroup;
         this.taskName = taskName;
-- 
2.34.1


From 389e6ddba539a51599051ce6cfdbcdfab2068385 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sun, 22 Oct 2023 20:42:57 +0200
Subject: [PATCH 02/50] Design TaskOverview

---
 backend/.idea/workspace.xml                   |  76 ++++++----
 .../api/controller/ScheduleController.java    |  56 +++++++-
 .../core/api/controller/TaskController.java   |  14 ++
 .../BasicTaskScheduleEntityInfo.java          |  53 +++++++
 .../BasicTaskScheduleFieldInfo.java           |  17 +++
 .../java/core/entities/timemanager/Task.java  |  12 ++
 .../BasicTaskScheduleRepository.java          |   9 ++
 .../core/services/TaskScheduleService.java    |  30 ++++
 frontend/src/api/.openapi-generator/FILES     |   3 +
 frontend/src/api/api.module.ts                |   1 +
 frontend/src/api/api/api.ts                   |   4 +-
 frontend/src/api/api/task.service.ts          |  77 +++++++++--
 frontend/src/api/model/models.ts              |   2 +
 frontend/src/app/app-routing.module.ts        |   4 +-
 frontend/src/app/app.module.ts                |  10 +-
 .../task-dashboard.component.css              |   8 ++
 .../task-dashboard.component.html             |   4 +-
 openapi.yaml                                  | 130 ++++++++++++++++--
 18 files changed, 450 insertions(+), 60 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java
 create mode 100644 backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
 create mode 100644 backend/src/main/java/core/services/TaskScheduleService.java

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 0a3a9ee..9e500e1 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,11 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete and clear Tasks (Frontend)">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -19,6 +22,7 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Enum" />
         <option value="Interface" />
         <option value="Class" />
       </list>
@@ -44,31 +48,31 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;issue-11-angular-update&quot;,
-    &quot;last_directory_selection&quot;: &quot;D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Programmierprojekte/Dicewars/client&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "issue-11-angular-update",
+    "last_directory_selection": "D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager",
+    "last_opened_file_path": "D:/Programmierprojekte/Dicewars/client",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "settings.editor.selected.configurable": "swagger",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mariadb&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mariadb"
     ]
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
@@ -94,7 +98,8 @@
       <workItem from="1697923629354" duration="3164000" />
       <workItem from="1697958018921" duration="91000" />
       <workItem from="1697958118995" duration="5749000" />
-      <workItem from="1697969480767" duration="6039000" />
+      <workItem from="1697969480767" duration="6407000" />
+      <workItem from="1697989716016" duration="3813000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -136,7 +141,15 @@
       <option name="project" value="LOCAL" />
       <updated>1697962125518</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="Define Entity BasicTaskSchedule and Taskcontroller">
+      <option name="closed" value="true" />
+      <created>1697976314517</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1697976314517</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -149,7 +162,8 @@
     <MESSAGE value="Implementing edit route for tasks" />
     <MESSAGE value="Delete and clear Tasks" />
     <MESSAGE value="Delete and clear Tasks (Frontend)" />
-    <option name="LAST_COMMIT_MESSAGE" value="Delete and clear Tasks (Frontend)" />
+    <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
+    <option name="LAST_COMMIT_MESSAGE" value="Define Entity BasicTaskSchedule and Taskcontroller" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -162,4 +176,8 @@
       </breakpoints>
     </breakpoint-manager>
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>
\ No newline at end of file
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 2c2e03b..29de764 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -1,22 +1,70 @@
 package core.api.controller;
 
+import core.api.models.auth.SimpleStatusResponse;
+import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
+import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
+import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
+import core.entities.timemanager.Task;
+import core.services.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 @RequestMapping("/api")
 public class ScheduleController {
 
+    private final TaskService taskService;
+    private final TaskScheduleService taskScheduleService;
+
+    public ScheduleController(@Autowired TaskService taskService, @Autowired TaskScheduleService taskScheduleService) {
+        this.taskService = taskService;
+        this.taskScheduleService = taskScheduleService;
+    }
+
     @GetMapping("/schedules/{taskID}/{scheduleType}")
     public ResponseEntity<?> loadSchedulesOfTask(@PathVariable long taskID, @PathVariable ScheduleType scheduleType) {
+        PermissionResult<Task> taskPermissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!taskPermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(taskPermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        switch (scheduleType) {
+            case BASIC -> {
+                List<BasicTaskSchedule> basicTaskScheduleList = new ArrayList<>(taskPermissionResult.getResult().getBasicTaskSchedules());
+                basicTaskScheduleList.sort(Comparator.comparing(BasicTaskSchedule::getScheduleDate));
+                return ResponseEntity.ok(basicTaskScheduleList.stream().map(BasicTaskScheduleEntityInfo::new));
+            }
+            case ADVANCED, MODERATE -> ResponseEntity.ok(new ArrayList<>());
+        }
         return null;
     }
 
-    @PutMapping("/schedules/{taskID}")
-    public ResponseEntity<?> scheduleTask(@PathVariable long taskID) {
-        return null;
+    @PutMapping("/schedules/{taskID}/basic")
+    public ResponseEntity<?> basicScheduleTask(@PathVariable long taskID, @Valid @RequestBody BasicTaskScheduleFieldInfo basicTaskSchedule) {
+        PermissionResult<Task> taskPermissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!taskPermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(taskPermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        ServiceResult<BasicTaskSchedule> creationResult = taskScheduleService.createBasicTaskSchedule(taskPermissionResult.getResult(), basicTaskSchedule);
+        return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(creationResult.getResult()));
     }
 
     @PostMapping("/schedules/{scheduleID}/{scheduleType}")
@@ -24,7 +72,7 @@ public class ScheduleController {
         return null;
     }
 
-    @PostMapping("/schedules/{scheduleID}/{scheduleType}")
+    @DeleteMapping("/schedules/{scheduleID}/{scheduleType}")
     public ResponseEntity<?> deleteScheduledTask(@PathVariable long scheduleID, @PathVariable ScheduleType scheduleType) {
         return null;
     }
diff --git a/backend/src/main/java/core/api/controller/TaskController.java b/backend/src/main/java/core/api/controller/TaskController.java
index f80135a..093102b 100644
--- a/backend/src/main/java/core/api/controller/TaskController.java
+++ b/backend/src/main/java/core/api/controller/TaskController.java
@@ -96,4 +96,18 @@ public class TaskController {
         taskService.deleteTask(taskPermissionResult.getResult());
         return ResponseEntity.ok(new SimpleStatusResponse("success"));
     }
+
+    @GetMapping("/tasks/{taskID}")
+    public ResponseEntity<?> loadTaskDetails(@PathVariable long taskID) {
+        PermissionResult<Task> taskPermissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if (!taskPermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if (taskPermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        return ResponseEntity.ok(new TaskEntityInfo(taskPermissionResult.getResult()));
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java
new file mode 100644
index 0000000..992b8a4
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java
@@ -0,0 +1,53 @@
+package core.api.models.timemanager.taskSchedule;
+
+import core.entities.timemanager.BasicTaskSchedule;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class BasicTaskScheduleEntityInfo {
+
+    private long scheduleID;
+    private LocalDate scheduleDate;
+    private LocalDateTime startTime;
+    private LocalDateTime finishedTime;
+
+    public BasicTaskScheduleEntityInfo(BasicTaskSchedule basicTaskSchedule) {
+        this.scheduleID = basicTaskSchedule.getScheduleID();
+        this.scheduleDate = basicTaskSchedule.getScheduleDate();
+        this.startTime = basicTaskSchedule.getStartTime();
+        this.finishedTime = basicTaskSchedule.getFinishedTime();
+    }
+
+    public long getScheduleID() {
+        return scheduleID;
+    }
+
+    public void setScheduleID(long scheduleID) {
+        this.scheduleID = scheduleID;
+    }
+
+    public LocalDate getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(LocalDate scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getFinishedTime() {
+        return finishedTime;
+    }
+
+    public void setFinishedTime(LocalDateTime finishedTime) {
+        this.finishedTime = finishedTime;
+    }
+}
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java
new file mode 100644
index 0000000..d8b53d5
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java
@@ -0,0 +1,17 @@
+package core.api.models.timemanager.taskSchedule;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+public class BasicTaskScheduleFieldInfo {
+    @NotNull
+    private LocalDate scheduleDate;
+
+    public LocalDate getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(LocalDate scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+}
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index dc39e91..aa8a9f4 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -109,4 +109,16 @@ public class Task {
     public int hashCode() {
         return Objects.hash(taskID);
     }
+
+    public void setTaskID(long taskID) {
+        this.taskID = taskID;
+    }
+
+    public Set<BasicTaskSchedule> getBasicTaskSchedules() {
+        return basicTaskSchedules;
+    }
+
+    public void setBasicTaskSchedules(Set<BasicTaskSchedule> basicTaskSchedules) {
+        this.basicTaskSchedules = basicTaskSchedules;
+    }
 }
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
new file mode 100644
index 0000000..785f9ca
--- /dev/null
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -0,0 +1,9 @@
+package core.repositories.timemanager;
+
+import core.entities.timemanager.BasicTaskSchedule;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
+}
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
new file mode 100644
index 0000000..e3cffee
--- /dev/null
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -0,0 +1,30 @@
+package core.services;
+
+import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
+import core.entities.timemanager.BasicTaskSchedule;
+import core.entities.timemanager.Task;
+import core.repositories.timemanager.BasicTaskScheduleRepository;
+import core.repositories.timemanager.TaskRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskScheduleService {
+
+    private final BasicTaskScheduleRepository basicTaskScheduleRepository;
+    private final TaskRepository taskRepository;
+
+    public TaskScheduleService(@Autowired BasicTaskScheduleRepository basicTaskScheduleRepository,
+                               @Autowired TaskRepository taskRepository) {
+        this.basicTaskScheduleRepository = basicTaskScheduleRepository;
+        this.taskRepository = taskRepository;
+    }
+
+    public ServiceResult<BasicTaskSchedule> createBasicTaskSchedule(Task task, BasicTaskScheduleFieldInfo basicTaskScheduleFieldInfo) {
+        BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, basicTaskScheduleFieldInfo.getScheduleDate());
+        task.getBasicTaskSchedules().add(basicTaskSchedule);
+        basicTaskScheduleRepository.save(basicTaskSchedule);
+        taskRepository.save(task);
+        return new ServiceResult<>(basicTaskSchedule);
+    }
+}
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 193e82b..e1d1e18 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -5,6 +5,7 @@ api/account.service.ts
 api/api.ts
 api/login.service.ts
 api/properties.service.ts
+api/schedule.service.ts
 api/task.service.ts
 api/taskgroup.service.ts
 api/users.service.ts
@@ -13,6 +14,8 @@ encoder.ts
 git_push.sh
 index.ts
 model/accountDeleteRequest.ts
+model/basicScheduleEntityInfo.ts
+model/basicScheduleFieldInfo.ts
 model/eMailChangeRequest.ts
 model/inlineResponse200.ts
 model/inlineResponse401.ts
diff --git a/frontend/src/api/api.module.ts b/frontend/src/api/api.module.ts
index eb73404..1781bef 100644
--- a/frontend/src/api/api.module.ts
+++ b/frontend/src/api/api.module.ts
@@ -5,6 +5,7 @@ import { HttpClient } from '@angular/common/http';
 import { AccountService } from './api/account.service';
 import { LoginService } from './api/login.service';
 import { PropertiesService } from './api/properties.service';
+import { ScheduleService } from './api/schedule.service';
 import { TaskService } from './api/task.service';
 import { TaskgroupService } from './api/taskgroup.service';
 import { UsersService } from './api/users.service';
diff --git a/frontend/src/api/api/api.ts b/frontend/src/api/api/api.ts
index 5df9774..15a0982 100644
--- a/frontend/src/api/api/api.ts
+++ b/frontend/src/api/api/api.ts
@@ -4,10 +4,12 @@ export * from './login.service';
 import { LoginService } from './login.service';
 export * from './properties.service';
 import { PropertiesService } from './properties.service';
+export * from './schedule.service';
+import { ScheduleService } from './schedule.service';
 export * from './task.service';
 import { TaskService } from './task.service';
 export * from './taskgroup.service';
 import { TaskgroupService } from './taskgroup.service';
 export * from './users.service';
 import { UsersService } from './users.service';
-export const APIS = [AccountService, LoginService, PropertiesService, TaskService, TaskgroupService, UsersService];
+export const APIS = [AccountService, LoginService, PropertiesService, ScheduleService, TaskService, TaskgroupService, UsersService];
diff --git a/frontend/src/api/api/task.service.ts b/frontend/src/api/api/task.service.ts
index 36cdf7e..9a8fb4f 100644
--- a/frontend/src/api/api/task.service.ts
+++ b/frontend/src/api/api/task.service.ts
@@ -92,14 +92,13 @@ export class TaskService {
      * edits an existing task
      * edits an existing task
      * @param taskID internal id of task
-     * @param taskFieldInfo 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public tasksTaskIDDelete(taskID: number, taskFieldInfo?: TaskFieldInfo, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<SimpleStatusResponse>;
-    public tasksTaskIDDelete(taskID: number, taskFieldInfo?: TaskFieldInfo, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<SimpleStatusResponse>>;
-    public tasksTaskIDDelete(taskID: number, taskFieldInfo?: TaskFieldInfo, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<SimpleStatusResponse>>;
-    public tasksTaskIDDelete(taskID: number, taskFieldInfo?: TaskFieldInfo, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+    public tasksTaskIDDelete(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<SimpleStatusResponse>;
+    public tasksTaskIDDelete(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<SimpleStatusResponse>>;
+    public tasksTaskIDDelete(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<SimpleStatusResponse>>;
+    public tasksTaskIDDelete(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
         if (taskID === null || taskID === undefined) {
             throw new Error('Required parameter taskID was null or undefined when calling tasksTaskIDDelete.');
         }
@@ -131,15 +130,6 @@ export class TaskService {
         }
 
 
-        // to determine the Content-Type header
-        const consumes: string[] = [
-            'application/json'
-        ];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
-        }
-
         let responseType_: 'text' | 'json' = 'json';
         if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
             responseType_ = 'text';
@@ -157,6 +147,65 @@ export class TaskService {
         );
     }
 
+    /**
+     * gets taskdetails
+     * loads information about a given task
+     * @param taskID internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public tasksTaskIDGet(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<TaskEntityInfo>;
+    public tasksTaskIDGet(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<TaskEntityInfo>>;
+    public tasksTaskIDGet(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<TaskEntityInfo>>;
+    public tasksTaskIDGet(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling tasksTaskIDGet.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<TaskEntityInfo>(`${this.configuration.basePath}/tasks/${encodeURIComponent(String(taskID))}`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * edits an existing task
      * edits an existing task
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index 6df1b66..780263c 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -1,4 +1,6 @@
 export * from './accountDeleteRequest';
+export * from './basicScheduleEntityInfo';
+export * from './basicScheduleFieldInfo';
 export * from './eMailChangeRequest';
 export * from './inlineResponse200';
 export * from './inlineResponse401';
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 9777643..14d95c1 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -5,13 +5,15 @@ import {AdminDashboardComponent} from "./admin-dashboard/admin-dashboard.compone
 import {MainComponent} from "./main/main.component";
 import {UserSettingsComponent} from "./user-settings/user-settings.component";
 import {TaskgroupDashboardComponent} from "./taskgroups/taskgroup-dashboard/taskgroup-dashboard.component";
+import {TaskDetailOverviewComponent} from "./tasks/task-detail-overview/task-detail-overview.component";
 
 const routes: Routes = [
   {path: '', component: MainComponent},
   {path: 'admin', component: AdminDashboardComponent},
   {path: 'user/settings', component: UserSettingsComponent},
   {path: 'taskgroups', component: TaskgroupDashboardComponent},
-  {path: 'taskgroups/:taskgroupID', component: TaskgroupDashboardComponent}
+  {path: 'taskgroups/:taskgroupID', component: TaskgroupDashboardComponent},
+  {path: 'taskgroups/:taskgroupID/tasks/:taskID', component: TaskDetailOverviewComponent}
 ];
 
 @NgModule({
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index a133b26..a0a7517 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -53,6 +53,9 @@ import {MatSortModule} from "@angular/material/sort";
 import {MatPaginatorModule} from "@angular/material/paginator";
 import { ClearTaskDialogComponent } from './tasks/clear-task-dialog/clear-task-dialog.component';
 import { NavigationLinkListComponent } from './navigation-link-list/navigation-link-list.component';
+import { TaskDetailOverviewComponent } from './tasks/task-detail-overview/task-detail-overview.component';
+import {MatProgressBarModule} from "@angular/material/progress-bar";
+import {MatExpansionModule} from "@angular/material/expansion";
 
 @NgModule({
   declarations: [
@@ -76,7 +79,8 @@ import { NavigationLinkListComponent } from './navigation-link-list/navigation-l
     TaskEditorComponent,
     TaskDashboardComponent,
     ClearTaskDialogComponent,
-    NavigationLinkListComponent
+    NavigationLinkListComponent,
+    TaskDetailOverviewComponent
   ],
   imports: [
     BrowserModule,
@@ -107,7 +111,9 @@ import { NavigationLinkListComponent } from './navigation-link-list/navigation-l
     FormsModule,
     MatSlideToggleModule,
     MatSortModule,
-    MatPaginatorModule
+    MatPaginatorModule,
+    MatProgressBarModule,
+    MatExpansionModule
   ],
   providers: [
     HttpClientModule,
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.css b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.css
index 481ebb4..532013d 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.css
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.css
@@ -35,3 +35,11 @@ td, th {
   float: right;
   margin-top: 10px;
 }
+
+
+.navLink {
+  text-decoration: underline;
+  color: black;
+  margin-right: 5px;
+  margin-left: 3px;
+}
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
index e9e1ace..030a157 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
@@ -10,7 +10,9 @@
   <table mat-table [dataSource]="datasource" matSort>
     <ng-container matColumnDef="name">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
-      <td mat-cell *matCellDef="let task"> {{task.taskName}} </td>
+      <td mat-cell *matCellDef="let task">
+        <a class="navLink" [routerLink]="['/taskgroups', taskgroupID!, 'tasks', task.taskID]">{{task.taskName}}</a>
+      </td>
     </ng-container>
     <ng-container matColumnDef="eta">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> ETA </th>
diff --git a/openapi.yaml b/openapi.yaml
index fe57c4d..b61ca75 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1095,11 +1095,6 @@ paths:
           schema:
             type: number
             example: 1
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TaskFieldInfo'
       responses:
         200:
           description: Anfrage erfolgreich
@@ -1122,9 +1117,94 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
-  
-
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - task
+      summary: gets taskdetails
+      description: loads information about a given task
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        200:
+          description: Anfrage erfolgreich
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/TaskEntityInfo"
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/{taskID}/{scheduleType}:
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: gets schedules of task
+      summary: gets schedules of task
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+        - name: scheduleType
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: string
+            enum:
+              - BASIC
+              - MODERATE
+              - ADVANCED
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/BasicScheduleEntityInfo'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
 
+      
 components:
   securitySchemes:
    API_TOKEN:
@@ -1437,4 +1517,38 @@ components:
         deadline:
           type: string
           format: date
-          description: date until the task has to be finished
\ No newline at end of file
+          description: date until the task has to be finished
+    BasicScheduleEntityInfo:
+      required:
+        - scheduleID
+        - scheduleDate
+        - startTime
+        - finishedTime
+      additionalProperties: false
+      properties:
+        scheduleID:
+          type: number
+          description: internal id of schedule
+          example: 1
+        scheduleDate:
+          type: string
+          format: date
+          description: date on which the task is scheduled
+        startTime:
+          type: string
+          format: date-time
+          description: date on which the task schedule was started
+        finishedTime:
+          type: string
+          format: date-time
+          description: date on which the tasks schedule was finished
+    BasicScheduleFieldInfo:
+      required:
+        - scheduleDate
+      additionalProperties: false
+      properties:
+        scheduleDate:
+          type: string
+          format: date
+          description: date on which the task is scheduled
+        
\ No newline at end of file
-- 
2.34.1


From 6f5397d8f82c543cd3ef701ef32dd220eb5142e3 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sun, 22 Oct 2023 20:43:20 +0200
Subject: [PATCH 03/50] Design TaskOverview (forgetted files)

---
 frontend/src/api/api/schedule.service.ts      | 152 ++++++++++++++++++
 .../src/api/model/basicScheduleEntityInfo.ts  |  32 ++++
 .../src/api/model/basicScheduleFieldInfo.ts   |  20 +++
 .../task-detail-overview.component.css        |  93 +++++++++++
 .../task-detail-overview.component.html       |  44 +++++
 .../task-detail-overview.component.spec.ts    |  21 +++
 .../task-detail-overview.component.ts         |  68 ++++++++
 7 files changed, 430 insertions(+)
 create mode 100644 frontend/src/api/api/schedule.service.ts
 create mode 100644 frontend/src/api/model/basicScheduleEntityInfo.ts
 create mode 100644 frontend/src/api/model/basicScheduleFieldInfo.ts
 create mode 100644 frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.css
 create mode 100644 frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
 create mode 100644 frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.spec.ts
 create mode 100644 frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts

diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
new file mode 100644
index 0000000..e160412
--- /dev/null
+++ b/frontend/src/api/api/schedule.service.ts
@@ -0,0 +1,152 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+        }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
+import { Observable }                                        from 'rxjs';
+
+import { BasicScheduleEntityInfo } from '../model/models';
+import { SimpleStatusResponse } from '../model/models';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ScheduleService {
+
+    protected basePath = 'http://localhost:8080/api';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+
+
+    private addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        } else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+
+    private addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
+        if (value == null) {
+            return httpParams;
+        }
+
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            } else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key,
+                        (value as Date).toISOString().substr(0, 10));
+                } else {
+                   throw Error("key may not be null if value is Date");
+                }
+            } else {
+                Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
+                    httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        } else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        } else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+
+    /**
+     * gets schedules of task
+     * gets schedules of task
+     * @param taskID internal id of task
+     * @param scheduleType internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesTaskIDScheduleTypeGet(taskID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDScheduleTypeGet(taskID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<BasicScheduleEntityInfo>>>;
+    public schedulesTaskIDScheduleTypeGet(taskID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<BasicScheduleEntityInfo>>>;
+    public schedulesTaskIDScheduleTypeGet(taskID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling schedulesTaskIDScheduleTypeGet.');
+        }
+        if (scheduleType === null || scheduleType === undefined) {
+            throw new Error('Required parameter scheduleType was null or undefined when calling schedulesTaskIDScheduleTypeGet.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<Array<BasicScheduleEntityInfo>>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/${encodeURIComponent(String(scheduleType))}`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}
diff --git a/frontend/src/api/model/basicScheduleEntityInfo.ts b/frontend/src/api/model/basicScheduleEntityInfo.ts
new file mode 100644
index 0000000..4bcb434
--- /dev/null
+++ b/frontend/src/api/model/basicScheduleEntityInfo.ts
@@ -0,0 +1,32 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface BasicScheduleEntityInfo { 
+    /**
+     * internal id of schedule
+     */
+    scheduleID: number;
+    /**
+     * date on which the task is scheduled
+     */
+    scheduleDate: string;
+    /**
+     * date on which the task schedule was started
+     */
+    startTime: string;
+    /**
+     * date on which the tasks schedule was finished
+     */
+    finishedTime: string;
+}
+
diff --git a/frontend/src/api/model/basicScheduleFieldInfo.ts b/frontend/src/api/model/basicScheduleFieldInfo.ts
new file mode 100644
index 0000000..41279ef
--- /dev/null
+++ b/frontend/src/api/model/basicScheduleFieldInfo.ts
@@ -0,0 +1,20 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface BasicScheduleFieldInfo { 
+    /**
+     * date on which the task is scheduled
+     */
+    scheduleDate: string;
+}
+
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.css b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.css
new file mode 100644
index 0000000..70c3167
--- /dev/null
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.css
@@ -0,0 +1,93 @@
+.container {
+  margin: 20px auto;
+  width: 70%;
+}
+
+.spacer {
+  margin-bottom: 2.5%;
+}
+
+
+@media screen and (max-width: 600px) {
+  .container {
+    width: 100%;
+    margin: 20px 10px;
+  }
+}
+
+.yellowBtn {
+  background-color: #f39c12;
+  color: white;
+  border-radius: 0;
+}
+
+.grayBtn {
+  background-color: #444444;
+  color: white;
+  border-radius: 0;
+}
+
+.greenBtn {
+  background-color: #00bc8c;
+  color: white;
+  border-radius: 0;
+}
+
+.lightBlueBtn {
+  background-color: #3498db;
+  color: white;
+  border-radius: 0;
+}
+
+.borderless-btn {
+  border-radius: 0;
+}
+
+.progressbar {
+  color: #00bc8c;
+  background-color: #20ffc5;
+}
+
+.status-indicator {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  margin: 0 auto;
+  display: inline;
+  margin-top: 5px;
+}
+
+.task-header {
+  display: inline-block;
+  margin-right: 10px;
+}
+
+.example-spacer {
+  flex: 1 1 auto;
+}
+
+.task-header-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.left, .right {
+  display: inline;
+}
+
+.left {
+  flex-grow: 4;
+}
+
+::ng-deep .mat-mdc-card-header-text {
+  display: block;
+  width: 100%;
+}
+
+.small-btn {
+  font-size: 0.6rem;
+  background-color: #3498db;
+
+}
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
new file mode 100644
index 0000000..66875ad
--- /dev/null
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -0,0 +1,44 @@
+<div class="container">
+  <app-navigation-link-list #navLinkList [navigationLinks]="defaultNavigationLinkPath"></app-navigation-link-list>
+  <mat-card *ngIf="task != undefined">
+    <mat-card-header>
+      <mat-card-title>
+        <div class="task-header-container">
+          <div class="left">
+            <div>🟢 {{task!.taskName}}</div>
+          </div>
+          <button class="right lightBlueBtn" mat-raised-button style="margin-left: auto">Add Subtask</button>
+        </div>
+      </mat-card-title>
+
+    </mat-card-header>
+    <mat-card-content>
+      <p>ETA: {{task!.eta}} Minuten - Deadline: {{task!.deadline}}</p>
+      <mat-progress-bar [mode]="'determinate'" value="40"></mat-progress-bar>
+    </mat-card-content>
+    <mat-card-actions>
+      <div style="width: 100%">
+        <div style="float: left">
+          <button mat-flat-button class="borderless-btn" color="primary">Schedule</button>
+          <button mat-flat-button class="yellowBtn">Start now</button>
+          <button mat-flat-button class="grayBtn" >Edit</button>
+          <!--<button mat-raised-button>Copy</button>-->
+          <button mat-flat-button class="greenBtn" >Finished</button>
+        </div>
+
+        <div style="float:right;">
+          <button mat-raised-button color="warn">Delete</button>
+        </div>
+
+      </div>
+
+    </mat-card-actions>
+  </mat-card>
+
+  <mat-expansion-panel>
+    <mat-expansion-panel-header>Schedules</mat-expansion-panel-header>
+    <div>
+      <button style="float: right" mat-raised-button color="primary">Add</button>
+    </div>
+  </mat-expansion-panel>
+</div>
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.spec.ts b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.spec.ts
new file mode 100644
index 0000000..cb88139
--- /dev/null
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TaskDetailOverviewComponent } from './task-detail-overview.component';
+
+describe('TaskDetailOverviewComponent', () => {
+  let component: TaskDetailOverviewComponent;
+  let fixture: ComponentFixture<TaskDetailOverviewComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [TaskDetailOverviewComponent]
+    });
+    fixture = TestBed.createComponent(TaskDetailOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000..7488a1f
--- /dev/null
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts
@@ -0,0 +1,68 @@
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
+import {ActivatedRoute} from "@angular/router";
+import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
+import {TaskDashboardComponent} from "../task-dashboard/task-dashboard.component";
+
+@Component({
+  selector: 'app-task-detail-overview',
+  templateUrl: './task-detail-overview.component.html',
+  styleUrls: ['./task-detail-overview.component.css']
+})
+export class TaskDetailOverviewComponent implements OnInit {
+
+  defaultNavigationLinkPath: NavigationLink[] = [
+    {
+      linkText: "Dashboard",
+      routerLink: ['/']
+    },
+    {
+      linkText: "Taskgroups",
+      routerLink: ["/taskgroups"]
+    }
+  ]
+  taskgroups: TaskgroupEntityInfo[] = []
+  taskgroup: TaskgroupEntityInfo | undefined
+  taskgroupPath: TaskgroupEntityInfo[] = []
+  taskgroupID: number = -1;
+  @ViewChild('navLinkList') navLinkListComponent: NavigationLinkListComponent | undefined
+
+  task: TaskEntityInfo | undefined
+
+  constructor(private activatedRoute: ActivatedRoute,
+              private taskgroupService: TaskgroupService,
+              private taskService: TaskService) {
+  }
+
+  ngOnInit(): void {
+    this.activatedRoute.paramMap.subscribe(params => {
+      if (params.has('taskgroupID')) {
+        this.taskgroupID = Number(params.get('taskgroupID'));
+        this.taskgroupService.taskgroupsTaskgroupIDGet(this.taskgroupID).subscribe({
+          next: resp => {
+            this.taskgroups = resp.children
+            this.taskgroupPath = resp.ancestors
+            this.taskgroup = resp.taskgroupInfo;
+            this.navLinkListComponent!.addNavigationLink(this.taskgroup.taskgroupName, ['/taskgroups', this.taskgroup.taskgroupID.toString()])
+            this.taskgroupPath.forEach(taskgroupEntity => {
+              this.navLinkListComponent!.addNavigationLink(taskgroupEntity.taskgroupName, ['/taskgroups', taskgroupEntity.taskgroupID.toString()]);
+            })
+          }
+        })
+      }
+
+      if(params.has('taskID')) {
+        this.taskService.tasksTaskIDGet(Number(params.get('taskID'))).subscribe({
+          next: resp => {
+            this.task = resp;
+          }
+        })
+      }
+    });
+  }
+
+  getStatusOfTask(task: TaskEntityInfo | undefined) {
+    return "green";
+
+  }
+}
-- 
2.34.1


From e6117d1f7e6af373486f9e2c4f30f506b6cf9f93 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 15:44:46 +0200
Subject: [PATCH 04/50] Add information on workedTime, added Scheduler
 Component

---
 backend/.idea/workspace.xml                   | 54 +++++++++----------
 .../timemanager/tasks/TaskEntityInfo.java     | 11 ++++
 .../java/core/entities/timemanager/Task.java  | 14 +++++
 .../src/api/model/basicScheduleEntityInfo.ts  |  8 ++-
 frontend/src/api/model/taskEntityInfo.ts      |  4 ++
 frontend/src/app/app-routing.module.ts        |  4 +-
 frontend/src/app/app.module.ts                |  4 +-
 .../task-detail-overview.component.html       |  4 +-
 openapi.yaml                                  | 11 +++-
 9 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 9e500e1..26b0173 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,13 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleEntityInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicTaskScheduleFieldInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -48,31 +43,31 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "issue-11-angular-update",
-    "last_directory_selection": "D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager",
-    "last_opened_file_path": "D:/Programmierprojekte/Dicewars/client",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "settings.editor.selected.configurable": "swagger",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;issue-11-angular-update&quot;,
+    &quot;last_directory_selection&quot;: &quot;D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Programmierprojekte/Dicewars/client&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;swagger&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "mariadb"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mariadb&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
@@ -99,7 +94,8 @@
       <workItem from="1697958018921" duration="91000" />
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
-      <workItem from="1697989716016" duration="3813000" />
+      <workItem from="1697989716016" duration="3814000" />
+      <workItem from="1698067098771" duration="307000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java
index 4930205..6fb9121 100644
--- a/backend/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java
@@ -20,6 +20,8 @@ public class TaskEntityInfo {
 
     private boolean finished;
 
+    private int workTime;
+
     public TaskEntityInfo(Task task) {
         this.taskID = task.getTaskID();
         this.taskName = task.getTaskName();
@@ -28,6 +30,7 @@ public class TaskEntityInfo {
         this.deadline = task.getDeadline();
         this.overdue = LocalDate.now().isAfter(task.getDeadline());
         this.finished = task.isFinished();
+        this.workTime = task.getWorkTime();
     }
 
     public long getTaskID() {
@@ -85,4 +88,12 @@ public class TaskEntityInfo {
     public void setFinished(boolean finished) {
         this.finished = finished;
     }
+
+    public int getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(int workTime) {
+        this.workTime = workTime;
+    }
 }
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index aa8a9f4..61f07d7 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -29,6 +29,8 @@ public class Task {
     @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private Set<BasicTaskSchedule> basicTaskSchedules;
 
+    private int workTime;
+
     public Task(Taskgroup taskgroup, String taskName, LocalDate startDate, LocalDate deadline, int eta) {
         this.taskgroup = taskgroup;
         this.taskName = taskName;
@@ -97,6 +99,18 @@ public class Task {
         this.finished = finished;
     }
 
+    public int getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(int workTime) {
+        this.workTime = workTime;
+    }
+
+    public void addWorkTime(int workTime) {
+        this.workTime += workTime;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/frontend/src/api/model/basicScheduleEntityInfo.ts b/frontend/src/api/model/basicScheduleEntityInfo.ts
index 4bcb434..794d1ff 100644
--- a/frontend/src/api/model/basicScheduleEntityInfo.ts
+++ b/frontend/src/api/model/basicScheduleEntityInfo.ts
@@ -23,10 +23,14 @@ export interface BasicScheduleEntityInfo {
     /**
      * date on which the task schedule was started
      */
-    startTime: string;
+    startTime?: string;
     /**
      * date on which the tasks schedule was finished
      */
-    finishedTime: string;
+    finishedTime?: string;
+    /**
+     * number in minutes that the schedule was active
+     */
+    activeTime?: number;
 }
 
diff --git a/frontend/src/api/model/taskEntityInfo.ts b/frontend/src/api/model/taskEntityInfo.ts
index ec68fa9..a4bab1f 100644
--- a/frontend/src/api/model/taskEntityInfo.ts
+++ b/frontend/src/api/model/taskEntityInfo.ts
@@ -40,5 +40,9 @@ export interface TaskEntityInfo {
      * determines whether the task is finished
      */
     finished: boolean;
+    /**
+     * number in minutes that was already worked on this task
+     */
+    workTime: number;
 }
 
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 14d95c1..a3778b1 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -6,6 +6,7 @@ import {MainComponent} from "./main/main.component";
 import {UserSettingsComponent} from "./user-settings/user-settings.component";
 import {TaskgroupDashboardComponent} from "./taskgroups/taskgroup-dashboard/taskgroup-dashboard.component";
 import {TaskDetailOverviewComponent} from "./tasks/task-detail-overview/task-detail-overview.component";
+import {SchedulerComponent} from "./schedules/scheduler/scheduler.component";
 
 const routes: Routes = [
   {path: '', component: MainComponent},
@@ -13,7 +14,8 @@ const routes: Routes = [
   {path: 'user/settings', component: UserSettingsComponent},
   {path: 'taskgroups', component: TaskgroupDashboardComponent},
   {path: 'taskgroups/:taskgroupID', component: TaskgroupDashboardComponent},
-  {path: 'taskgroups/:taskgroupID/tasks/:taskID', component: TaskDetailOverviewComponent}
+  {path: 'taskgroups/:taskgroupID/tasks/:taskID', component: TaskDetailOverviewComponent},
+  {path: 'taskgroups/:taskgroupID/tasks/:taskID/schedule', component: SchedulerComponent}
 ];
 
 @NgModule({
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index a0a7517..e4aaf42 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -56,6 +56,7 @@ import { NavigationLinkListComponent } from './navigation-link-list/navigation-l
 import { TaskDetailOverviewComponent } from './tasks/task-detail-overview/task-detail-overview.component';
 import {MatProgressBarModule} from "@angular/material/progress-bar";
 import {MatExpansionModule} from "@angular/material/expansion";
+import { SchedulerComponent } from './schedules/scheduler/scheduler.component';
 
 @NgModule({
   declarations: [
@@ -80,7 +81,8 @@ import {MatExpansionModule} from "@angular/material/expansion";
     TaskDashboardComponent,
     ClearTaskDialogComponent,
     NavigationLinkListComponent,
-    TaskDetailOverviewComponent
+    TaskDetailOverviewComponent,
+    SchedulerComponent
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index 66875ad..c1f1766 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -14,7 +14,7 @@
     </mat-card-header>
     <mat-card-content>
       <p>ETA: {{task!.eta}} Minuten - Deadline: {{task!.deadline}}</p>
-      <mat-progress-bar [mode]="'determinate'" value="40"></mat-progress-bar>
+      <mat-progress-bar [mode]="'determinate'" [value]="task!.workTime"></mat-progress-bar>
     </mat-card-content>
     <mat-card-actions>
       <div style="width: 100%">
@@ -38,7 +38,7 @@
   <mat-expansion-panel>
     <mat-expansion-panel-header>Schedules</mat-expansion-panel-header>
     <div>
-      <button style="float: right" mat-raised-button color="primary">Add</button>
+      <button style="float: right" mat-raised-button color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Add</button>
     </div>
   </mat-expansion-panel>
 </div>
diff --git a/openapi.yaml b/openapi.yaml
index b61ca75..ca9e1d4 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1462,6 +1462,7 @@ components:
         - deadline
         - overdue
         - finished
+        - workTime
       additionalProperties: false
       properties:
         taskID:
@@ -1493,6 +1494,10 @@ components:
           type: boolean
           description: determines whether the task is finished
           example: True
+        workTime:
+          type: number
+          description: number in minutes that was already worked on this task
+          example: 10
     TaskFieldInfo:
       required:
         - taskName
@@ -1522,8 +1527,6 @@ components:
       required:
         - scheduleID
         - scheduleDate
-        - startTime
-        - finishedTime
       additionalProperties: false
       properties:
         scheduleID:
@@ -1542,6 +1545,10 @@ components:
           type: string
           format: date-time
           description: date on which the tasks schedule was finished
+        activeTime: 
+          type: number
+          description: number in minutes that the schedule was active
+          example: 10
     BasicScheduleFieldInfo:
       required:
         - scheduleDate
-- 
2.34.1


From e8bea7abcf703ff9e14f3b2a5a5ea068db50ad9a Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 15:44:58 +0200
Subject: [PATCH 05/50] Scheduler Component

---
 .../scheduler/scheduler.component.css         | 16 +++++
 .../scheduler/scheduler.component.html        |  5 ++
 .../scheduler/scheduler.component.spec.ts     | 21 ++++++
 .../scheduler/scheduler.component.ts          | 70 +++++++++++++++++++
 4 files changed, 112 insertions(+)
 create mode 100644 frontend/src/app/schedules/scheduler/scheduler.component.css
 create mode 100644 frontend/src/app/schedules/scheduler/scheduler.component.html
 create mode 100644 frontend/src/app/schedules/scheduler/scheduler.component.spec.ts
 create mode 100644 frontend/src/app/schedules/scheduler/scheduler.component.ts

diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.css b/frontend/src/app/schedules/scheduler/scheduler.component.css
new file mode 100644
index 0000000..67e8ece
--- /dev/null
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.css
@@ -0,0 +1,16 @@
+.container {
+  margin: 20px auto;
+  width: 70%;
+}
+
+.spacer {
+  margin-bottom: 2.5%;
+}
+
+
+@media screen and (max-width: 600px) {
+  .container {
+    width: 100%;
+    margin: 20px 10px;
+  }
+}
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html
new file mode 100644
index 0000000..86cc339
--- /dev/null
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.html
@@ -0,0 +1,5 @@
+<div class="container">
+  <app-navigation-link-list #navLinkList [navigationLinks]="defaultNavigationLinkPath"></app-navigation-link-list>
+
+
+</div>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.spec.ts b/frontend/src/app/schedules/scheduler/scheduler.component.spec.ts
new file mode 100644
index 0000000..6548836
--- /dev/null
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SchedulerComponent } from './scheduler.component';
+
+describe('SchedulerComponent', () => {
+  let component: SchedulerComponent;
+  let fixture: ComponentFixture<SchedulerComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [SchedulerComponent]
+    });
+    fixture = TestBed.createComponent(SchedulerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
new file mode 100644
index 0000000..57a9a94
--- /dev/null
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -0,0 +1,70 @@
+import {Component, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
+import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
+import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
+import {ActivatedRoute} from "@angular/router";
+
+@Component({
+  selector: 'app-scheduler',
+  templateUrl: './scheduler.component.html',
+  styleUrls: ['./scheduler.component.css']
+})
+export class SchedulerComponent implements OnInit{
+  defaultNavigationLinkPath: NavigationLink[] = [
+    {
+      linkText: "Dashboard",
+      routerLink: ['/']
+    },
+    {
+      linkText: "Taskgroups",
+      routerLink: ["/taskgroups"]
+    }
+  ]
+  taskgroups: TaskgroupEntityInfo[] = []
+  taskgroup: TaskgroupEntityInfo | undefined
+  taskgroupPath: TaskgroupEntityInfo[] = []
+  taskgroupID: number = -1;
+  @ViewChild('navLinkList') navLinkListComponent: NavigationLinkListComponent | undefined
+
+  task: TaskEntityInfo | undefined
+
+  constructor(private activatedRoute: ActivatedRoute,
+              private taskgroupService: TaskgroupService,
+              private taskService: TaskService) {
+  }
+
+  ngOnInit(): void {
+    this.activatedRoute.paramMap.subscribe(params => {
+      if (params.has('taskgroupID')) {
+        this.taskgroupID = Number(params.get('taskgroupID'));
+        this.taskgroupService.taskgroupsTaskgroupIDGet(this.taskgroupID).subscribe({
+          next: resp => {
+            this.taskgroups = resp.children
+            this.taskgroupPath = resp.ancestors
+            this.taskgroup = resp.taskgroupInfo;
+            this.initializeNavigationLinkList()
+          }
+        })
+      }
+
+      if(params.has('taskID')) {
+        this.taskService.tasksTaskIDGet(Number(params.get('taskID'))).subscribe({
+          next: resp => {
+            this.task = resp;
+            this.initializeNavigationLinkList()
+          }
+        })
+      }
+    });
+  }
+
+  initializeNavigationLinkList() {
+    if(this.taskgroup != undefined && this.task != undefined) {
+      this.navLinkListComponent!.addNavigationLink(this.taskgroup!.taskgroupName, ['/taskgroups', this.taskgroup!.taskgroupID.toString()])
+      this.taskgroupPath.forEach(taskgroupEntity => {
+        this.navLinkListComponent!.addNavigationLink(taskgroupEntity.taskgroupName, ['/taskgroups', taskgroupEntity.taskgroupID.toString()]);
+      })
+      this.navLinkListComponent!.addNavigationLink(this.task!.taskName, ['/taskgroups', this.taskgroup!.taskgroupID.toString(), 'tasks', this.task.taskID.toString()]);
+      this.navLinkListComponent!.addNavigationLink('Schedule', [this.taskgroup!.taskgroupID.toString(), 'tasks', this.task.taskID.toString(), 'schedule'])
+    }
+  }
+}
-- 
2.34.1


From 5aac068d21eb8683d9c52bbebf08c8b883567cf8 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 19:56:16 +0200
Subject: [PATCH 06/50] Include basic schedules of tasks

---
 backend/.idea/workspace.xml                   | 14 +++-
 frontend/angular.json                         |  2 +
 frontend/package-lock.json                    | 84 ++++++++++++++++++-
 frontend/package.json                         |  2 +
 frontend/src/api/api/schedule.service.ts      | 71 ++++++++++++++++
 frontend/src/app/app.module.ts                | 13 ++-
 .../basic-scheduler.component.css             |  3 +
 .../basic-scheduler.component.html            |  8 ++
 .../basic-scheduler.component.spec.ts         | 21 +++++
 .../basic-scheduler.component.ts              | 37 ++++++++
 .../scheduler/scheduler.component.css         | 11 +++
 .../scheduler/scheduler.component.html        | 19 +++++
 .../scheduler/scheduler.component.ts          | 74 +++++++++++++++-
 .../task-detail-overview.component.html       |  2 +-
 frontend/src/index.html                       | 17 ++++
 openapi.yaml                                  | 45 +++++++++-
 16 files changed, 408 insertions(+), 15 deletions(-)
 create mode 100644 frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
 create mode 100644 frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
 create mode 100644 frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.spec.ts
 create mode 100644 frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 26b0173..dfb3dad 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <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/api/models/timemanager/tasks/TaskEntityInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskEntityInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/angular.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/angular.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,7 +101,7 @@
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
-      <workItem from="1698067098771" duration="307000" />
+      <workItem from="1698067098771" duration="909000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/frontend/angular.json b/frontend/angular.json
index 724b650..691c23f 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -27,6 +27,7 @@
               "src/assets"
             ],
             "styles": [
+              "node_modules/angular-calendar/css/angular-calendar.css",
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/styles.css"
             ],
@@ -95,6 +96,7 @@
               "src/assets"
             ],
             "styles": [
+              "node_modules/angular-calendar/css/angular-calendar.css",
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/styles.css"
             ],
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b095a07..42f4e47 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,6 +21,8 @@
         "@angular/platform-browser": "^16.2.7",
         "@angular/platform-browser-dynamic": "^16.2.7",
         "@angular/router": "^16.2.7",
+        "angular-calendar": "^0.31.0",
+        "date-fns": "^2.29.3",
         "moment": "^2.29.4",
         "rxjs": "~7.5.0",
         "tslib": "^2.3.0",
@@ -2574,7 +2576,6 @@
       "version": "7.22.6",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
       "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
-      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -3953,6 +3954,11 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@mattlewis92/dom-autoscroller": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz",
+      "integrity": "sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ=="
+    },
     "node_modules/@ngtools/webpack": {
       "version": "16.2.4",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.4.tgz",
@@ -4152,6 +4158,12 @@
         "node": ">=14"
       }
     },
+    "node_modules/@scarf/scarf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.3.0.tgz",
+      "integrity": "sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew==",
+      "hasInstallScript": true
+    },
     "node_modules/@schematics/angular": {
       "version": "16.2.4",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.4.tgz",
@@ -4904,6 +4916,48 @@
         "ajv": "^8.8.2"
       }
     },
+    "node_modules/angular-calendar": {
+      "version": "0.31.0",
+      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.31.0.tgz",
+      "integrity": "sha512-QGPObUmOYLr4IeSaj1pzZjcycN6otYx+SbeezJuujstXR9f2wo4CtMlBQ+SU+ZF5VFfrdYge8qkxMGCLBLBRrw==",
+      "dependencies": {
+        "@scarf/scarf": "^1.1.1",
+        "angular-draggable-droppable": "^8.0.0",
+        "angular-resizable-element": "^7.0.0",
+        "calendar-utils": "^0.10.4",
+        "positioning": "^2.0.1",
+        "tslib": "^2.4.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mattlewis92"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
+    "node_modules/angular-draggable-droppable": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-8.0.0.tgz",
+      "integrity": "sha512-+gpSNBbygjV1pxTxsM3UPJKcXHXJabYoTtKcgQe74rGnb1umKc07XCBD1qDzvlG/kocthvhQ12qfYOYzHnE3ZA==",
+      "dependencies": {
+        "@mattlewis92/dom-autoscroller": "^2.4.2",
+        "tslib": "^2.4.1"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
+    "node_modules/angular-resizable-element": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz",
+      "integrity": "sha512-/BGuNiA38n9klexHO1xgnsA3VYigj9v+jUGjKtBRgfB26bCxZKsNWParSu2k3EqbATrfAJC4Nl8f7cORpJFf4w==",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
@@ -5403,6 +5457,11 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/calendar-utils": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.10.4.tgz",
+      "integrity": "sha512-gBK4xCJ42yjaUKwuUha6cZOfxAmGzvSgbdAaX3xLRioeKbYoOK1x1qeD6dch72rsMZlTgATPbBBx42bnkStqgQ=="
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -6153,6 +6212,21 @@
         "node": ">=10"
       }
     },
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
     "node_modules/date-format": {
       "version": "4.0.14",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
@@ -10574,6 +10648,11 @@
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
+    "node_modules/positioning": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/positioning/-/positioning-2.0.1.tgz",
+      "integrity": "sha512-DsAgM42kV/ObuwlRpAzDTjH9E8fGKkMDJHWFX+kfNXSxh7UCCQxEmdjv/Ws5Ft1XDnt3JT8fIDYeKNSE2TbttA=="
+    },
     "node_modules/postcss": {
       "version": "8.4.27",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
@@ -10974,8 +11053,7 @@
     "node_modules/regenerator-runtime": {
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-      "dev": true
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
diff --git a/frontend/package.json b/frontend/package.json
index 0c876cd..5e11c63 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -23,6 +23,8 @@
     "@angular/platform-browser": "^16.2.7",
     "@angular/platform-browser-dynamic": "^16.2.7",
     "@angular/router": "^16.2.7",
+    "angular-calendar": "^0.31.0",
+    "date-fns": "^2.29.3",
     "moment": "^2.29.4",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index e160412..01ae69a 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -19,6 +19,7 @@ import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { BasicScheduleEntityInfo } from '../model/models';
+import { BasicScheduleFieldInfo } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
@@ -86,6 +87,76 @@ export class ScheduleService {
         return httpParams;
     }
 
+    /**
+     * creates basic schedule for task
+     * creates a basic schedule for a task
+     * @param taskID internal id of task
+     * @param basicScheduleFieldInfo 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesTaskIDBasicPut(taskID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<BasicScheduleEntityInfo>;
+    public schedulesTaskIDBasicPut(taskID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDBasicPut(taskID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDBasicPut(taskID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling schedulesTaskIDBasicPut.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.put<BasicScheduleEntityInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/basic`,
+            basicScheduleFieldInfo,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * gets schedules of task
      * gets schedules of task
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index e4aaf42..59c0925 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -45,7 +45,7 @@ import {MatTableModule} from "@angular/material/table";
 import {MatCheckboxModule} from "@angular/material/checkbox";
 import {MatCardModule} from "@angular/material/card";
 import {MatListModule} from "@angular/material/list";
-import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule} from "@angular/material/core";
+import {MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule} from "@angular/material/core";
 import {MatMomentDateModule, MomentDateModule} from "@angular/material-moment-adapter";
 import { TaskDashboardComponent } from './tasks/task-dashboard/task-dashboard.component';
 import {MatSlideToggleModule} from "@angular/material/slide-toggle";
@@ -57,6 +57,10 @@ import { TaskDetailOverviewComponent } from './tasks/task-detail-overview/task-d
 import {MatProgressBarModule} from "@angular/material/progress-bar";
 import {MatExpansionModule} from "@angular/material/expansion";
 import { SchedulerComponent } from './schedules/scheduler/scheduler.component';
+import { CalendarModule, DateAdapter } from 'angular-calendar';
+import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
+import {MatSelectModule} from "@angular/material/select";
+import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
 
 @NgModule({
   declarations: [
@@ -82,7 +86,8 @@ import { SchedulerComponent } from './schedules/scheduler/scheduler.component';
     ClearTaskDialogComponent,
     NavigationLinkListComponent,
     TaskDetailOverviewComponent,
-    SchedulerComponent
+    SchedulerComponent,
+    BasicSchedulerComponent
   ],
   imports: [
     BrowserModule,
@@ -115,7 +120,9 @@ import { SchedulerComponent } from './schedules/scheduler/scheduler.component';
     MatSortModule,
     MatPaginatorModule,
     MatProgressBarModule,
-    MatExpansionModule
+    MatExpansionModule,
+    CalendarModule.forRoot({provide: DateAdapter, useFactory: adapterFactory}),
+    MatSelectModule
   ],
   providers: [
     HttpClientModule,
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
new file mode 100644
index 0000000..c7acb4b
--- /dev/null
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
@@ -0,0 +1,3 @@
+mat-form-field {
+  width: 100%;
+}
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
new file mode 100644
index 0000000..45f414c
--- /dev/null
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
@@ -0,0 +1,8 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="picker" [formControl]="dateCtrl">
+  <mat-hint>MM/DD/YYYY</mat-hint>
+  <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
+
+<button mat-raised-button color="primary" (click)="schedule()">Schedule</button>
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.spec.ts b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.spec.ts
new file mode 100644
index 0000000..c816df5
--- /dev/null
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BasicSchedulerComponent } from './basic-scheduler.component';
+
+describe('BasicSchedulerComponent', () => {
+  let component: BasicSchedulerComponent;
+  let fixture: ComponentFixture<BasicSchedulerComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [BasicSchedulerComponent]
+    });
+    fixture = TestBed.createComponent(BasicSchedulerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts
new file mode 100644
index 0000000..c53d01d
--- /dev/null
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts
@@ -0,0 +1,37 @@
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {FormControl, Validators} from "@angular/forms";
+import {BasicScheduleEntityInfo, ScheduleService, TaskEntityInfo} from "../../../api";
+import {MatSnackBar} from "@angular/material/snack-bar";
+
+@Component({
+  selector: 'app-basic-scheduler',
+  templateUrl: './basic-scheduler.component.html',
+  styleUrls: ['./basic-scheduler.component.css']
+})
+export class BasicSchedulerComponent {
+
+  dateCtrl: FormControl = new FormControl('', [Validators.required])
+  @Input('task') task: TaskEntityInfo | undefined
+  @Output('onSchedule') scheduleEmitter: EventEmitter<BasicScheduleEntityInfo> = new EventEmitter<BasicScheduleEntityInfo>();
+
+  constructor(private scheduleService: ScheduleService,
+              private snackbar: MatSnackBar) {
+  }
+
+  setDate(date: Date) {
+    this.dateCtrl.setValue(date);
+  }
+
+  schedule() {
+    if(this.task != undefined) {
+      this.scheduleService.schedulesTaskIDBasicPut(this.task.taskID, {
+        scheduleDate: this.dateCtrl.value
+      }).subscribe({
+        next: resp => {
+          this.scheduleEmitter.emit(resp);
+        }
+      })
+    }
+
+  }
+}
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.css b/frontend/src/app/schedules/scheduler/scheduler.component.css
index 67e8ece..c59e314 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.css
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.css
@@ -14,3 +14,14 @@
     margin: 20px 10px;
   }
 }
+
+.schedule-header {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.long-form {
+  width: 100%;
+}
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html
index 86cc339..9542e2a 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.html
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.html
@@ -1,5 +1,24 @@
+
 <div class="container">
   <app-navigation-link-list #navLinkList [navigationLinks]="defaultNavigationLinkPath"></app-navigation-link-list>
 
+  <div class="schedule-header">
+    <h1>Monday, {{ viewDate | calendarDate:(view + 'ViewTitle'):'en':1 }}</h1>
+      <mat-form-field style="float:right;">
+        <mat-label>Schedule Strategy</mat-label>
+        <mat-select [(ngModel)]="scheduleStrategy">
+          <mat-option [value]="1">Basic</mat-option>
+          <mat-option [value]="2">Moderate</mat-option>
+          <mat-option [value]="3">Advanced</mat-option>
+        </mat-select>
+      </mat-form-field>
+  </div>
+  <mwl-calendar-week-view [viewDate]="viewDate" [daysInWeek]="daysInWeek" [dayStartHour]="7" [dayEndHour]="21" [refresh]="refresh"
+                          (dayHeaderClicked)="timeClick($event.day.date)"
+                          (hourSegmentClicked)="timeClick($event.date)" [events]="events"
+  >
+  </mwl-calendar-week-view>
+
+  <app-basic-scheduler #basicScheduler [task]="task" (onSchedule)="onBasicSchedule($event)"></app-basic-scheduler>
 
 </div>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index 57a9a94..d1398ae 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -1,8 +1,34 @@
-import {Component, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
 import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
-import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
+import {
+  BasicScheduleEntityInfo,
+  TaskEntityInfo,
+  TaskgroupEntityInfo,
+  TaskgroupService,
+  TaskService
+} from "../../../api";
 import {ActivatedRoute} from "@angular/router";
+import {CalendarDateFormatter, CalendarEvent, CalendarView} from "angular-calendar";
+import { Subject } from 'rxjs';
+import {CalendarDatePipe} from "angular-calendar/modules/common/calendar-date/calendar-date.pipe";
+import {BasicSchedulerComponent} from "../basic-scheduler/basic-scheduler.component";
+import * as events from "events";
+import { EventColor } from 'calendar-utils';
 
+const colors: Record<string, EventColor> = {
+  red: {
+    primary: '#ad2121',
+    secondary: '#FAE3E3',
+  },
+  blue: {
+    primary: '#1e90ff',
+    secondary: '#D1E8FF',
+  },
+  yellow: {
+    primary: '#e3bc08',
+    secondary: '#FDF1BA',
+  },
+};
 @Component({
   selector: 'app-scheduler',
   templateUrl: './scheduler.component.html',
@@ -26,6 +52,31 @@ export class SchedulerComponent implements OnInit{
   @ViewChild('navLinkList') navLinkListComponent: NavigationLinkListComponent | undefined
 
   task: TaskEntityInfo | undefined
+  scheduleStrategy: number = 1
+
+
+  /**************************************************/
+  //Calendar-Stuff
+  /**************************************************/
+  view: CalendarView = CalendarView.Week;
+  viewDate = new Date();
+  daysInWeek = 7;
+  refresh: Subject<void> = new Subject<void>()
+  events: CalendarEvent[] = [
+    {
+      title: 'An all day event',
+      color: colors['yellow'],
+      start: new Date(),
+      allDay: true,
+    },
+    {
+      title: 'A non all day event',
+      color: colors['blue'],
+      start: new Date(),
+    },
+  ]
+
+  @ViewChild('basicScheduler') basicScheduler: BasicSchedulerComponent | undefined
 
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
@@ -67,4 +118,23 @@ export class SchedulerComponent implements OnInit{
       this.navLinkListComponent!.addNavigationLink('Schedule', [this.taskgroup!.taskgroupID.toString(), 'tasks', this.task.taskID.toString(), 'schedule'])
     }
   }
+
+  protected readonly CalendarView = CalendarView;
+
+  timeClick(clickedDate: Date) {
+    if(this.basicScheduler != undefined) {
+      this.basicScheduler.setDate(clickedDate)
+    }
+  }
+
+  onBasicSchedule(scheduleInfo: BasicScheduleEntityInfo) {
+    this.events.push({
+      start: new Date(scheduleInfo.scheduleDate),
+      title: this.task!.taskName,
+      color: colors['red'],
+      allDay: true
+    })
+    this.refresh.next();
+    console.log(this.events)
+  }
 }
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index c1f1766..ae6a38a 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -35,7 +35,7 @@
     </mat-card-actions>
   </mat-card>
 
-  <mat-expansion-panel>
+  <mat-expansion-panel *ngIf="taskgroup != undefined && task != undefined">
     <mat-expansion-panel-header>Schedules</mat-expansion-panel-header>
     <div>
       <button style="float: right" mat-raised-button color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Add</button>
diff --git a/frontend/src/index.html b/frontend/src/index.html
index fb9a46a..90ebf21 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -13,5 +13,22 @@
 </head>
 <body class="mat-typography">
   <app-root></app-root>
+
+  <style type="text/css">
+
+    .cal-week-view .cal-time-events {
+      max-height: 400px;
+      overflow-y: auto;
+    }
+
+    .cal-day-headers {
+
+    }
+
+    .cal-day-columns {
+      height: 100%;
+    }
+
+  </style>
 </body>
 </html>
diff --git a/openapi.yaml b/openapi.yaml
index ca9e1d4..2d4b63f 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1203,8 +1203,49 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
-
-      
+  /schedules/{taskID}/basic:
+    put:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: creates a basic schedule for a task
+      summary: creates basic schedule for task
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasicScheduleFieldInfo'
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/BasicScheduleEntityInfo'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
 components:
   securitySchemes:
    API_TOKEN:
-- 
2.34.1


From 40a8a5fa13e4f3557eb43be91df5c212dda0bb7e Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 20:17:31 +0200
Subject: [PATCH 07/50] Visualize Basic Schedules

---
 backend/.idea/workspace.xml                   | 15 ++++++------
 .../scheduler/scheduler.component.html        |  2 +-
 .../scheduler/scheduler.component.ts          | 24 ++++++++++++++++---
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index dfb3dad..a573d41 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,15 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <change beforePath="$PROJECT_DIR$/../frontend/angular.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/angular.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -101,7 +95,7 @@
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
-      <workItem from="1698067098771" duration="909000" />
+      <workItem from="1698067098771" duration="2156000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -175,6 +169,11 @@
           <line>52</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
+          <line>36</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html
index 9542e2a..df2a7db 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.html
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.html
@@ -19,6 +19,6 @@
   >
   </mwl-calendar-week-view>
 
-  <app-basic-scheduler #basicScheduler [task]="task" (onSchedule)="onBasicSchedule($event)"></app-basic-scheduler>
+  <app-basic-scheduler *ngIf="scheduleStrategy === 1" #basicScheduler [task]="task" (onSchedule)="onBasicSchedule($event)"></app-basic-scheduler>
 
 </div>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index d1398ae..ee1abf5 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
 import {
-  BasicScheduleEntityInfo,
+  BasicScheduleEntityInfo, ScheduleService,
   TaskEntityInfo,
   TaskgroupEntityInfo,
   TaskgroupService,
@@ -80,7 +80,8 @@ export class SchedulerComponent implements OnInit{
 
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
-              private taskService: TaskService) {
+              private taskService: TaskService,
+              private scheduleService: ScheduleService) {
   }
 
   ngOnInit(): void {
@@ -102,6 +103,7 @@ export class SchedulerComponent implements OnInit{
           next: resp => {
             this.task = resp;
             this.initializeNavigationLinkList()
+            this.fetchBasicSchedules();
           }
         })
       }
@@ -135,6 +137,22 @@ export class SchedulerComponent implements OnInit{
       allDay: true
     })
     this.refresh.next();
-    console.log(this.events)
+  }
+
+  fetchBasicSchedules() {
+    this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
+      next: resp => {
+        resp.forEach(basicSchedule => {
+          this.events.push({
+            start: new Date(basicSchedule.scheduleDate),
+            title: this.task!.taskName,
+            color: colors['red'],
+            allDay: true
+          })
+        })
+        this.refresh.next();
+      }
+    })
+
   }
 }
-- 
2.34.1


From c598515899b8297371aa837043248c3293c3f1c9 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 20:34:39 +0200
Subject: [PATCH 08/50] Complete Basic Task Visualization in CalendarScheduler

---
 .../scheduler/scheduler.component.html        |  2 +-
 .../scheduler/scheduler.component.ts          | 37 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html
index df2a7db..ae24991 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.html
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.html
@@ -15,7 +15,7 @@
   </div>
   <mwl-calendar-week-view [viewDate]="viewDate" [daysInWeek]="daysInWeek" [dayStartHour]="7" [dayEndHour]="21" [refresh]="refresh"
                           (dayHeaderClicked)="timeClick($event.day.date)"
-                          (hourSegmentClicked)="timeClick($event.date)" [events]="events"
+                          (hourSegmentClicked)="timeClick($event.date)" [events]="events" (eventClicked)="eventClicked($event)"
   >
   </mwl-calendar-week-view>
 
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index ee1abf5..0f274fd 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -7,7 +7,7 @@ import {
   TaskgroupService,
   TaskService
 } from "../../../api";
-import {ActivatedRoute} from "@angular/router";
+import {ActivatedRoute, Router} from "@angular/router";
 import {CalendarDateFormatter, CalendarEvent, CalendarView} from "angular-calendar";
 import { Subject } from 'rxjs';
 import {CalendarDatePipe} from "angular-calendar/modules/common/calendar-date/calendar-date.pipe";
@@ -62,26 +62,15 @@ export class SchedulerComponent implements OnInit{
   viewDate = new Date();
   daysInWeek = 7;
   refresh: Subject<void> = new Subject<void>()
-  events: CalendarEvent[] = [
-    {
-      title: 'An all day event',
-      color: colors['yellow'],
-      start: new Date(),
-      allDay: true,
-    },
-    {
-      title: 'A non all day event',
-      color: colors['blue'],
-      start: new Date(),
-    },
-  ]
+  events: CalendarEvent[] = []
 
   @ViewChild('basicScheduler') basicScheduler: BasicSchedulerComponent | undefined
 
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
               private taskService: TaskService,
-              private scheduleService: ScheduleService) {
+              private scheduleService: ScheduleService,
+              private router: Router) {
   }
 
   ngOnInit(): void {
@@ -145,9 +134,9 @@ export class SchedulerComponent implements OnInit{
         resp.forEach(basicSchedule => {
           this.events.push({
             start: new Date(basicSchedule.scheduleDate),
-            title: this.task!.taskName,
+            title: this.computeTaskPath(),
             color: colors['red'],
-            allDay: true
+            allDay: true,
           })
         })
         this.refresh.next();
@@ -155,4 +144,18 @@ export class SchedulerComponent implements OnInit{
     })
 
   }
+
+  eventClicked({ event }: { event: CalendarEvent }): void {
+    this.router.navigateByUrl("/taskgroups/" + this.taskgroupID.toString() + "/tasks/" + this.task!.taskID )
+  }
+
+  computeTaskPath() {
+    let result = "";
+    this.taskgroupPath.forEach(taskgroupPathPart => {
+      result += taskgroupPathPart.taskgroupName + "/"
+    });
+    result += this.taskgroup!.taskgroupName + "/"
+    result += this.task!.taskName
+    return result;
+  }
 }
-- 
2.34.1


From 662277c2376e2188b470125c4f89f75f4e176d54 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 21:08:44 +0200
Subject: [PATCH 09/50] Create ScheduleDashboard

---
 backend/.idea/workspace.xml                   |  7 +++--
 frontend/src/app/app.module.ts                |  5 ++--
 .../schedule-dashboard.component.css          | 14 ++++++++++
 .../schedule-dashboard.component.html         | 17 ++++++++++++
 .../schedule-dashboard.component.spec.ts      | 21 +++++++++++++++
 .../schedule-dashboard.component.ts           | 27 +++++++++++++++++++
 .../task-detail-overview.component.html       |  5 ++--
 7 files changed, 88 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.css
 create mode 100644 frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
 create mode 100644 frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.spec.ts
 create mode 100644 frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index a573d41..f33cb1b 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,7 +94,7 @@
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
-      <workItem from="1698067098771" duration="2156000" />
+      <workItem from="1698067098771" duration="2794000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 59c0925..f4794ee 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -61,7 +61,7 @@ import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import {MatSelectModule} from "@angular/material/select";
 import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
-
+import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -87,7 +87,8 @@ import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-sched
     NavigationLinkListComponent,
     TaskDetailOverviewComponent,
     SchedulerComponent,
-    BasicSchedulerComponent
+    BasicSchedulerComponent,
+    ScheduleDashboardComponent
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.css b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.css
new file mode 100644
index 0000000..aead524
--- /dev/null
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.css
@@ -0,0 +1,14 @@
+.basicScheduleContainer {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.basicScheduleContent {
+  display: inline;
+}
+
+.scheduleContainer {
+  margin-bottom: 5px;
+}
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
new file mode 100644
index 0000000..479f31b
--- /dev/null
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
@@ -0,0 +1,17 @@
+<mat-card *ngFor="let schedule of schedules" class="scheduleContainer">
+  <mat-card-content>
+    <div class="basicScheduleContainer">
+      <p class="basicScheduleContent">{{schedule.scheduleDate | date:'EEEE, d MMM. y'}}</p>
+      <div class="basicScheduleContent">
+        <button mat-icon-button color="primary"><mat-icon>edit</mat-icon></button>
+        <button mat-icon-button color="warn"><mat-icon>delete</mat-icon></button>
+      </div>
+    </div>
+
+
+
+
+  </mat-card-content>
+</mat-card>
+
+<button style="float: right" mat-raised-button color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Add</button>
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.spec.ts b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.spec.ts
new file mode 100644
index 0000000..f7bb43b
--- /dev/null
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ScheduleDashboardComponent } from './schedule-dashboard.component';
+
+describe('ScheduleDashboardComponent', () => {
+  let component: ScheduleDashboardComponent;
+  let fixture: ComponentFixture<ScheduleDashboardComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ScheduleDashboardComponent]
+    });
+    fixture = TestBed.createComponent(ScheduleDashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts
new file mode 100644
index 0000000..274a085
--- /dev/null
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts
@@ -0,0 +1,27 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {BasicScheduleEntityInfo, ScheduleService, TaskEntityInfo, TaskgroupEntityInfo} from "../../../api";
+
+@Component({
+  selector: 'app-schedule-dashboard',
+  templateUrl: './schedule-dashboard.component.html',
+  styleUrls: ['./schedule-dashboard.component.css']
+})
+export class ScheduleDashboardComponent implements OnInit{
+
+  @Input('taskgroup')  taskgroup: TaskgroupEntityInfo | undefined
+  @Input('task') task: TaskEntityInfo | undefined
+
+  schedules: BasicScheduleEntityInfo[] = []
+
+  constructor(private scheduleService: ScheduleService) {
+
+  }
+
+  ngOnInit() {
+    this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
+      next: resp => {
+        this.schedules = resp;
+      }
+    })
+  }
+}
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index ae6a38a..86fece0 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -35,10 +35,11 @@
     </mat-card-actions>
   </mat-card>
 
-  <mat-expansion-panel *ngIf="taskgroup != undefined && task != undefined">
+
+  <mat-expansion-panel *ngIf="taskgroup != undefined && task != undefined" style="margin-top: 20px" expanded>
     <mat-expansion-panel-header>Schedules</mat-expansion-panel-header>
     <div>
-      <button style="float: right" mat-raised-button color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Add</button>
+      <app-schedule-dashboard [taskgroup]="taskgroup" [task]="task"></app-schedule-dashboard>
     </div>
   </mat-expansion-panel>
 </div>
-- 
2.34.1


From d6d267c645ed1aaa4ee52c63e625b44076d73c8b Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Mon, 23 Oct 2023 21:35:42 +0200
Subject: [PATCH 10/50] Delete Schedules

---
 backend/.idea/workspace.xml                   |   8 +-
 .../api/controller/ScheduleController.java    |  28 ++-
 .../BasicTaskScheduleRepository.java          |   9 +
 .../core/services/TaskScheduleService.java    |  17 ++
 frontend/src/api/.openapi-generator/FILES     |   1 +
 frontend/src/api/api/schedule.service.ts      | 189 ++++++++++++++++++
 frontend/src/api/model/models.ts              |   1 +
 frontend/src/api/model/scheduleInfo.ts        |  35 ++++
 .../schedule-dashboard.component.html         |   2 +-
 .../schedule-dashboard.component.ts           |  25 ++-
 openapi.yaml                                  | 133 +++++++++++-
 11 files changed, 438 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/api/model/scheduleInfo.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index f33cb1b..aa00851 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,8 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html" afterDir="false" />
+      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,7 +96,7 @@
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
-      <workItem from="1698067098771" duration="2794000" />
+      <workItem from="1698067098771" duration="4010000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 29de764..be5271d 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -67,13 +67,33 @@ public class ScheduleController {
         return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(creationResult.getResult()));
     }
 
-    @PostMapping("/schedules/{scheduleID}/{scheduleType}")
-    public ResponseEntity<?> editScheduledTask(@PathVariable long scheduleID, @PathVariable ScheduleType scheduleType) {
-        return null;
+    @PostMapping("/schedules/{scheduleID}/basic")
+    public ResponseEntity<?> editScheduledTask(@PathVariable long scheduleID, @Valid @RequestBody BasicTaskScheduleFieldInfo basicTaskScheduleFieldInfo) {
+        PermissionResult<BasicTaskSchedule> permissionResult = taskScheduleService.getSchedulePermissions(scheduleID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!permissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(permissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        taskScheduleService.reschedule(permissionResult.getResult(), basicTaskScheduleFieldInfo);
+        return ResponseEntity.ok(new SimpleStatusResponse("success"));
     }
 
     @DeleteMapping("/schedules/{scheduleID}/{scheduleType}")
     public ResponseEntity<?> deleteScheduledTask(@PathVariable long scheduleID, @PathVariable ScheduleType scheduleType) {
-        return null;
+        PermissionResult<BasicTaskSchedule> permissionResult = taskScheduleService.getSchedulePermissions(scheduleID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!permissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(permissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        taskScheduleService.deleteBasicSchedule(permissionResult.getResult());
+        return ResponseEntity.ok(new SimpleStatusResponse("success"));
     }
 }
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
index 785f9ca..eea760f 100644
--- a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -1,9 +1,18 @@
 package core.repositories.timemanager;
 
 import core.entities.timemanager.BasicTaskSchedule;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
+
 @Repository
 public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
+
+    @Modifying
+    @Transactional
+    @Query(value = "DELETE FROM BasicTaskSchedule bts WHERE bts.scheduleID = ?1")
+    void deleteBasicTaskScheduleByID(long id);
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index e3cffee..4b97ed2 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -8,6 +8,8 @@ import core.repositories.timemanager.TaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 public class TaskScheduleService {
 
@@ -27,4 +29,19 @@ public class TaskScheduleService {
         taskRepository.save(task);
         return new ServiceResult<>(basicTaskSchedule);
     }
+
+    public PermissionResult<BasicTaskSchedule> getSchedulePermissions(long scheduleID, String name) {
+        Optional<BasicTaskSchedule> basicSchedule = basicTaskScheduleRepository.findById(scheduleID);
+        return basicSchedule.map(value -> new PermissionResult<>(value, value.getTask().getTaskgroup().getUser().getUsername().equals(name))).orElseGet(() ->
+                new PermissionResult<>(ServiceExitCode.MISSING_ENTITY));
+    }
+
+    public void reschedule(BasicTaskSchedule basicTaskSchedule, BasicTaskScheduleFieldInfo basicTaskScheduleFieldInfo) {
+        basicTaskSchedule.setScheduleDate(basicTaskScheduleFieldInfo.getScheduleDate());
+        basicTaskScheduleRepository.save(basicTaskSchedule);
+    }
+
+    public void deleteBasicSchedule(BasicTaskSchedule basicTaskSchedule) {
+        basicTaskScheduleRepository.deleteBasicTaskScheduleByID(basicTaskSchedule.getScheduleID());
+    }
 }
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index e1d1e18..23d2f54 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -28,6 +28,7 @@ model/passwordChangeRequest.ts
 model/propertiesInfo.ts
 model/propertyInfo.ts
 model/propertyUpdateRequest.ts
+model/scheduleInfo.ts
 model/signUpRequest.ts
 model/simpleStatusResponse.ts
 model/taskEntityInfo.ts
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index 01ae69a..8f7757d 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -20,6 +20,7 @@ import { Observable }                                        from 'rxjs';
 
 import { BasicScheduleEntityInfo } from '../model/models';
 import { BasicScheduleFieldInfo } from '../model/models';
+import { ScheduleInfo } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
@@ -87,6 +88,194 @@ export class ScheduleService {
         return httpParams;
     }
 
+    /**
+     * gets all schedules of user
+     * gets all schedules of user
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<ScheduleInfo>>;
+    public schedulesGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<ScheduleInfo>>>;
+    public schedulesGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<ScheduleInfo>>>;
+    public schedulesGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<Array<ScheduleInfo>>(`${this.configuration.basePath}/schedules`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * reschedules task
+     * reschedules a task
+     * @param scheduleID internal id of schedule
+     * @param basicScheduleFieldInfo 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesScheduleIDBasicPost(scheduleID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<SimpleStatusResponse>;
+    public schedulesScheduleIDBasicPost(scheduleID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<SimpleStatusResponse>>;
+    public schedulesScheduleIDBasicPost(scheduleID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<SimpleStatusResponse>>;
+    public schedulesScheduleIDBasicPost(scheduleID: number, basicScheduleFieldInfo?: BasicScheduleFieldInfo, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (scheduleID === null || scheduleID === undefined) {
+            throw new Error('Required parameter scheduleID was null or undefined when calling schedulesScheduleIDBasicPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<SimpleStatusResponse>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(scheduleID))}/basic`,
+            basicScheduleFieldInfo,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * deletes schedule
+     * deletes a schedule
+     * @param scheduleID internal id of schedule
+     * @param scheduleType internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesScheduleIDScheduleTypeDelete(scheduleID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<SimpleStatusResponse>;
+    public schedulesScheduleIDScheduleTypeDelete(scheduleID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<SimpleStatusResponse>>;
+    public schedulesScheduleIDScheduleTypeDelete(scheduleID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<SimpleStatusResponse>>;
+    public schedulesScheduleIDScheduleTypeDelete(scheduleID: number, scheduleType: 'BASIC' | 'MODERATE' | 'ADVANCED', observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (scheduleID === null || scheduleID === undefined) {
+            throw new Error('Required parameter scheduleID was null or undefined when calling schedulesScheduleIDScheduleTypeDelete.');
+        }
+        if (scheduleType === null || scheduleType === undefined) {
+            throw new Error('Required parameter scheduleType was null or undefined when calling schedulesScheduleIDScheduleTypeDelete.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.delete<SimpleStatusResponse>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(scheduleID))}/${encodeURIComponent(String(scheduleType))}`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * creates basic schedule for task
      * creates a basic schedule for a task
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index 780263c..8d70e8b 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -12,6 +12,7 @@ export * from './passwordChangeRequest';
 export * from './propertiesInfo';
 export * from './propertyInfo';
 export * from './propertyUpdateRequest';
+export * from './scheduleInfo';
 export * from './signUpRequest';
 export * from './simpleStatusResponse';
 export * from './taskEntityInfo';
diff --git a/frontend/src/api/model/scheduleInfo.ts b/frontend/src/api/model/scheduleInfo.ts
new file mode 100644
index 0000000..fed9334
--- /dev/null
+++ b/frontend/src/api/model/scheduleInfo.ts
@@ -0,0 +1,35 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { BasicScheduleEntityInfo } from './basicScheduleEntityInfo';
+
+
+export interface ScheduleInfo { 
+    /**
+     * internal id of schedule
+     */
+    scheduleID: number;
+    /**
+     * type of schedule
+     */
+    scheduleType: ScheduleInfo.ScheduleTypeEnum;
+    schedule: BasicScheduleEntityInfo;
+}
+export namespace ScheduleInfo {
+    export type ScheduleTypeEnum = 'BASIC' | 'MODERATE' | 'ADVANCED';
+    export const ScheduleTypeEnum = {
+        Basic: 'BASIC' as ScheduleTypeEnum,
+        Moderate: 'MODERATE' as ScheduleTypeEnum,
+        Advanced: 'ADVANCED' as ScheduleTypeEnum
+    };
+}
+
+
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
index 479f31b..2118056 100644
--- a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
@@ -4,7 +4,7 @@
       <p class="basicScheduleContent">{{schedule.scheduleDate | date:'EEEE, d MMM. y'}}</p>
       <div class="basicScheduleContent">
         <button mat-icon-button color="primary"><mat-icon>edit</mat-icon></button>
-        <button mat-icon-button color="warn"><mat-icon>delete</mat-icon></button>
+        <button mat-icon-button color="warn" (click)="deleteSchedule(schedule)"><mat-icon>delete</mat-icon></button>
       </div>
     </div>
 
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts
index 274a085..82de4b0 100644
--- a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {BasicScheduleEntityInfo, ScheduleService, TaskEntityInfo, TaskgroupEntityInfo} from "../../../api";
+import {MatSnackBar} from "@angular/material/snack-bar";
 
 @Component({
   selector: 'app-schedule-dashboard',
@@ -13,7 +14,8 @@ export class ScheduleDashboardComponent implements OnInit{
 
   schedules: BasicScheduleEntityInfo[] = []
 
-  constructor(private scheduleService: ScheduleService) {
+  constructor(private scheduleService: ScheduleService,
+              private snackbar: MatSnackBar) {
 
   }
 
@@ -24,4 +26,25 @@ export class ScheduleDashboardComponent implements OnInit{
       }
     })
   }
+
+  reschedule() {
+    //todo
+  }
+
+  deleteSchedule(deletedSchedule: BasicScheduleEntityInfo) {
+    this.scheduleService.schedulesScheduleIDScheduleTypeDelete(deletedSchedule.scheduleID, 'BASIC').subscribe({
+      next: resp => {
+        this.schedules = this.schedules.filter(schedule => schedule.scheduleID !== deletedSchedule.scheduleID);
+      },
+      error: err => {
+        if(err.status == 403) {
+          this.snackbar.open("No permission", "", {duration: 2000});
+        } else if(err.status == 404) {
+          this.snackbar.open("Schedule not found", "", {duration: 2000});
+        } else {
+          this.snackbar.open("Unexpected error", "",{duration: 2000});
+        }
+      }
+    })
+  }
 }
diff --git a/openapi.yaml b/openapi.yaml
index 2d4b63f..c6b2492 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1154,6 +1154,24 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules:
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: gets all schedules of user
+      summary: gets all schedules of user
+      responses:
+        200:
+          description: request successfull
+          content:
+            application/json:
+              schema:
+                type: array
+                items: 
+                  $ref: '#/components/schemas/ScheduleInfo'
+
   /schedules/{taskID}/{scheduleType}:
     get:
       security:
@@ -1246,6 +1264,97 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/{scheduleID}/basic:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: reschedules a task
+      summary:  reschedules task
+      parameters:
+        - name: scheduleID
+          in: path
+          description: internal id of schedule
+          required: true
+          schema:
+            type: number
+            example: 1
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasicScheduleFieldInfo'
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/SimpleStatusResponse'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/{scheduleID}/{scheduleType}:
+    delete:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: deletes a schedule
+      summary:  deletes schedule
+      parameters:
+        - name: scheduleID
+          in: path
+          description: internal id of schedule
+          required: true
+          schema:
+            type: number
+            example: 1
+        - name: scheduleType
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: string
+            enum:
+              - BASIC
+              - MODERATE
+              - ADVANCED
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/SimpleStatusResponse'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
 components:
   securitySchemes:
    API_TOKEN:
@@ -1599,4 +1708,26 @@ components:
           type: string
           format: date
           description: date on which the task is scheduled
-        
\ No newline at end of file
+    ScheduleInfo:
+      required:
+        - scheduleID
+        - scheduleType
+        - schedule
+      additionalProperties: false
+      properties:
+        scheduleID:
+          type: number
+          description: internal id of schedule
+          example: 1
+        scheduleType:
+          type: string
+          description: type of schedule
+          example: BASIC
+          enum:
+            - BASIC
+            - MODERATE
+            - ADVANCED
+        schedule:
+          type: object
+          oneOf:
+            - $ref: '#/components/schemas/BasicScheduleEntityInfo'
-- 
2.34.1


From e2d871f7fbe2b308f966b31ebd75e4ed6fb87ee5 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 08:20:42 +0200
Subject: [PATCH 11/50] Reschedule Tasks (Basicschedules)

---
 backend/.idea/workspace.xml                   | 24 ++++---
 frontend/src/app/app-routing.module.ts        |  3 +-
 .../basic-scheduler.component.css             | 16 ++++-
 .../basic-scheduler.component.html            | 17 +++--
 .../basic-scheduler.component.ts              | 65 +++++++++++++++----
 .../schedule-dashboard.component.html         |  2 +-
 .../scheduler/scheduler.component.html        |  2 +-
 .../scheduler/scheduler.component.ts          | 49 +++++++++++---
 8 files changed, 136 insertions(+), 42 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index aa00851..6aad4ea 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,11 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Define Entity BasicTaskSchedule and Taskcontroller">
-      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,7 +95,7 @@
       <workItem from="1697958118995" duration="5749000" />
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
-      <workItem from="1698067098771" duration="4010000" />
+      <workItem from="1698067098771" duration="4770000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -146,7 +145,15 @@
       <option name="project" value="LOCAL" />
       <updated>1697976314517</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Delete Schedules">
+      <option name="closed" value="true" />
+      <created>1698089745245</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1698089745245</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -160,7 +167,8 @@
     <MESSAGE value="Delete and clear Tasks" />
     <MESSAGE value="Delete and clear Tasks (Frontend)" />
     <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
-    <option name="LAST_COMMIT_MESSAGE" value="Define Entity BasicTaskSchedule and Taskcontroller" />
+    <MESSAGE value="Delete Schedules" />
+    <option name="LAST_COMMIT_MESSAGE" value="Delete Schedules" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index a3778b1..076bea8 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -15,7 +15,8 @@ const routes: Routes = [
   {path: 'taskgroups', component: TaskgroupDashboardComponent},
   {path: 'taskgroups/:taskgroupID', component: TaskgroupDashboardComponent},
   {path: 'taskgroups/:taskgroupID/tasks/:taskID', component: TaskDetailOverviewComponent},
-  {path: 'taskgroups/:taskgroupID/tasks/:taskID/schedule', component: SchedulerComponent}
+  {path: 'taskgroups/:taskgroupID/tasks/:taskID/schedule', component: SchedulerComponent},
+  {path: 'taskgroups/:taskgroupID/tasks/:taskID/schedule/:scheduleID', component: SchedulerComponent}
 ];
 
 @NgModule({
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
index c7acb4b..344ec8b 100644
--- a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.css
@@ -1,3 +1,15 @@
-mat-form-field {
-  width: 100%;
+.scheduleContainer {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+mat-form-field {
+  width: 80%;
+}
+
+.scheduleBtn {
+  float: right;
+  margin-top: 10px;
 }
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
index 45f414c..0a25912 100644
--- a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.html
@@ -1,8 +1,11 @@
-<mat-form-field>
-  <input matInput [matDatepicker]="picker" [formControl]="dateCtrl">
-  <mat-hint>MM/DD/YYYY</mat-hint>
-  <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
-  <mat-datepicker #picker></mat-datepicker>
-</mat-form-field>
+<div class="scheduler-container">
+  <mat-form-field>
+    <input matInput [matDatepicker]="picker" [formControl]="dateCtrl">
+    <mat-hint>MM/DD/YYYY</mat-hint>
+    <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
+    <mat-datepicker #picker></mat-datepicker>
+  </mat-form-field>
+
+  <button class="scheduleBtn" mat-raised-button color="primary" (click)="schedule()">Schedule</button>
+</div>
 
-<button mat-raised-button color="primary" (click)="schedule()">Schedule</button>
diff --git a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts
index c53d01d..b5dd17c 100644
--- a/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts
+++ b/frontend/src/app/schedules/basic-scheduler/basic-scheduler.component.ts
@@ -1,21 +1,25 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from '@angular/core';
 import {FormControl, Validators} from "@angular/forms";
-import {BasicScheduleEntityInfo, ScheduleService, TaskEntityInfo} from "../../../api";
+import {BasicScheduleEntityInfo, ScheduleService, TaskEntityInfo, TaskgroupEntityInfo} from "../../../api";
 import {MatSnackBar} from "@angular/material/snack-bar";
+import {Router} from "@angular/router";
 
 @Component({
   selector: 'app-basic-scheduler',
   templateUrl: './basic-scheduler.component.html',
   styleUrls: ['./basic-scheduler.component.css']
 })
-export class BasicSchedulerComponent {
+export class BasicSchedulerComponent implements OnChanges{
 
   dateCtrl: FormControl = new FormControl('', [Validators.required])
+  @Input('taskgroup') taskgroup: TaskgroupEntityInfo | undefined
   @Input('task') task: TaskEntityInfo | undefined
+  @Input('scheduleInfo') scheduleEntityInfo: BasicScheduleEntityInfo | undefined
   @Output('onSchedule') scheduleEmitter: EventEmitter<BasicScheduleEntityInfo> = new EventEmitter<BasicScheduleEntityInfo>();
 
   constructor(private scheduleService: ScheduleService,
-              private snackbar: MatSnackBar) {
+              private snackbar: MatSnackBar,
+              private router: Router) {
   }
 
   setDate(date: Date) {
@@ -24,14 +28,51 @@ export class BasicSchedulerComponent {
 
   schedule() {
     if(this.task != undefined) {
-      this.scheduleService.schedulesTaskIDBasicPut(this.task.taskID, {
-        scheduleDate: this.dateCtrl.value
-      }).subscribe({
-        next: resp => {
-          this.scheduleEmitter.emit(resp);
-        }
-      })
-    }
+      if(this.scheduleEntityInfo == undefined) {
+        this.scheduleService.schedulesTaskIDBasicPut(this.task.taskID, {
+          scheduleDate: this.dateCtrl.value
+        }).subscribe({
+          next: resp => {
+            this.scheduleEmitter.emit(resp);
+          }
+        })
+      } else {
+        this.scheduleService.schedulesScheduleIDBasicPost(this.scheduleEntityInfo!.scheduleID, {
+          scheduleDate: this.dateCtrl.value
+        }).subscribe({
+          next: resp => {
+            this.router.navigateByUrl("/taskgroups/" + this.taskgroup!.taskgroupID + "/tasks/" + this.task!.taskID);
+          },
+          error: err => {
+            if(err.status == 403) {
+              this.snackbar.open("No permission", "",{duration: 2000});
+            } else if(err.status == 404) {
+              this.snackbar.open("Not found", "", {duration: 2000});
+            } else {
+              this.snackbar.open("Unexpected error", "",{duration: 2000});
+            }
+          }
+        })
+      }
 
+    }
+  }
+
+  ngOnInit(): void {
+    if(this.scheduleEntityInfo != undefined) {
+      this.dateCtrl.setValue(this.scheduleEntityInfo!.scheduleID)
+    }
+  }
+
+  ngOnChanges(): void {
+    if(this.scheduleEntityInfo != undefined) {
+      this.dateCtrl.setValue(this.scheduleEntityInfo!.scheduleID)
+    }
+  }
+
+  setEditedBasicSchedule(basicSchedule: BasicScheduleEntityInfo) {
+    this.dateCtrl.setValue(basicSchedule.scheduleDate)
+    this.scheduleEntityInfo = basicSchedule;
+    console.log(this.dateCtrl.value)
   }
 }
diff --git a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
index 2118056..1eb8a54 100644
--- a/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
+++ b/frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html
@@ -3,7 +3,7 @@
     <div class="basicScheduleContainer">
       <p class="basicScheduleContent">{{schedule.scheduleDate | date:'EEEE, d MMM. y'}}</p>
       <div class="basicScheduleContent">
-        <button mat-icon-button color="primary"><mat-icon>edit</mat-icon></button>
+        <button mat-icon-button color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule', schedule.scheduleID]"><mat-icon>edit</mat-icon></button>
         <button mat-icon-button color="warn" (click)="deleteSchedule(schedule)"><mat-icon>delete</mat-icon></button>
       </div>
     </div>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html
index ae24991..73e2dc4 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.html
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.html
@@ -19,6 +19,6 @@
   >
   </mwl-calendar-week-view>
 
-  <app-basic-scheduler *ngIf="scheduleStrategy === 1" #basicScheduler [task]="task" (onSchedule)="onBasicSchedule($event)"></app-basic-scheduler>
+  <app-basic-scheduler *ngIf="scheduleStrategy === 1" #basicScheduler [task]="task" [taskgroup]="taskgroup" (onSchedule)="onBasicSchedule($event)"></app-basic-scheduler>
 
 </div>
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index 0f274fd..aaa61e2 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -129,19 +129,48 @@ export class SchedulerComponent implements OnInit{
   }
 
   fetchBasicSchedules() {
-    this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
-      next: resp => {
-        resp.forEach(basicSchedule => {
-          this.events.push({
-            start: new Date(basicSchedule.scheduleDate),
-            title: this.computeTaskPath(),
-            color: colors['red'],
-            allDay: true,
+    this.activatedRoute.paramMap.subscribe(params => {
+      if(params.has('scheduleID')) {
+        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
+            next: resp => {
+              resp.forEach(basicSchedule => {
+                if(basicSchedule.scheduleID === Number(params.get('scheduleID'))) {
+                  this.events.push({
+                    start: new Date(basicSchedule.scheduleDate),
+                    title: this.computeTaskPath(),
+                    color: colors['yellow'],
+                    allDay: true,
+                  })
+                  this.basicScheduler?.setEditedBasicSchedule(basicSchedule);
+                } else {
+                  this.events.push({
+                    start: new Date(basicSchedule.scheduleDate),
+                    title: this.computeTaskPath(),
+                    color: colors['red'],
+                    allDay: true,
+                  })
+                }
+              })
+                this.refresh.next();
+            }
           })
+      } else {
+        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
+          next: resp => {
+            resp.forEach(basicSchedule => {
+              this.events.push({
+                start: new Date(basicSchedule.scheduleDate),
+                title: this.computeTaskPath(),
+                color: colors['red'],
+                allDay: true,
+              })
+            })
+            this.refresh.next();
+          }
         })
-        this.refresh.next();
       }
-    })
+    });
+
 
   }
 
-- 
2.34.1


From 713dc1b06d228ed7dfe03c6e68baa789291c1ae9 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 08:22:17 +0200
Subject: [PATCH 12/50] Functionality of Schedule Direct Btn

---
 .../task-detail-overview/task-detail-overview.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index 86fece0..d6a8a39 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -19,7 +19,7 @@
     <mat-card-actions>
       <div style="width: 100%">
         <div style="float: left">
-          <button mat-flat-button class="borderless-btn" color="primary">Schedule</button>
+          <button mat-flat-button class="borderless-btn" color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Schedule</button>
           <button mat-flat-button class="yellowBtn">Start now</button>
           <button mat-flat-button class="grayBtn" >Edit</button>
           <!--<button mat-raised-button>Copy</button>-->
-- 
2.34.1


From 7707831463105c7c4075cceae127f7272a6e0450 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 08:47:02 +0200
Subject: [PATCH 13/50] Adapt Backend and OpenAPI description to fetch all
 schedules

---
 backend/.idea/workspace.xml                   | 13 ++-
 .../api/controller/ScheduleController.java    | 27 +++++-
 .../AbstractScheduleShortInfo.java            |  4 +
 .../taskSchedule/BasicScheduleShortInfo.java  | 22 +++++
 .../taskSchedule/ScheduleInfo.java            | 83 +++++++++++++++++++
 .../BasicTaskScheduleRepository.java          |  9 ++
 .../core/services/TaskScheduleService.java    | 21 ++++-
 frontend/src/api/api/schedule.service.ts      | 55 ++++++++++++
 frontend/src/api/model/scheduleInfo.ts        | 16 +++-
 openapi.yaml                                  | 35 +++++++-
 10 files changed, 276 insertions(+), 9 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 6aad4ea..dd44bae 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/schedule-dashboard/schedule-dashboard.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,6 +100,7 @@
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
       <workItem from="1698067098771" duration="4770000" />
+      <workItem from="1698127431684" duration="1530000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -180,7 +185,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>36</line>
+          <line>41</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index be5271d..3b1482f 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -3,9 +3,11 @@ package core.api.controller;
 import core.api.models.auth.SimpleStatusResponse;
 import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
 import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
+import core.api.models.timemanager.taskSchedule.ScheduleInfo;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
 import core.entities.timemanager.Task;
+import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.services.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -24,10 +26,13 @@ public class ScheduleController {
 
     private final TaskService taskService;
     private final TaskScheduleService taskScheduleService;
+    private final BasicTaskScheduleRepository basicTaskScheduleRepository;
 
-    public ScheduleController(@Autowired TaskService taskService, @Autowired TaskScheduleService taskScheduleService) {
+    public ScheduleController(@Autowired TaskService taskService, @Autowired TaskScheduleService taskScheduleService,
+                              BasicTaskScheduleRepository basicTaskScheduleRepository) {
         this.taskService = taskService;
         this.taskScheduleService = taskScheduleService;
+        this.basicTaskScheduleRepository = basicTaskScheduleRepository;
     }
 
     @GetMapping("/schedules/{taskID}/{scheduleType}")
@@ -96,4 +101,24 @@ public class ScheduleController {
         taskScheduleService.deleteBasicSchedule(permissionResult.getResult());
         return ResponseEntity.ok(new SimpleStatusResponse("success"));
     }
+
+    @GetMapping("/schedules/today")
+    public ResponseEntity<?> loadTodaysSchedules() {
+        ServiceResult<List<BasicTaskSchedule>> todaysSchedules = taskScheduleService.loadTodaysSchedule(SecurityContextHolder.getContext().getAuthentication().getName());
+        if(todaysSchedules.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(todaysSchedules.getResult().stream().map(ScheduleInfo::new).toList());
+        }
+    }
+
+    @GetMapping("/schedules")
+    public ResponseEntity<?> loadSchedules() {
+        ServiceResult<List<BasicTaskSchedule>> schedules = taskScheduleService.loadSchedules(SecurityContextHolder.getContext().getAuthentication().getName());
+        if(schedules.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(schedules.getResult().stream().map(ScheduleInfo::new).toList());
+        }
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java
new file mode 100644
index 0000000..1cc5365
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java
@@ -0,0 +1,4 @@
+package core.api.models.timemanager.taskSchedule;
+
+public abstract class AbstractScheduleShortInfo {
+}
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java
new file mode 100644
index 0000000..2ba9de1
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java
@@ -0,0 +1,22 @@
+package core.api.models.timemanager.taskSchedule;
+
+import core.entities.timemanager.BasicTaskSchedule;
+
+import java.time.LocalDate;
+
+public class BasicScheduleShortInfo extends AbstractScheduleShortInfo {
+
+    private LocalDate scheduleDate;
+
+    public BasicScheduleShortInfo(BasicTaskSchedule basicTaskSchedule) {
+        this.scheduleDate = basicTaskSchedule.getScheduleDate();
+    }
+
+    public LocalDate getScheduleDate() {
+        return scheduleDate;
+    }
+
+    public void setScheduleDate(LocalDate scheduleDate) {
+        this.scheduleDate = scheduleDate;
+    }
+}
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
new file mode 100644
index 0000000..8896515
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
@@ -0,0 +1,83 @@
+package core.api.models.timemanager.taskSchedule;
+
+import core.entities.timemanager.BasicTaskSchedule;
+import core.entities.timemanager.ScheduleType;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class ScheduleInfo {
+
+    private long scheduleID;
+    private ScheduleType scheduleType;
+    private LocalDateTime startTime;
+
+    private LocalDateTime finishTime;
+    private int activeMinutes;
+
+    private AbstractScheduleShortInfo schedule;
+
+    public ScheduleInfo(BasicTaskSchedule basicTaskSchedule) {
+        this.scheduleID = basicTaskSchedule.getScheduleID();
+        this.scheduleType = ScheduleType.BASIC;
+        this.startTime = basicTaskSchedule.getStartTime();
+        this.finishTime = basicTaskSchedule.getFinishedTime();
+
+        if(this.finishTime == null) {
+            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDate.now()).toMinutes();
+        } else {
+            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
+        }
+
+        this.schedule = new BasicScheduleShortInfo(basicTaskSchedule);
+    }
+
+    public long getScheduleID() {
+        return scheduleID;
+    }
+
+    public void setScheduleID(long scheduleID) {
+        this.scheduleID = scheduleID;
+    }
+
+    public ScheduleType getScheduleType() {
+        return scheduleType;
+    }
+
+    public void setScheduleType(ScheduleType scheduleType) {
+        this.scheduleType = scheduleType;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public int getActiveMinutes() {
+        return activeMinutes;
+    }
+
+    public void setActiveMinutes(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+
+    public AbstractScheduleShortInfo getSchedule() {
+        return schedule;
+    }
+
+    public void setSchedule(AbstractScheduleShortInfo schedule) {
+        this.schedule = schedule;
+    }
+}
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
index eea760f..f37b1e0 100644
--- a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -1,5 +1,6 @@
 package core.repositories.timemanager;
 
+import core.entities.User;
 import core.entities.timemanager.BasicTaskSchedule;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -7,6 +8,8 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.time.LocalDate;
+import java.util.List;
 
 @Repository
 public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
@@ -15,4 +18,10 @@ public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSch
     @Transactional
     @Query(value = "DELETE FROM BasicTaskSchedule bts WHERE bts.scheduleID = ?1")
     void deleteBasicTaskScheduleByID(long id);
+
+    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1")
+    List<BasicTaskSchedule> findAllByUser(User user);
+
+    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1 AND bts.scheduleDate = ?2")
+    List<BasicTaskSchedule> findAllByUserAndDate(User user, LocalDate localDate);
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 4b97ed2..8e15e3b 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -1,13 +1,17 @@
 package core.services;
 
 import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
+import core.entities.User;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.Task;
+import core.repositories.UserRepository;
 import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.repositories.timemanager.TaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -15,11 +19,14 @@ public class TaskScheduleService {
 
     private final BasicTaskScheduleRepository basicTaskScheduleRepository;
     private final TaskRepository taskRepository;
+    private final UserRepository userRepository;
 
     public TaskScheduleService(@Autowired BasicTaskScheduleRepository basicTaskScheduleRepository,
-                               @Autowired TaskRepository taskRepository) {
+                               @Autowired TaskRepository taskRepository,
+                               UserRepository userRepository) {
         this.basicTaskScheduleRepository = basicTaskScheduleRepository;
         this.taskRepository = taskRepository;
+        this.userRepository = userRepository;
     }
 
     public ServiceResult<BasicTaskSchedule> createBasicTaskSchedule(Task task, BasicTaskScheduleFieldInfo basicTaskScheduleFieldInfo) {
@@ -44,4 +51,16 @@ public class TaskScheduleService {
     public void deleteBasicSchedule(BasicTaskSchedule basicTaskSchedule) {
         basicTaskScheduleRepository.deleteBasicTaskScheduleByID(basicTaskSchedule.getScheduleID());
     }
+
+    public ServiceResult<List<BasicTaskSchedule>> loadTodaysSchedule(String username) {
+        Optional<User> user = userRepository.findByUsername(username);
+        return user.map(value -> new ServiceResult<>(basicTaskScheduleRepository.findAllByUserAndDate(value, LocalDate.now()))).orElseGet(() ->
+                new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
+    }
+
+    public ServiceResult<List<BasicTaskSchedule>> loadSchedules(String username) {
+        Optional<User> user = userRepository.findByUsername(username);
+        return user.map(value -> new ServiceResult<>(basicTaskScheduleRepository.findAllByUser(value))).orElseGet(() ->
+                new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
+    }
 }
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index 8f7757d..fc0089c 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -409,4 +409,59 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * get today\&#39;s schedules
+     * get all schedules of today
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<ScheduleInfo>>;
+    public schedulesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<ScheduleInfo>>>;
+    public schedulesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<ScheduleInfo>>>;
+    public schedulesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<Array<ScheduleInfo>>(`${this.configuration.basePath}/schedules/today`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }
diff --git a/frontend/src/api/model/scheduleInfo.ts b/frontend/src/api/model/scheduleInfo.ts
index fed9334..a6d33d1 100644
--- a/frontend/src/api/model/scheduleInfo.ts
+++ b/frontend/src/api/model/scheduleInfo.ts
@@ -9,7 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-import { BasicScheduleEntityInfo } from './basicScheduleEntityInfo';
+import { BasicScheduleFieldInfo } from './basicScheduleFieldInfo';
 
 
 export interface ScheduleInfo { 
@@ -21,7 +21,19 @@ export interface ScheduleInfo {
      * type of schedule
      */
     scheduleType: ScheduleInfo.ScheduleTypeEnum;
-    schedule: BasicScheduleEntityInfo;
+    /**
+     * date on which the task schedule was started
+     */
+    startTime: string;
+    /**
+     * date on which the tasks schedule was finished
+     */
+    finishedTime?: string;
+    /**
+     * number in minutes that the schedule was active
+     */
+    activeMinutes: number;
+    schedule: BasicScheduleFieldInfo;
 }
 export namespace ScheduleInfo {
     export type ScheduleTypeEnum = 'BASIC' | 'MODERATE' | 'ADVANCED';
diff --git a/openapi.yaml b/openapi.yaml
index c6b2492..12df4ea 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1355,6 +1355,24 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/today:
+    get: 
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: get all schedules of today
+      summary: get today's schedules
+      responses:
+        200:
+          description: Operation successfull
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ScheduleInfo'
+      
 components:
   securitySchemes:
    API_TOKEN:
@@ -1712,6 +1730,9 @@ components:
       required:
         - scheduleID
         - scheduleType
+        - startTime
+        - finishTime
+        - activeMinutes
         - schedule
       additionalProperties: false
       properties:
@@ -1727,7 +1748,19 @@ components:
             - BASIC
             - MODERATE
             - ADVANCED
+        startTime:
+          type: string
+          format: date-time
+          description: date on which the task schedule was started
+        finishedTime:
+          type: string
+          format: date-time
+          description: date on which the tasks schedule was finished
+        activeMinutes: 
+          type: number
+          description: number in minutes that the schedule was active
+          example: 10
         schedule:
           type: object
           oneOf:
-            - $ref: '#/components/schemas/BasicScheduleEntityInfo'
+            - $ref: '#/components/schemas/BasicScheduleFieldInfo'
\ No newline at end of file
-- 
2.34.1


From bd82fb9f8157c3c38bd562cd48dc137bec2e858c Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:22:56 +0200
Subject: [PATCH 14/50] Deliver Schedule Path Info when fetching Schedules

---
 backend/.idea/workspace.xml                   | 12 ++-
 .../taskSchedule/ScheduleInfo.java            | 33 ++++++++-
 .../timemanager/tasks/TaskShortInfo.java      | 30 ++++++++
 .../scheduler/scheduler.component.ts          | 74 +++++++------------
 4 files changed, 93 insertions(+), 56 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index dd44bae..9fdd8b6 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,13 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java" afterDir="false" />
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +97,8 @@
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
       <workItem from="1698067098771" duration="4770000" />
-      <workItem from="1698127431684" duration="1530000" />
+      <workItem from="1698127431684" duration="2039000" />
+      <workItem from="1698164397550" duration="2329000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
index 8896515..fd0656d 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
@@ -1,11 +1,15 @@
 package core.api.models.timemanager.taskSchedule;
 
+import core.api.models.timemanager.taskgroup.TaskgroupEntityInfo;
+import core.api.models.timemanager.tasks.TaskShortInfo;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
+import core.entities.timemanager.Taskgroup;
 
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 public class ScheduleInfo {
 
@@ -15,22 +19,29 @@ public class ScheduleInfo {
 
     private LocalDateTime finishTime;
     private int activeMinutes;
-
     private AbstractScheduleShortInfo schedule;
 
+    private List<TaskgroupEntityInfo> taskgroupPath;
+
+    private TaskShortInfo task;
+
     public ScheduleInfo(BasicTaskSchedule basicTaskSchedule) {
         this.scheduleID = basicTaskSchedule.getScheduleID();
         this.scheduleType = ScheduleType.BASIC;
         this.startTime = basicTaskSchedule.getStartTime();
         this.finishTime = basicTaskSchedule.getFinishedTime();
 
-        if(this.finishTime == null) {
+        if(this.finishTime == null && this.startTime != null) {
             this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDate.now()).toMinutes();
-        } else {
+        } else if(this.startTime != null){
             this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
         }
 
         this.schedule = new BasicScheduleShortInfo(basicTaskSchedule);
+        this.task = new TaskShortInfo(basicTaskSchedule.getTask());
+        List<Taskgroup> taskgroupPath = Taskgroup.getAncestorList(basicTaskSchedule.getTask().getTaskgroup());
+        taskgroupPath.add(basicTaskSchedule.getTask().getTaskgroup());
+        this.taskgroupPath = taskgroupPath.stream().map(TaskgroupEntityInfo::new).toList();
     }
 
     public long getScheduleID() {
@@ -80,4 +91,20 @@ public class ScheduleInfo {
     public void setSchedule(AbstractScheduleShortInfo schedule) {
         this.schedule = schedule;
     }
+
+    public List<TaskgroupEntityInfo> getTaskgroupPath() {
+        return taskgroupPath;
+    }
+
+    public void setTaskgroupPath(List<TaskgroupEntityInfo> taskgroupPath) {
+        this.taskgroupPath = taskgroupPath;
+    }
+
+    public TaskShortInfo getTask() {
+        return task;
+    }
+
+    public void setTask(TaskShortInfo task) {
+        this.task = task;
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java
new file mode 100644
index 0000000..c1e5c6b
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java
@@ -0,0 +1,30 @@
+package core.api.models.timemanager.tasks;
+
+import core.entities.timemanager.Task;
+
+public class TaskShortInfo {
+
+    private long taskID;
+    private String taskName;
+
+    public TaskShortInfo(Task task) {
+        this.taskID = task.getTaskID();
+        this.taskName = task.getTaskName();
+    }
+
+    public long getTaskID() {
+        return taskID;
+    }
+
+    public void setTaskID(long taskID) {
+        this.taskID = taskID;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+}
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index aaa61e2..a5aea85 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -5,7 +5,7 @@ import {
   TaskEntityInfo,
   TaskgroupEntityInfo,
   TaskgroupService,
-  TaskService
+  TaskService, TaskShortInfo
 } from "../../../api";
 import {ActivatedRoute, Router} from "@angular/router";
 import {CalendarDateFormatter, CalendarEvent, CalendarView} from "angular-calendar";
@@ -49,6 +49,7 @@ export class SchedulerComponent implements OnInit{
   taskgroup: TaskgroupEntityInfo | undefined
   taskgroupPath: TaskgroupEntityInfo[] = []
   taskgroupID: number = -1;
+  scheduleID: number = -1;
   @ViewChild('navLinkList') navLinkListComponent: NavigationLinkListComponent | undefined
 
   task: TaskEntityInfo | undefined
@@ -92,10 +93,14 @@ export class SchedulerComponent implements OnInit{
           next: resp => {
             this.task = resp;
             this.initializeNavigationLinkList()
-            this.fetchBasicSchedules();
+            this.fetschSchedules();
           }
         })
       }
+
+      if(params.has('scheduleID')) {
+        this.scheduleID = Number(params.get('scheduleID'));
+      }
     });
   }
 
@@ -128,63 +133,40 @@ export class SchedulerComponent implements OnInit{
     this.refresh.next();
   }
 
-  fetchBasicSchedules() {
-    this.activatedRoute.paramMap.subscribe(params => {
-      if(params.has('scheduleID')) {
-        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
-            next: resp => {
-              resp.forEach(basicSchedule => {
-                if(basicSchedule.scheduleID === Number(params.get('scheduleID'))) {
-                  this.events.push({
-                    start: new Date(basicSchedule.scheduleDate),
-                    title: this.computeTaskPath(),
-                    color: colors['yellow'],
-                    allDay: true,
-                  })
-                  this.basicScheduler?.setEditedBasicSchedule(basicSchedule);
-                } else {
-                  this.events.push({
-                    start: new Date(basicSchedule.scheduleDate),
-                    title: this.computeTaskPath(),
-                    color: colors['red'],
-                    allDay: true,
-                  })
-                }
-              })
-                this.refresh.next();
-            }
-          })
-      } else {
-        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
-          next: resp => {
-            resp.forEach(basicSchedule => {
-              this.events.push({
-                start: new Date(basicSchedule.scheduleDate),
-                title: this.computeTaskPath(),
-                color: colors['red'],
-                allDay: true,
-              })
+  fetschSchedules() {
+    this.scheduleService.schedulesGet().subscribe({
+      next: resp => {
+        resp.forEach(schedule => {
+          let color: EventColor = colors['red']
+          if(schedule.scheduleID === this.scheduleID) {
+            color = colors['yellow']
+          }
+
+          if(schedule.scheduleType === 'BASIC') {
+            this.events.push({
+              start: new Date(schedule.schedule.scheduleDate),
+              title: this.computeTaskPath(schedule.taskgroupPath, schedule.task),
+              color: color,
+              allDay: true,
             })
-            this.refresh.next();
           }
         })
+        this.refresh.next();
       }
-    });
-
-
+    })
   }
 
   eventClicked({ event }: { event: CalendarEvent }): void {
     this.router.navigateByUrl("/taskgroups/" + this.taskgroupID.toString() + "/tasks/" + this.task!.taskID )
   }
 
-  computeTaskPath() {
+  computeTaskPath(taskgroupPath: TaskgroupEntityInfo[], task: TaskShortInfo | TaskEntityInfo) {
     let result = "";
-    this.taskgroupPath.forEach(taskgroupPathPart => {
+    taskgroupPath.forEach(taskgroupPathPart => {
       result += taskgroupPathPart.taskgroupName + "/"
     });
-    result += this.taskgroup!.taskgroupName + "/"
-    result += this.task!.taskName
+    result += task!.taskName
     return result;
   }
+
 }
-- 
2.34.1


From d4dd66073efe695fd53ae2da33a88f9aefc3ec9b Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:22:56 +0200
Subject: [PATCH 15/50] Deliver Schedule Path Info when fetching Schedules

---
 backend/.idea/workspace.xml                   | 12 ++-
 .../taskSchedule/ScheduleInfo.java            | 33 ++++++++-
 .../timemanager/tasks/TaskShortInfo.java      | 30 ++++++++
 frontend/src/api/.openapi-generator/FILES     |  1 +
 frontend/src/api/model/models.ts              |  1 +
 frontend/src/api/model/scheduleInfo.ts        |  4 +
 frontend/src/api/model/taskShortInfo.ts       | 24 ++++++
 .../scheduler/scheduler.component.ts          | 74 +++++++------------
 openapi.yaml                                  | 26 ++++++-
 9 files changed, 148 insertions(+), 57 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java
 create mode 100644 frontend/src/api/model/taskShortInfo.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index dd44bae..9fdd8b6 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,13 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/AbstractScheduleShortInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/BasicScheduleShortInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java" afterDir="false" />
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +97,8 @@
       <workItem from="1697969480767" duration="6407000" />
       <workItem from="1697989716016" duration="3814000" />
       <workItem from="1698067098771" duration="4770000" />
-      <workItem from="1698127431684" duration="1530000" />
+      <workItem from="1698127431684" duration="2039000" />
+      <workItem from="1698164397550" duration="2329000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
index 8896515..fd0656d 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
@@ -1,11 +1,15 @@
 package core.api.models.timemanager.taskSchedule;
 
+import core.api.models.timemanager.taskgroup.TaskgroupEntityInfo;
+import core.api.models.timemanager.tasks.TaskShortInfo;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
+import core.entities.timemanager.Taskgroup;
 
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 public class ScheduleInfo {
 
@@ -15,22 +19,29 @@ public class ScheduleInfo {
 
     private LocalDateTime finishTime;
     private int activeMinutes;
-
     private AbstractScheduleShortInfo schedule;
 
+    private List<TaskgroupEntityInfo> taskgroupPath;
+
+    private TaskShortInfo task;
+
     public ScheduleInfo(BasicTaskSchedule basicTaskSchedule) {
         this.scheduleID = basicTaskSchedule.getScheduleID();
         this.scheduleType = ScheduleType.BASIC;
         this.startTime = basicTaskSchedule.getStartTime();
         this.finishTime = basicTaskSchedule.getFinishedTime();
 
-        if(this.finishTime == null) {
+        if(this.finishTime == null && this.startTime != null) {
             this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDate.now()).toMinutes();
-        } else {
+        } else if(this.startTime != null){
             this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
         }
 
         this.schedule = new BasicScheduleShortInfo(basicTaskSchedule);
+        this.task = new TaskShortInfo(basicTaskSchedule.getTask());
+        List<Taskgroup> taskgroupPath = Taskgroup.getAncestorList(basicTaskSchedule.getTask().getTaskgroup());
+        taskgroupPath.add(basicTaskSchedule.getTask().getTaskgroup());
+        this.taskgroupPath = taskgroupPath.stream().map(TaskgroupEntityInfo::new).toList();
     }
 
     public long getScheduleID() {
@@ -80,4 +91,20 @@ public class ScheduleInfo {
     public void setSchedule(AbstractScheduleShortInfo schedule) {
         this.schedule = schedule;
     }
+
+    public List<TaskgroupEntityInfo> getTaskgroupPath() {
+        return taskgroupPath;
+    }
+
+    public void setTaskgroupPath(List<TaskgroupEntityInfo> taskgroupPath) {
+        this.taskgroupPath = taskgroupPath;
+    }
+
+    public TaskShortInfo getTask() {
+        return task;
+    }
+
+    public void setTask(TaskShortInfo task) {
+        this.task = task;
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java
new file mode 100644
index 0000000..c1e5c6b
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java
@@ -0,0 +1,30 @@
+package core.api.models.timemanager.tasks;
+
+import core.entities.timemanager.Task;
+
+public class TaskShortInfo {
+
+    private long taskID;
+    private String taskName;
+
+    public TaskShortInfo(Task task) {
+        this.taskID = task.getTaskID();
+        this.taskName = task.getTaskName();
+    }
+
+    public long getTaskID() {
+        return taskID;
+    }
+
+    public void setTaskID(long taskID) {
+        this.taskID = taskID;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+}
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 23d2f54..9f2926a 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -33,6 +33,7 @@ model/signUpRequest.ts
 model/simpleStatusResponse.ts
 model/taskEntityInfo.ts
 model/taskFieldInfo.ts
+model/taskShortInfo.ts
 model/taskgroupDetailInfo.ts
 model/taskgroupEntityInfo.ts
 model/taskgroupFieldInfo.ts
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index 8d70e8b..af77e58 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -17,6 +17,7 @@ export * from './signUpRequest';
 export * from './simpleStatusResponse';
 export * from './taskEntityInfo';
 export * from './taskFieldInfo';
+export * from './taskShortInfo';
 export * from './taskgroupDetailInfo';
 export * from './taskgroupEntityInfo';
 export * from './taskgroupFieldInfo';
diff --git a/frontend/src/api/model/scheduleInfo.ts b/frontend/src/api/model/scheduleInfo.ts
index a6d33d1..a9deba8 100644
--- a/frontend/src/api/model/scheduleInfo.ts
+++ b/frontend/src/api/model/scheduleInfo.ts
@@ -10,6 +10,8 @@
  * Do not edit the class manually.
  */
 import { BasicScheduleFieldInfo } from './basicScheduleFieldInfo';
+import { TaskgroupEntityInfo } from './taskgroupEntityInfo';
+import { TaskShortInfo } from './taskShortInfo';
 
 
 export interface ScheduleInfo { 
@@ -34,6 +36,8 @@ export interface ScheduleInfo {
      */
     activeMinutes: number;
     schedule: BasicScheduleFieldInfo;
+    task: TaskShortInfo;
+    taskgroupPath: Array<TaskgroupEntityInfo>;
 }
 export namespace ScheduleInfo {
     export type ScheduleTypeEnum = 'BASIC' | 'MODERATE' | 'ADVANCED';
diff --git a/frontend/src/api/model/taskShortInfo.ts b/frontend/src/api/model/taskShortInfo.ts
new file mode 100644
index 0000000..0038f44
--- /dev/null
+++ b/frontend/src/api/model/taskShortInfo.ts
@@ -0,0 +1,24 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface TaskShortInfo { 
+    /**
+     * internal id of task
+     */
+    taskID: number;
+    /**
+     * name of task
+     */
+    taskName: string;
+}
+
diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts
index aaa61e2..a5aea85 100644
--- a/frontend/src/app/schedules/scheduler/scheduler.component.ts
+++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts
@@ -5,7 +5,7 @@ import {
   TaskEntityInfo,
   TaskgroupEntityInfo,
   TaskgroupService,
-  TaskService
+  TaskService, TaskShortInfo
 } from "../../../api";
 import {ActivatedRoute, Router} from "@angular/router";
 import {CalendarDateFormatter, CalendarEvent, CalendarView} from "angular-calendar";
@@ -49,6 +49,7 @@ export class SchedulerComponent implements OnInit{
   taskgroup: TaskgroupEntityInfo | undefined
   taskgroupPath: TaskgroupEntityInfo[] = []
   taskgroupID: number = -1;
+  scheduleID: number = -1;
   @ViewChild('navLinkList') navLinkListComponent: NavigationLinkListComponent | undefined
 
   task: TaskEntityInfo | undefined
@@ -92,10 +93,14 @@ export class SchedulerComponent implements OnInit{
           next: resp => {
             this.task = resp;
             this.initializeNavigationLinkList()
-            this.fetchBasicSchedules();
+            this.fetschSchedules();
           }
         })
       }
+
+      if(params.has('scheduleID')) {
+        this.scheduleID = Number(params.get('scheduleID'));
+      }
     });
   }
 
@@ -128,63 +133,40 @@ export class SchedulerComponent implements OnInit{
     this.refresh.next();
   }
 
-  fetchBasicSchedules() {
-    this.activatedRoute.paramMap.subscribe(params => {
-      if(params.has('scheduleID')) {
-        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
-            next: resp => {
-              resp.forEach(basicSchedule => {
-                if(basicSchedule.scheduleID === Number(params.get('scheduleID'))) {
-                  this.events.push({
-                    start: new Date(basicSchedule.scheduleDate),
-                    title: this.computeTaskPath(),
-                    color: colors['yellow'],
-                    allDay: true,
-                  })
-                  this.basicScheduler?.setEditedBasicSchedule(basicSchedule);
-                } else {
-                  this.events.push({
-                    start: new Date(basicSchedule.scheduleDate),
-                    title: this.computeTaskPath(),
-                    color: colors['red'],
-                    allDay: true,
-                  })
-                }
-              })
-                this.refresh.next();
-            }
-          })
-      } else {
-        this.scheduleService.schedulesTaskIDScheduleTypeGet(this.task!.taskID, "BASIC").subscribe({
-          next: resp => {
-            resp.forEach(basicSchedule => {
-              this.events.push({
-                start: new Date(basicSchedule.scheduleDate),
-                title: this.computeTaskPath(),
-                color: colors['red'],
-                allDay: true,
-              })
+  fetschSchedules() {
+    this.scheduleService.schedulesGet().subscribe({
+      next: resp => {
+        resp.forEach(schedule => {
+          let color: EventColor = colors['red']
+          if(schedule.scheduleID === this.scheduleID) {
+            color = colors['yellow']
+          }
+
+          if(schedule.scheduleType === 'BASIC') {
+            this.events.push({
+              start: new Date(schedule.schedule.scheduleDate),
+              title: this.computeTaskPath(schedule.taskgroupPath, schedule.task),
+              color: color,
+              allDay: true,
             })
-            this.refresh.next();
           }
         })
+        this.refresh.next();
       }
-    });
-
-
+    })
   }
 
   eventClicked({ event }: { event: CalendarEvent }): void {
     this.router.navigateByUrl("/taskgroups/" + this.taskgroupID.toString() + "/tasks/" + this.task!.taskID )
   }
 
-  computeTaskPath() {
+  computeTaskPath(taskgroupPath: TaskgroupEntityInfo[], task: TaskShortInfo | TaskEntityInfo) {
     let result = "";
-    this.taskgroupPath.forEach(taskgroupPathPart => {
+    taskgroupPath.forEach(taskgroupPathPart => {
       result += taskgroupPathPart.taskgroupName + "/"
     });
-    result += this.taskgroup!.taskgroupName + "/"
-    result += this.task!.taskName
+    result += task!.taskName
     return result;
   }
+
 }
diff --git a/openapi.yaml b/openapi.yaml
index 12df4ea..c9af16e 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1734,6 +1734,8 @@ components:
         - finishTime
         - activeMinutes
         - schedule
+        - task
+        - taskgroupPath
       additionalProperties: false
       properties:
         scheduleID:
@@ -1763,4 +1765,26 @@ components:
         schedule:
           type: object
           oneOf:
-            - $ref: '#/components/schemas/BasicScheduleFieldInfo'
\ No newline at end of file
+            - $ref: '#/components/schemas/BasicScheduleFieldInfo'
+        task:
+          type: object
+          $ref: '#/components/schemas/TaskShortInfo'
+        taskgroupPath:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaskgroupEntityInfo'
+        
+    TaskShortInfo:
+      required:
+        - taskID
+        - taskName
+      additionalProperties: false
+      properties:
+        taskID:
+          type: number
+          description: internal id of task
+          example: 1
+        taskName:
+          type: string
+          description: name of task
+          example: "Vorlesung zusammenfassen"
\ No newline at end of file
-- 
2.34.1


From 7a044baebe4504b0ad213522c246e6a4f8283ed0 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:26:45 +0200
Subject: [PATCH 16/50] Removed unused TaskgroupShortInfo.java

---
 .../models/timemanager/taskgroup/TaskgroupShortInfo.java   | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 backend/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupShortInfo.java

diff --git a/backend/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupShortInfo.java b/backend/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupShortInfo.java
deleted file mode 100644
index 7e2d6b7..0000000
--- a/backend/src/main/java/core/api/models/timemanager/taskgroup/TaskgroupShortInfo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package core.api.models.timemanager.taskgroup;
-
-public class TaskgroupShortInfo {
-
-    private long taskgroupID;
-    private String taskgroupName;
-}
-- 
2.34.1


From 94892451150b542c143a66ac0fc4e37e0a357cbc Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:28:53 +0200
Subject: [PATCH 17/50] Fix taskgroup and task undefined when initializing

---
 .../task-detail-overview/task-detail-overview.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index d6a8a39..11d22d8 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -16,7 +16,7 @@
       <p>ETA: {{task!.eta}} Minuten - Deadline: {{task!.deadline}}</p>
       <mat-progress-bar [mode]="'determinate'" [value]="task!.workTime"></mat-progress-bar>
     </mat-card-content>
-    <mat-card-actions>
+    <mat-card-actions *ngIf="taskgroup != undefined && task != undefined">
       <div style="width: 100%">
         <div style="float: left">
           <button mat-flat-button class="borderless-btn" color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Schedule</button>
-- 
2.34.1


From b8664124ca92b49650f0ed8cc1afa2f901b10aee Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:31:55 +0200
Subject: [PATCH 18/50] Edit Task from TaskDetailView

---
 .../task-detail-overview.component.html         |  2 +-
 .../task-detail-overview.component.ts           | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index 11d22d8..19e1895 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -21,7 +21,7 @@
         <div style="float: left">
           <button mat-flat-button class="borderless-btn" color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Schedule</button>
           <button mat-flat-button class="yellowBtn">Start now</button>
-          <button mat-flat-button class="grayBtn" >Edit</button>
+          <button mat-flat-button class="grayBtn" (click)="openTaskEditor()">Edit</button>
           <!--<button mat-raised-button>Copy</button>-->
           <button mat-flat-button class="greenBtn" >Finished</button>
         </div>
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 7488a1f..c9bb35b 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
@@ -3,6 +3,9 @@ import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link
 import {ActivatedRoute} from "@angular/router";
 import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
 import {TaskDashboardComponent} from "../task-dashboard/task-dashboard.component";
+import {MatDialog} from "@angular/material/dialog";
+import {TaskEditorComponent} from "../task-editor/task-editor.component";
+import {TaskEditorData} from "../task-editor/TaskEditorData";
 
 @Component({
   selector: 'app-task-detail-overview',
@@ -31,7 +34,8 @@ export class TaskDetailOverviewComponent implements OnInit {
 
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
-              private taskService: TaskService) {
+              private taskService: TaskService,
+              private dialog: MatDialog) {
   }
 
   ngOnInit(): void {
@@ -65,4 +69,15 @@ export class TaskDetailOverviewComponent implements OnInit {
     return "green";
 
   }
+
+  openTaskEditor() {
+    if(this.task != undefined) {
+      const taskEditorInfo: TaskEditorData = {
+        task: this.task!,
+        taskgroupID: this.taskgroupID!
+      };
+      this.dialog.open(TaskEditorComponent, {data: taskEditorInfo, width: "600px"})
+    }
+
+  }
 }
-- 
2.34.1


From 170723bbd6fad9727fe960a5bd865d6c611ea3f6 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Tue, 24 Oct 2023 19:58:12 +0200
Subject: [PATCH 19/50] Start now

---
 backend/.idea/workspace.xml                   | 26 +++++---
 .../api/controller/ScheduleController.java    | 18 ++++++
 .../java/core/entities/timemanager/Task.java  |  9 +++
 .../core/services/TaskScheduleService.java    | 13 ++++
 frontend/src/api/api/schedule.service.ts      | 60 +++++++++++++++++++
 .../task-detail-overview.component.html       |  2 +-
 .../task-detail-overview.component.ts         | 18 +++++-
 openapi.yaml                                  | 46 ++++++++++++++
 8 files changed, 181 insertions(+), 11 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 9fdd8b6..fa7146a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,11 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Removed unused TaskgroupShortInfo.java">
       <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/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -27,7 +29,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$/.." value="master" />
+        <entry key="$PROJECT_DIR$/.." value="issue-23" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
@@ -156,7 +158,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698089745245</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Removed unused TaskgroupShortInfo.java">
+      <option name="closed" value="true" />
+      <created>1698168406655</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1698168406655</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -171,7 +181,9 @@
     <MESSAGE value="Delete and clear Tasks (Frontend)" />
     <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
     <MESSAGE value="Delete Schedules" />
-    <option name="LAST_COMMIT_MESSAGE" value="Delete Schedules" />
+    <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
+    <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed unused TaskgroupShortInfo.java" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 3b1482f..7a7f8dc 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -121,4 +121,22 @@ public class ScheduleController {
             return ResponseEntity.ok(schedules.getResult().stream().map(ScheduleInfo::new).toList());
         }
     }
+    @PostMapping("/schedules/{taskID}/now")
+    public ResponseEntity<?> scheduleTaskNow(@PathVariable long taskID) {
+        PermissionResult<Task> permissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!permissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(permissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        ServiceResult<BasicTaskSchedule> scheduleResult = taskScheduleService.scheduleTaskNow(permissionResult.getResult());
+        if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
+            return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
+        }
+    }
 }
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index 61f07d7..90fa77c 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -135,4 +135,13 @@ public class Task {
     public void setBasicTaskSchedules(Set<BasicTaskSchedule> basicTaskSchedules) {
         this.basicTaskSchedules = basicTaskSchedules;
     }
+
+    public boolean hasActiveSchedule() {
+        for(BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
+           if(basicTaskSchedule.getStartTime() != null && basicTaskSchedule.getFinishedTime() == null) {
+               return true;
+           }
+        }
+        return false;
+    }
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 8e15e3b..579cdcd 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -63,4 +63,17 @@ public class TaskScheduleService {
         return user.map(value -> new ServiceResult<>(basicTaskScheduleRepository.findAllByUser(value))).orElseGet(() ->
                 new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
     }
+
+    public ServiceResult<BasicTaskSchedule> scheduleTaskNow(Task task) {
+        //Check if task has already an active schedule
+        if(task.hasActiveSchedule()) {
+            return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
+        } else {
+            BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now());
+            task.getBasicTaskSchedules().add(basicTaskSchedule);
+            basicTaskScheduleRepository.save(basicTaskSchedule);
+            taskRepository.save(task);
+            return new ServiceResult<>(basicTaskSchedule);
+        }
+    }
 }
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index fc0089c..e5fb590 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -346,6 +346,66 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * schedule task now
+     * schedule task now
+     * @param taskID internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<BasicScheduleEntityInfo>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling schedulesTaskIDNowPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<BasicScheduleEntityInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/now`,
+            null,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * gets schedules of task
      * gets schedules of task
diff --git a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
index 19e1895..880b8de 100644
--- a/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
+++ b/frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html
@@ -20,7 +20,7 @@
       <div style="width: 100%">
         <div style="float: left">
           <button mat-flat-button class="borderless-btn" color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Schedule</button>
-          <button mat-flat-button class="yellowBtn">Start now</button>
+          <button mat-flat-button class="yellowBtn" (click)="startTaskNow()">Start now</button>
           <button mat-flat-button class="grayBtn" (click)="openTaskEditor()">Edit</button>
           <!--<button mat-raised-button>Copy</button>-->
           <button mat-flat-button class="greenBtn" >Finished</button>
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 c9bb35b..70061af 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
@@ -1,7 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
-import {ActivatedRoute} from "@angular/router";
-import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
+import {ActivatedRoute, Router} from "@angular/router";
+import {ScheduleService, TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
 import {TaskDashboardComponent} from "../task-dashboard/task-dashboard.component";
 import {MatDialog} from "@angular/material/dialog";
 import {TaskEditorComponent} from "../task-editor/task-editor.component";
@@ -35,7 +35,9 @@ export class TaskDetailOverviewComponent implements OnInit {
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
               private taskService: TaskService,
-              private dialog: MatDialog) {
+              private dialog: MatDialog,
+              private scheduleService: ScheduleService,
+              private router: Router) {
   }
 
   ngOnInit(): void {
@@ -80,4 +82,14 @@ export class TaskDetailOverviewComponent implements OnInit {
     }
 
   }
+
+  startTaskNow() {
+    if(this.task != undefined) {
+      this.scheduleService.schedulesTaskIDNowPost(this.task.taskID).subscribe({
+        next: resp => {
+          this.router.navigateByUrl('/');
+        }
+      });
+    }
+  }
 }
diff --git a/openapi.yaml b/openapi.yaml
index c9af16e..b72835b 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1372,6 +1372,52 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/ScheduleInfo'
+  /schedules/{taskID}/now:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: schedule task now
+      summary: schedule task now
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        200:
+          description: Operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/BasicScheduleEntityInfo'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        409:
+          description: Task is already running
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+      
       
 components:
   securitySchemes:
-- 
2.34.1


From 30d1bacbd69b38fefd74ec23725cbfd39387ac68 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Wed, 25 Oct 2023 17:25:29 +0200
Subject: [PATCH 20/50] Fix Foreign Key Constraint Fail when deleting
 Taskgroups

---
 backend/.idea/workspace.xml                            |  7 +++----
 .../timemanager/BasicTaskScheduleRepository.java       |  6 ++++++
 .../main/java/core/services/TaskScheduleService.java   |  4 ++++
 backend/src/main/java/core/services/TaskService.java   | 10 ++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index fa7146a..0cb0a89 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -6,11 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Removed unused TaskgroupShortInfo.java">
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -101,6 +99,7 @@
       <workItem from="1698067098771" duration="4770000" />
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
+      <workItem from="1698246651541" duration="766000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
index f37b1e0..81e0fa9 100644
--- a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -2,6 +2,7 @@ package core.repositories.timemanager;
 
 import core.entities.User;
 import core.entities.timemanager.BasicTaskSchedule;
+import core.entities.timemanager.Task;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
@@ -19,6 +20,11 @@ public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSch
     @Query(value = "DELETE FROM BasicTaskSchedule bts WHERE bts.scheduleID = ?1")
     void deleteBasicTaskScheduleByID(long id);
 
+    @Modifying
+    @Transactional
+    @Query(value = "DELETE FROM BasicTaskSchedule bts WHERE bts.task = ?1")
+    void deleteAllByTask(Task task);
+
     @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1")
     List<BasicTaskSchedule> findAllByUser(User user);
 
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 579cdcd..a2a8407 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -76,4 +76,8 @@ public class TaskScheduleService {
             return new ServiceResult<>(basicTaskSchedule);
         }
     }
+
+    public void deleteScheduleByTask(Task task) {
+        basicTaskScheduleRepository.deleteAllByTask(task);
+    }
 }
diff --git a/backend/src/main/java/core/services/TaskService.java b/backend/src/main/java/core/services/TaskService.java
index 061cb08..4f2f9d4 100644
--- a/backend/src/main/java/core/services/TaskService.java
+++ b/backend/src/main/java/core/services/TaskService.java
@@ -3,25 +3,26 @@ package core.services;
 import core.api.models.timemanager.tasks.TaskFieldInfo;
 import core.entities.timemanager.Task;
 import core.entities.timemanager.Taskgroup;
+import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.repositories.timemanager.TaskRepository;
 import core.repositories.timemanager.TaskgroupRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Optional;
 
 @Service
 public class TaskService {
 
     private final TaskRepository taskRepository;
-    private final TaskgroupRepository taskgroupRepository;
+    private final TaskScheduleService taskScheduleService;
+
 
     public TaskService(@Autowired TaskRepository taskRepository,
-                       TaskgroupRepository taskgroupRepository) {
+                       @Autowired TaskScheduleService taskScheduleService) {
         this.taskRepository = taskRepository;
-        this.taskgroupRepository = taskgroupRepository;
+        this.taskScheduleService = taskScheduleService;
     }
 
     public ServiceResult<Task> createTask(Taskgroup taskgroup, TaskFieldInfo taskFieldInfo) {
@@ -67,6 +68,7 @@ public class TaskService {
     }
 
     public void deleteTask(Task task) {
+        taskScheduleService.deleteScheduleByTask(task);
         taskRepository.deleteByTaskID(task.getTaskID());
     }
 
-- 
2.34.1


From 5b6e42e93f980eb9b3d68fbbef60a40933a43ffc Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Wed, 25 Oct 2023 18:49:19 +0200
Subject: [PATCH 21/50] Create Basic Main Dashboard

---
 backend/.idea/workspace.xml                   | 22 +++--
 frontend/src/app/app.module.ts                |  4 +-
 .../src/app/dashboard/dashboard.component.css | 94 +++++++++++++++++++
 .../app/dashboard/dashboard.component.html    | 34 +++++++
 .../app/dashboard/dashboard.component.spec.ts | 21 +++++
 .../src/app/dashboard/dashboard.component.ts  | 14 +++
 frontend/src/app/main/main.component.html     |  1 +
 7 files changed, 180 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/app/dashboard/dashboard.component.css
 create mode 100644 frontend/src/app/dashboard/dashboard.component.html
 create mode 100644 frontend/src/app/dashboard/dashboard.component.spec.ts
 create mode 100644 frontend/src/app/dashboard/dashboard.component.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 0cb0a89..cc8ba2d 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,12 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Removed unused TaskgroupShortInfo.java">
-      <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/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
-    </list>
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -99,7 +94,7 @@
       <workItem from="1698067098771" duration="4770000" />
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
-      <workItem from="1698246651541" duration="766000" />
+      <workItem from="1698246651541" duration="1537000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -165,7 +160,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698168406655</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="Fix Foreign Key Constraint Fail when deleting Taskgroups">
+      <option name="closed" value="true" />
+      <created>1698247531000</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1698247531000</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -182,7 +185,8 @@
     <MESSAGE value="Delete Schedules" />
     <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
     <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
-    <option name="LAST_COMMIT_MESSAGE" value="Removed unused TaskgroupShortInfo.java" />
+    <MESSAGE value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index f4794ee..ae6b623 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -62,6 +62,7 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 import {MatSelectModule} from "@angular/material/select";
 import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
 import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
+import { DashboardComponent } from './dashboard/dashboard.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -88,7 +89,8 @@ import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/sched
     TaskDetailOverviewComponent,
     SchedulerComponent,
     BasicSchedulerComponent,
-    ScheduleDashboardComponent
+    ScheduleDashboardComponent,
+    DashboardComponent
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
new file mode 100644
index 0000000..c77f51c
--- /dev/null
+++ b/frontend/src/app/dashboard/dashboard.component.css
@@ -0,0 +1,94 @@
+.container {
+  margin: 20px auto;
+  width: 70%;
+  display: flex;
+}
+
+.spacer {
+  margin-bottom: 2.5%;
+}
+
+
+@media screen and (max-width: 600px) {
+  .container {
+    width: 100%;
+    margin: 20px 10px;
+  }
+}
+
+.today-worked-info {
+  margin-left: 20px;
+  background-color: #e1e1e1;
+  padding-right: 5px;
+  padding-left: 5px;
+  border-radius: 5px;
+}
+
+.red-card {
+  background-color: #e54c3c;
+  color: white;
+}
+
+.green-card {
+  background-color: #00bc8c;
+  color: white;
+}
+
+.main-container {
+  width: 45%;
+  margin-right: 20px;
+}
+
+.btn-link {
+  text-decoration: underline;
+  color: white;
+  margin-left: 20px;
+}
+
+.dashboard-heading {
+  margin-top: 20px;
+  font-size: 2.5em;
+}
+
+.today-worked-info {
+  font-size: .8em;
+}
+
+
+.lightBlueBtn {
+  background-color: #3498db;
+  color: white;
+}
+
+.grayBtn {
+  background-color: #444444;
+  color: white;
+  border-radius: 0;
+}
+
+::ng-deep .mat-mdc-list-base {
+  --mdc-list-list-item-label-text-color: white
+}
+
+::ng-deep .mat-mdc-list-base .taskgroup-btn, ::ng-deep .mat-mdc-list-base .taskgroup-last-btn  {
+  --mdc-list-list-item-label-text-color: black
+}
+
+.taskgroup-overview {
+  width: 25%;
+  float: right;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+.taskgroup-btn {
+  background-color: #f3f3f3;
+  border: 0 solid #000000;
+  border-bottom-width: 1px;
+}
+
+.taskgroup-last-btn {
+  background-color: #f3f3f3;
+}
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
new file mode 100644
index 0000000..2cb3126
--- /dev/null
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -0,0 +1,34 @@
+<div class="container">
+  <div class="main-container">
+    <mat-card *ngIf="missedSchedules" class="red-card">
+      <mat-card-content>
+        <p>There are missed schedules. Please reschedule them.</p>
+        <a class="btn-link" routerLink="/">Reschedule</a>
+      </mat-card-content>
+    </mat-card>
+    <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: 0 min</b></h1>
+
+    <mat-card class="green-card" *ngIf="!taskRunning">
+      <mat-card-content>
+        <p>Currently there is no task in progress.</p>
+        <a class="btn-link" routerLink="/">Did you forget to start an activity?</a>
+      </mat-card-content>
+    </mat-card>
+
+    <h1 class="dashboard-heading">Scheduled for today</h1>
+    <mat-card class="green-card" *ngIf="schedules.length == 0">
+      <mat-card-content>
+        <p>There is no scheduled Task for today</p>
+      </mat-card-content>
+    </mat-card>
+  </div>
+  <span class="spacer"></span>
+  <div class="taskgroup-overview">
+      <mat-action-list>
+        <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
+        <button mat-list-item class="taskgroup-btn">Algorithmen II</button>
+        <button mat-list-item class="taskgroup-last-btn">Computer Grafik</button>
+      </mat-action-list>
+  </div>
+
+</div>
diff --git a/frontend/src/app/dashboard/dashboard.component.spec.ts b/frontend/src/app/dashboard/dashboard.component.spec.ts
new file mode 100644
index 0000000..5e98991
--- /dev/null
+++ b/frontend/src/app/dashboard/dashboard.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DashboardComponent } from './dashboard.component';
+
+describe('DashboardComponent', () => {
+  let component: DashboardComponent;
+  let fixture: ComponentFixture<DashboardComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [DashboardComponent]
+    });
+    fixture = TestBed.createComponent(DashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
new file mode 100644
index 0000000..5b4bfeb
--- /dev/null
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import {ScheduleInfo} from "../../api";
+
+@Component({
+  selector: 'app-dashboard',
+  templateUrl: './dashboard.component.html',
+  styleUrls: ['./dashboard.component.css']
+})
+export class DashboardComponent {
+
+  missedSchedules: boolean = true
+  taskRunning: boolean = false
+  schedules: ScheduleInfo[] = []
+}
diff --git a/frontend/src/app/main/main.component.html b/frontend/src/app/main/main.component.html
index e69de29..c7d86fe 100644
--- a/frontend/src/app/main/main.component.html
+++ b/frontend/src/app/main/main.component.html
@@ -0,0 +1 @@
+<app-dashboard></app-dashboard>
-- 
2.34.1


From f2149358fa8b60be7e9d93ebc1a39bcb5793d661 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Wed, 25 Oct 2023 19:10:17 +0200
Subject: [PATCH 22/50] List schedules for today in dashboard

---
 .../src/app/dashboard/dashboard.component.css | 41 +++++++++++++++++++
 .../app/dashboard/dashboard.component.html    | 19 +++++++++
 .../src/app/dashboard/dashboard.component.ts  | 17 ++++++--
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
index c77f51c..b6f411a 100644
--- a/frontend/src/app/dashboard/dashboard.component.css
+++ b/frontend/src/app/dashboard/dashboard.component.css
@@ -92,3 +92,44 @@
 .taskgroup-last-btn {
   background-color: #f3f3f3;
 }
+
+.link-no-deco {
+  text-decoration: none;
+  color: black;
+}
+
+.link-no-deco:hover{
+  text-decoration: underline;
+}
+
+.gray-text {
+  color: #6e6e6e;
+}
+
+.yellowBtn {
+  background-color: #f39c12;
+  color: white;
+  border-radius: 0;
+}
+
+.primaryBtn {
+  border-radius: 0;
+}
+
+
+::ng-deep .mat-mdc-card-header-text {
+  display: block;
+  width: 100%;
+}
+
+.schedule-del-btn {
+  margin-top: 10px;
+}
+
+.left-actions {
+  float: left;
+}
+
+.right-actions {
+  float: right;
+}
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 2cb3126..2b0ee4f 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -21,6 +21,25 @@
         <p>There is no scheduled Task for today</p>
       </mat-card-content>
     </mat-card>
+
+    <div>
+      <mat-card *ngFor="let schedule of schedules">
+        <mat-card-header>
+          <mat-card-title>
+            <a routerLink="/" class="link-no-deco">{{schedule.task.taskName}}</a>
+          </mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+          <span *ngFor="let taskgroupPath of schedule.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span>
+          <p class="gray-text" *ngIf="schedule.scheduleType==='BASIC'">To be done sometime today</p>
+        </mat-card-content>
+        <mat-card-actions>
+          <button mat-raised-button color="primary" class="primaryBtn">Start now</button>
+          <button mat-raised-button class="yellowBtn">Reschedule</button>
+        </mat-card-actions>
+      </mat-card>
+    </div>
+
   </div>
   <span class="spacer"></span>
   <div class="taskgroup-overview">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 5b4bfeb..3442273 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,14 +1,25 @@
-import { Component } from '@angular/core';
-import {ScheduleInfo} from "../../api";
+import {Component, OnInit} from '@angular/core';
+import {ScheduleInfo, ScheduleService} from "../../api";
 
 @Component({
   selector: 'app-dashboard',
   templateUrl: './dashboard.component.html',
   styleUrls: ['./dashboard.component.css']
 })
-export class DashboardComponent {
+export class DashboardComponent implements OnInit{
 
   missedSchedules: boolean = true
   taskRunning: boolean = false
   schedules: ScheduleInfo[] = []
+
+  constructor(private scheduleService: ScheduleService) {
+  }
+
+  ngOnInit() {
+    this.scheduleService.schedulesTodayGet().subscribe({
+      next: resp => {
+        this.schedules = resp;
+      }
+    })
+  }
 }
-- 
2.34.1


From 606e89b287c2b88d10bfee98fbbd4667c1290cac Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Wed, 25 Oct 2023 20:25:04 +0200
Subject: [PATCH 23/50] Visualize Active Schedule and schedules todo

---
 backend/.idea/workspace.xml                   |  13 +-
 .../api/controller/ScheduleController.java    |  30 ++++
 .../taskSchedule/ScheduleActivateInfo.java    |  21 +++
 .../taskSchedule/ScheduleInfo.java            |   2 +-
 .../BasicTaskScheduleRepository.java          |   4 +
 .../core/services/TaskScheduleService.java    |  16 ++
 frontend/src/api/.openapi-generator/FILES     |   1 +
 frontend/src/api/api/schedule.service.ts      | 116 ++++++++++++++
 frontend/src/api/model/models.ts              |   1 +
 .../src/api/model/scheduleActivateInfo.ts     |  20 +++
 frontend/src/app/app.module.ts                |   4 +-
 .../active-schedule.component.css             | 141 ++++++++++++++++++
 .../active-schedule.component.html            |  19 +++
 .../active-schedule.component.spec.ts         |  21 +++
 .../active-schedule.component.ts              |  51 +++++++
 .../app/dashboard/dashboard.component.html    |  11 +-
 .../src/app/dashboard/dashboard.component.ts  |  20 ++-
 openapi.yaml                                  |  78 +++++++++-
 18 files changed, 554 insertions(+), 15 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java
 create mode 100644 frontend/src/api/model/scheduleActivateInfo.ts
 create mode 100644 frontend/src/app/dashboard/active-schedule/active-schedule.component.css
 create mode 100644 frontend/src/app/dashboard/active-schedule/active-schedule.component.html
 create mode 100644 frontend/src/app/dashboard/active-schedule/active-schedule.component.spec.ts
 create mode 100644 frontend/src/app/dashboard/active-schedule/active-schedule.component.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index cc8ba2d..90e4b44 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups">
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java" afterDir="false" />
+      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -94,7 +101,7 @@
       <workItem from="1698067098771" duration="4770000" />
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
-      <workItem from="1698246651541" duration="1537000" />
+      <workItem from="1698246651541" duration="4710000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -198,7 +205,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>41</line>
+          <line>42</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 7a7f8dc..d4dd87b 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -3,6 +3,7 @@ package core.api.controller;
 import core.api.models.auth.SimpleStatusResponse;
 import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
 import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
+import core.api.models.timemanager.taskSchedule.ScheduleActivateInfo;
 import core.api.models.timemanager.taskSchedule.ScheduleInfo;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
@@ -139,4 +140,33 @@ public class ScheduleController {
             return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
         }
     }
+
+    @GetMapping("/schedules/active")
+    public ResponseEntity<?> getActiveSchedule() {
+        ServiceResult<BasicTaskSchedule> activeScheduleResult = taskScheduleService.getActiveSchedule(SecurityContextHolder.getContext().getAuthentication().getName());
+        if(activeScheduleResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(new ScheduleInfo(activeScheduleResult.getResult()));
+        }
+    }
+
+    @PostMapping("/schedules/{scheduleID}/activate")
+    public ResponseEntity<?> activateSchedule(@PathVariable long scheduleID) {
+        PermissionResult<BasicTaskSchedule> schedulePermissionResult = taskScheduleService.getSchedulePermissions(scheduleID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!schedulePermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(schedulePermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        ServiceResult<BasicTaskSchedule> scheduleActivateResult = taskScheduleService.activateSchedule(schedulePermissionResult.getResult());
+        if(scheduleActivateResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
+            return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(new ScheduleActivateInfo(scheduleActivateResult.getResult().getStartTime()));
+        }
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java
new file mode 100644
index 0000000..74a07fb
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java
@@ -0,0 +1,21 @@
+package core.api.models.timemanager.taskSchedule;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+public class ScheduleActivateInfo {
+
+    private LocalDateTime startTime;
+
+    public ScheduleActivateInfo(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+}
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
index fd0656d..f92eead 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
@@ -32,7 +32,7 @@ public class ScheduleInfo {
         this.finishTime = basicTaskSchedule.getFinishedTime();
 
         if(this.finishTime == null && this.startTime != null) {
-            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDate.now()).toMinutes();
+            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDateTime.now()).toMinutes();
         } else if(this.startTime != null){
             this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
         }
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
index 81e0fa9..facd866 100644
--- a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Repository;
 import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
@@ -30,4 +31,7 @@ public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSch
 
     @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1 AND bts.scheduleDate = ?2")
     List<BasicTaskSchedule> findAllByUserAndDate(User user, LocalDate localDate);
+
+    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user.username = ?1 AND bts.startTime is not null  and bts.finishedTime is null")
+    Optional<BasicTaskSchedule> findActiveTaskSchedule(String username);
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index a2a8407..be1f5cd 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -80,4 +81,19 @@ public class TaskScheduleService {
     public void deleteScheduleByTask(Task task) {
         basicTaskScheduleRepository.deleteAllByTask(task);
     }
+
+    public ServiceResult<BasicTaskSchedule> getActiveSchedule(String username) {
+        Optional<BasicTaskSchedule> activeTaskScheduleResult = basicTaskScheduleRepository.findActiveTaskSchedule(username);
+        return activeTaskScheduleResult.map(ServiceResult::new).orElseGet(() -> new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
+    }
+
+    public ServiceResult<BasicTaskSchedule> activateSchedule(BasicTaskSchedule taskSchedule) {
+        if(getActiveSchedule(taskSchedule.getTask().getTaskgroup().getUser().getUsername()).getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            taskSchedule.setStartTime(LocalDateTime.now());
+            basicTaskScheduleRepository.save(taskSchedule);
+            return new ServiceResult<>(taskSchedule);
+        } else {
+            return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
+        }
+    }
 }
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 9f2926a..8041db9 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -28,6 +28,7 @@ model/passwordChangeRequest.ts
 model/propertiesInfo.ts
 model/propertyInfo.ts
 model/propertyUpdateRequest.ts
+model/scheduleActivateInfo.ts
 model/scheduleInfo.ts
 model/signUpRequest.ts
 model/simpleStatusResponse.ts
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index e5fb590..95c13ff 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -20,6 +20,7 @@ import { Observable }                                        from 'rxjs';
 
 import { BasicScheduleEntityInfo } from '../model/models';
 import { BasicScheduleFieldInfo } from '../model/models';
+import { ScheduleActivateInfo } from '../model/models';
 import { ScheduleInfo } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
 
@@ -88,6 +89,61 @@ export class ScheduleService {
         return httpParams;
     }
 
+    /**
+     * get active schedule
+     * get active schedule
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesActiveGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleInfo>;
+    public schedulesActiveGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleInfo>>;
+    public schedulesActiveGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleInfo>>;
+    public schedulesActiveGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<ScheduleInfo>(`${this.configuration.basePath}/schedules/active`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * gets all schedules of user
      * gets all schedules of user
@@ -143,6 +199,66 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * activates schedule
+     * activates schedule
+     * @param scheduleID internal id of schedule
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleActivateInfo>;
+    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleActivateInfo>>;
+    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleActivateInfo>>;
+    public schedulesScheduleIDActivatePost(scheduleID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (scheduleID === null || scheduleID === undefined) {
+            throw new Error('Required parameter scheduleID was null or undefined when calling schedulesScheduleIDActivatePost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<ScheduleActivateInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(scheduleID))}/activate`,
+            null,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * reschedules task
      * reschedules a task
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index af77e58..c9d526d 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -12,6 +12,7 @@ export * from './passwordChangeRequest';
 export * from './propertiesInfo';
 export * from './propertyInfo';
 export * from './propertyUpdateRequest';
+export * from './scheduleActivateInfo';
 export * from './scheduleInfo';
 export * from './signUpRequest';
 export * from './simpleStatusResponse';
diff --git a/frontend/src/api/model/scheduleActivateInfo.ts b/frontend/src/api/model/scheduleActivateInfo.ts
new file mode 100644
index 0000000..c04a111
--- /dev/null
+++ b/frontend/src/api/model/scheduleActivateInfo.ts
@@ -0,0 +1,20 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface ScheduleActivateInfo { 
+    /**
+     * point in time at which the schedule was started
+     */
+    startTime: string;
+}
+
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index ae6b623..c107997 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -63,6 +63,7 @@ import {MatSelectModule} from "@angular/material/select";
 import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
 import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
+import { ActiveScheduleComponent } from './dashboard/active-schedule/active-schedule.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -90,7 +91,8 @@ import { DashboardComponent } from './dashboard/dashboard.component';
     SchedulerComponent,
     BasicSchedulerComponent,
     ScheduleDashboardComponent,
-    DashboardComponent
+    DashboardComponent,
+    ActiveScheduleComponent
   ],
   imports: [
     BrowserModule,
diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.css b/frontend/src/app/dashboard/active-schedule/active-schedule.component.css
new file mode 100644
index 0000000..ea0b6c2
--- /dev/null
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.css
@@ -0,0 +1,141 @@
+.container {
+  margin: 20px auto;
+  width: 70%;
+  display: flex;
+}
+
+.spacer {
+  margin-bottom: 2.5%;
+}
+
+
+@media screen and (max-width: 600px) {
+  .container {
+    width: 100%;
+    margin: 20px 10px;
+  }
+}
+
+.today-worked-info {
+  margin-left: 20px;
+  background-color: #e1e1e1;
+  padding-right: 5px;
+  padding-left: 5px;
+  border-radius: 5px;
+}
+
+.red-card {
+  background-color: #e54c3c;
+  color: white;
+}
+
+.green-card {
+  background-color: #00bc8c;
+  color: white;
+}
+
+.main-container {
+  width: 45%;
+  margin-right: 20px;
+}
+
+.btn-link {
+  text-decoration: underline;
+  color: white;
+  margin-left: 20px;
+}
+
+.dashboard-heading {
+  margin-top: 20px;
+  font-size: 2.5em;
+}
+
+.today-worked-info {
+  font-size: .8em;
+}
+
+
+.lightBlueBtn {
+  background-color: #3498db;
+  color: white;
+}
+
+.grayBtn {
+  background-color: #444444;
+  color: white;
+  border-radius: 0;
+}
+
+::ng-deep .mat-mdc-list-base {
+  --mdc-list-list-item-label-text-color: white
+}
+
+::ng-deep .mat-mdc-list-base .taskgroup-btn, ::ng-deep .mat-mdc-list-base .taskgroup-last-btn  {
+  --mdc-list-list-item-label-text-color: black
+}
+
+.taskgroup-overview {
+  width: 25%;
+  float: right;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+.taskgroup-btn {
+  background-color: #f3f3f3;
+  border: 0 solid #000000;
+  border-bottom-width: 1px;
+}
+
+.taskgroup-last-btn {
+  background-color: #f3f3f3;
+}
+
+.link-no-deco {
+  text-decoration: none;
+  color: black;
+}
+
+.link-no-deco:hover{
+  text-decoration: underline;
+}
+
+.gray-text {
+  color: #6e6e6e;
+}
+
+.yellowBtn {
+  background-color: #f39c12;
+  color: white;
+  border-radius: 0;
+}
+
+.primaryBtn {
+  border-radius: 0;
+}
+
+
+::ng-deep .mat-mdc-card-header-text {
+  display: block;
+  width: 100%;
+}
+
+.schedule-del-btn {
+  margin-top: 10px;
+}
+
+.left-actions {
+  float: left;
+}
+
+.right-actions {
+  float: right;
+}
+
+.greenBtn {
+  background-color: #00bc8c;
+  color: white;
+  border-radius: 0;
+}
diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.html b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html
new file mode 100644
index 0000000..10a1c1f
--- /dev/null
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html
@@ -0,0 +1,19 @@
+<mat-card class="green-card" *ngIf="activeSchedule == undefined">
+  <mat-card-content>
+    <p>Currently there is no task in progress.</p>
+    <a class="btn-link" routerLink="/">Did you forget to start an activity?</a>
+  </mat-card-content>
+</mat-card>
+<mat-card *ngIf="activeSchedule != undefined">
+  <mat-card-header>
+    <mat-card-title><a routerLink="/" class="link-no-deco">{{activeSchedule!.task.taskName}}</a></mat-card-title>
+  </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>
+  </mat-card-content>
+  <mat-card-actions>
+    <button mat-raised-button class="grayBtn">Stop</button>
+    <button mat-raised-button class="greenBtn">Finish</button>
+  </mat-card-actions>
+</mat-card>
diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.spec.ts b/frontend/src/app/dashboard/active-schedule/active-schedule.component.spec.ts
new file mode 100644
index 0000000..b00144b
--- /dev/null
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ActiveScheduleComponent } from './active-schedule.component';
+
+describe('ActiveScheduleComponent', () => {
+  let component: ActiveScheduleComponent;
+  let fixture: ComponentFixture<ActiveScheduleComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ActiveScheduleComponent]
+    });
+    fixture = TestBed.createComponent(ActiveScheduleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
new file mode 100644
index 0000000..40b2412
--- /dev/null
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
@@ -0,0 +1,51 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {ScheduleInfo, ScheduleService} from "../../../api";
+
+@Component({
+  selector: 'app-active-schedule',
+  templateUrl: './active-schedule.component.html',
+  styleUrls: ['./active-schedule.component.css']
+})
+export class ActiveScheduleComponent implements OnInit{
+  activeSchedule: ScheduleInfo | undefined
+
+  startTime: number = 0;
+  currentTime: number = 0;
+  displayTime: string = "00:00:00"
+
+  constructor(private scheduleService: ScheduleService) {
+
+
+  }
+
+
+  updateTime() {
+    const now = Date.now();
+    const elapsed = this.activeSchedule != undefined ? now - this.startTime + this.currentTime : this.currentTime;
+    this.displayTime = this.formatTime(elapsed);
+    console.log("Update!")
+    requestAnimationFrame(() => this.updateTime());
+  }
+
+  formatTime(milliseconds: number): string {
+    const seconds = Math.floor((milliseconds / 1000) % 60);
+    const minutes = Math.floor((milliseconds / 1000 / 60) % 60);
+    const hours = Math.floor(milliseconds / 1000 / 60 / 60);
+    return `${this.padNumber(hours)}:${this.padNumber(minutes)}:${this.padNumber(seconds)}`;
+  }
+  padNumber(num: number): string {
+    return num < 10 ? `0${num}` : `${num}`;
+  }
+
+  ngOnInit(): void {
+    this.scheduleService.schedulesActiveGet().subscribe({
+      next: resp => {
+        this.activeSchedule = resp;
+        this.startTime = new Date(this.activeSchedule.startTime).getTime();
+        this.updateTime()
+      }
+    })
+  }
+
+
+}
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 2b0ee4f..36181bc 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -8,12 +8,7 @@
     </mat-card>
     <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: 0 min</b></h1>
 
-    <mat-card class="green-card" *ngIf="!taskRunning">
-      <mat-card-content>
-        <p>Currently there is no task in progress.</p>
-        <a class="btn-link" routerLink="/">Did you forget to start an activity?</a>
-      </mat-card-content>
-    </mat-card>
+    <app-active-schedule #activeSchedule></app-active-schedule>
 
     <h1 class="dashboard-heading">Scheduled for today</h1>
     <mat-card class="green-card" *ngIf="schedules.length == 0">
@@ -22,6 +17,8 @@
       </mat-card-content>
     </mat-card>
 
+
+
     <div>
       <mat-card *ngFor="let schedule of schedules">
         <mat-card-header>
@@ -34,7 +31,7 @@
           <p class="gray-text" *ngIf="schedule.scheduleType==='BASIC'">To be done sometime today</p>
         </mat-card-content>
         <mat-card-actions>
-          <button mat-raised-button color="primary" class="primaryBtn">Start now</button>
+          <button mat-raised-button color="primary" class="primaryBtn" (click)="startSchedule(schedule)" [disabled]="activeScheduleComponent!.activeSchedule != undefined">Start now</button>
           <button mat-raised-button class="yellowBtn">Reschedule</button>
         </mat-card-actions>
       </mat-card>
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 3442273..c0ffd44 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,5 +1,6 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
 import {ScheduleInfo, ScheduleService} from "../../api";
+import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
 
 @Component({
   selector: 'app-dashboard',
@@ -9,9 +10,9 @@ import {ScheduleInfo, ScheduleService} from "../../api";
 export class DashboardComponent implements OnInit{
 
   missedSchedules: boolean = true
-  taskRunning: boolean = false
   schedules: ScheduleInfo[] = []
 
+  @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
   }
 
@@ -21,5 +22,20 @@ export class DashboardComponent implements OnInit{
         this.schedules = resp;
       }
     })
+
+
   }
+
+  startSchedule(schedule: ScheduleInfo) {
+    this.scheduleService.schedulesScheduleIDActivatePost(schedule.scheduleID).subscribe({
+      next: resp => {
+        schedule.startTime = resp.startTime;
+        if(this.activeScheduleComponent != undefined) {
+          this.activeScheduleComponent.activeSchedule = schedule;
+        }
+      }
+    })
+  }
+
+
 }
diff --git a/openapi.yaml b/openapi.yaml
index b72835b..00fd525 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1417,6 +1417,73 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/active: 
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: get active schedule
+      summary: get active schedule
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ScheduleInfo'
+        404:
+          description: there is no active schedule
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SimpleStatusResponse'
+  /schedules/{scheduleID}/activate:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: activates schedule
+      summary: activates schedule
+      parameters:
+        - name: scheduleID
+          in: path
+          description: internal id of schedule
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        200:
+          description: Operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/ScheduleActivateInfo'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Schedule does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        409:
+          description: Task is already running
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+      
       
       
 components:
@@ -1833,4 +1900,13 @@ components:
         taskName:
           type: string
           description: name of task
-          example: "Vorlesung zusammenfassen"
\ No newline at end of file
+          example: "Vorlesung zusammenfassen"
+    ScheduleActivateInfo:
+      required:
+        - startTime
+      additionalProperties: false
+      properties:
+        startTime:
+          type: string
+          format: date-time
+          description: point in time at which the schedule was started
\ No newline at end of file
-- 
2.34.1


From 004d376daf658e2d03dcc75802c3d257ba5a7025 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 09:40:36 +0200
Subject: [PATCH 24/50] Stop and Finish TaskSchedules

---
 backend/.idea/workspace.xml                   | 31 ++++++--
 .../api/controller/ScheduleController.java    | 38 ++++++---
 .../taskSchedule/ScheduleInfo.java            |  4 +
 .../TaskScheduleStopResponse.java             | 18 +++++
 .../timemanager/BasicTaskSchedule.java        |  4 +
 .../java/core/services/ServiceExitCode.java   |  3 +-
 .../core/services/TaskScheduleService.java    | 38 ++++++++-
 frontend/src/api/.openapi-generator/FILES     |  1 +
 frontend/src/api/api/schedule.service.ts      | 77 +++++++++++++++++--
 frontend/src/api/model/models.ts              |  1 +
 .../active-schedule/StopActiveScheduleInfo.ts |  6 ++
 .../active-schedule.component.html            |  4 +-
 .../active-schedule.component.ts              | 31 +++++++-
 .../app/dashboard/dashboard.component.html    |  4 +-
 .../src/app/dashboard/dashboard.component.ts  | 11 ++-
 openapi.yaml                                  | 73 +++++++++++++++++-
 16 files changed, 307 insertions(+), 37 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java
 create mode 100644 frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 90e4b44..1d75187 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,12 +5,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts" afterDir="false" />
       <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -101,7 +111,8 @@
       <workItem from="1698067098771" duration="4770000" />
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
-      <workItem from="1698246651541" duration="4710000" />
+      <workItem from="1698246651541" duration="5106000" />
+      <workItem from="1698298897364" duration="2350000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -205,8 +216,18 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>42</line>
-          <option name="timeStamp" value="2" />
+          <line>158</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
+          <line>167</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java</url>
+          <line>123</line>
+          <option name="timeStamp" value="5" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index d4dd87b..aa64ab9 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -1,10 +1,7 @@
 package core.api.controller;
 
 import core.api.models.auth.SimpleStatusResponse;
-import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
-import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
-import core.api.models.timemanager.taskSchedule.ScheduleActivateInfo;
-import core.api.models.timemanager.taskSchedule.ScheduleInfo;
+import core.api.models.timemanager.taskSchedule.*;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
 import core.entities.timemanager.Task;
@@ -103,9 +100,9 @@ public class ScheduleController {
         return ResponseEntity.ok(new SimpleStatusResponse("success"));
     }
 
-    @GetMapping("/schedules/today")
-    public ResponseEntity<?> loadTodaysSchedules() {
-        ServiceResult<List<BasicTaskSchedule>> todaysSchedules = taskScheduleService.loadTodaysSchedule(SecurityContextHolder.getContext().getAuthentication().getName());
+    @GetMapping("/schedules/today/{activateable}")
+    public ResponseEntity<?> loadTodaysSchedules(@PathVariable boolean activateable) {
+        ServiceResult<List<BasicTaskSchedule>> todaysSchedules = taskScheduleService.loadTodaysSchedule(SecurityContextHolder.getContext().getAuthentication().getName(), activateable);
         if(todaysSchedules.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
             return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
         } else {
@@ -145,7 +142,7 @@ public class ScheduleController {
     public ResponseEntity<?> getActiveSchedule() {
         ServiceResult<BasicTaskSchedule> activeScheduleResult = taskScheduleService.getActiveSchedule(SecurityContextHolder.getContext().getAuthentication().getName());
         if(activeScheduleResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
-            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+            return ResponseEntity.ok(new ScheduleInfo());
         } else {
             return ResponseEntity.ok(new ScheduleInfo(activeScheduleResult.getResult()));
         }
@@ -165,8 +162,31 @@ public class ScheduleController {
         ServiceResult<BasicTaskSchedule> scheduleActivateResult = taskScheduleService.activateSchedule(schedulePermissionResult.getResult());
         if(scheduleActivateResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
             return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
-        } else {
+        } else if(scheduleActivateResult.getExitCode() == ServiceExitCode.OK){
             return ResponseEntity.ok(new ScheduleActivateInfo(scheduleActivateResult.getResult().getStartTime()));
+        } else {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
         }
     }
+
+    @PostMapping("/schedules/{scheduleID}/stop/{finish}")
+    public ResponseEntity<?> stopSchedule(@PathVariable long scheduleID, @PathVariable boolean finish) {
+        PermissionResult<BasicTaskSchedule> schedulePermissionResult = taskScheduleService.getSchedulePermissions(scheduleID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!schedulePermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(schedulePermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        ServiceResult<Integer> stopResult = taskScheduleService.stopSchedule(schedulePermissionResult.getResult());
+        if(stopResult.getExitCode() == ServiceExitCode.INVALID_OPERATION) {
+            return ResponseEntity.status(400).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(new TaskScheduleStopResponse(stopResult.getResult()));
+        }
+
+
+    }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
index f92eead..65a12c8 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java
@@ -44,6 +44,10 @@ public class ScheduleInfo {
         this.taskgroupPath = taskgroupPath.stream().map(TaskgroupEntityInfo::new).toList();
     }
 
+    public ScheduleInfo() {
+        this.scheduleID = -1;
+    }
+
     public long getScheduleID() {
         return scheduleID;
     }
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
new file mode 100644
index 0000000..460c247
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java
@@ -0,0 +1,18 @@
+package core.api.models.timemanager.taskSchedule;
+
+public class TaskScheduleStopResponse {
+
+    private int workTime;
+
+    public TaskScheduleStopResponse(int workTime) {
+        this.workTime = workTime;
+    }
+
+    public int getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(int workTime) {
+        this.workTime = workTime;
+    }
+}
diff --git a/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
index d9e0f6a..55fd4e7 100644
--- a/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
+++ b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
@@ -75,4 +75,8 @@ public class BasicTaskSchedule {
     public void setFinishedTime(LocalDateTime finishedTime) {
         this.finishedTime = finishedTime;
     }
+
+    public boolean isActivateAble() {
+        return startTime == null;
+    }
 }
diff --git a/backend/src/main/java/core/services/ServiceExitCode.java b/backend/src/main/java/core/services/ServiceExitCode.java
index 6105f94..4282071 100644
--- a/backend/src/main/java/core/services/ServiceExitCode.java
+++ b/backend/src/main/java/core/services/ServiceExitCode.java
@@ -4,5 +4,6 @@ public enum ServiceExitCode {
 
     OK,
     ENTITY_ALREADY_EXIST,
-    MISSING_ENTITY;
+    MISSING_ENTITY,
+    INVALID_OPERATION;
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index be1f5cd..b3e2c9d 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -10,6 +10,7 @@ import core.repositories.timemanager.TaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -53,10 +54,21 @@ public class TaskScheduleService {
         basicTaskScheduleRepository.deleteBasicTaskScheduleByID(basicTaskSchedule.getScheduleID());
     }
 
-    public ServiceResult<List<BasicTaskSchedule>> loadTodaysSchedule(String username) {
+    public ServiceResult<List<BasicTaskSchedule>> loadTodaysSchedule(String username, boolean onlyActivateable) {
         Optional<User> user = userRepository.findByUsername(username);
-        return user.map(value -> new ServiceResult<>(basicTaskScheduleRepository.findAllByUserAndDate(value, LocalDate.now()))).orElseGet(() ->
-                new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
+        if(user.isEmpty()) {
+            return new ServiceResult<>(ServiceExitCode.MISSING_ENTITY);
+        }
+
+        List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUserAndDate(user.get(), LocalDate.now());
+        if(onlyActivateable) {
+            for(int i=0; i<basicTaskSchedules.size(); i++)  {
+                if(!basicTaskSchedules.get(i).isActivateAble()) {
+                    basicTaskSchedules.remove(i);
+                }
+            }
+        }
+        return new ServiceResult<>(basicTaskSchedules);
     }
 
     public ServiceResult<List<BasicTaskSchedule>> loadSchedules(String username) {
@@ -88,6 +100,11 @@ public class TaskScheduleService {
     }
 
     public ServiceResult<BasicTaskSchedule> activateSchedule(BasicTaskSchedule taskSchedule) {
+        //Check if taskSchedule can be started
+        if(taskSchedule.getStartTime() != null) {
+            return new ServiceResult<>(ServiceExitCode.INVALID_OPERATION);
+        }
+
         if(getActiveSchedule(taskSchedule.getTask().getTaskgroup().getUser().getUsername()).getExitCode() == ServiceExitCode.MISSING_ENTITY) {
             taskSchedule.setStartTime(LocalDateTime.now());
             basicTaskScheduleRepository.save(taskSchedule);
@@ -96,4 +113,19 @@ public class TaskScheduleService {
             return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
         }
     }
+
+    public ServiceResult<Integer> stopSchedule(BasicTaskSchedule taskSchedule) {
+        if(taskSchedule.getStartTime() == null || taskSchedule.getFinishedTime() != null) {
+            return new ServiceResult<>(ServiceExitCode.INVALID_OPERATION);
+        }
+
+        taskSchedule.setFinishedTime(LocalDateTime.now());
+        long activeTime = Duration.between(taskSchedule.getStartTime(), taskSchedule.getFinishedTime()).toMinutes();
+        long workTime = (taskSchedule.getTask().getWorkTime() + activeTime);
+        int workTime_i = (int) (workTime);
+        taskSchedule.getTask().setWorkTime(workTime_i);
+        basicTaskScheduleRepository.save(taskSchedule);
+        taskRepository.save(taskSchedule.getTask());
+        return new ServiceResult<>(workTime_i);
+    }
 }
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 8041db9..bd6b702 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -34,6 +34,7 @@ model/signUpRequest.ts
 model/simpleStatusResponse.ts
 model/taskEntityInfo.ts
 model/taskFieldInfo.ts
+model/taskScheduleStopResponse.ts
 model/taskShortInfo.ts
 model/taskgroupDetailInfo.ts
 model/taskgroupEntityInfo.ts
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index 95c13ff..e8c21da 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -23,6 +23,7 @@ import { BasicScheduleFieldInfo } from '../model/models';
 import { ScheduleActivateInfo } from '../model/models';
 import { ScheduleInfo } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
+import { TaskScheduleStopResponse } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
@@ -392,6 +393,68 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * @param scheduleID internal id of schedule
+     * @param finish internal id of schedule
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesScheduleIDStopFinishPost(scheduleID: number, finish: boolean, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<TaskScheduleStopResponse>;
+    public schedulesScheduleIDStopFinishPost(scheduleID: number, finish: boolean, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<TaskScheduleStopResponse>>;
+    public schedulesScheduleIDStopFinishPost(scheduleID: number, finish: boolean, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<TaskScheduleStopResponse>>;
+    public schedulesScheduleIDStopFinishPost(scheduleID: number, finish: boolean, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (scheduleID === null || scheduleID === undefined) {
+            throw new Error('Required parameter scheduleID was null or undefined when calling schedulesScheduleIDStopFinishPost.');
+        }
+        if (finish === null || finish === undefined) {
+            throw new Error('Required parameter finish was null or undefined when calling schedulesScheduleIDStopFinishPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<TaskScheduleStopResponse>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(scheduleID))}/stop/${encodeURIComponent(String(finish))}`,
+            null,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * creates basic schedule for task
      * creates a basic schedule for a task
@@ -588,13 +651,17 @@ export class ScheduleService {
     /**
      * get today\&#39;s schedules
      * get all schedules of today
+     * @param activateable determines whether only schedules that can be started should be included or all schedules of today
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public schedulesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<ScheduleInfo>>;
-    public schedulesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<ScheduleInfo>>>;
-    public schedulesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<ScheduleInfo>>>;
-    public schedulesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+    public schedulesTodayActivateableGet(activateable: boolean, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<ScheduleInfo>>;
+    public schedulesTodayActivateableGet(activateable: boolean, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<ScheduleInfo>>>;
+    public schedulesTodayActivateableGet(activateable: boolean, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<ScheduleInfo>>>;
+    public schedulesTodayActivateableGet(activateable: boolean, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (activateable === null || activateable === undefined) {
+            throw new Error('Required parameter activateable was null or undefined when calling schedulesTodayActivateableGet.');
+        }
 
         let localVarHeaders = this.defaultHeaders;
 
@@ -628,7 +695,7 @@ export class ScheduleService {
             responseType_ = 'text';
         }
 
-        return this.httpClient.get<Array<ScheduleInfo>>(`${this.configuration.basePath}/schedules/today`,
+        return this.httpClient.get<Array<ScheduleInfo>>(`${this.configuration.basePath}/schedules/today/${encodeURIComponent(String(activateable))}`,
             {
                 context: localVarHttpContext,
                 responseType: <any>responseType_,
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index c9d526d..b684587 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -18,6 +18,7 @@ export * from './signUpRequest';
 export * from './simpleStatusResponse';
 export * from './taskEntityInfo';
 export * from './taskFieldInfo';
+export * from './taskScheduleStopResponse';
 export * from './taskShortInfo';
 export * from './taskgroupDetailInfo';
 export * from './taskgroupEntityInfo';
diff --git a/frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts b/frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts
new file mode 100644
index 0000000..ed859c9
--- /dev/null
+++ b/frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts
@@ -0,0 +1,6 @@
+import {ScheduleInfo} from "../../../api";
+
+export interface StopActiveScheduleInfo {
+  schedule: ScheduleInfo
+  workedMinutes: number
+}
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 10a1c1f..b793d84 100644
--- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.html
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html
@@ -13,7 +13,7 @@
     <p class="gray-text" *ngIf="activeSchedule!.scheduleType==='BASIC'">Running for {{displayTime}}</p>
   </mat-card-content>
   <mat-card-actions>
-    <button mat-raised-button class="grayBtn">Stop</button>
-    <button mat-raised-button class="greenBtn">Finish</button>
+    <button mat-raised-button class="grayBtn" (click)="stopTask(false)">Stop</button>
+    <button mat-raised-button class="greenBtn" (click)="stopTask(true)">Finish</button>
   </mat-card-actions>
 </mat-card>
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 40b2412..c23a344 100644
--- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
@@ -1,5 +1,6 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {ScheduleInfo, ScheduleService} from "../../../api";
+import {StopActiveScheduleInfo} from "./StopActiveScheduleInfo";
 
 @Component({
   selector: 'app-active-schedule',
@@ -13,6 +14,8 @@ export class ActiveScheduleComponent implements OnInit{
   currentTime: number = 0;
   displayTime: string = "00:00:00"
 
+  @Output('onStopTask') scheduleStopEmitter = new EventEmitter<StopActiveScheduleInfo>;
+
   constructor(private scheduleService: ScheduleService) {
 
 
@@ -40,12 +43,32 @@ export class ActiveScheduleComponent implements OnInit{
   ngOnInit(): void {
     this.scheduleService.schedulesActiveGet().subscribe({
       next: resp => {
-        this.activeSchedule = resp;
-        this.startTime = new Date(this.activeSchedule.startTime).getTime();
-        this.updateTime()
+        if(resp.scheduleID >= 0) {
+          this.activateSchedule(resp);
+        }
+
+      },
+
+    })
+  }
+
+  stopTask(finish: boolean) {
+    this.scheduleService.schedulesScheduleIDStopFinishPost(this.activeSchedule!.scheduleID, finish).subscribe({
+      next: resp => {
+        this.scheduleStopEmitter.emit({
+          schedule: this.activeSchedule!,
+          workedMinutes: resp.workTime
+        })
+        this.activeSchedule = undefined
       }
     })
   }
 
+  activateSchedule(schedule: ScheduleInfo) {
+    this.activeSchedule = schedule;
+    this.startTime = new Date(this.activeSchedule.startTime).getTime();
+    this.updateTime();
+  }
+
 
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 36181bc..3b16ade 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -6,9 +6,9 @@
         <a class="btn-link" routerLink="/">Reschedule</a>
       </mat-card-content>
     </mat-card>
-    <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: 0 min</b></h1>
+    <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: {{workedMinutesToday}} min</b></h1>
 
-    <app-active-schedule #activeSchedule></app-active-schedule>
+    <app-active-schedule #activeSchedule (onStopTask)="stopedTask($event)"></app-active-schedule>
 
     <h1 class="dashboard-heading">Scheduled for today</h1>
     <mat-card class="green-card" *ngIf="schedules.length == 0">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index c0ffd44..7d74b8f 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,6 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {ScheduleInfo, ScheduleService} from "../../api";
 import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
+import {StopActiveScheduleInfo} from "./active-schedule/StopActiveScheduleInfo";
 
 @Component({
   selector: 'app-dashboard',
@@ -11,19 +12,18 @@ export class DashboardComponent implements OnInit{
 
   missedSchedules: boolean = true
   schedules: ScheduleInfo[] = []
+  workedMinutesToday: number = 0
 
   @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
   }
 
   ngOnInit() {
-    this.scheduleService.schedulesTodayGet().subscribe({
+    this.scheduleService.schedulesTodayActivateableGet(true).subscribe({
       next: resp => {
         this.schedules = resp;
       }
     })
-
-
   }
 
   startSchedule(schedule: ScheduleInfo) {
@@ -31,11 +31,14 @@ export class DashboardComponent implements OnInit{
       next: resp => {
         schedule.startTime = resp.startTime;
         if(this.activeScheduleComponent != undefined) {
-          this.activeScheduleComponent.activeSchedule = schedule;
+          this.activeScheduleComponent.activateSchedule(schedule);
         }
       }
     })
   }
 
 
+  stopedTask(stopActiveScheduleInfo: StopActiveScheduleInfo) {
+    this.workedMinutesToday += stopActiveScheduleInfo.workedMinutes;
+  }
 }
diff --git a/openapi.yaml b/openapi.yaml
index 00fd525..dd3cfe3 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1355,7 +1355,7 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
-  /schedules/today:
+  /schedules/today/{activateable}:
     get: 
       security:
         - API_TOKEN: []
@@ -1363,6 +1363,15 @@ paths:
         - schedule
       description: get all schedules of today
       summary: get today's schedules
+      parameters:
+        - name: activateable
+          in: path
+          description: determines whether only schedules that can be started should be included or all schedules of today
+          required: true
+          schema:
+            type: boolean
+            example: true
+          
       responses:
         200:
           description: Operation successfull
@@ -1483,6 +1492,57 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/{scheduleID}/stop/{finish}:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      parameters:
+        - name: scheduleID
+          in: path
+          description: internal id of schedule
+          required: true
+          schema:
+            type: number
+            example: 1
+        - name: finish
+          in: path
+          description: internal id of schedule
+          required: true
+          schema:
+            type: boolean
+            example: True
+      responses:
+        200:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/TaskScheduleStopResponse"
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Schedule does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        400:
+          description: Operation not valid
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+      
       
       
       
@@ -1909,4 +1969,13 @@ components:
         startTime:
           type: string
           format: date-time
-          description: point in time at which the schedule was started
\ No newline at end of file
+          description: point in time at which the schedule was started
+    TaskScheduleStopResponse:
+      required:
+        - workTime
+      additionalProperties: false
+      properties:
+        workTime:
+          type: number
+          description: time where the schedule was active
+          example: 10
\ No newline at end of file
-- 
2.34.1


From dfa06232b0b0b5e2a07e034a2d057dad4e4f4f42 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 09:40:54 +0200
Subject: [PATCH 25/50] Include TaskScheduleStopResponse

---
 .../src/api/model/taskScheduleStopResponse.ts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 frontend/src/api/model/taskScheduleStopResponse.ts

diff --git a/frontend/src/api/model/taskScheduleStopResponse.ts b/frontend/src/api/model/taskScheduleStopResponse.ts
new file mode 100644
index 0000000..b9a7937
--- /dev/null
+++ b/frontend/src/api/model/taskScheduleStopResponse.ts
@@ -0,0 +1,20 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface TaskScheduleStopResponse { 
+    /**
+     * time where the schedule was active
+     */
+    workTime: number;
+}
+
-- 
2.34.1


From cbd1a4ab19a75e8788fc496039d0f0310f4c81b8 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 09:43:59 +0200
Subject: [PATCH 26/50] Delete Schedule after it was performed

---
 backend/.idea/workspace.xml                   | 93 ++++++++++---------
 .../src/app/dashboard/dashboard.component.ts  |  1 +
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 1d75187..f221cac 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,24 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/TaskScheduleStopResponse.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/StopActiveScheduleInfo.ts" afterDir="false" />
-      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/.openapi-generator/FILES" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/model/models.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
-    </list>
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Include TaskScheduleStopResponse" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -56,31 +39,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;issue-11-angular-update&quot;,
-    &quot;last_directory_selection&quot;: &quot;D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Programmierprojekte/Dicewars/client&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;swagger&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "issue-11-angular-update",
+    "last_directory_selection": "D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager",
+    "last_opened_file_path": "D:/Programmierprojekte/Dicewars/client",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "swagger",
+    "ts.external.directory.path": "/snap/intellij-idea-ultimate/459/plugins/javascript-impl/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mariadb&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mariadb"
     ]
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
@@ -112,7 +97,7 @@
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
       <workItem from="1698246651541" duration="5106000" />
-      <workItem from="1698298897364" duration="2350000" />
+      <workItem from="1698298897364" duration="2689000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -186,7 +171,23 @@
       <option name="project" value="LOCAL" />
       <updated>1698247531000</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="Stop and Finish TaskSchedules">
+      <option name="closed" value="true" />
+      <created>1698306038382</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1698306038383</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Include TaskScheduleStopResponse">
+      <option name="closed" value="true" />
+      <created>1698306056254</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1698306056254</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -204,7 +205,9 @@
     <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
     <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
     <MESSAGE value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
+    <MESSAGE value="Stop and Finish TaskSchedules" />
+    <MESSAGE value="Include TaskScheduleStopResponse" />
+    <option name="LAST_COMMIT_MESSAGE" value="Include TaskScheduleStopResponse" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -226,8 +229,8 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java</url>
-          <line>123</line>
-          <option name="timeStamp" value="5" />
+          <line>124</line>
+          <option name="timeStamp" value="7" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 7d74b8f..0a089b9 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -40,5 +40,6 @@ export class DashboardComponent implements OnInit{
 
   stopedTask(stopActiveScheduleInfo: StopActiveScheduleInfo) {
     this.workedMinutesToday += stopActiveScheduleInfo.workedMinutes;
+    this.schedules = this.schedules.filter(schedule => schedule.scheduleID !== stopActiveScheduleInfo.schedule.scheduleID);
   }
 }
-- 
2.34.1


From bd90907bb8f0016c3f3170f4f931bf6933f38fae Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 09:47:21 +0200
Subject: [PATCH 27/50] Fix starting schedule and returning active time of
 schedule after stop

---
 backend/src/main/java/core/services/TaskScheduleService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index b3e2c9d..6840d42 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -83,6 +83,7 @@ public class TaskScheduleService {
             return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
         } else {
             BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now());
+            basicTaskSchedule.setStartTime(LocalDateTime.now());
             task.getBasicTaskSchedules().add(basicTaskSchedule);
             basicTaskScheduleRepository.save(basicTaskSchedule);
             taskRepository.save(task);
@@ -126,6 +127,6 @@ public class TaskScheduleService {
         taskSchedule.getTask().setWorkTime(workTime_i);
         basicTaskScheduleRepository.save(taskSchedule);
         taskRepository.save(taskSchedule.getTask());
-        return new ServiceResult<>(workTime_i);
+        return new ServiceResult<>((int) activeTime);
     }
 }
-- 
2.34.1


From 80dc508e67ec5e3d7ae34bc86c75a9951a53aa25 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 09:54:48 +0200
Subject: [PATCH 28/50] Remove update spamming in console

---
 backend/.idea/workspace.xml                   | 23 +++++++++++++++----
 .../active-schedule.component.ts              |  1 -
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index f221cac..22d5067 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Include TaskScheduleStopResponse" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix starting schedule and returning active time of schedule after stop">
+      <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/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -97,7 +101,7 @@
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
       <workItem from="1698246651541" duration="5106000" />
-      <workItem from="1698298897364" duration="2689000" />
+      <workItem from="1698298897364" duration="3234000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -187,7 +191,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698306056254</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Fix starting schedule and returning active time of schedule after stop">
+      <option name="closed" value="true" />
+      <created>1698306442833</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1698306442833</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -207,7 +219,8 @@
     <MESSAGE value="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
     <MESSAGE value="Stop and Finish TaskSchedules" />
     <MESSAGE value="Include TaskScheduleStopResponse" />
-    <option name="LAST_COMMIT_MESSAGE" value="Include TaskScheduleStopResponse" />
+    <MESSAGE value="Fix starting schedule and returning active time of schedule after stop" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix starting schedule and returning active time of schedule after stop" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -229,7 +242,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java</url>
-          <line>124</line>
+          <line>125</line>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
       </breakpoints>
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 c23a344..3328d12 100644
--- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
@@ -26,7 +26,6 @@ export class ActiveScheduleComponent implements OnInit{
     const now = Date.now();
     const elapsed = this.activeSchedule != undefined ? now - this.startTime + this.currentTime : this.currentTime;
     this.displayTime = this.formatTime(elapsed);
-    console.log("Update!")
     requestAnimationFrame(() => this.updateTime());
   }
 
-- 
2.34.1


From bcc9b4760fe4d913e99e8df1fd0ba89339fc1d06 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 10:02:03 +0200
Subject: [PATCH 29/50] Finish task and display finished tasks correctly

---
 backend/.idea/workspace.xml                   | 22 +++++++++++++------
 .../api/controller/ScheduleController.java    |  2 +-
 .../core/services/TaskScheduleService.java    |  5 ++++-
 .../task-dashboard.component.html             |  2 +-
 .../task-dashboard.component.ts               |  2 ++
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 22d5067..0c2911a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix starting schedule and returning active time of schedule after stop">
-      <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/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/active-schedule/active-schedule.component.ts" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -101,7 +100,7 @@
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
       <workItem from="1698246651541" duration="5106000" />
-      <workItem from="1698298897364" duration="3234000" />
+      <workItem from="1698298897364" duration="3634000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -199,7 +198,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698306442833</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="Remove update spamming in console">
+      <option name="closed" value="true" />
+      <created>1698306889808</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1698306889808</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -220,7 +227,8 @@
     <MESSAGE value="Stop and Finish TaskSchedules" />
     <MESSAGE value="Include TaskScheduleStopResponse" />
     <MESSAGE value="Fix starting schedule and returning active time of schedule after stop" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix starting schedule and returning active time of schedule after stop" />
+    <MESSAGE value="Remove update spamming in console" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove update spamming in console" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index aa64ab9..75ba77f 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -180,7 +180,7 @@ public class ScheduleController {
             return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
         }
 
-        ServiceResult<Integer> stopResult = taskScheduleService.stopSchedule(schedulePermissionResult.getResult());
+        ServiceResult<Integer> stopResult = taskScheduleService.stopSchedule(schedulePermissionResult.getResult(), finish);
         if(stopResult.getExitCode() == ServiceExitCode.INVALID_OPERATION) {
             return ResponseEntity.status(400).body(new SimpleStatusResponse("failed"));
         } else {
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 6840d42..b98d444 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -115,7 +115,7 @@ public class TaskScheduleService {
         }
     }
 
-    public ServiceResult<Integer> stopSchedule(BasicTaskSchedule taskSchedule) {
+    public ServiceResult<Integer> stopSchedule(BasicTaskSchedule taskSchedule, boolean finish) {
         if(taskSchedule.getStartTime() == null || taskSchedule.getFinishedTime() != null) {
             return new ServiceResult<>(ServiceExitCode.INVALID_OPERATION);
         }
@@ -125,6 +125,9 @@ public class TaskScheduleService {
         long workTime = (taskSchedule.getTask().getWorkTime() + activeTime);
         int workTime_i = (int) (workTime);
         taskSchedule.getTask().setWorkTime(workTime_i);
+        if(finish) {
+            taskSchedule.getTask().setFinished(true);
+        }
         basicTaskScheduleRepository.save(taskSchedule);
         taskRepository.save(taskSchedule.getTask());
         return new ServiceResult<>((int) activeTime);
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
index 030a157..0fc9f75 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.html
@@ -29,7 +29,7 @@
     <ng-container matColumnDef="finished">
       <th mat-header-cell *matHeaderCellDef mat-sort-header> Finished </th>
       <td mat-cell *matCellDef="let task">
-        <mat-checkbox [value]="task.finished" [contentEditable]="false" disableRipple="true" (click)="$event.preventDefault()"></mat-checkbox>
+        <mat-checkbox [checked]="task.finished" [contentEditable]="false" disableRipple="true" (click)="$event.preventDefault()"></mat-checkbox>
       </td>
     </ng-container>
     <ng-container matColumnDef="status">
diff --git a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
index ba18818..57357f7 100644
--- a/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
+++ b/frontend/src/app/tasks/task-dashboard/task-dashboard.component.ts
@@ -22,6 +22,8 @@ export class TaskDashboardComponent implements OnChanges{
           this.datasource = new MatTableDataSource<TaskEntityInfo>(resp);
           this.datasource.paginator = this.paginator!;
           this.datasource.sort = this.sort!;
+
+          resp.forEach(task => console.log(task))
         }
       })
     }
-- 
2.34.1


From 8b7354de510c3c3ed618f095aef4468b10e26099 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 10:13:57 +0200
Subject: [PATCH 30/50] Clear Worktime/ActiveTime Code

---
 backend/.idea/workspace.xml                               | 8 +-------
 .../src/main/java/core/services/TaskScheduleService.java  | 5 ++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 0c2911a..86e32db 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,7 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -100,7 +99,7 @@
       <workItem from="1698127431684" duration="2039000" />
       <workItem from="1698164397550" duration="2329000" />
       <workItem from="1698246651541" duration="5106000" />
-      <workItem from="1698298897364" duration="3634000" />
+      <workItem from="1698298897364" duration="4242000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -248,11 +247,6 @@
           <line>167</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java</url>
-          <line>125</line>
-          <option name="timeStamp" value="7" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index b98d444..464e84d 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -122,9 +122,8 @@ public class TaskScheduleService {
 
         taskSchedule.setFinishedTime(LocalDateTime.now());
         long activeTime = Duration.between(taskSchedule.getStartTime(), taskSchedule.getFinishedTime()).toMinutes();
-        long workTime = (taskSchedule.getTask().getWorkTime() + activeTime);
-        int workTime_i = (int) (workTime);
-        taskSchedule.getTask().setWorkTime(workTime_i);
+        long workTime = taskSchedule.getTask().getWorkTime() + activeTime;
+        taskSchedule.getTask().setWorkTime((int) workTime);
         if(finish) {
             taskSchedule.getTask().setFinished(true);
         }
-- 
2.34.1


From 673faa5912be7ed3af564d35316a8c477d5a9dd8 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Thu, 26 Oct 2023 10:21:29 +0200
Subject: [PATCH 31/50] First Approach to visualize nested taskgroups

---
 frontend/src/app/dashboard/dashboard.component.html | 13 ++++++++++++-
 frontend/src/app/dashboard/dashboard.component.ts   |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 3b16ade..05f687c 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -42,7 +42,18 @@
   <div class="taskgroup-overview">
       <mat-action-list>
         <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
-        <button mat-list-item class="taskgroup-btn">Algorithmen II</button>
+        <div mat-list-item class="taskgroup-btn">
+          <button mat-list-item (click)="test()">Algorithmen II</button>
+          <div style=" background: aliceblue">
+            <mat-action-list style="margin-left: 20px;" *ngIf="test_Var">
+              <button mat-list-item class="taskgroup-btn">
+                Vorlesungen
+              </button>
+            </mat-action-list>
+          </div>
+
+        </div>
+
         <button mat-list-item class="taskgroup-last-btn">Computer Grafik</button>
       </mat-action-list>
   </div>
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 0a089b9..4cf6195 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -13,6 +13,7 @@ export class DashboardComponent implements OnInit{
   missedSchedules: boolean = true
   schedules: ScheduleInfo[] = []
   workedMinutesToday: number = 0
+  test_Var: boolean = false;
 
   @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
@@ -42,4 +43,8 @@ export class DashboardComponent implements OnInit{
     this.workedMinutesToday += stopActiveScheduleInfo.workedMinutes;
     this.schedules = this.schedules.filter(schedule => schedule.scheduleID !== stopActiveScheduleInfo.schedule.scheduleID);
   }
+
+  test() {
+    this.test_Var = !this.test_Var;
+  }
 }
-- 
2.34.1


From 7ee892884981518aab08d1f4363ca408f4d67055 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 08:48:52 +0200
Subject: [PATCH 32/50] Taskgroup Overview with Action-List

---
 backend/.idea/workspace.xml                   |  55 ++++---
 frontend/src/app/app.module.ts                |  76 +++++-----
 .../src/app/dashboard/dashboard.component.css |   7 +
 .../app/dashboard/dashboard.component.html    |  19 +--
 .../src/app/dashboard/dashboard.component.ts  |   5 +-
 .../taskgroup-overview.component.css          | 142 ++++++++++++++++++
 .../taskgroup-overview.component.html         |   7 +
 .../taskgroup-overview.component.spec.ts      |  21 +++
 .../taskgroup-overview.component.ts           |  14 ++
 9 files changed, 265 insertions(+), 81 deletions(-)
 create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
 create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
 create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.spec.ts
 create mode 100644 frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 86e32db..07e8d25 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,7 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,33 +44,33 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "issue-11-angular-update",
-    "last_directory_selection": "D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager",
-    "last_opened_file_path": "D:/Programmierprojekte/Dicewars/client",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "swagger",
-    "ts.external.directory.path": "/snap/intellij-idea-ultimate/459/plugins/javascript-impl/jsLanguageServicesImpl/external",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;issue-11-angular-update&quot;,
+    &quot;last_directory_selection&quot;: &quot;D:/Programmierprojekte/TimeManager/backend/src/main/java/core/api/models/timemanager&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Programmierprojekte/Dicewars/client&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;swagger&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/snap/intellij-idea-ultimate/459/plugins/javascript-impl/jsLanguageServicesImpl/external&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "mariadb"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mariadb&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RunManager">
     <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="demo" />
@@ -100,6 +103,8 @@
       <workItem from="1698164397550" duration="2329000" />
       <workItem from="1698246651541" duration="5106000" />
       <workItem from="1698298897364" duration="4242000" />
+      <workItem from="1698426430946" duration="665000" />
+      <workItem from="1698474363766" duration="612000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index c107997..8043478 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -64,6 +64,8 @@ import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-sched
 import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { ActiveScheduleComponent } from './dashboard/active-schedule/active-schedule.component';
+import {MatTreeModule} from "@angular/material/tree";
+import { TaskgroupOverviewComponent } from './dashboard/taskgroup-overview/taskgroup-overview.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -92,43 +94,45 @@ import { ActiveScheduleComponent } from './dashboard/active-schedule/active-sche
     BasicSchedulerComponent,
     ScheduleDashboardComponent,
     DashboardComponent,
-    ActiveScheduleComponent
-  ],
-  imports: [
-    BrowserModule,
-    AppRoutingModule,
-    FormsModule,
-    ApiModule,
-    HttpClientModule,
-    BrowserAnimationsModule,
-    MatToolbarModule,
-    MatButtonModule,
-    MatIconModule,
-    MatDialogModule,
-    MatFormFieldModule,
-    MatInputModule,
-    MatProgressSpinnerModule,
-    MatSnackBarModule,
-    MatMenuModule,
-    MatTabsModule,
-    MatTableModule,
-    MatCheckboxModule,
-    MatCardModule,
-    ReactiveFormsModule,
-    MatListModule,
-    MatDatepickerModule,
-    MatInputModule,
-    MatDatepickerModule,
-    MatMomentDateModule,
-    FormsModule,
-    MatSlideToggleModule,
-    MatSortModule,
-    MatPaginatorModule,
-    MatProgressBarModule,
-    MatExpansionModule,
-    CalendarModule.forRoot({provide: DateAdapter, useFactory: adapterFactory}),
-    MatSelectModule
+    ActiveScheduleComponent,
+    TaskgroupOverviewComponent
   ],
+    imports: [
+        BrowserModule,
+        AppRoutingModule,
+        FormsModule,
+        ApiModule,
+        HttpClientModule,
+        BrowserAnimationsModule,
+        MatToolbarModule,
+        MatButtonModule,
+        MatIconModule,
+        MatDialogModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatProgressSpinnerModule,
+        MatSnackBarModule,
+        MatMenuModule,
+        MatTabsModule,
+        MatTableModule,
+        MatCheckboxModule,
+        MatCardModule,
+        ReactiveFormsModule,
+        MatListModule,
+        MatDatepickerModule,
+        MatInputModule,
+        MatDatepickerModule,
+        MatMomentDateModule,
+        FormsModule,
+        MatSlideToggleModule,
+        MatSortModule,
+        MatPaginatorModule,
+        MatProgressBarModule,
+        MatExpansionModule,
+        CalendarModule.forRoot({provide: DateAdapter, useFactory: adapterFactory}),
+        MatSelectModule,
+        MatTreeModule
+    ],
   providers: [
     HttpClientModule,
     /*
diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
index b6f411a..d6a2964 100644
--- a/frontend/src/app/dashboard/dashboard.component.css
+++ b/frontend/src/app/dashboard/dashboard.component.css
@@ -133,3 +133,10 @@
 .right-actions {
   float: right;
 }
+
+.taskgroup-first-child {
+  background-color: #f3f3f3;
+  border: 0 solid #000000;
+  border-top-width: 1px;
+  border-bottom-width: 1px;
+}
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 05f687c..a516d20 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -39,23 +39,10 @@
 
   </div>
   <span class="spacer"></span>
+
   <div class="taskgroup-overview">
-      <mat-action-list>
-        <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
-        <div mat-list-item class="taskgroup-btn">
-          <button mat-list-item (click)="test()">Algorithmen II</button>
-          <div style=" background: aliceblue">
-            <mat-action-list style="margin-left: 20px;" *ngIf="test_Var">
-              <button mat-list-item class="taskgroup-btn">
-                Vorlesungen
-              </button>
-            </mat-action-list>
-          </div>
-
-        </div>
-
-        <button mat-list-item class="taskgroup-last-btn">Computer Grafik</button>
-      </mat-action-list>
+      <app-taskgroup-overview></app-taskgroup-overview>
   </div>
 
+
 </div>
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 4cf6195..ccc66d2 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -13,7 +13,6 @@ export class DashboardComponent implements OnInit{
   missedSchedules: boolean = true
   schedules: ScheduleInfo[] = []
   workedMinutesToday: number = 0
-  test_Var: boolean = false;
 
   @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
@@ -44,7 +43,5 @@ export class DashboardComponent implements OnInit{
     this.schedules = this.schedules.filter(schedule => schedule.scheduleID !== stopActiveScheduleInfo.schedule.scheduleID);
   }
 
-  test() {
-    this.test_Var = !this.test_Var;
-  }
+
 }
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
new file mode 100644
index 0000000..d6a2964
--- /dev/null
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -0,0 +1,142 @@
+.container {
+  margin: 20px auto;
+  width: 70%;
+  display: flex;
+}
+
+.spacer {
+  margin-bottom: 2.5%;
+}
+
+
+@media screen and (max-width: 600px) {
+  .container {
+    width: 100%;
+    margin: 20px 10px;
+  }
+}
+
+.today-worked-info {
+  margin-left: 20px;
+  background-color: #e1e1e1;
+  padding-right: 5px;
+  padding-left: 5px;
+  border-radius: 5px;
+}
+
+.red-card {
+  background-color: #e54c3c;
+  color: white;
+}
+
+.green-card {
+  background-color: #00bc8c;
+  color: white;
+}
+
+.main-container {
+  width: 45%;
+  margin-right: 20px;
+}
+
+.btn-link {
+  text-decoration: underline;
+  color: white;
+  margin-left: 20px;
+}
+
+.dashboard-heading {
+  margin-top: 20px;
+  font-size: 2.5em;
+}
+
+.today-worked-info {
+  font-size: .8em;
+}
+
+
+.lightBlueBtn {
+  background-color: #3498db;
+  color: white;
+}
+
+.grayBtn {
+  background-color: #444444;
+  color: white;
+  border-radius: 0;
+}
+
+::ng-deep .mat-mdc-list-base {
+  --mdc-list-list-item-label-text-color: white
+}
+
+::ng-deep .mat-mdc-list-base .taskgroup-btn, ::ng-deep .mat-mdc-list-base .taskgroup-last-btn  {
+  --mdc-list-list-item-label-text-color: black
+}
+
+.taskgroup-overview {
+  width: 25%;
+  float: right;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+.taskgroup-btn {
+  background-color: #f3f3f3;
+  border: 0 solid #000000;
+  border-bottom-width: 1px;
+}
+
+.taskgroup-last-btn {
+  background-color: #f3f3f3;
+}
+
+.link-no-deco {
+  text-decoration: none;
+  color: black;
+}
+
+.link-no-deco:hover{
+  text-decoration: underline;
+}
+
+.gray-text {
+  color: #6e6e6e;
+}
+
+.yellowBtn {
+  background-color: #f39c12;
+  color: white;
+  border-radius: 0;
+}
+
+.primaryBtn {
+  border-radius: 0;
+}
+
+
+::ng-deep .mat-mdc-card-header-text {
+  display: block;
+  width: 100%;
+}
+
+.schedule-del-btn {
+  margin-top: 10px;
+}
+
+.left-actions {
+  float: left;
+}
+
+.right-actions {
+  float: right;
+}
+
+.taskgroup-first-child {
+  background-color: #f3f3f3;
+  border: 0 solid #000000;
+  border-top-width: 1px;
+  border-bottom-width: 1px;
+}
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
new file mode 100644
index 0000000..77e3667
--- /dev/null
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -0,0 +1,7 @@
+<mat-action-list>
+  <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
+  <button mat-list-item (click)="test()" class="taskgroup-btn">Algorithmen II</button>
+  <button mat-list-item *ngIf="test_Var" class="taskgroup-btn"><span style="margin-left: 10px">Vorlesungen</span></button>
+  <button mat-list-item *ngIf="test_Var" class="taskgroup-btn"><span style="margin-left: 10px">Übungen</span></button>
+  <button mat-list-item class="taskgroup-last-btn" *ngIf="!test_Var">Computer Grafik</button>
+</mat-action-list>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.spec.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.spec.ts
new file mode 100644
index 0000000..064cc0d
--- /dev/null
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TaskgroupOverviewComponent } from './taskgroup-overview.component';
+
+describe('TaskgroupOverviewComponent', () => {
+  let component: TaskgroupOverviewComponent;
+  let fixture: ComponentFixture<TaskgroupOverviewComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [TaskgroupOverviewComponent]
+    });
+    fixture = TestBed.createComponent(TaskgroupOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
new file mode 100644
index 0000000..bfba540
--- /dev/null
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-taskgroup-overview',
+  templateUrl: './taskgroup-overview.component.html',
+  styleUrls: ['./taskgroup-overview.component.css']
+})
+export class TaskgroupOverviewComponent {
+
+  test_Var: boolean = false;
+  test() {
+    this.test_Var = !this.test_Var;
+  }
+}
-- 
2.34.1


From eb197aca52841c5457c8a4106232d1acc65b10a9 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 09:09:00 +0200
Subject: [PATCH 33/50] Taskgroup Overview with Action-List

---
 .../taskgroup-overview.component.css          |  4 +
 .../taskgroup-overview.component.html         | 24 ++++--
 .../taskgroup-overview.component.ts           | 79 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index d6a2964..2b7e42c 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -140,3 +140,7 @@
   border-top-width: 1px;
   border-bottom-width: 1px;
 }
+
+.node-name {
+  font-style: normal;
+}
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index 77e3667..e576d32 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -1,7 +1,21 @@
-<mat-action-list>
+<mat-action-list style="padding: 0">
   <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
-  <button mat-list-item (click)="test()" class="taskgroup-btn">Algorithmen II</button>
-  <button mat-list-item *ngIf="test_Var" class="taskgroup-btn"><span style="margin-left: 10px">Vorlesungen</span></button>
-  <button mat-list-item *ngIf="test_Var" class="taskgroup-btn"><span style="margin-left: 10px">Übungen</span></button>
-  <button mat-list-item class="taskgroup-last-btn" *ngIf="!test_Var">Computer Grafik</button>
 </mat-action-list>
+<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
+  <!-- This is the tree node template for leaf nodes -->
+  <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn">
+    <!-- use a disabled button to provide padding for tree leaf -->
+    <button mat-icon-button disabled></button>
+    <button mat-button>{{node.name}}</button>
+  </mat-tree-node>
+  <!-- This is the tree node template for expandable nodes -->
+  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn">
+    <button mat-icon-button matTreeNodeToggle
+            [attr.aria-label]="'Toggle ' + node.name">
+      <mat-icon class="mat-icon-rtl-mirror">
+        {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+      </mat-icon>
+    </button>
+    <button mat-button>{{node.name}}</button>
+  </mat-tree-node>
+</mat-tree>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
index bfba540..acf9627 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -1,5 +1,55 @@
 import { Component } from '@angular/core';
+import {MatIconModule} from "@angular/material/icon";
+import {MatButtonModule} from "@angular/material/button";
+import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeModule} from "@angular/material/tree";
+import {FlatTreeControl} from "@angular/cdk/tree";
 
+
+interface TreeNode {
+  name: string
+  children?: TreeNode[]
+}
+
+const TREE_DATA: TreeNode[] = [
+  {
+    name: "KIT",
+    children: [
+      {
+        name: "WS23",
+        children: [
+          {
+            name: "Computergrafik",
+            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
+          },
+          {
+            name: "Softwaretechnik II",
+            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
+          },
+          {
+            name: "Algorithmen II",
+            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
+          }
+        ]
+      },
+      {
+        name: "SS24",
+        children: [
+          {
+            name: "Interaktive Computergrafik",
+            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
+          }
+        ]
+      }
+    ]
+  }
+]
+
+/** Flat node with expandable and level information */
+interface ExampleFlatNode {
+  expandable: boolean;
+  name: string;
+  level: number;
+}
 @Component({
   selector: 'app-taskgroup-overview',
   templateUrl: './taskgroup-overview.component.html',
@@ -7,8 +57,31 @@ import { Component } from '@angular/core';
 })
 export class TaskgroupOverviewComponent {
 
-  test_Var: boolean = false;
-  test() {
-    this.test_Var = !this.test_Var;
+  private _transformer = (node: TreeNode, level: number) => {
+    return {
+      expandable: !!node.children && node.children.length > 0,
+      name: node.name,
+      level: level,
+    };
+  };
+
+  treeControl = new FlatTreeControl<ExampleFlatNode>(
+    node => node.level,
+    node => node.expandable,
+  );
+
+  treeFlattener = new MatTreeFlattener(
+    this._transformer,
+    node => node.level,
+    node => node.expandable,
+    node => node.children,
+  );
+
+  dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
+
+  constructor() {
+    this.dataSource.data = TREE_DATA;
   }
+
+  hasChild = (_: number, node: ExampleFlatNode) => node.expandable;
 }
-- 
2.34.1


From b57ee244c0098ab63dc6f03d69cb7a4d00b9c534 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 09:46:32 +0200
Subject: [PATCH 34/50] Adjust Padding and Font-Weight

---
 .../taskgroup-overview.component.css                   |  1 +
 .../taskgroup-overview.component.html                  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index 2b7e42c..2d2f9c7 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -143,4 +143,5 @@
 
 .node-name {
   font-style: normal;
+  font-weight: normal;
 }
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index e576d32..c0b2d37 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -3,19 +3,19 @@
 </mat-action-list>
 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
   <!-- This is the tree node template for leaf nodes -->
-  <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn">
+  <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button disabled></button>
-    <button mat-button>{{node.name}}</button>
+    <button mat-button class="node-name">{{node.name}}</button>
   </mat-tree-node>
   <!-- This is the tree node template for expandable nodes -->
-  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn">
+  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
     <button mat-icon-button matTreeNodeToggle
-            [attr.aria-label]="'Toggle ' + node.name">
+            [attr.aria-label]="'Toggle ' + node.name" style="padding-left: 10px">
       <mat-icon class="mat-icon-rtl-mirror">
         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
       </mat-icon>
     </button>
-    <button mat-button>{{node.name}}</button>
+    <button mat-button class="node-name">{{node.name}}</button>
   </mat-tree-node>
 </mat-tree>
-- 
2.34.1


From 7d123f87ae782dad83954a8300b547e240412a6a Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 09:50:12 +0200
Subject: [PATCH 35/50] Change text-align of taskgroup btns

---
 .../taskgroup-overview/taskgroup-overview.component.css          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index 2d2f9c7..ff6ca31 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -144,4 +144,5 @@
 .node-name {
   font-style: normal;
   font-weight: normal;
+  text-align: left;
 }
-- 
2.34.1


From 7394f9910a38948313267db8a1880cabe1915b2d Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 11:22:14 +0200
Subject: [PATCH 36/50] Use backend as taskgroup source and add number active
 tasks

---
 backend/.idea/workspace.xml                   |  8 +-
 .../api/controller/TaskgroupController.java   |  8 ++
 .../taskgroup/RecursiveTaskgroupInfo.java     | 63 +++++++++++++++
 .../timemanager/tasks/TaskOverviewInfo.java   | 72 +++++++++++++++++
 frontend/src/api/.openapi-generator/FILES     |  2 +
 frontend/src/api/api/taskgroup.service.ts     | 56 +++++++++++++
 frontend/src/api/model/models.ts              |  2 +
 .../src/api/model/recursiveTaskgroupInfo.ts   | 27 +++++++
 frontend/src/api/model/taskOverviewInfo.ts    | 40 ++++++++++
 .../taskgroup-overview.component.css          | 19 ++++-
 .../taskgroup-overview.component.html         | 12 ++-
 .../taskgroup-overview.component.ts           | 61 ++++----------
 openapi.yaml                                  | 80 ++++++++++++++++++-
 13 files changed, 397 insertions(+), 53 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
 create mode 100644 backend/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java
 create mode 100644 frontend/src/api/model/recursiveTaskgroupInfo.ts
 create mode 100644 frontend/src/api/model/taskOverviewInfo.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 07e8d25..614d225 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,10 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/app.module.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,7 +104,7 @@
       <workItem from="1698246651541" duration="5106000" />
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
-      <workItem from="1698474363766" duration="612000" />
+      <workItem from="1698474363766" duration="1934000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/controller/TaskgroupController.java b/backend/src/main/java/core/api/controller/TaskgroupController.java
index 3aac83d..6de2010 100644
--- a/backend/src/main/java/core/api/controller/TaskgroupController.java
+++ b/backend/src/main/java/core/api/controller/TaskgroupController.java
@@ -1,6 +1,7 @@
 package core.api.controller;
 
 import core.api.models.auth.SimpleStatusResponse;
+import core.api.models.timemanager.taskgroup.RecursiveTaskgroupInfo;
 import core.api.models.timemanager.taskgroup.TaskgroupDetailInfo;
 import core.api.models.timemanager.taskgroup.TaskgroupEntityInfo;
 import core.api.models.timemanager.taskgroup.TaskgroupFieldInfo;
@@ -80,6 +81,13 @@ public class TaskgroupController {
         return ResponseEntity.ok(taskgroupEntityInfos);
     }
 
+    @GetMapping("/taskgroups/tree")
+    public ResponseEntity<List<RecursiveTaskgroupInfo>> listTaskgroupsOfUserAsTree() {
+        List<Taskgroup> taskgroups = taskgroupService.getTopTaskgroupsByUser(SecurityContextHolder.getContext().getAuthentication().getName());
+        List<RecursiveTaskgroupInfo> taskgroupEntityInfos = taskgroups.stream().map(RecursiveTaskgroupInfo::new).toList();
+        return ResponseEntity.ok(taskgroupEntityInfos);
+    }
+
     @GetMapping("/taskgroups/{taskgroupID}")
     public ResponseEntity<?> getDetails(@PathVariable long taskgroupID) {
         PermissionResult<Taskgroup> taskgroupPermissionResult = taskgroupService.getTaskgroupByIDAndUsername(taskgroupID, SecurityContextHolder.getContext().getAuthentication().getName());
diff --git a/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java b/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
new file mode 100644
index 0000000..ca19aa6
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
@@ -0,0 +1,63 @@
+package core.api.models.timemanager.taskgroup;
+
+import core.api.models.timemanager.tasks.TaskOverviewInfo;
+import core.entities.timemanager.Task;
+import core.entities.timemanager.Taskgroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecursiveTaskgroupInfo {
+
+    private long taskgroupID;
+    private String taskgroupName;
+
+    private List<RecursiveTaskgroupInfo> childTaskgroups = new ArrayList<>();
+
+    private List<TaskOverviewInfo> activeTasks = new ArrayList<>();
+
+    public RecursiveTaskgroupInfo(Taskgroup taskgroup) {
+        this.taskgroupID = taskgroup.getTaskgroupID();
+        this.taskgroupName = taskgroup.getTaskgroupName();
+
+        for(Taskgroup child : taskgroup.getChildren()) {
+            this.childTaskgroups.add(new RecursiveTaskgroupInfo(child));
+        }
+
+        for(Task task : taskgroup.getTasks()) {
+            this.activeTasks.add(new TaskOverviewInfo(task));
+        }
+    }
+
+    public long getTaskgroupID() {
+        return taskgroupID;
+    }
+
+    public void setTaskgroupID(long taskgroupID) {
+        this.taskgroupID = taskgroupID;
+    }
+
+    public String getTaskgroupName() {
+        return taskgroupName;
+    }
+
+    public void setTaskgroupName(String taskgroupName) {
+        this.taskgroupName = taskgroupName;
+    }
+
+    public List<RecursiveTaskgroupInfo> getChildTaskgroups() {
+        return childTaskgroups;
+    }
+
+    public void setChildTaskgroups(List<RecursiveTaskgroupInfo> childTaskgroups) {
+        this.childTaskgroups = childTaskgroups;
+    }
+
+    public List<TaskOverviewInfo> getActiveTasks() {
+        return activeTasks;
+    }
+
+    public void setActiveTasks(List<TaskOverviewInfo> activeTasks) {
+        this.activeTasks = activeTasks;
+    }
+}
diff --git a/backend/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java b/backend/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java
new file mode 100644
index 0000000..22d5dc7
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java
@@ -0,0 +1,72 @@
+package core.api.models.timemanager.tasks;
+
+import core.entities.timemanager.Task;
+
+import java.time.LocalDate;
+
+public class TaskOverviewInfo {
+
+    private long taskID;
+    private String taskName;
+    private int activeMinutes;
+    private int eta;
+    private LocalDate limit;
+    private boolean overdue;
+
+    public TaskOverviewInfo(Task task) {
+        this.taskID = task.getTaskID();
+        this.taskName = task.getTaskName();
+        this.activeMinutes = task.getWorkTime();
+        this.eta = task.getEta();
+        this.limit = task.getDeadline();
+        this.overdue = LocalDate.now().isAfter(task.getDeadline());
+    }
+
+    public long getTaskID() {
+        return taskID;
+    }
+
+    public void setTaskID(long taskID) {
+        this.taskID = taskID;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public int getActiveMinutes() {
+        return activeMinutes;
+    }
+
+    public void setActiveMinutes(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+
+    public int getEta() {
+        return eta;
+    }
+
+    public void setEta(int eta) {
+        this.eta = eta;
+    }
+
+    public LocalDate getLimit() {
+        return limit;
+    }
+
+    public void setLimit(LocalDate limit) {
+        this.limit = limit;
+    }
+
+    public boolean isOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(boolean overdue) {
+        this.overdue = overdue;
+    }
+}
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index bd6b702..97c4929 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -28,12 +28,14 @@ model/passwordChangeRequest.ts
 model/propertiesInfo.ts
 model/propertyInfo.ts
 model/propertyUpdateRequest.ts
+model/recursiveTaskgroupInfo.ts
 model/scheduleActivateInfo.ts
 model/scheduleInfo.ts
 model/signUpRequest.ts
 model/simpleStatusResponse.ts
 model/taskEntityInfo.ts
 model/taskFieldInfo.ts
+model/taskOverviewInfo.ts
 model/taskScheduleStopResponse.ts
 model/taskShortInfo.ts
 model/taskgroupDetailInfo.ts
diff --git a/frontend/src/api/api/taskgroup.service.ts b/frontend/src/api/api/taskgroup.service.ts
index 986a270..5b797b2 100644
--- a/frontend/src/api/api/taskgroup.service.ts
+++ b/frontend/src/api/api/taskgroup.service.ts
@@ -20,6 +20,7 @@ import { Observable }                                        from 'rxjs';
 
 import { InlineResponse200 } from '../model/models';
 import { InlineResponse403 } from '../model/models';
+import { RecursiveTaskgroupInfo } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
 import { TaskgroupDetailInfo } from '../model/models';
 import { TaskgroupEntityInfo } from '../model/models';
@@ -513,4 +514,59 @@ export class TaskgroupService {
         );
     }
 
+    /**
+     * list all top level taskgroups of authorized user
+     * list all taskgroups of authorized user
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public taskgroupsTreeGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<RecursiveTaskgroupInfo>>;
+    public taskgroupsTreeGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<RecursiveTaskgroupInfo>>>;
+    public taskgroupsTreeGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<RecursiveTaskgroupInfo>>>;
+    public taskgroupsTreeGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<Array<RecursiveTaskgroupInfo>>(`${this.configuration.basePath}/taskgroups/tree`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index b684587..31bf812 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -12,12 +12,14 @@ export * from './passwordChangeRequest';
 export * from './propertiesInfo';
 export * from './propertyInfo';
 export * from './propertyUpdateRequest';
+export * from './recursiveTaskgroupInfo';
 export * from './scheduleActivateInfo';
 export * from './scheduleInfo';
 export * from './signUpRequest';
 export * from './simpleStatusResponse';
 export * from './taskEntityInfo';
 export * from './taskFieldInfo';
+export * from './taskOverviewInfo';
 export * from './taskScheduleStopResponse';
 export * from './taskShortInfo';
 export * from './taskgroupDetailInfo';
diff --git a/frontend/src/api/model/recursiveTaskgroupInfo.ts b/frontend/src/api/model/recursiveTaskgroupInfo.ts
new file mode 100644
index 0000000..57aa8cb
--- /dev/null
+++ b/frontend/src/api/model/recursiveTaskgroupInfo.ts
@@ -0,0 +1,27 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { TaskOverviewInfo } from './taskOverviewInfo';
+
+
+export interface RecursiveTaskgroupInfo { 
+    /**
+     * internal id of taskgroup
+     */
+    taskgroupID: number;
+    /**
+     * name of taskgroup
+     */
+    taskgroupName: string;
+    childTaskgroups: Array<RecursiveTaskgroupInfo>;
+    activeTasks: Array<TaskOverviewInfo>;
+}
+
diff --git a/frontend/src/api/model/taskOverviewInfo.ts b/frontend/src/api/model/taskOverviewInfo.ts
new file mode 100644
index 0000000..90f3cc1
--- /dev/null
+++ b/frontend/src/api/model/taskOverviewInfo.ts
@@ -0,0 +1,40 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface TaskOverviewInfo { 
+    /**
+     * internal id of task
+     */
+    taskID: number;
+    /**
+     * name of task
+     */
+    taskName: string;
+    /**
+     * expected time to finish task
+     */
+    eta: number;
+    /**
+     * date until the task has to be finished
+     */
+    limit: string;
+    /**
+     * determines whether the task is overdue
+     */
+    overdue: boolean;
+    /**
+     * number in minutes that was already worked on this task
+     */
+    activeTime?: number;
+}
+
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index ff6ca31..e3dd867 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -1,11 +1,10 @@
 .container {
   margin: 20px auto;
   width: 70%;
-  display: flex;
 }
 
 .spacer {
-  margin-bottom: 2.5%;
+  flex: 1 1 auto;
 }
 
 
@@ -146,3 +145,19 @@
   font-weight: normal;
   text-align: left;
 }
+
+.task-number{
+  color: white;
+  background-color: deepskyblue;
+  padding: 1px 10px;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+.treenode-content-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index c0b2d37..d2a16ab 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -6,7 +6,11 @@
   <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button disabled></button>
-    <button mat-button class="node-name">{{node.name}}</button>
+    <div class="treenode-content-container">
+      <button mat-button class="node-name">{{node.name}}</button>
+      <span class="spacer"></span>
+      <div class="task-number">{{node.activeTasks}}</div>
+    </div>
   </mat-tree-node>
   <!-- This is the tree node template for expandable nodes -->
   <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
@@ -16,6 +20,10 @@
         {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
       </mat-icon>
     </button>
-    <button mat-button class="node-name">{{node.name}}</button>
+    <div class="treenode-content-container">
+      <button mat-button class="node-name">{{node.name}}</button>
+      <span class="spacer"></span>
+      <div class="task-number">{{node.activeTasks}}</div>
+    </div>
   </mat-tree-node>
 </mat-tree>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
index acf9627..6f501e0 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -3,52 +3,17 @@ import {MatIconModule} from "@angular/material/icon";
 import {MatButtonModule} from "@angular/material/button";
 import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeModule} from "@angular/material/tree";
 import {FlatTreeControl} from "@angular/cdk/tree";
+import {RecursiveTaskgroupInfo, TaskgroupService} from "../../../api";
 
 
-interface TreeNode {
-  name: string
-  children?: TreeNode[]
-}
 
-const TREE_DATA: TreeNode[] = [
-  {
-    name: "KIT",
-    children: [
-      {
-        name: "WS23",
-        children: [
-          {
-            name: "Computergrafik",
-            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
-          },
-          {
-            name: "Softwaretechnik II",
-            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
-          },
-          {
-            name: "Algorithmen II",
-            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
-          }
-        ]
-      },
-      {
-        name: "SS24",
-        children: [
-          {
-            name: "Interaktive Computergrafik",
-            children: [{name: "Vorlesungen"}, {name: "Globalübungen"}]
-          }
-        ]
-      }
-    ]
-  }
-]
 
 /** Flat node with expandable and level information */
 interface ExampleFlatNode {
   expandable: boolean;
   name: string;
   level: number;
+  activeTasks: number;
 }
 @Component({
   selector: 'app-taskgroup-overview',
@@ -56,12 +21,12 @@ interface ExampleFlatNode {
   styleUrls: ['./taskgroup-overview.component.css']
 })
 export class TaskgroupOverviewComponent {
-
-  private _transformer = (node: TreeNode, level: number) => {
+  private _transformer = (node: RecursiveTaskgroupInfo, level: number) => {
     return {
-      expandable: !!node.children && node.children.length > 0,
-      name: node.name,
+      expandable: !!node.childTaskgroups && node.childTaskgroups.length > 0,
+      name: node.taskgroupName,
       level: level,
+      activeTasks: node.activeTasks.length
     };
   };
 
@@ -74,13 +39,21 @@ export class TaskgroupOverviewComponent {
     this._transformer,
     node => node.level,
     node => node.expandable,
-    node => node.children,
+    node => node.childTaskgroups,
   );
 
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
 
-  constructor() {
-    this.dataSource.data = TREE_DATA;
+  constructor(private taskgroupService: TaskgroupService) {
+
+  }
+
+  ngOnInit() {
+    this.taskgroupService.taskgroupsTreeGet().subscribe({
+      next: resp => {
+        this.dataSource.data = resp;
+      }
+    })
   }
 
   hasChild = (_: number, node: ExampleFlatNode) => node.expandable;
diff --git a/openapi.yaml b/openapi.yaml
index dd3cfe3..bdf9a9b 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -581,6 +581,23 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/TaskgroupEntityInfo'
+  /taskgroups/tree:
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - taskgroup
+      summary: list all top level taskgroups of authorized user
+      description: list all taskgroups of authorized user
+      responses:
+        200: 
+          description: Anfrage erfolgreich
+          content:
+            'application/json':
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/RecursiveTaskgroupInfo'
   /taskgroups:
     get:
       security:
@@ -1978,4 +1995,65 @@ components:
         workTime:
           type: number
           description: time where the schedule was active
-          example: 10
\ No newline at end of file
+          example: 10
+    RecursiveTaskgroupInfo:
+      required:
+        - taskgroupID
+        - taskgroupName
+        - childTaskgroups
+        - activeTasks
+      additionalProperties: false
+      properties:
+        taskgroupID:
+          type: number
+          description: internal id of taskgroup
+          example: 1
+        taskgroupName:
+          type: string
+          description: name of taskgroup
+          example: Taskgroup 1
+          maxLength: 255
+          minLength: 1
+        childTaskgroups:
+          type: array
+          items: 
+            $ref: '#/components/schemas/RecursiveTaskgroupInfo'
+        activeTasks:
+          type: array
+          items:
+            $ref: '#/components/schemas/TaskOverviewInfo'
+    TaskOverviewInfo:
+      required:
+        - taskID
+        - taskName
+        - activeMinutes
+        - eta
+        - limit
+        - overdue
+      additionalProperties: false
+      properties:
+        taskID:
+          type: number
+          description: internal id of task
+          example: 1
+        taskName:
+          type: string
+          description: name of task
+          example: Vorlesung schauen
+        eta:
+          type: number
+          description: expected time to finish task
+          example: 10
+          minimum: 0
+        limit:
+          type: string
+          format: date
+          description: date until the task has to be finished
+        overdue:
+          type: boolean
+          description: determines whether the task is overdue
+          example: True
+        activeTime:
+          type: number
+          description: number in minutes that was already worked on this task
+          example: 10
-- 
2.34.1


From 2c6c5dd6a6ebe917f9ed82af549544ff2371b578 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 12:02:00 +0200
Subject: [PATCH 37/50] Visualize Overdue Taskgroups

---
 backend/.idea/workspace.xml                   |  7 ++---
 .../taskgroup/RecursiveTaskgroupInfo.java     | 30 +++++++++++++++++--
 .../core/entities/timemanager/Taskgroup.java  | 18 +++++++++++
 .../src/api/model/recursiveTaskgroupInfo.ts   |  8 +++++
 .../taskgroup-overview.component.css          |  4 +++
 .../taskgroup-overview.component.html         |  5 ++--
 .../taskgroup-overview.component.ts           |  4 ++-
 openapi.yaml                                  | 10 +++++++
 8 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 614d225..62660ce 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,10 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskOverviewInfo.java" afterDir="false" />
       <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/api/controller/TaskgroupController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskgroupController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" 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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,7 +103,7 @@
       <workItem from="1698246651541" duration="5106000" />
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
-      <workItem from="1698474363766" duration="1934000" />
+      <workItem from="1698474363766" duration="3686000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java b/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
index ca19aa6..2cfd127 100644
--- a/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
+++ b/backend/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java
@@ -4,7 +4,9 @@ import core.api.models.timemanager.tasks.TaskOverviewInfo;
 import core.entities.timemanager.Task;
 import core.entities.timemanager.Taskgroup;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 public class RecursiveTaskgroupInfo {
@@ -12,9 +14,13 @@ public class RecursiveTaskgroupInfo {
     private long taskgroupID;
     private String taskgroupName;
 
+    private boolean hasOverdueTask;
+
+    private int amountActiveTasks;
+
     private List<RecursiveTaskgroupInfo> childTaskgroups = new ArrayList<>();
 
-    private List<TaskOverviewInfo> activeTasks = new ArrayList<>();
+    private List<TaskOverviewInfo> activeTasks = new LinkedList<>();
 
     public RecursiveTaskgroupInfo(Taskgroup taskgroup) {
         this.taskgroupID = taskgroup.getTaskgroupID();
@@ -24,9 +30,13 @@ public class RecursiveTaskgroupInfo {
             this.childTaskgroups.add(new RecursiveTaskgroupInfo(child));
         }
 
-        for(Task task : taskgroup.getTasks()) {
+        for(Task task : taskgroup.getActiveTasks()) {
             this.activeTasks.add(new TaskOverviewInfo(task));
+            if(task.getDeadline().isBefore(LocalDate.now())) {
+                this.hasOverdueTask = true;
+            }
         }
+        this.amountActiveTasks = taskgroup.getAmountOfActiveTasks();
     }
 
     public long getTaskgroupID() {
@@ -60,4 +70,20 @@ public class RecursiveTaskgroupInfo {
     public void setActiveTasks(List<TaskOverviewInfo> activeTasks) {
         this.activeTasks = activeTasks;
     }
+
+    public boolean isHasOverdueTask() {
+        return hasOverdueTask;
+    }
+
+    public void setHasOverdueTask(boolean hasOverdueTask) {
+        this.hasOverdueTask = hasOverdueTask;
+    }
+
+    public int getAmountActiveTasks() {
+        return amountActiveTasks;
+    }
+
+    public void setAmountActiveTasks(int amountActiveTasks) {
+        this.amountActiveTasks = amountActiveTasks;
+    }
 }
diff --git a/backend/src/main/java/core/entities/timemanager/Taskgroup.java b/backend/src/main/java/core/entities/timemanager/Taskgroup.java
index cda02db..864c9b0 100644
--- a/backend/src/main/java/core/entities/timemanager/Taskgroup.java
+++ b/backend/src/main/java/core/entities/timemanager/Taskgroup.java
@@ -97,4 +97,22 @@ public class Taskgroup {
         }
         return ancestors;
     }
+
+    public List<Task> getActiveTasks() {
+        List<Task> tasks = new LinkedList<>();
+        for(Task task : this.tasks) {
+            if(!task.isFinished()) {
+                tasks.add(task);
+            }
+        }
+        return tasks;
+    }
+
+    public int getAmountOfActiveTasks() {
+        int activeAmountTasks = getActiveTasks().size();
+        for(Taskgroup taskgroup : children) {
+            activeAmountTasks += taskgroup.getAmountOfActiveTasks();
+        }
+        return activeAmountTasks;
+    }
 }
diff --git a/frontend/src/api/model/recursiveTaskgroupInfo.ts b/frontend/src/api/model/recursiveTaskgroupInfo.ts
index 57aa8cb..0ca5616 100644
--- a/frontend/src/api/model/recursiveTaskgroupInfo.ts
+++ b/frontend/src/api/model/recursiveTaskgroupInfo.ts
@@ -23,5 +23,13 @@ export interface RecursiveTaskgroupInfo {
     taskgroupName: string;
     childTaskgroups: Array<RecursiveTaskgroupInfo>;
     activeTasks: Array<TaskOverviewInfo>;
+    /**
+     * determines whether the taskgroup has an overdue task or not
+     */
+    hasOverdueTask: boolean;
+    /**
+     * determines the number of active tasks that can be scheduled
+     */
+    amountActiveTasks: number;
 }
 
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index e3dd867..53bc088 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -161,3 +161,7 @@
   align-items: center;
   width: 100%;
 }
+
+.overdue-taskgroup {
+  background-color: #ff6354;
+}
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index d2a16ab..493b18b 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -3,7 +3,7 @@
 </mat-action-list>
 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
   <!-- This is the tree node template for leaf nodes -->
-  <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
+  <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10" [ngClass]="node.hasOverdueTask? 'overdue-taskgroup':''">
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button disabled></button>
     <div class="treenode-content-container">
@@ -13,7 +13,7 @@
     </div>
   </mat-tree-node>
   <!-- This is the tree node template for expandable nodes -->
-  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10">
+  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding class="taskgroup-btn" matTreeNodePaddingIndent="10" [ngClass]="node.hasOverdueTask? 'overdue-taskgroup':''">
     <button mat-icon-button matTreeNodeToggle
             [attr.aria-label]="'Toggle ' + node.name" style="padding-left: 10px">
       <mat-icon class="mat-icon-rtl-mirror">
@@ -24,6 +24,7 @@
       <button mat-button class="node-name">{{node.name}}</button>
       <span class="spacer"></span>
       <div class="task-number">{{node.activeTasks}}</div>
+
     </div>
   </mat-tree-node>
 </mat-tree>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
index 6f501e0..5b4dd9f 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -14,6 +14,7 @@ interface ExampleFlatNode {
   name: string;
   level: number;
   activeTasks: number;
+  hasOverdueTask: boolean
 }
 @Component({
   selector: 'app-taskgroup-overview',
@@ -26,7 +27,8 @@ export class TaskgroupOverviewComponent {
       expandable: !!node.childTaskgroups && node.childTaskgroups.length > 0,
       name: node.taskgroupName,
       level: level,
-      activeTasks: node.activeTasks.length
+      activeTasks: node.amountActiveTasks,
+      hasOverdueTask: node.hasOverdueTask
     };
   };
 
diff --git a/openapi.yaml b/openapi.yaml
index bdf9a9b..53f3969 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -2002,6 +2002,8 @@ components:
         - taskgroupName
         - childTaskgroups
         - activeTasks
+        - hasOverdueTask
+        - amountActiveTasks
       additionalProperties: false
       properties:
         taskgroupID:
@@ -2022,6 +2024,14 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/TaskOverviewInfo'
+        hasOverdueTask:
+          type: boolean
+          example: true
+          description: determines whether the taskgroup has an overdue task or not
+        amountActiveTasks:
+          type: number
+          example: 2
+          description: determines the number of active tasks that can be scheduled
     TaskOverviewInfo:
       required:
         - taskID
-- 
2.34.1


From d4ca2a3fd251f1374b6aeaa3c37d534ad68457e4 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 13:18:24 +0200
Subject: [PATCH 38/50] Implement Task Overview

---
 frontend/src/app/app.module.ts                |  4 ++-
 .../src/app/dashboard/dashboard.component.css |  3 +-
 .../app/dashboard/dashboard.component.html    |  7 +++--
 .../src/app/dashboard/dashboard.component.ts  | 10 ++++++-
 .../task-overview/task-overview.component.css | 28 +++++++++++++++++++
 .../task-overview.component.html              | 14 ++++++++++
 .../task-overview.component.spec.ts           | 21 ++++++++++++++
 .../task-overview/task-overview.component.ts  | 12 ++++++++
 .../taskgroup-overview.component.css          |  2 +-
 .../taskgroup-overview.component.html         |  5 ++--
 .../taskgroup-overview.component.ts           | 19 +++++++++----
 11 files changed, 111 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/app/dashboard/task-overview/task-overview.component.css
 create mode 100644 frontend/src/app/dashboard/task-overview/task-overview.component.html
 create mode 100644 frontend/src/app/dashboard/task-overview/task-overview.component.spec.ts
 create mode 100644 frontend/src/app/dashboard/task-overview/task-overview.component.ts

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 8043478..a9d9233 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -66,6 +66,7 @@ import { DashboardComponent } from './dashboard/dashboard.component';
 import { ActiveScheduleComponent } from './dashboard/active-schedule/active-schedule.component';
 import {MatTreeModule} from "@angular/material/tree";
 import { TaskgroupOverviewComponent } from './dashboard/taskgroup-overview/taskgroup-overview.component';
+import { TaskOverviewComponent } from './dashboard/task-overview/task-overview.component';
 @NgModule({
   declarations: [
     AppComponent,
@@ -95,7 +96,8 @@ import { TaskgroupOverviewComponent } from './dashboard/taskgroup-overview/taskg
     ScheduleDashboardComponent,
     DashboardComponent,
     ActiveScheduleComponent,
-    TaskgroupOverviewComponent
+    TaskgroupOverviewComponent,
+    TaskOverviewComponent
   ],
     imports: [
         BrowserModule,
diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
index d6a2964..93f55f9 100644
--- a/frontend/src/app/dashboard/dashboard.component.css
+++ b/frontend/src/app/dashboard/dashboard.component.css
@@ -75,8 +75,9 @@
 }
 
 .taskgroup-overview {
-  width: 25%;
+  width: 30%;
   float: right;
+  margin-right: 20px;
 }
 
 .spacer {
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index a516d20..dc0c2cf 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -38,10 +38,13 @@
     </div>
 
   </div>
-  <span class="spacer"></span>
+  <div class="taskgroup-overview">
+    <app-task-overview [tasks]="tasks"></app-task-overview>
+  </div>
 
   <div class="taskgroup-overview">
-      <app-taskgroup-overview></app-taskgroup-overview>
+
+      <app-taskgroup-overview (taskgroupSelected)="onSelectTaskgroup($event)"></app-taskgroup-overview>
   </div>
 
 
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index ccc66d2..72b2802 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,7 +1,8 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {ScheduleInfo, ScheduleService} from "../../api";
+import {ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../api";
 import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
 import {StopActiveScheduleInfo} from "./active-schedule/StopActiveScheduleInfo";
+import {TaskOverviewComponent} from "./task-overview/task-overview.component";
 
 @Component({
   selector: 'app-dashboard',
@@ -14,6 +15,8 @@ export class DashboardComponent implements OnInit{
   schedules: ScheduleInfo[] = []
   workedMinutesToday: number = 0
 
+  tasks: TaskOverviewInfo[] = []
+
   @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
   }
@@ -44,4 +47,9 @@ export class DashboardComponent implements OnInit{
   }
 
 
+    protected readonly TaskOverviewComponent = TaskOverviewComponent;
+
+  onSelectTaskgroup(tasks: TaskOverviewInfo[]) {
+    this.tasks = tasks;
+  }
 }
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.css b/frontend/src/app/dashboard/task-overview/task-overview.component.css
new file mode 100644
index 0000000..178ad85
--- /dev/null
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.css
@@ -0,0 +1,28 @@
+.greenBtn {
+  background-color: #00bc8c;
+  color: white;
+}
+
+.btn-without-radius {
+  border-radius: 0;
+}
+
+.task-info {
+  line-height: .75em;
+}
+
+.progress {
+  margin-bottom: 10px;
+  margin-top: -5px;
+}
+
+.long-btn {
+  width: 100%;
+}
+
+
+.yellowBtn {
+  background-color: #f39c12;
+  color: white;
+  border-radius: 0;
+}
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
new file mode 100644
index 0000000..0bca0db
--- /dev/null
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -0,0 +1,14 @@
+<button mat-raised-button class="greenBtn long-btn" *ngIf="tasks.length > 0">Add</button>
+<mat-card *ngFor="let task of tasks">
+  <mat-card-content>
+    <h3>{{task.taskName}}</h3>
+    <mat-progress-bar mode="determinate" value="{{task.activeTime}}" class="progress"></mat-progress-bar>
+    <p class="task-info"><i>ETA: </i>{{task.activeTime}} / {{task.eta}}</p>
+    <p class="task-info"><i>Limit: </i>{{task.limit}}</p>
+  </mat-card-content>
+  <mat-card-actions>
+    <button mat-raised-button color="primary" class="btn-without-radius">Start now</button>
+    <button mat-raised-button class="yellowBtn btn-without-radius">Schedule</button>
+    <button mat-raised-button class="greenBtn btn-without-radius">Finish</button>
+  </mat-card-actions>
+</mat-card>
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.spec.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.spec.ts
new file mode 100644
index 0000000..ae6373b
--- /dev/null
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TaskOverviewComponent } from './task-overview.component';
+
+describe('TaskOverviewComponent', () => {
+  let component: TaskOverviewComponent;
+  let fixture: ComponentFixture<TaskOverviewComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [TaskOverviewComponent]
+    });
+    fixture = TestBed.createComponent(TaskOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
new file mode 100644
index 0000000..186a7eb
--- /dev/null
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -0,0 +1,12 @@
+import {Component, Input} from '@angular/core';
+import {TaskOverviewInfo} from "../../../api";
+
+@Component({
+  selector: 'app-task-overview',
+  templateUrl: './task-overview.component.html',
+  styleUrls: ['./task-overview.component.css']
+})
+export class TaskOverviewComponent {
+
+  @Input() tasks: TaskOverviewInfo[] = []
+ }
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
index 53bc088..3d7fabd 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.css
@@ -163,5 +163,5 @@
 }
 
 .overdue-taskgroup {
-  background-color: #ff6354;
+  background-color: #ff695b;
 }
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index 493b18b..5da9649 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -7,7 +7,7 @@
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button disabled></button>
     <div class="treenode-content-container">
-      <button mat-button class="node-name">{{node.name}}</button>
+      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks)">{{node.name}}</button>
       <span class="spacer"></span>
       <div class="task-number">{{node.activeTasks}}</div>
     </div>
@@ -21,10 +21,9 @@
       </mat-icon>
     </button>
     <div class="treenode-content-container">
-      <button mat-button class="node-name">{{node.name}}</button>
+      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks)">{{node.name}}</button>
       <span class="spacer"></span>
       <div class="task-number">{{node.activeTasks}}</div>
-
     </div>
   </mat-tree-node>
 </mat-tree>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
index 5b4dd9f..4cebf7c 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -1,9 +1,10 @@
-import { Component } from '@angular/core';
+import {Component, EventEmitter, Output} from '@angular/core';
 import {MatIconModule} from "@angular/material/icon";
 import {MatButtonModule} from "@angular/material/button";
 import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeModule} from "@angular/material/tree";
 import {FlatTreeControl} from "@angular/cdk/tree";
-import {RecursiveTaskgroupInfo, TaskgroupService} from "../../../api";
+import {RecursiveTaskgroupInfo, TaskgroupService, TaskOverviewInfo} from "../../../api";
+import {TaskOverviewComponent} from "../task-overview/task-overview.component";
 
 
 
@@ -11,10 +12,11 @@ import {RecursiveTaskgroupInfo, TaskgroupService} from "../../../api";
 /** Flat node with expandable and level information */
 interface ExampleFlatNode {
   expandable: boolean;
-  name: string;
   level: number;
+  name: string
   activeTasks: number;
-  hasOverdueTask: boolean
+  hasOverdueTask: boolean;
+  tasks: TaskOverviewInfo[];
 }
 @Component({
   selector: 'app-taskgroup-overview',
@@ -22,13 +24,16 @@ interface ExampleFlatNode {
   styleUrls: ['./taskgroup-overview.component.css']
 })
 export class TaskgroupOverviewComponent {
+
+  @Output('taskgroupSelected') taskgroupSelected: EventEmitter<TaskOverviewInfo[]> = new EventEmitter<TaskOverviewInfo[]>();
   private _transformer = (node: RecursiveTaskgroupInfo, level: number) => {
     return {
       expandable: !!node.childTaskgroups && node.childTaskgroups.length > 0,
       name: node.taskgroupName,
       level: level,
       activeTasks: node.amountActiveTasks,
-      hasOverdueTask: node.hasOverdueTask
+      hasOverdueTask: node.hasOverdueTask,
+      tasks: node.activeTasks
     };
   };
 
@@ -59,4 +64,8 @@ export class TaskgroupOverviewComponent {
   }
 
   hasChild = (_: number, node: ExampleFlatNode) => node.expandable;
+
+  onSelectTaskgroup(tasks: TaskOverviewInfo[]) {
+    this.taskgroupSelected.emit(tasks)
+  }
 }
-- 
2.34.1


From 2fb3555c040defdf8041d71c8cd4335218017b49 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 15:33:46 +0200
Subject: [PATCH 39/50] Start task now from Taskoverview in Dashboard

---
 backend/.idea/workspace.xml                   |  5 ++-
 .../api/controller/ScheduleController.java    |  2 +-
 frontend/src/api/api/schedule.service.ts      |  8 ++---
 .../app/dashboard/dashboard.component.html    |  2 +-
 .../src/app/dashboard/dashboard.component.ts  |  6 +++-
 .../task-overview.component.html              |  2 +-
 .../task-overview/task-overview.component.ts  | 35 +++++++++++++++++--
 openapi.yaml                                  |  2 +-
 8 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 62660ce..1a297ba 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
-      <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/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskgroup/RecursiveTaskgroupInfo.java" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,6 +102,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
+      <workItem from="1698499063683" duration="646000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index 75ba77f..c80aab6 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -134,7 +134,7 @@ public class ScheduleController {
         if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
             return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
         } else {
-            return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
+            return ResponseEntity.ok(new ScheduleInfo(scheduleResult.getResult()));
         }
     }
 
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index e8c21da..d354d76 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -532,9 +532,9 @@ export class ScheduleService {
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public schedulesTaskIDNowPost(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<BasicScheduleEntityInfo>;
-    public schedulesTaskIDNowPost(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<BasicScheduleEntityInfo>>;
-    public schedulesTaskIDNowPost(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleInfo>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleInfo>>;
     public schedulesTaskIDNowPost(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
         if (taskID === null || taskID === undefined) {
             throw new Error('Required parameter taskID was null or undefined when calling schedulesTaskIDNowPost.');
@@ -572,7 +572,7 @@ export class ScheduleService {
             responseType_ = 'text';
         }
 
-        return this.httpClient.post<BasicScheduleEntityInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/now`,
+        return this.httpClient.post<ScheduleInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/now`,
             null,
             {
                 context: localVarHttpContext,
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index dc0c2cf..1e87e61 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -39,7 +39,7 @@
 
   </div>
   <div class="taskgroup-overview">
-    <app-task-overview [tasks]="tasks"></app-task-overview>
+    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)"></app-task-overview>
   </div>
 
   <div class="taskgroup-overview">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 72b2802..0749a57 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../api";
+import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../api";
 import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
 import {StopActiveScheduleInfo} from "./active-schedule/StopActiveScheduleInfo";
 import {TaskOverviewComponent} from "./task-overview/task-overview.component";
@@ -52,4 +52,8 @@ export class DashboardComponent implements OnInit{
   onSelectTaskgroup(tasks: TaskOverviewInfo[]) {
     this.tasks = tasks;
   }
+
+  onStartTaskNow(schedule: ScheduleInfo) {
+    this.activeScheduleComponent?.activateSchedule(schedule)
+  }
 }
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index 0bca0db..57d622a 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -7,7 +7,7 @@
     <p class="task-info"><i>Limit: </i>{{task.limit}}</p>
   </mat-card-content>
   <mat-card-actions>
-    <button mat-raised-button color="primary" class="btn-without-radius">Start now</button>
+    <button mat-raised-button color="primary" class="btn-without-radius" (click)="startTaskNow(task)">Start now</button>
     <button mat-raised-button class="yellowBtn btn-without-radius">Schedule</button>
     <button mat-raised-button class="greenBtn btn-without-radius">Finish</button>
   </mat-card-actions>
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index 186a7eb..163e102 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -1,5 +1,6 @@
-import {Component, Input} from '@angular/core';
-import {TaskOverviewInfo} from "../../../api";
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../../api";
+import {MatSnackBar} from "@angular/material/snack-bar";
 
 @Component({
   selector: 'app-task-overview',
@@ -9,4 +10,32 @@ import {TaskOverviewInfo} from "../../../api";
 export class TaskOverviewComponent {
 
   @Input() tasks: TaskOverviewInfo[] = []
- }
+  @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
+
+  constructor(private scheduleService: ScheduleService,
+              private snackbar: MatSnackBar) {
+
+  }
+  startTaskNow(task: TaskOverviewInfo) {
+    this.scheduleService.schedulesTaskIDNowPost(task.taskID).subscribe({
+      next: resp => {
+        this.startNowEmitter.emit(resp);
+      },
+      error: err => {
+        if(err.status == 403) {
+          this.snackbar.open("No permission", "", {duration: 2000});
+        } else if(err.status == 404) {
+          this.snackbar.open("Task not found", "", {duration: 2000});
+        } else if(err.status == 409) {
+          this.snackbar.open("Task is already running", "", {duration: 2000});
+        } else {
+          this.snackbar.open("Unexpected error", "", {duration: 2000});
+        }
+      }
+    })
+  }
+
+  finishTask(task: TaskOverviewInfo) {
+    
+  }
+}
diff --git a/openapi.yaml b/openapi.yaml
index 53f3969..4116bf7 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1421,7 +1421,7 @@ paths:
             application/json:
               schema:
                 type: object
-                $ref: '#/components/schemas/BasicScheduleEntityInfo'
+                $ref: '#/components/schemas/ScheduleInfo'
         403:
           description: No permission
           content:
-- 
2.34.1


From 00a15e91ea676c49da43e8eaa52f4606ea0ccc71 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:29:34 +0200
Subject: [PATCH 40/50] Finishing Task from Taskoverview

---
 backend/.idea/workspace.xml                   | 27 +++++++--
 .../core/api/controller/TaskController.java   | 16 +++++
 .../java/core/entities/timemanager/Task.java  |  8 ++-
 .../main/java/core/services/TaskService.java  | 27 ++++++++-
 frontend/src/api/api/task.service.ts          | 60 +++++++++++++++++++
 .../task-overview.component.html              |  2 +-
 .../task-overview/task-overview.component.ts  | 20 ++++++-
 openapi.yaml                                  | 38 ++++++++++++
 8 files changed, 184 insertions(+), 14 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 1a297ba..93c0480 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,8 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Remove update spamming in console">
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Start task now from Taskoverview in Dashboard">
+      <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/api/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,7 +110,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
-      <workItem from="1698499063683" duration="646000" />
+      <workItem from="1698499063683" duration="4869000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -208,7 +216,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698306889808</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="Start task now from Taskoverview in Dashboard">
+      <option name="closed" value="true" />
+      <created>1698500028161</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1698500028161</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -230,7 +246,8 @@
     <MESSAGE value="Include TaskScheduleStopResponse" />
     <MESSAGE value="Fix starting schedule and returning active time of schedule after stop" />
     <MESSAGE value="Remove update spamming in console" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove update spamming in console" />
+    <MESSAGE value="Start task now from Taskoverview in Dashboard" />
+    <option name="LAST_COMMIT_MESSAGE" value="Start task now from Taskoverview in Dashboard" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/backend/src/main/java/core/api/controller/TaskController.java b/backend/src/main/java/core/api/controller/TaskController.java
index 093102b..7ec2b13 100644
--- a/backend/src/main/java/core/api/controller/TaskController.java
+++ b/backend/src/main/java/core/api/controller/TaskController.java
@@ -1,6 +1,7 @@
 package core.api.controller;
 
 import core.api.models.auth.SimpleStatusResponse;
+import core.api.models.timemanager.taskSchedule.ScheduleInfo;
 import core.api.models.timemanager.tasks.TaskEntityInfo;
 import core.api.models.timemanager.tasks.TaskFieldInfo;
 import core.entities.timemanager.Task;
@@ -110,4 +111,19 @@ public class TaskController {
 
         return ResponseEntity.ok(new TaskEntityInfo(taskPermissionResult.getResult()));
     }
+
+    @PostMapping("/tasks/{taskID}/finish")
+    public ResponseEntity<?> finishTask(@PathVariable long taskID) {
+        PermissionResult<Task> taskPermissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if (!taskPermissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if (taskPermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        taskService.finishTask(taskPermissionResult.getResult());
+        return ResponseEntity.ok(new SimpleStatusResponse("success"));
+    }
 }
diff --git a/backend/src/main/java/core/entities/timemanager/Task.java b/backend/src/main/java/core/entities/timemanager/Task.java
index 90fa77c..92b45e7 100644
--- a/backend/src/main/java/core/entities/timemanager/Task.java
+++ b/backend/src/main/java/core/entities/timemanager/Task.java
@@ -2,6 +2,8 @@ package core.entities.timemanager;
 
 import javax.persistence.*;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -27,7 +29,7 @@ public class Task {
     private boolean finished;
 
     @OneToMany(mappedBy = "task", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    private Set<BasicTaskSchedule> basicTaskSchedules;
+    private List<BasicTaskSchedule> basicTaskSchedules;
 
     private int workTime;
 
@@ -128,11 +130,11 @@ public class Task {
         this.taskID = taskID;
     }
 
-    public Set<BasicTaskSchedule> getBasicTaskSchedules() {
+    public List<BasicTaskSchedule> getBasicTaskSchedules() {
         return basicTaskSchedules;
     }
 
-    public void setBasicTaskSchedules(Set<BasicTaskSchedule> basicTaskSchedules) {
+    public void setBasicTaskSchedules(List<BasicTaskSchedule> basicTaskSchedules) {
         this.basicTaskSchedules = basicTaskSchedules;
     }
 
diff --git a/backend/src/main/java/core/services/TaskService.java b/backend/src/main/java/core/services/TaskService.java
index 4f2f9d4..7a31773 100644
--- a/backend/src/main/java/core/services/TaskService.java
+++ b/backend/src/main/java/core/services/TaskService.java
@@ -1,6 +1,7 @@
 package core.services;
 
 import core.api.models.timemanager.tasks.TaskFieldInfo;
+import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.Task;
 import core.entities.timemanager.Taskgroup;
 import core.repositories.timemanager.BasicTaskScheduleRepository;
@@ -9,8 +10,8 @@ import core.repositories.timemanager.TaskgroupRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.Optional;
+import java.time.LocalDateTime;
+import java.util.*;
 
 @Service
 public class TaskService {
@@ -75,4 +76,26 @@ public class TaskService {
     public void clearTasks(Taskgroup taskgroup) {
         taskRepository.deleteAllByTaskgroup(taskgroup);
     }
+
+    public void finishTask(Task task) {
+        //Mark task as finished and remove all unstarted schedules as well as finish all started schedules
+        task.finish();
+        taskRepository.save(task);
+
+        List<BasicTaskSchedule> removedBasicTaskSchedules = new LinkedList<>();
+        for(BasicTaskSchedule basicTaskSchedule : task.getBasicTaskSchedules()) {
+            if(basicTaskSchedule.getStartTime() == null) {
+                removedBasicTaskSchedules.add(basicTaskSchedule);
+            } else if(basicTaskSchedule.getFinishedTime() == null) {
+                ServiceResult<?> result = taskScheduleService.stopSchedule(basicTaskSchedule, true);
+                System.out.println(result);
+            }
+        }
+
+        for(BasicTaskSchedule deletedTaskSchedule: removedBasicTaskSchedules) {
+            task.getBasicTaskSchedules().remove(deletedTaskSchedule);
+            taskRepository.save(task);
+            taskScheduleService.deleteBasicSchedule(deletedTaskSchedule);
+        }
+    }
 }
diff --git a/frontend/src/api/api/task.service.ts b/frontend/src/api/api/task.service.ts
index 9a8fb4f..69a7362 100644
--- a/frontend/src/api/api/task.service.ts
+++ b/frontend/src/api/api/task.service.ts
@@ -147,6 +147,66 @@ export class TaskService {
         );
     }
 
+    /**
+     * finishs task
+     * finish tasks
+     * @param taskID internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public tasksTaskIDFinishPost(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<SimpleStatusResponse>;
+    public tasksTaskIDFinishPost(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<SimpleStatusResponse>>;
+    public tasksTaskIDFinishPost(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<SimpleStatusResponse>>;
+    public tasksTaskIDFinishPost(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling tasksTaskIDFinishPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<SimpleStatusResponse>(`${this.configuration.basePath}/tasks/${encodeURIComponent(String(taskID))}/finish`,
+            null,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * gets taskdetails
      * loads information about a given task
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index 57d622a..56aa9df 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -9,6 +9,6 @@
   <mat-card-actions>
     <button mat-raised-button color="primary" class="btn-without-radius" (click)="startTaskNow(task)">Start now</button>
     <button mat-raised-button class="yellowBtn btn-without-radius">Schedule</button>
-    <button mat-raised-button class="greenBtn btn-without-radius">Finish</button>
+    <button mat-raised-button class="greenBtn btn-without-radius" (click)="finishTask(task)">Finish</button>
   </mat-card-actions>
 </mat-card>
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index 163e102..3c0e173 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -1,5 +1,5 @@
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../../api";
+import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo, TaskService} from "../../../api";
 import {MatSnackBar} from "@angular/material/snack-bar";
 
 @Component({
@@ -13,7 +13,8 @@ export class TaskOverviewComponent {
   @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
 
   constructor(private scheduleService: ScheduleService,
-              private snackbar: MatSnackBar) {
+              private snackbar: MatSnackBar,
+              private taskService: TaskService) {
 
   }
   startTaskNow(task: TaskOverviewInfo) {
@@ -36,6 +37,19 @@ export class TaskOverviewComponent {
   }
 
   finishTask(task: TaskOverviewInfo) {
-    
+    this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({
+      next: resp => {
+
+      },
+      error: err => {
+        if(err.status == 403) {
+          this.snackbar.open("No permission", "", {duration: 2000});
+        } else if(err.status == 404) {
+          this.snackbar.open("Task not found", "", {duration: 2000});
+        } else {
+          this.snackbar.open("Unexpected error", "", {duration: 2000});
+        }
+       }
+    })
   }
 }
diff --git a/openapi.yaml b/openapi.yaml
index 4116bf7..c7a16a9 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1171,6 +1171,44 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /tasks/{taskID}/finish:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - task
+      summary: finishs task
+      description: finish tasks
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        200:
+          description: Anfrage erfolgreich
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
   /schedules:
     get:
       security:
-- 
2.34.1


From 1dd01d0249db07d23197e19c6ee3c5ec9b3434e9 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:30:14 +0200
Subject: [PATCH 41/50] Fix removing objects from lists while iterating over
 them

---
 .../entities/timemanager/BasicTaskSchedule.java    | 14 ++++++++++++++
 .../java/core/services/TaskScheduleService.java    | 10 ++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
index 55fd4e7..00d281e 100644
--- a/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
+++ b/backend/src/main/java/core/entities/timemanager/BasicTaskSchedule.java
@@ -3,6 +3,7 @@ package core.entities.timemanager;
 import javax.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 @Entity
 @Table(name = "basic_schedules")
@@ -79,4 +80,17 @@ public class BasicTaskSchedule {
     public boolean isActivateAble() {
         return startTime == null;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        BasicTaskSchedule that = (BasicTaskSchedule) o;
+        return scheduleID == that.scheduleID;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(scheduleID);
+    }
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 464e84d..9d62574 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -61,14 +62,15 @@ public class TaskScheduleService {
         }
 
         List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUserAndDate(user.get(), LocalDate.now());
+        List<BasicTaskSchedule> activatableSchedules = new LinkedList<>();
         if(onlyActivateable) {
-            for(int i=0; i<basicTaskSchedules.size(); i++)  {
-                if(!basicTaskSchedules.get(i).isActivateAble()) {
-                    basicTaskSchedules.remove(i);
+            for (BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
+                if (basicTaskSchedule.isActivateAble()) {
+                    activatableSchedules.add(basicTaskSchedule);
                 }
             }
         }
-        return new ServiceResult<>(basicTaskSchedules);
+        return new ServiceResult<>(activatableSchedules);
     }
 
     public ServiceResult<List<BasicTaskSchedule>> loadSchedules(String username) {
-- 
2.34.1


From d3257b87484c1707884dc6b59363fb6197fb640d Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:36:32 +0200
Subject: [PATCH 42/50] Remove Finished Tasks from Dashboard (Schedules)

---
 .../dashboard/active-schedule/active-schedule.component.ts  | 6 +++++-
 frontend/src/app/dashboard/dashboard.component.html         | 2 +-
 frontend/src/app/dashboard/dashboard.component.ts           | 6 ++++++
 .../app/dashboard/task-overview/task-overview.component.ts  | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)

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 3328d12..69dd31c 100644
--- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
+++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
@@ -1,6 +1,7 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {ScheduleInfo, ScheduleService} from "../../../api";
+import {ScheduleInfo, ScheduleService, TaskOverviewInfo} from "../../../api";
 import {StopActiveScheduleInfo} from "./StopActiveScheduleInfo";
+import {TaskOverviewComponent} from "../task-overview/task-overview.component";
 
 @Component({
   selector: 'app-active-schedule',
@@ -69,5 +70,8 @@ export class ActiveScheduleComponent implements OnInit{
     this.updateTime();
   }
 
+  finishTaskByOverview(task: TaskOverviewInfo) {
+    this.activeSchedule = undefined
+  }
 
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 1e87e61..0213582 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -39,7 +39,7 @@
 
   </div>
   <div class="taskgroup-overview">
-    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)"></app-task-overview>
+    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)" (onFinished)="onFinishTask($event)"></app-task-overview>
   </div>
 
   <div class="taskgroup-overview">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 0749a57..3a9e648 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -56,4 +56,10 @@ export class DashboardComponent implements OnInit{
   onStartTaskNow(schedule: ScheduleInfo) {
     this.activeScheduleComponent?.activateSchedule(schedule)
   }
+
+  onFinishTask(task: TaskOverviewInfo) {
+    this.activeScheduleComponent?.finishTaskByOverview(task);
+
+    this.schedules = this.schedules.filter(schedule => schedule.task.taskID !== task.taskID)
+  }
 }
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index 3c0e173..ef1d591 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -11,6 +11,7 @@ export class TaskOverviewComponent {
 
   @Input() tasks: TaskOverviewInfo[] = []
   @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
+  @Output('onFinished') finishedEmitter: EventEmitter<TaskOverviewInfo> = new EventEmitter<TaskOverviewInfo>();
 
   constructor(private scheduleService: ScheduleService,
               private snackbar: MatSnackBar,
@@ -39,7 +40,7 @@ export class TaskOverviewComponent {
   finishTask(task: TaskOverviewInfo) {
     this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({
       next: resp => {
-
+        this.finishedEmitter.emit(task);
       },
       error: err => {
         if(err.status == 403) {
-- 
2.34.1


From e1ea8684b22956d5797c62baafc142712c51d237 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:37:16 +0200
Subject: [PATCH 43/50] Remove Finished Task from Dashboard (Taskoverview)

---
 .../src/app/dashboard/task-overview/task-overview.component.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index ef1d591..7d25357 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -41,6 +41,7 @@ export class TaskOverviewComponent {
     this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({
       next: resp => {
         this.finishedEmitter.emit(task);
+        this.tasks = this.tasks.filter(ct => ct.taskID !== task.taskID)
       },
       error: err => {
         if(err.status == 403) {
-- 
2.34.1


From 154cd20683a19a16159f1d889fbb6a34ad13d73d Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:54:17 +0200
Subject: [PATCH 44/50] Load worked minutes when reloading dashboard

---
 backend/.idea/workspace.xml                   | 22 ++------
 .../api/controller/ScheduleController.java    |  7 ++-
 .../ActiveMinutesInformation.java             | 18 ++++++
 .../core/services/TaskScheduleService.java    | 17 ++++++
 frontend/src/api/api/schedule.service.ts      | 56 +++++++++++++++++++
 .../src/app/dashboard/dashboard.component.ts  |  6 ++
 openapi.yaml                                  | 31 ++++++++++
 7 files changed, 139 insertions(+), 18 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 93c0480..449d5dd 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,14 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Start task now from Taskoverview in Dashboard">
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java" afterDir="false" />
       <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/api/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -110,7 +108,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
-      <workItem from="1698499063683" duration="4869000" />
+      <workItem from="1698499063683" duration="6495000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -257,16 +255,6 @@
           <line>52</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>158</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>167</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index c80aab6..e119421 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 
 @CrossOrigin(origins = "*", maxAge = 3600)
@@ -186,7 +187,11 @@ public class ScheduleController {
         } else {
             return ResponseEntity.ok(new TaskScheduleStopResponse(stopResult.getResult()));
         }
+    }
 
-
+    @GetMapping("/schedules/workedMinutesToday")
+    public ResponseEntity<?> getWorkedMinutesToday() {
+        ServiceResult<Integer> getWorkedMinutes = taskScheduleService.getWorkedMinutes(SecurityContextHolder.getContext().getAuthentication().getName());
+        return ResponseEntity.ok(new ActiveMinutesInformation(getWorkedMinutes.getResult()));
     }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
new file mode 100644
index 0000000..3f84af3
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
@@ -0,0 +1,18 @@
+package core.api.models.timemanager.taskSchedule;
+
+public class ActiveMinutesInformation {
+
+    public int activeMinutes;
+
+    public ActiveMinutesInformation(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+
+    public int getActiveMinutes() {
+        return activeMinutes;
+    }
+
+    public void setActiveMinutes(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+}
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 9d62574..5e1d559 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -8,6 +8,7 @@ import core.repositories.UserRepository;
 import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.repositories.timemanager.TaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
@@ -133,4 +134,20 @@ public class TaskScheduleService {
         taskRepository.save(taskSchedule.getTask());
         return new ServiceResult<>((int) activeTime);
     }
+
+    public ServiceResult<Integer> getWorkedMinutes(String username) {
+        Optional<User> user = userRepository.findByUsername(username);
+        if(user.isEmpty()) {
+            return new ServiceResult<>(ServiceExitCode.MISSING_ENTITY);
+        }
+
+        List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUser(user.get());
+        long workedMinutes = 0;
+        for(BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
+            if(basicTaskSchedule.getFinishedTime() != null && basicTaskSchedule.getFinishedTime().toLocalDate().isEqual(LocalDate.now())) {
+                workedMinutes += Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
+            }
+        }
+        return new ServiceResult<>((int) workedMinutes);
+    }
 }
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index d354d76..eceb46f 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -18,6 +18,7 @@ import { HttpClient, HttpHeaders, HttpParams,
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
+import { ActiveMinutesInformation } from '../model/models';
 import { BasicScheduleEntityInfo } from '../model/models';
 import { BasicScheduleFieldInfo } from '../model/models';
 import { ScheduleActivateInfo } from '../model/models';
@@ -707,4 +708,59 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * get number of active minutes
+     * get number of worked minutes today
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesWorkedMinutesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ActiveMinutesInformation>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<ActiveMinutesInformation>(`${this.configuration.basePath}/schedules/workedMinutesToday`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 3a9e648..07cf48d 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -27,6 +27,12 @@ export class DashboardComponent implements OnInit{
         this.schedules = resp;
       }
     })
+
+    this.scheduleService.schedulesWorkedMinutesTodayGet().subscribe({
+      next: resp => {
+        this.workedMinutesToday = resp.activeMinutes;
+      }
+    })
   }
 
   startSchedule(schedule: ScheduleInfo) {
diff --git a/openapi.yaml b/openapi.yaml
index c7a16a9..9d81ead 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1597,6 +1597,28 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/workedMinutesToday:
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: get number of worked minutes today
+      summary: get number of active minutes
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ActiveMinutesInformation'
+        404:
+          description: User not found
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
       
       
       
@@ -2105,3 +2127,12 @@ components:
           type: number
           description: number in minutes that was already worked on this task
           example: 10
+    ActiveMinutesInformation:
+      required:
+        - activeMinutes
+      additionalProperties: false
+      properties:
+        activeMinutes:
+          type: number
+          example: 1
+          description: number of minutes it was worked today
\ No newline at end of file
-- 
2.34.1


From 2fda77858db518334a1b585d684c199e9d1f4548 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 18:54:17 +0200
Subject: [PATCH 45/50] Load worked minutes when reloading dashboard

---
 backend/.idea/workspace.xml                   |  22 +--
 .../api/controller/ScheduleController.java    |   7 +-
 .../ActiveMinutesInformation.java             |  18 +++
 .../core/services/TaskScheduleService.java    |  17 +++
 frontend/src/api/.openapi-generator/FILES     |   1 +
 frontend/src/api/api/schedule.service.ts      |  56 +++++++
 frontend/src/api/api/schedules.service.ts     | 144 ++++++++++++++++++
 .../src/api/model/activeMinutesInformation.ts |  20 +++
 frontend/src/api/model/models.ts              |   1 +
 .../src/app/dashboard/dashboard.component.ts  |   6 +
 openapi.yaml                                  |  31 ++++
 11 files changed, 305 insertions(+), 18 deletions(-)
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
 create mode 100644 frontend/src/api/api/schedules.service.ts
 create mode 100644 frontend/src/api/model/activeMinutesInformation.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 93c0480..449d5dd 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,14 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Start task now from Taskoverview in Dashboard">
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java" afterDir="false" />
       <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/api/controller/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/TaskController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/BasicTaskSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -110,7 +108,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
-      <workItem from="1698499063683" duration="4869000" />
+      <workItem from="1698499063683" duration="6495000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -257,16 +255,6 @@
           <line>52</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>158</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
-          <line>167</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index c80aab6..e119421 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 
 @CrossOrigin(origins = "*", maxAge = 3600)
@@ -186,7 +187,11 @@ public class ScheduleController {
         } else {
             return ResponseEntity.ok(new TaskScheduleStopResponse(stopResult.getResult()));
         }
+    }
 
-
+    @GetMapping("/schedules/workedMinutesToday")
+    public ResponseEntity<?> getWorkedMinutesToday() {
+        ServiceResult<Integer> getWorkedMinutes = taskScheduleService.getWorkedMinutes(SecurityContextHolder.getContext().getAuthentication().getName());
+        return ResponseEntity.ok(new ActiveMinutesInformation(getWorkedMinutes.getResult()));
     }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
new file mode 100644
index 0000000..3f84af3
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
@@ -0,0 +1,18 @@
+package core.api.models.timemanager.taskSchedule;
+
+public class ActiveMinutesInformation {
+
+    public int activeMinutes;
+
+    public ActiveMinutesInformation(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+
+    public int getActiveMinutes() {
+        return activeMinutes;
+    }
+
+    public void setActiveMinutes(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+}
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 9d62574..5e1d559 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -8,6 +8,7 @@ import core.repositories.UserRepository;
 import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.repositories.timemanager.TaskRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
@@ -133,4 +134,20 @@ public class TaskScheduleService {
         taskRepository.save(taskSchedule.getTask());
         return new ServiceResult<>((int) activeTime);
     }
+
+    public ServiceResult<Integer> getWorkedMinutes(String username) {
+        Optional<User> user = userRepository.findByUsername(username);
+        if(user.isEmpty()) {
+            return new ServiceResult<>(ServiceExitCode.MISSING_ENTITY);
+        }
+
+        List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUser(user.get());
+        long workedMinutes = 0;
+        for(BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
+            if(basicTaskSchedule.getFinishedTime() != null && basicTaskSchedule.getFinishedTime().toLocalDate().isEqual(LocalDate.now())) {
+                workedMinutes += Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
+            }
+        }
+        return new ServiceResult<>((int) workedMinutes);
+    }
 }
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 97c4929..51b0542 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -14,6 +14,7 @@ encoder.ts
 git_push.sh
 index.ts
 model/accountDeleteRequest.ts
+model/activeMinutesInformation.ts
 model/basicScheduleEntityInfo.ts
 model/basicScheduleFieldInfo.ts
 model/eMailChangeRequest.ts
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index d354d76..eceb46f 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -18,6 +18,7 @@ import { HttpClient, HttpHeaders, HttpParams,
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
+import { ActiveMinutesInformation } from '../model/models';
 import { BasicScheduleEntityInfo } from '../model/models';
 import { BasicScheduleFieldInfo } from '../model/models';
 import { ScheduleActivateInfo } from '../model/models';
@@ -707,4 +708,59 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * get number of active minutes
+     * get number of worked minutes today
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesWorkedMinutesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ActiveMinutesInformation>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<ActiveMinutesInformation>(`${this.configuration.basePath}/schedules/workedMinutesToday`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
 }
diff --git a/frontend/src/api/api/schedules.service.ts b/frontend/src/api/api/schedules.service.ts
new file mode 100644
index 0000000..4ebfc3b
--- /dev/null
+++ b/frontend/src/api/api/schedules.service.ts
@@ -0,0 +1,144 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+        }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
+import { Observable }                                        from 'rxjs';
+
+import { ActiveMinutesInformation } from '../model/models';
+import { SimpleStatusResponse } from '../model/models';
+
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SchedulesService {
+
+    protected basePath = 'http://localhost:8080/api';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+
+
+    private addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        } else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+
+    private addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
+        if (value == null) {
+            return httpParams;
+        }
+
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            } else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key,
+                        (value as Date).toISOString().substr(0, 10));
+                } else {
+                   throw Error("key may not be null if value is Date");
+                }
+            } else {
+                Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
+                    httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        } else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        } else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+
+    /**
+     * get number of active minutes
+     * get number of worked minutes today
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesWorkedMinutesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ActiveMinutesInformation>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ActiveMinutesInformation>>;
+    public schedulesWorkedMinutesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<ActiveMinutesInformation>(`${this.configuration.basePath}/schedules/workedMinutesToday`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}
diff --git a/frontend/src/api/model/activeMinutesInformation.ts b/frontend/src/api/model/activeMinutesInformation.ts
new file mode 100644
index 0000000..53a9f43
--- /dev/null
+++ b/frontend/src/api/model/activeMinutesInformation.ts
@@ -0,0 +1,20 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface ActiveMinutesInformation { 
+    /**
+     * number of minutes it was worked today
+     */
+    activeMinutes: number;
+}
+
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index 31bf812..d539dab 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -1,4 +1,5 @@
 export * from './accountDeleteRequest';
+export * from './activeMinutesInformation';
 export * from './basicScheduleEntityInfo';
 export * from './basicScheduleFieldInfo';
 export * from './eMailChangeRequest';
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 3a9e648..07cf48d 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -27,6 +27,12 @@ export class DashboardComponent implements OnInit{
         this.schedules = resp;
       }
     })
+
+    this.scheduleService.schedulesWorkedMinutesTodayGet().subscribe({
+      next: resp => {
+        this.workedMinutesToday = resp.activeMinutes;
+      }
+    })
   }
 
   startSchedule(schedule: ScheduleInfo) {
diff --git a/openapi.yaml b/openapi.yaml
index c7a16a9..9d81ead 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1597,6 +1597,28 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
+  /schedules/workedMinutesToday:
+    get:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: get number of worked minutes today
+      summary: get number of active minutes
+      responses:
+        200:
+          description: operation successfull
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ActiveMinutesInformation'
+        404:
+          description: User not found
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
       
       
       
@@ -2105,3 +2127,12 @@ components:
           type: number
           description: number in minutes that was already worked on this task
           example: 10
+    ActiveMinutesInformation:
+      required:
+        - activeMinutes
+      additionalProperties: false
+      properties:
+        activeMinutes:
+          type: number
+          example: 1
+          description: number of minutes it was worked today
\ No newline at end of file
-- 
2.34.1


From 217e48aead8a52c050d373b3e296a2bb756acaac Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 19:05:20 +0200
Subject: [PATCH 46/50] Implement routing to schedule from TaskOverviewCard

---
 backend/.idea/workspace.xml                   | 33 +++++++++++++------
 .../src/app/dashboard/dashboard.component.css |  2 +-
 .../app/dashboard/dashboard.component.html    |  2 +-
 .../src/app/dashboard/dashboard.component.ts  |  7 ++--
 .../task-overview.component.html              |  2 +-
 .../task-overview/task-overview.component.ts  |  1 +
 .../taskgroup-overview.component.html         |  4 +--
 .../taskgroup-overview.component.ts           | 18 +++++++---
 8 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 449d5dd..d2a1011 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -4,14 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Start task now from Taskoverview in Dashboard">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java" afterDir="false" />
-      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Load worked minutes when reloading dashboard">
       <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,7 +104,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
-      <workItem from="1698499063683" duration="6495000" />
+      <workItem from="1698499063683" duration="7085000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
@@ -222,7 +218,23 @@
       <option name="project" value="LOCAL" />
       <updated>1698500028161</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Load worked minutes when reloading dashboard">
+      <option name="closed" value="true" />
+      <created>1698512058945</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1698512058945</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Load worked minutes when reloading dashboard">
+      <option name="closed" value="true" />
+      <created>1698512069065</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1698512069065</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -245,7 +257,8 @@
     <MESSAGE value="Fix starting schedule and returning active time of schedule after stop" />
     <MESSAGE value="Remove update spamming in console" />
     <MESSAGE value="Start task now from Taskoverview in Dashboard" />
-    <option name="LAST_COMMIT_MESSAGE" value="Start task now from Taskoverview in Dashboard" />
+    <MESSAGE value="Load worked minutes when reloading dashboard" />
+    <option name="LAST_COMMIT_MESSAGE" value="Load worked minutes when reloading dashboard" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/frontend/src/app/dashboard/dashboard.component.css b/frontend/src/app/dashboard/dashboard.component.css
index 93f55f9..ad949b2 100644
--- a/frontend/src/app/dashboard/dashboard.component.css
+++ b/frontend/src/app/dashboard/dashboard.component.css
@@ -75,7 +75,7 @@
 }
 
 .taskgroup-overview {
-  width: 30%;
+  width: 35%;
   float: right;
   margin-right: 20px;
 }
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index 0213582..90d9742 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -39,7 +39,7 @@
 
   </div>
   <div class="taskgroup-overview">
-    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)" (onFinished)="onFinishTask($event)"></app-task-overview>
+    <app-task-overview [tasks]="tasks" (onStartNow)="onStartTaskNow($event)"  [taskgroupID]="selectedTaskgroupID" (onFinished)="onFinishTask($event)"></app-task-overview>
   </div>
 
   <div class="taskgroup-overview">
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 07cf48d..b0da6e9 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -3,6 +3,7 @@ import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo
 import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
 import {StopActiveScheduleInfo} from "./active-schedule/StopActiveScheduleInfo";
 import {TaskOverviewComponent} from "./task-overview/task-overview.component";
+import {TaskOverviewData} from "./taskgroup-overview/taskgroup-overview.component";
 
 @Component({
   selector: 'app-dashboard',
@@ -16,6 +17,7 @@ export class DashboardComponent implements OnInit{
   workedMinutesToday: number = 0
 
   tasks: TaskOverviewInfo[] = []
+  selectedTaskgroupID: number | undefined
 
   @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
   constructor(private scheduleService: ScheduleService) {
@@ -55,8 +57,9 @@ export class DashboardComponent implements OnInit{
 
     protected readonly TaskOverviewComponent = TaskOverviewComponent;
 
-  onSelectTaskgroup(tasks: TaskOverviewInfo[]) {
-    this.tasks = tasks;
+  onSelectTaskgroup(taskOverviewData: TaskOverviewData) {
+    this.tasks = taskOverviewData.tasks;
+    this.selectedTaskgroupID = taskOverviewData.taskgroupID;
   }
 
   onStartTaskNow(schedule: ScheduleInfo) {
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index 56aa9df..b0b45fa 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -8,7 +8,7 @@
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button color="primary" class="btn-without-radius" (click)="startTaskNow(task)">Start now</button>
-    <button mat-raised-button class="yellowBtn btn-without-radius">Schedule</button>
+    <button *ngIf="taskgroupID != undefined" mat-raised-button class="yellowBtn btn-without-radius" [routerLink]="['/taskgroups', taskgroupID!, 'tasks', task.taskID, 'schedule']">Schedule</button>
     <button mat-raised-button class="greenBtn btn-without-radius" (click)="finishTask(task)">Finish</button>
   </mat-card-actions>
 </mat-card>
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index 7d25357..aebc19c 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -10,6 +10,7 @@ import {MatSnackBar} from "@angular/material/snack-bar";
 export class TaskOverviewComponent {
 
   @Input() tasks: TaskOverviewInfo[] = []
+  @Input() taskgroupID: number | undefined
   @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
   @Output('onFinished') finishedEmitter: EventEmitter<TaskOverviewInfo> = new EventEmitter<TaskOverviewInfo>();
 
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index 5da9649..f37e1d0 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -7,7 +7,7 @@
     <!-- use a disabled button to provide padding for tree leaf -->
     <button mat-icon-button disabled></button>
     <div class="treenode-content-container">
-      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks)">{{node.name}}</button>
+      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks, node.taskgroupID)">{{node.name}}</button>
       <span class="spacer"></span>
       <div class="task-number">{{node.activeTasks}}</div>
     </div>
@@ -21,7 +21,7 @@
       </mat-icon>
     </button>
     <div class="treenode-content-container">
-      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks)">{{node.name}}</button>
+      <button mat-button class="node-name" (click)="onSelectTaskgroup(node.tasks, node.taskgroupID)">{{node.name}}</button>
       <span class="spacer"></span>
       <div class="task-number">{{node.activeTasks}}</div>
     </div>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
index 4cebf7c..c17aa39 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.ts
@@ -17,6 +17,12 @@ interface ExampleFlatNode {
   activeTasks: number;
   hasOverdueTask: boolean;
   tasks: TaskOverviewInfo[];
+  taskgroupID: number
+}
+
+export interface TaskOverviewData {
+  tasks: TaskOverviewInfo[],
+  taskgroupID: number
 }
 @Component({
   selector: 'app-taskgroup-overview',
@@ -25,7 +31,7 @@ interface ExampleFlatNode {
 })
 export class TaskgroupOverviewComponent {
 
-  @Output('taskgroupSelected') taskgroupSelected: EventEmitter<TaskOverviewInfo[]> = new EventEmitter<TaskOverviewInfo[]>();
+  @Output('taskgroupSelected') taskgroupSelected: EventEmitter<TaskOverviewData> = new EventEmitter<TaskOverviewData>();
   private _transformer = (node: RecursiveTaskgroupInfo, level: number) => {
     return {
       expandable: !!node.childTaskgroups && node.childTaskgroups.length > 0,
@@ -33,7 +39,8 @@ export class TaskgroupOverviewComponent {
       level: level,
       activeTasks: node.amountActiveTasks,
       hasOverdueTask: node.hasOverdueTask,
-      tasks: node.activeTasks
+      tasks: node.activeTasks,
+      taskgroupID: node.taskgroupID
     };
   };
 
@@ -65,7 +72,10 @@ export class TaskgroupOverviewComponent {
 
   hasChild = (_: number, node: ExampleFlatNode) => node.expandable;
 
-  onSelectTaskgroup(tasks: TaskOverviewInfo[]) {
-    this.taskgroupSelected.emit(tasks)
+  onSelectTaskgroup(tasks: TaskOverviewInfo[], taskgroupID: number) {
+    this.taskgroupSelected.emit({
+      tasks: tasks,
+      taskgroupID:  taskgroupID
+    })
   }
 }
-- 
2.34.1


From 98efb9150c3aec2d48de6fc26643446ac9012daf Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 19:09:07 +0200
Subject: [PATCH 47/50] Add tasks from TaskOverview

---
 .../task-overview.component.html              |  2 +-
 .../task-overview/task-overview.component.ts  | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index b0b45fa..4f5a1c8 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -1,4 +1,4 @@
-<button mat-raised-button class="greenBtn long-btn" *ngIf="tasks.length > 0">Add</button>
+<button mat-raised-button class="greenBtn long-btn" *ngIf="tasks.length > 0" (click)="openTaskCreation()">Add</button>
 <mat-card *ngFor="let task of tasks">
   <mat-card-content>
     <h3>{{task.taskName}}</h3>
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.ts b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
index aebc19c..c0d491b 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.ts
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.ts
@@ -1,6 +1,9 @@
 import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {BasicScheduleEntityInfo, ScheduleInfo, ScheduleService, TaskOverviewInfo, TaskService} from "../../../api";
 import {MatSnackBar} from "@angular/material/snack-bar";
+import {TaskEditorData} from "../../tasks/task-editor/TaskEditorData";
+import {TaskEditorComponent} from "../../tasks/task-editor/task-editor.component";
+import {MatDialog} from "@angular/material/dialog";
 
 @Component({
   selector: 'app-task-overview',
@@ -16,7 +19,8 @@ export class TaskOverviewComponent {
 
   constructor(private scheduleService: ScheduleService,
               private snackbar: MatSnackBar,
-              private taskService: TaskService) {
+              private taskService: TaskService,
+              private dialog: MatDialog) {
 
   }
   startTaskNow(task: TaskOverviewInfo) {
@@ -55,4 +59,24 @@ export class TaskOverviewComponent {
        }
     })
   }
+
+  openTaskCreation() {
+    const editorData: TaskEditorData = {
+      task: undefined,
+      taskgroupID: this.taskgroupID!
+    }
+    const dialogRef = this.dialog.open(TaskEditorComponent, {data: editorData, width: "600px"})
+    dialogRef.afterClosed().subscribe(res => {
+      if(res != undefined) {
+        this.tasks.push({
+          taskID: res.taskID,
+          eta: res.eta,
+          limit: res.deadline,
+          taskName: res.taskName,
+          activeTime: 0,
+          overdue: res.overdue
+        })
+      }
+    })
+  }
 }
-- 
2.34.1


From 9402db4a9bd20037cb853528121c07e25409d393 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 19:10:46 +0200
Subject: [PATCH 48/50] Show add task btn also when no task exists

---
 .../app/dashboard/task-overview/task-overview.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index 4f5a1c8..e7c4325 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -1,4 +1,4 @@
-<button mat-raised-button class="greenBtn long-btn" *ngIf="tasks.length > 0" (click)="openTaskCreation()">Add</button>
+<button mat-raised-button class="greenBtn long-btn" *ngIf="taskgroupID != undefined" (click)="openTaskCreation()">Add</button>
 <mat-card *ngFor="let task of tasks">
   <mat-card-content>
     <h3>{{task.taskName}}</h3>
-- 
2.34.1


From 314a11ee18133a97554faf7abd5ccf210bf2185e Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 19:27:13 +0200
Subject: [PATCH 49/50] Visualize Anouncement for missed schedules

---
 backend/.idea/workspace.xml                   |  11 +-
 .../api/controller/ScheduleController.java    |  23 ++--
 .../ActiveMinutesInformation.java             |  18 ---
 .../taskSchedule/ScheduleStatus.java          |  28 +++++
 .../BasicTaskScheduleRepository.java          |   2 +
 .../core/services/TaskScheduleService.java    |  22 ++--
 frontend/src/api/.openapi-generator/FILES     |   2 +-
 frontend/src/api/api/schedule.service.ts      | 112 +++++++++---------
 frontend/src/api/model/models.ts              |   2 +-
 frontend/src/api/model/scheduleStatus.ts      |  24 ++++
 .../src/app/dashboard/dashboard.component.ts  |   3 +-
 openapi.yaml                                  |  13 +-
 12 files changed, 159 insertions(+), 101 deletions(-)
 delete mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
 create mode 100644 backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleStatus.java
 create mode 100644 frontend/src/api/model/scheduleStatus.ts

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index d2a1011..c0cb9cd 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -5,9 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Load worked minutes when reloading dashboard">
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/dashboard.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/dashboard/task-overview/task-overview.component.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleStatus.java" afterDir="false" />
+      <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/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,7 +107,7 @@
       <workItem from="1698298897364" duration="4242000" />
       <workItem from="1698426430946" duration="665000" />
       <workItem from="1698474363766" duration="3686000" />
-      <workItem from="1698499063683" duration="7085000" />
+      <workItem from="1698499063683" duration="7685000" />
     </task>
     <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/core/api/controller/ScheduleController.java b/backend/src/main/java/core/api/controller/ScheduleController.java
index e119421..cbdf1a3 100644
--- a/backend/src/main/java/core/api/controller/ScheduleController.java
+++ b/backend/src/main/java/core/api/controller/ScheduleController.java
@@ -2,9 +2,11 @@ package core.api.controller;
 
 import core.api.models.auth.SimpleStatusResponse;
 import core.api.models.timemanager.taskSchedule.*;
+import core.entities.User;
 import core.entities.timemanager.BasicTaskSchedule;
 import core.entities.timemanager.ScheduleType;
 import core.entities.timemanager.Task;
+import core.repositories.UserRepository;
 import core.repositories.timemanager.BasicTaskScheduleRepository;
 import core.services.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +15,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
@@ -26,12 +25,15 @@ public class ScheduleController {
     private final TaskService taskService;
     private final TaskScheduleService taskScheduleService;
     private final BasicTaskScheduleRepository basicTaskScheduleRepository;
+    private final UserRepository userRepository;
 
     public ScheduleController(@Autowired TaskService taskService, @Autowired TaskScheduleService taskScheduleService,
-                              BasicTaskScheduleRepository basicTaskScheduleRepository) {
+                              BasicTaskScheduleRepository basicTaskScheduleRepository,
+                              UserRepository userRepository) {
         this.taskService = taskService;
         this.taskScheduleService = taskScheduleService;
         this.basicTaskScheduleRepository = basicTaskScheduleRepository;
+        this.userRepository = userRepository;
     }
 
     @GetMapping("/schedules/{taskID}/{scheduleType}")
@@ -189,9 +191,14 @@ public class ScheduleController {
         }
     }
 
-    @GetMapping("/schedules/workedMinutesToday")
+    @GetMapping("/schedules/status/today")
     public ResponseEntity<?> getWorkedMinutesToday() {
-        ServiceResult<Integer> getWorkedMinutes = taskScheduleService.getWorkedMinutes(SecurityContextHolder.getContext().getAuthentication().getName());
-        return ResponseEntity.ok(new ActiveMinutesInformation(getWorkedMinutes.getResult()));
+        Optional<User> user = userRepository.findByUsername(SecurityContextHolder.getContext().getAuthentication().getName());
+        if(user.isEmpty()) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        int workedMinutes = taskScheduleService.getWorkedMinutes(user.get());
+        return ResponseEntity.ok(new ScheduleStatus(workedMinutes, taskScheduleService.isAnyScheduleMissed(user.get())));
     }
 }
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
deleted file mode 100644
index 3f84af3..0000000
--- a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ActiveMinutesInformation.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package core.api.models.timemanager.taskSchedule;
-
-public class ActiveMinutesInformation {
-
-    public int activeMinutes;
-
-    public ActiveMinutesInformation(int activeMinutes) {
-        this.activeMinutes = activeMinutes;
-    }
-
-    public int getActiveMinutes() {
-        return activeMinutes;
-    }
-
-    public void setActiveMinutes(int activeMinutes) {
-        this.activeMinutes = activeMinutes;
-    }
-}
diff --git a/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleStatus.java b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleStatus.java
new file mode 100644
index 0000000..d412d6d
--- /dev/null
+++ b/backend/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleStatus.java
@@ -0,0 +1,28 @@
+package core.api.models.timemanager.taskSchedule;
+
+public class ScheduleStatus {
+
+    private int activeMinutes;
+    private boolean missedSchedules;
+
+    public ScheduleStatus(int activeMinutes, boolean missedSchedules) {
+        this.activeMinutes = activeMinutes;
+        this.missedSchedules = missedSchedules;
+    }
+
+    public int getActiveMinutes() {
+        return activeMinutes;
+    }
+
+    public void setActiveMinutes(int activeMinutes) {
+        this.activeMinutes = activeMinutes;
+    }
+
+    public boolean isMissedSchedules() {
+        return missedSchedules;
+    }
+
+    public void setMissedSchedules(boolean missedSchedules) {
+        this.missedSchedules = missedSchedules;
+    }
+}
diff --git a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
index facd866..9a735dd 100644
--- a/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
+++ b/backend/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java
@@ -34,4 +34,6 @@ public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSch
 
     @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user.username = ?1 AND bts.startTime is not null  and bts.finishedTime is null")
     Optional<BasicTaskSchedule> findActiveTaskSchedule(String username);
+
+    List<BasicTaskSchedule> findAllByStartTimeIsNull();
 }
diff --git a/backend/src/main/java/core/services/TaskScheduleService.java b/backend/src/main/java/core/services/TaskScheduleService.java
index 5e1d559..85562b4 100644
--- a/backend/src/main/java/core/services/TaskScheduleService.java
+++ b/backend/src/main/java/core/services/TaskScheduleService.java
@@ -135,19 +135,25 @@ public class TaskScheduleService {
         return new ServiceResult<>((int) activeTime);
     }
 
-    public ServiceResult<Integer> getWorkedMinutes(String username) {
-        Optional<User> user = userRepository.findByUsername(username);
-        if(user.isEmpty()) {
-            return new ServiceResult<>(ServiceExitCode.MISSING_ENTITY);
-        }
-
-        List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUser(user.get());
+    public int getWorkedMinutes(User user) {
+        List<BasicTaskSchedule> basicTaskSchedules = basicTaskScheduleRepository.findAllByUser(user);
         long workedMinutes = 0;
         for(BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
             if(basicTaskSchedule.getFinishedTime() != null && basicTaskSchedule.getFinishedTime().toLocalDate().isEqual(LocalDate.now())) {
                 workedMinutes += Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
             }
         }
-        return new ServiceResult<>((int) workedMinutes);
+        return (int) workedMinutes;
+    }
+
+    public boolean isAnyScheduleMissed(User user) {
+        List<BasicTaskSchedule> unstartedSchedules = basicTaskScheduleRepository.findAllByStartTimeIsNull();
+        LocalDate dateReference = LocalDate.now();
+        for(BasicTaskSchedule schedule : unstartedSchedules) {
+            if(schedule.getScheduleDate().isBefore(dateReference)) {
+                return true;
+            }
+        }
+        return false;
     }
 }
diff --git a/frontend/src/api/.openapi-generator/FILES b/frontend/src/api/.openapi-generator/FILES
index 51b0542..f2b32bb 100644
--- a/frontend/src/api/.openapi-generator/FILES
+++ b/frontend/src/api/.openapi-generator/FILES
@@ -14,7 +14,6 @@ encoder.ts
 git_push.sh
 index.ts
 model/accountDeleteRequest.ts
-model/activeMinutesInformation.ts
 model/basicScheduleEntityInfo.ts
 model/basicScheduleFieldInfo.ts
 model/eMailChangeRequest.ts
@@ -32,6 +31,7 @@ model/propertyUpdateRequest.ts
 model/recursiveTaskgroupInfo.ts
 model/scheduleActivateInfo.ts
 model/scheduleInfo.ts
+model/scheduleStatus.ts
 model/signUpRequest.ts
 model/simpleStatusResponse.ts
 model/taskEntityInfo.ts
diff --git a/frontend/src/api/api/schedule.service.ts b/frontend/src/api/api/schedule.service.ts
index eceb46f..41cc133 100644
--- a/frontend/src/api/api/schedule.service.ts
+++ b/frontend/src/api/api/schedule.service.ts
@@ -18,11 +18,11 @@ import { HttpClient, HttpHeaders, HttpParams,
 import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
-import { ActiveMinutesInformation } from '../model/models';
 import { BasicScheduleEntityInfo } from '../model/models';
 import { BasicScheduleFieldInfo } from '../model/models';
 import { ScheduleActivateInfo } from '../model/models';
 import { ScheduleInfo } from '../model/models';
+import { ScheduleStatus } from '../model/models';
 import { SimpleStatusResponse } from '../model/models';
 import { TaskScheduleStopResponse } from '../model/models';
 
@@ -456,6 +456,61 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * get number of active minutes
+     * get number of worked minutes today
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesStatusTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleStatus>;
+    public schedulesStatusTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleStatus>>;
+    public schedulesStatusTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleStatus>>;
+    public schedulesStatusTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.get<ScheduleStatus>(`${this.configuration.basePath}/schedules/status/today`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * creates basic schedule for task
      * creates a basic schedule for a task
@@ -708,59 +763,4 @@ export class ScheduleService {
         );
     }
 
-    /**
-     * get number of active minutes
-     * get number of worked minutes today
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public schedulesWorkedMinutesTodayGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ActiveMinutesInformation>;
-    public schedulesWorkedMinutesTodayGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ActiveMinutesInformation>>;
-    public schedulesWorkedMinutesTodayGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ActiveMinutesInformation>>;
-    public schedulesWorkedMinutesTodayGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarCredential: string | undefined;
-        // authentication (API_TOKEN) required
-        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
-        if (localVarCredential) {
-            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
-        }
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        let responseType_: 'text' | 'json' = 'json';
-        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
-            responseType_ = 'text';
-        }
-
-        return this.httpClient.get<ActiveMinutesInformation>(`${this.configuration.basePath}/schedules/workedMinutesToday`,
-            {
-                context: localVarHttpContext,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
 }
diff --git a/frontend/src/api/model/models.ts b/frontend/src/api/model/models.ts
index d539dab..008265d 100644
--- a/frontend/src/api/model/models.ts
+++ b/frontend/src/api/model/models.ts
@@ -1,5 +1,4 @@
 export * from './accountDeleteRequest';
-export * from './activeMinutesInformation';
 export * from './basicScheduleEntityInfo';
 export * from './basicScheduleFieldInfo';
 export * from './eMailChangeRequest';
@@ -16,6 +15,7 @@ export * from './propertyUpdateRequest';
 export * from './recursiveTaskgroupInfo';
 export * from './scheduleActivateInfo';
 export * from './scheduleInfo';
+export * from './scheduleStatus';
 export * from './signUpRequest';
 export * from './simpleStatusResponse';
 export * from './taskEntityInfo';
diff --git a/frontend/src/api/model/scheduleStatus.ts b/frontend/src/api/model/scheduleStatus.ts
new file mode 100644
index 0000000..6457cfb
--- /dev/null
+++ b/frontend/src/api/model/scheduleStatus.ts
@@ -0,0 +1,24 @@
+/**
+ * API Title
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface ScheduleStatus { 
+    /**
+     * number of minutes it was worked today
+     */
+    activeMinutes: number;
+    /**
+     * states whether a schedule was missed or not
+     */
+    missedSchedules: boolean;
+}
+
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index b0da6e9..f09a3d8 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -30,9 +30,10 @@ export class DashboardComponent implements OnInit{
       }
     })
 
-    this.scheduleService.schedulesWorkedMinutesTodayGet().subscribe({
+    this.scheduleService.schedulesStatusTodayGet().subscribe({
       next: resp => {
         this.workedMinutesToday = resp.activeMinutes;
+        this.missedSchedules = resp.missedSchedules;
       }
     })
   }
diff --git a/openapi.yaml b/openapi.yaml
index 9d81ead..19ab60b 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1597,7 +1597,7 @@ paths:
               schema:
                 type: object
                 $ref: "#/components/schemas/SimpleStatusResponse"
-  /schedules/workedMinutesToday:
+  /schedules/status/today:
     get:
       security:
         - API_TOKEN: []
@@ -1611,7 +1611,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ActiveMinutesInformation'
+                $ref: '#/components/schemas/ScheduleStatus'
         404:
           description: User not found
           content:
@@ -2127,12 +2127,17 @@ components:
           type: number
           description: number in minutes that was already worked on this task
           example: 10
-    ActiveMinutesInformation:
+    ScheduleStatus:
       required:
         - activeMinutes
+        - missedSchedules
       additionalProperties: false
       properties:
         activeMinutes:
           type: number
           example: 1
-          description: number of minutes it was worked today
\ No newline at end of file
+          description: number of minutes it was worked today
+        missedSchedules:
+          type: boolean
+          description: states whether a schedule was missed or not
+          example: true
\ No newline at end of file
-- 
2.34.1


From 984552bc69e32d9a659b8c9ea3086d5576ecbeae Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Sat, 28 Oct 2023 19:31:08 +0200
Subject: [PATCH 50/50] Routing for TaskLink and ManageTaskgroup Btn

---
 .../app/dashboard/task-overview/task-overview.component.css  | 5 +++++
 .../app/dashboard/task-overview/task-overview.component.html | 2 +-
 .../taskgroup-overview/taskgroup-overview.component.html     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.css b/frontend/src/app/dashboard/task-overview/task-overview.component.css
index 178ad85..8c786e8 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.css
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.css
@@ -26,3 +26,8 @@
   color: white;
   border-radius: 0;
 }
+
+.task-link {
+  text-decoration: none;
+  color: black;
+}
diff --git a/frontend/src/app/dashboard/task-overview/task-overview.component.html b/frontend/src/app/dashboard/task-overview/task-overview.component.html
index e7c4325..8ed063e 100644
--- a/frontend/src/app/dashboard/task-overview/task-overview.component.html
+++ b/frontend/src/app/dashboard/task-overview/task-overview.component.html
@@ -1,7 +1,7 @@
 <button mat-raised-button class="greenBtn long-btn" *ngIf="taskgroupID != undefined" (click)="openTaskCreation()">Add</button>
 <mat-card *ngFor="let task of tasks">
   <mat-card-content>
-    <h3>{{task.taskName}}</h3>
+    <h3><a class="task-link" [routerLink]="['/taskgroups', taskgroupID!, 'tasks', task.taskID]">{{task.taskName}}</a></h3>
     <mat-progress-bar mode="determinate" value="{{task.activeTime}}" class="progress"></mat-progress-bar>
     <p class="task-info"><i>ETA: </i>{{task.activeTime}} / {{task.eta}}</p>
     <p class="task-info"><i>Limit: </i>{{task.limit}}</p>
diff --git a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
index f37e1d0..945f17d 100644
--- a/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
+++ b/frontend/src/app/dashboard/taskgroup-overview/taskgroup-overview.component.html
@@ -1,5 +1,5 @@
 <mat-action-list style="padding: 0">
-  <button mat-list-item class="lightBlueBtn">Manage Taskgroups</button>
+  <button mat-list-item class="lightBlueBtn" [routerLink]="['/taskgroups']">Manage Taskgroups</button>
 </mat-action-list>
 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
   <!-- This is the tree node template for leaf nodes -->
-- 
2.34.1