From 2660f3a407f22e4fe226037a41b7077f164d291f Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 12:53:48 +0200 Subject: [PATCH 1/6] Added priotity to Task --- src/app/services/backend.service.ts | 8 +++++++- src/app/task-list/task-list.component.html | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index d023a1b..39e2395 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -36,11 +36,17 @@ export class BackendService { } +enum Priority { + High="high", + Middle="middle", + Low="low" +} + //enum prio{high, middle, low}; --> noch nicht im backend export interface Task { id?: number; title: string; - //prio; --> noch nicht im backend + priority?: Priority; content?: string; status?: number; category?: number; diff --git a/src/app/task-list/task-list.component.html b/src/app/task-list/task-list.component.html index 269ec70..1f501a3 100644 --- a/src/app/task-list/task-list.component.html +++ b/src/app/task-list/task-list.component.html @@ -5,6 +5,8 @@ Titel: {{task.title}}
Inhalt: {{task.content}} +
+ Priotität: {{task.priority}}
From c9b814a0fe6a43b65f58a9eae5654141b811eea0 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 12:55:11 +0200 Subject: [PATCH 2/6] Removed comment --- src/app/services/backend.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index 39e2395..9c082e5 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -42,7 +42,6 @@ enum Priority { Low="low" } -//enum prio{high, middle, low}; --> noch nicht im backend export interface Task { id?: number; title: string; From 072a83cb628b22fa798e0edd32f78c717824fe8d Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 12:56:16 +0200 Subject: [PATCH 3/6] Now reflects order of the json --- src/app/services/backend.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index 9c082e5..e9d9ed3 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -45,7 +45,6 @@ enum Priority { export interface Task { id?: number; title: string; - priority?: Priority; content?: string; status?: number; category?: number; @@ -53,4 +52,5 @@ export interface Task { sprint?: number; project?: number; userstory?: number; + priority?: Priority; } From 831d91498afa94ba90d8d2c3e96104d94a114fbc Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 12:57:43 +0200 Subject: [PATCH 4/6] Removed a \n --- src/app/services/backend.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index e9d9ed3..f7933f6 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -53,4 +53,4 @@ export interface Task { project?: number; userstory?: number; priority?: Priority; -} +} \ No newline at end of file From 301d2d93540af1b8b4a01aba2f71c3931cbe1f06 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 13:17:42 +0200 Subject: [PATCH 5/6] Fixed unexported enum --- src/app/services/backend.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index f7933f6..98433f0 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -36,9 +36,9 @@ export class BackendService { } -enum Priority { +export enum Priority { High="high", - Middle="middle", + Medium="medium", Low="low" } From e81cb51f05aa58cd899a7de29382bbaf719d7504 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 8 Jun 2020 13:17:58 +0200 Subject: [PATCH 6/6] Added Priority Selector --- src/app/task-form/task-form.component.html | 9 +++++++++ src/app/task-form/task-form.component.ts | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index c01cd5b..114d1d2 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -10,6 +10,15 @@ +
+ + +
+ diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts index 7f2aa19..858a647 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -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');