sebastian/timemanager
Template
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-112 #115

Merged
sebastian merged 7 commits from issue-112 into master 2024-04-18 20:20:22 +02:00
Conversation 0 Commits 7 Files Changed 8 +13 -2
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd98423f6b - Show all commits

2
frontend/src/app/dashboard/active-schedule/active-schedule.component.html
View File

@ -6,7 +6,7 @@
</mat-card> </mat-card>
<mat-card *ngIf="activeSchedule != undefined"> <mat-card *ngIf="activeSchedule != undefined">
<mat-card-header> <mat-card-header>
<mat-card-title><a routerLink="/" class="link-no-deco">{{activeSchedule!.task.taskName}}</a></mat-card-title> <mat-card-title><a [routerLink]="['/taskgroups', taskgroupID, 'tasks', activeSchedule!.task.taskID]" class="link-no-deco">{{activeSchedule!.task.taskName}}</a></mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span> <span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span>

13
frontend/src/app/dashboard/active-schedule/active-schedule.component.ts
View File

@ -1,5 +1,11 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; 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 {StopActiveScheduleInfo} from "./StopActiveScheduleInfo";
import {TaskOverviewComponent} from "../task-overview/task-overview.component"; import {TaskOverviewComponent} from "../task-overview/task-overview.component";
import {MatDialog} from "@angular/material/dialog"; import {MatDialog} from "@angular/material/dialog";
@ -19,6 +25,7 @@ export interface StopActiveScheduleEmitterInfo {
}) })
export class ActiveScheduleComponent implements OnInit{ export class ActiveScheduleComponent implements OnInit{
activeSchedule: ScheduleInfo | undefined activeSchedule: ScheduleInfo | undefined
taskgroupID: number | undefined
startTime: number = 0; startTime: number = 0;
currentTime: number = 0; currentTime: number = 0;
@ -56,11 +63,15 @@ export class ActiveScheduleComponent implements OnInit{
next: resp => { next: resp => {
if(resp.scheduleID >= 0) { if(resp.scheduleID >= 0) {
this.activateSchedule(resp); this.activateSchedule(resp);
this.taskgroupID = resp.taskgroupPath[resp.taskgroupPath.length-1].taskgroupID
console.log(this.taskgroupID)
} }
}, },
}) })
} }
stopTask(finish: boolean) { stopTask(finish: boolean) {