Merge branch 'master' into deployment/cicd

This commit is contained in:
Nicolai Ort 2020-06-08 13:24:43 +02:00
commit e51604efdf
4 changed files with 23 additions and 4 deletions

View File

@ -36,11 +36,15 @@ export class BackendService {
}
//enum prio{high, middle, low}; --> noch nicht im backend
export enum Priority {
High="high",
Medium="medium",
Low="low"
}
export interface Task {
id?: number;
title: string;
//prio; --> noch nicht im backend
content?: string;
status?: number;
category?: number;
@ -48,4 +52,5 @@ export interface Task {
sprint?: number;
project?: number;
userstory?: number;
}
priority?: Priority;
}

View File

@ -10,6 +10,15 @@
<input type="text" class="form-control" id="Content" required name="content" [(ngModel)]="content">
</div>
<div class="form-group">
<label for="Prio">Prio</label>
<select class="form-control" id="prio" required name="prio" [(ngModel)]="prio">
<option value="low">Low</option>
<option value="medium">Medium</option>
<option value="high">High</option>
</select>
</div>
<button type="submit" class="btn btn-success">Submit</button>
</form>

View File

@ -1,6 +1,6 @@
import { Component, OnInit, Input } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { BackendService, Task } from '../services/backend.service';
import { BackendService, Task, Priority } from '../services/backend.service';
@Component({
selector: 'app-task-form',
@ -11,6 +11,7 @@ export class TaskFormComponent implements OnInit {
public title: string;
public content: string;
public prio: Priority;
@Input()
public task: Task;
@ -22,6 +23,7 @@ export class TaskFormComponent implements OnInit {
if (this.task !== null && this.task !== undefined) {
this.title = this.task.title;
this.content = this.task.content;
this.prio = this.task.priority;
}
}
@ -29,6 +31,7 @@ export class TaskFormComponent implements OnInit {
if (this.task !== null && this.task !== undefined) {
this.task.title = this.title;
this.task.content = this.content;
this.task.priority = this.prio;
this.backendService.putTask(this.task).subscribe(response => {
if (response.status > 399) {
alert('Fehler');

View File

@ -5,6 +5,8 @@
<span>Titel: {{task.title}}</span>
<br/>
<span>Inhalt: {{task.content}}</span>
<br/>
<span>Priotität: {{task.priority}}</span>
<br>
<button class="btn btn-secondary m-2" (click)="openTaskForm(task)">Bearbeiten</button>
<button class="btn btn-secondary m-2" (click)="deleteTask(task)">Löschen</button>