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

issue-25 #27

Merged
sebastian merged 32 commits from issue-25 into issue-18 2023-10-28 19:33:06 +02:00
Conversation 0 Commits 32 Files Changed 51 +14 -3
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d3257b8748 - Show all commits

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

@ -1,6 +1,7 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; 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 {StopActiveScheduleInfo} from "./StopActiveScheduleInfo";
import {TaskOverviewComponent} from "../task-overview/task-overview.component";
@Component({ @Component({
selector: 'app-active-schedule', selector: 'app-active-schedule',
@ -69,5 +70,8 @@ export class ActiveScheduleComponent implements OnInit{
this.updateTime(); this.updateTime();
} }
finishTaskByOverview(task: TaskOverviewInfo) {
this.activeSchedule = undefined
}
} }

2
frontend/src/app/dashboard/dashboard.component.html
View File

@ -39,7 +39,7 @@
</div> </div>
<div class="taskgroup-overview"> <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>
<div class="taskgroup-overview"> <div class="taskgroup-overview">

6
frontend/src/app/dashboard/dashboard.component.ts
View File

@ -56,4 +56,10 @@ export class DashboardComponent implements OnInit{
onStartTaskNow(schedule: ScheduleInfo) { onStartTaskNow(schedule: ScheduleInfo) {
this.activeScheduleComponent?.activateSchedule(schedule) this.activeScheduleComponent?.activateSchedule(schedule)
} }
onFinishTask(task: TaskOverviewInfo) {
this.activeScheduleComponent?.finishTaskByOverview(task);
this.schedules = this.schedules.filter(schedule => schedule.task.taskID !== task.taskID)
}
} }

3
frontend/src/app/dashboard/task-overview/task-overview.component.ts
View File

@ -11,6 +11,7 @@ export class TaskOverviewComponent {
@Input() tasks: TaskOverviewInfo[] = [] @Input() tasks: TaskOverviewInfo[] = []
@Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>(); @Output('onStartNow') startNowEmitter: EventEmitter<ScheduleInfo> = new EventEmitter<ScheduleInfo>();
@Output('onFinished') finishedEmitter: EventEmitter<TaskOverviewInfo> = new EventEmitter<TaskOverviewInfo>();
constructor(private scheduleService: ScheduleService, constructor(private scheduleService: ScheduleService,
private snackbar: MatSnackBar, private snackbar: MatSnackBar,
@ -39,7 +40,7 @@ export class TaskOverviewComponent {
finishTask(task: TaskOverviewInfo) { finishTask(task: TaskOverviewInfo) {
this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({ this.taskService.tasksTaskIDFinishPost(task.taskID).subscribe({
next: resp => { next: resp => {
this.finishedEmitter.emit(task);
}, },
error: err => { error: err => {
if(err.status == 403) { if(err.status == 403) {