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] 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: