issue-10 #17

Merged
sebastian merged 29 commits from issue-10 into master 2023-10-22 11:40:25 +02:00
5 changed files with 25 additions and 6 deletions
Showing only changes of commit d6116729fd - Show all commits

View File

@ -18,7 +18,7 @@
<mat-card style="width: 100%">
<mat-card-content>
<app-task-dashboard [taskgroupID]="taskgroupID"></app-task-dashboard>
<app-task-dashboard #taskDashboard [taskgroupID]="taskgroupID"></app-task-dashboard>
</mat-card-content>
</mat-card>
<div style="width: 100%">

View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import {Component, OnInit, ViewChild} from '@angular/core';
import {MatDialog as MatDialog} from "@angular/material/dialog";
import {TaskgroupCreationComponent} from "../taskgroup-creation/taskgroup-creation.component";
import {TaskgroupEntityInfo, TaskgroupService} from "../../../api";
@ -6,6 +6,7 @@ import {TaskgroupDeletionComponent} from "../taskgroup-deletion/taskgroup-deleti
import {ActivatedRoute} from "@angular/router";
import {TaskEditorComponent} from "../../tasks/task-editor/task-editor.component";
import {TaskEditorData} from "../../tasks/task-editor/TaskEditorData";
import {TaskDashboardComponent} from "../../tasks/task-dashboard/task-dashboard.component";
@Component({
selector: 'app-taskgroup-dashboard',
@ -20,6 +21,7 @@ export class TaskgroupDashboardComponent implements OnInit {
taskgroups: TaskgroupEntityInfo[] = []
taskgroupID: number = -1;
@ViewChild("taskDashboard") taskDashboard: TaskDashboardComponent | undefined
ngOnInit(): void {
this.activatedRoute.paramMap.subscribe(params => {
@ -73,6 +75,11 @@ export class TaskgroupDashboardComponent implements OnInit {
task: undefined,
taskgroupID: this.taskgroupID
}
const dialogRef = this.dialog.open(TaskEditorComponent, {data: editorData, minWidth: "400px"})
const dialogRef = this.dialog.open(TaskEditorComponent, {data: editorData, width: "600px"})
dialogRef.afterClosed().subscribe(res => {
if(res != undefined) {
this.taskDashboard!.addTask(res);
}
})
}
}

View File

@ -94,4 +94,9 @@ export class TaskDashboardComponent implements OnChanges{
}
})
}
addTask(task: TaskEntityInfo) {
const data = this.datasource.data;
data.push(task)
this.datasource.data = data;
}
}

View File

@ -4,5 +4,12 @@
.date-form {
width: 49%;
margin-right: 9px;
}
#startDate {
float: left;
}
#endDate {
float: right;
}

View File

@ -10,14 +10,14 @@
<mat-label>ETA</mat-label>
<input matInput type="number" [formControl]="etaCtrl" min="0">
</mat-form-field>
<mat-form-field class="date-form">
<mat-form-field class="date-form" id="startDate">
<mat-label>Startdate</mat-label>
<input matInput [matDatepicker]="startpicker" [formControl]="startDate">
<mat-hint>MM/DD/YYYY</mat-hint>
<mat-datepicker-toggle matIconSuffix [for]="startpicker"></mat-datepicker-toggle>
<mat-datepicker #startpicker></mat-datepicker>
</mat-form-field>
<mat-form-field class="date-form">
<mat-form-field class="date-form" id="endDate">
<mat-label>Deadline</mat-label>
<input matInput [matDatepicker]="deadlinepicker" [formControl]="endDate">
<mat-hint>MM/DD/YYYY</mat-hint>