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

Navigate to task by given taskID of schedule and not fixed one from route param
All checks were successful
Java CI with Maven / test (push) Successful in 35s
Details
Java CI with Maven / build-and-push-frontend (push) Successful in 6s
Details
Java CI with Maven / build-and-push-backend (push) Successful in 7s
Details

Browse Source
This commit is contained in:
Sebastian Böckelmann 2023-11-18 08:48:45 +01:00
parent edf19a52ba
commit 7b7d85d873
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/app/schedules/scheduler/scheduler.component.html
View File

@ -1,4 +1,3 @@
<div class="container"> <div class="container">
<app-navigation-link-list #navLinkList [navigationLinks]="defaultNavigationLinkPath"></app-navigation-link-list> <app-navigation-link-list #navLinkList [navigationLinks]="defaultNavigationLinkPath"></app-navigation-link-list>

9
frontend/src/app/schedules/scheduler/scheduler.component.ts
View File

@ -171,7 +171,7 @@ export class SchedulerComponent implements OnInit{
start: new Date(scheduleInfo.scheduleDate), start: new Date(scheduleInfo.scheduleDate),
title: this.task!.taskName, title: this.task!.taskName,
color: colors['red'], color: colors['red'],
allDay: true allDay: true,
}) })
this.refresh.next(); this.refresh.next();
} }
@ -204,7 +204,9 @@ export class SchedulerComponent implements OnInit{
color: color, color: color,
allDay: true, allDay: true,
meta: { meta: {
ID: this.scheduleID ID: this.scheduleID,
taskgroupID: schedule.taskgroupPath[schedule.taskgroupPath.length-1].taskgroupID,
taskID: schedule.task.taskID
} }
}) })
this.refresh.next(); this.refresh.next();
@ -212,7 +214,8 @@ export class SchedulerComponent implements OnInit{
} }
eventClicked({ event }: { event: CalendarEvent }): void { eventClicked({ event }: { event: CalendarEvent }): void {
this.router.navigateByUrl("/taskgroups/" + this.taskgroupID.toString() + "/tasks/" + this.task!.taskID ) console.log(event.meta.taskgroupID);
this.router.navigateByUrl("/taskgroups/" + event.meta.taskgroupID + "/tasks/" + event.meta.taskID )
} }
computeTaskPath(taskgroupPath: TaskgroupEntityInfo[], task: TaskShortInfo | TaskEntityInfo) { computeTaskPath(taskgroupPath: TaskgroupEntityInfo[], task: TaskShortInfo | TaskEntityInfo) {