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 d6055c6..986ea7b 100644 --- a/frontend/src/app/dashboard/active-schedule/active-schedule.component.html +++ b/frontend/src/app/dashboard/active-schedule/active-schedule.component.html @@ -6,7 +6,7 @@ - {{activeSchedule!.task.taskName}} + {{activeSchedule!.task.taskName}} {{taskgroupPath.taskgroupName}} / 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 ea291d2..1ef0519 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,11 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {ScheduleInfo, ScheduleService, TaskOverviewInfo, TaskScheduleStopResponse} from "../../../api"; +import { + ScheduleInfo, + ScheduleService, + TaskgroupEntityInfo, + TaskOverviewInfo, + TaskScheduleStopResponse +} from "../../../api"; import {StopActiveScheduleInfo} from "./StopActiveScheduleInfo"; import {TaskOverviewComponent} from "../task-overview/task-overview.component"; import {MatDialog} from "@angular/material/dialog"; @@ -19,6 +25,7 @@ export interface StopActiveScheduleEmitterInfo { }) export class ActiveScheduleComponent implements OnInit{ activeSchedule: ScheduleInfo | undefined + taskgroupID: number | undefined startTime: number = 0; currentTime: number = 0; @@ -56,11 +63,15 @@ export class ActiveScheduleComponent implements OnInit{ next: resp => { if(resp.scheduleID >= 0) { this.activateSchedule(resp); + this.taskgroupID = resp.taskgroupPath[resp.taskgroupPath.length-1].taskgroupID + console.log(this.taskgroupID) } }, }) + + } stopTask(finish: boolean) {