From c393afb7b8ce280f0c5e4b6755845697b187b145 Mon Sep 17 00:00:00 2001 From: test Date: Fri, 3 Jul 2020 11:17:37 +0200 Subject: [PATCH 1/8] created dropdown to choose a user assigned to the task. --- src/app/task-form/task-form.component.html | 165 +++++++++++++-------- src/app/task-form/task-form.component.ts | 26 ++++ 2 files changed, 126 insertions(+), 65 deletions(-) diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index 2e688ac..872a86a 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -1,83 +1,118 @@ -
+
-
-
- -
-
-
-

Neuen Task anlegen

-
- -
- +
+
+ +
+
+
+

Neuen Task anlegen

+
+ +
+ +
-
-
-
-
-
-
-
- - -
-
- - -
+
-
+ +
+
+
+ + +
+
+ + +
+
+
-
- +
-
-
-
- -
-
Status wählen
- - -
-
Neuer Status
- - - +
+ +
+
+ +
+
Status wählen
+ + +
+
Neuer Status
+ + + +
-
-
- + - + +
+
+ +
+
+ +
+
User wählen
+ +
+
+
+ +
+
-
- - +
+
+ + +
-
-
-
-
- - +
-
-
\ No newline at end of file diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts index 2b361ca..d4df3c8 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -26,10 +26,13 @@ export class TaskFormComponent implements OnInit { public userstories: any[] = []; public allStatus: any[] = []; public status: ScrumStatus = {title: "", description: ""}; + public allUser: any[] = []; + public user: ScrumUser = { name: "" }; constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) { this.getUserStories(); this.getTaskStatus(); + this.getAllUsers(); } ngOnInit(): void { @@ -155,4 +158,27 @@ export class TaskFormComponent implements OnInit { } return status.title; } + + // Methods for choosing creator of a userstory. + + getAllUsers() { + this.backendService.getUsers().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.allUser.push(...response.body); + } + }); + } + + getAuthorById(id: number): string { + if (!id) { + return null; + } + var user = this.allUser.find((x) => x.id === id); + if (!user) { + return null; + } + return user.name; + } } From dd4112f5bca833064693825a38341f6662ace037 Mon Sep 17 00:00:00 2001 From: test Date: Fri, 3 Jul 2020 13:09:55 +0200 Subject: [PATCH 2/8] Created new table for backlog. --- .../backlog-table.component.css | 3 + .../backlog-table.component.html | 229 ++++++++++++++++++ .../backlog-table.component.ts | 185 ++++++++++++++ 3 files changed, 417 insertions(+) create mode 100644 src/app/backlog-table copy/backlog-table.component.css create mode 100644 src/app/backlog-table copy/backlog-table.component.html create mode 100644 src/app/backlog-table copy/backlog-table.component.ts diff --git a/src/app/backlog-table copy/backlog-table.component.css b/src/app/backlog-table copy/backlog-table.component.css new file mode 100644 index 0000000..a268ac9 --- /dev/null +++ b/src/app/backlog-table copy/backlog-table.component.css @@ -0,0 +1,3 @@ +th.sortable:hover { + text-decoration: underline; +} \ No newline at end of file diff --git a/src/app/backlog-table copy/backlog-table.component.html b/src/app/backlog-table copy/backlog-table.component.html new file mode 100644 index 0000000..89da5a1 --- /dev/null +++ b/src/app/backlog-table copy/backlog-table.component.html @@ -0,0 +1,229 @@ +
+ +

Backlog

+
+
+
+
+ +
+
+
+
+

Verfügbare Userstories

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + + + + + + Titel + + + + + + + Tasks + + + + + + + Status + + + + + + +
+
+ Priorität: +
+ {{filterPriority || "All"}} +
+ + +
+
+ + + + + +
+
+ 		+ Category + + + + + +
{{userstory.id}}{{userstory.title}} + + {{getNumberOfTasks(userstory)}} Tasks + + + + {{getStatusTitleById(userstory.statusid)}} + + {{userstory.priority}} + + {{getCategoryTitleById(userstory.categoryid)}} + + + + +
+
+
+ +
+ +

Sprint-Backlog

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + + + + + + Titel + + + + + + + Tasks + + + + + + + Status + + + + + + +
+
+ Priorität: +
+ {{filterPriority || "All"}} +
+ + +
+
+ + + + + +
+
+ 		+ Category + + + + + +
{{userstory.id}}{{userstory.title}} + + {{getNumberOfTasks(userstory)}} Tasks + + + + {{getStatusTitleById(userstory.statusid)}} + + {{userstory.priority}} + + {{getCategoryTitleById(userstory.categoryid)}} + + + +
+
+
+
\ No newline at end of file diff --git a/src/app/backlog-table copy/backlog-table.component.ts b/src/app/backlog-table copy/backlog-table.component.ts new file mode 100644 index 0000000..2d799c4 --- /dev/null +++ b/src/app/backlog-table copy/backlog-table.component.ts @@ -0,0 +1,185 @@ +import { Component } from '@angular/core'; +import { + BackendService, + ScrumTask, + ScrumUserstory, + ScrumStatus, + ScrumCategory, + ScrumSprint, + ScrumUser, +} from '../services/backend.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TableComponentBase } from '../services/table-component.base'; +import { getNumberForPriority } from '../services/sorting.service'; +import { UserstoryFormComponent } from '../userstory-form/userstory-form.component'; +import { ActivatedRoute, ParamMap, Router } from '@angular/router'; +import { SprintFormComponent } from '../sprint-form/sprint-form.component'; + + +@Component({ + selector: 'app-userstory-table', + templateUrl: './userstory-table.component.html', + styleUrls: ['./userstory-table.component.css'], +}) +export class UserstoryTableComponent extends TableComponentBase< + ScrumUserstory +> { + public tasks: ScrumTask[] = []; + public filterPriority: string | null = null; + public highlightId: number; + public status: ScrumStatus[] = []; + public categories: ScrumCategory[] = []; + + public choosen: ScrumUserstory[] = []; + + public get filteredItems() { + return this.items.filter( + (task) => + this.filterPriority === null || task.priority === this.filterPriority + ); + } + + constructor( + private backendService: BackendService, + private modalService: NgbModal, + private route: ActivatedRoute, + private router: Router + ) { + super(); + + this.applyFilterParameters(this.route.snapshot.paramMap); + this.route.paramMap.subscribe((map) => this.applyFilterParameters(map)); + + backendService.getUserstories().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.items.push(...response.body); + } + }); + backendService.getTasks().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.tasks.push(...response.body); + } + }); + backendService.getAllStatus().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.status.push(...response.body); + } + }); + backendService.getCategories().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.categories.push(...response.body); + } + }); + } + + private applyFilterParameters(params: ParamMap) { + if (params.has('id')) { + this.highlightId = parseInt(params.get('id')); + } + } + + public deleteUserstory(userstory: ScrumUserstory) { + this.backendService.deleteUserstory(userstory).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + const index = this.items.indexOf(userstory); + if (index !== -1) { + this.items.splice(index, 1); + } + } + + public openUserstoryForm(editUserstory?: ScrumUserstory) { + const modalRef = this.modalService.open(UserstoryFormComponent, { + backdrop: 'static', + keyboard: true, + size: 'lg' + }); + if (editUserstory === null) { + modalRef.result.then((result) => { + this.items.push(result); + }); + } + modalRef.componentInstance.userstory = editUserstory; + } + + public getNumberOfTasks(userstory: ScrumUserstory) { + return this.tasks.filter((t) => t.userstoryid === userstory.id).length; + } + + public sortById() { + this.doNumericSort('id', (us) => us.id); + } + + public sortByTitle() { + this.doStringSort('title', (us) => us.title); + } + + public sortByPrio() { + this.doNumericSort('priority', (us) => getNumberForPriority(us.priority)); + } + + public sortByTasks() { + this.doNumericSort('tasks', (us) => this.getNumberOfTasks(us)); + } + + sortByStatus() { + this.doNumericSort('statusid', (us) => us.statusid); + } + sortByCategory() { + this.doNumericSort('categoryid', (us) => us.categoryid); + } + + getStatusTitleById(id) { + var status = this.status.find((x) => x.id === id); + if (!status) { + return 'N/A'; + } + return status.title; + } + + getCategoryTitleById(id) { + var category = this.categories.find((x) => x.id === id); + if (!category) { + return 'N/A'; + } + return category.title; + } + + // Sprint-Backlog + + public addToSprintBacklog(userstory: ScrumUserstory) { + this.choosen.push(userstory); + } + public deleteFromSprintBacklog(userstory: ScrumUserstory){ + + const index = this.choosen.indexOf(userstory); + this.choosen.splice(index, 1); + } + + public addToSprint(choosen: ScrumUserstory[]){ + + } + + public openSprintForm(editSprint?: ScrumSprint) { + const modalRef = this.modalService.open(SprintFormComponent, { + backdrop: 'static', + keyboard: true, + }); + if (editSprint === null) { + modalRef.result.then(result => { + this.items.push(result); + }); + } + modalRef.componentInstance.sprint = editSprint; + } +} From c496bbe8ac5adc5f6b54477ae81e64895e019472 Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 15:51:04 +0200 Subject: [PATCH 3/8] Renamed Folder --- .../backlog-table.component.css | 4 +- .../backlog-table.component.html | 456 +++++++++--------- .../backlog-table.component.ts | 370 +++++++------- 3 files changed, 415 insertions(+), 415 deletions(-) rename src/app/{backlog-table copy => backlog-table}/backlog-table.component.css (96%) rename src/app/{backlog-table copy => backlog-table}/backlog-table.component.html (97%) rename src/app/{backlog-table copy => backlog-table}/backlog-table.component.ts (96%) diff --git a/src/app/backlog-table copy/backlog-table.component.css b/src/app/backlog-table/backlog-table.component.css similarity index 96% rename from src/app/backlog-table copy/backlog-table.component.css rename to src/app/backlog-table/backlog-table.component.css index a268ac9..7fd1803 100644 --- a/src/app/backlog-table copy/backlog-table.component.css +++ b/src/app/backlog-table/backlog-table.component.css @@ -1,3 +1,3 @@ -th.sortable:hover { - text-decoration: underline; +th.sortable:hover { + text-decoration: underline; } \ No newline at end of file diff --git a/src/app/backlog-table copy/backlog-table.component.html b/src/app/backlog-table/backlog-table.component.html similarity index 97% rename from src/app/backlog-table copy/backlog-table.component.html rename to src/app/backlog-table/backlog-table.component.html index 89da5a1..acd12f5 100644 --- a/src/app/backlog-table copy/backlog-table.component.html +++ b/src/app/backlog-table/backlog-table.component.html @@ -1,229 +1,229 @@ -
- -

Backlog

-
-
-
-
- -
-
-
-
-

Verfügbare Userstories

- - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID - - - - - - - Titel - - - - - - - Tasks - - - - - - - Status - - - - - - -
-
- Priorität: -
- {{filterPriority || "All"}} -
- - -
-
- - - - - -
-
- 		- Category - - - - - -
{{userstory.id}}{{userstory.title}} - - {{getNumberOfTasks(userstory)}} Tasks - - - - {{getStatusTitleById(userstory.statusid)}} - - {{userstory.priority}} - - {{getCategoryTitleById(userstory.categoryid)}} - - - - -
-
-
- -
- -

Sprint-Backlog

- - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID - - - - - - - Titel - - - - - - - Tasks - - - - - - - Status - - - - - - -
-
- Priorität: -
- {{filterPriority || "All"}} -
- - -
-
- - - - - -
-
- 		- Category - - - - - -
{{userstory.id}}{{userstory.title}} - - {{getNumberOfTasks(userstory)}} Tasks - - - - {{getStatusTitleById(userstory.statusid)}} - - {{userstory.priority}} - - {{getCategoryTitleById(userstory.categoryid)}} - - - -
-
-
+
+ +

Backlog

+
+
+
+
+ +
+
+
+
+

Verfügbare Userstories

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + + + + + + Titel + + + + + + + Tasks + + + + + + + Status + + + + + + +
+
+ Priorität: +
+ {{filterPriority || "All"}} +
+ + +
+
+ + + + + +
+
+ 		+ Category + + + + + +
{{userstory.id}}{{userstory.title}} + + {{getNumberOfTasks(userstory)}} Tasks + + + + {{getStatusTitleById(userstory.statusid)}} + + {{userstory.priority}} + + {{getCategoryTitleById(userstory.categoryid)}} + + + + +
+
+
+ +
+ +

Sprint-Backlog

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + + + + + + Titel + + + + + + + Tasks + + + + + + + Status + + + + + + +
+
+ Priorität: +
+ {{filterPriority || "All"}} +
+ + +
+
+ + + + + +
+
+ 		+ Category + + + + + +
{{userstory.id}}{{userstory.title}} + + {{getNumberOfTasks(userstory)}} Tasks + + + + {{getStatusTitleById(userstory.statusid)}} + + {{userstory.priority}} + + {{getCategoryTitleById(userstory.categoryid)}} + + + +
+
+
\ No newline at end of file diff --git a/src/app/backlog-table copy/backlog-table.component.ts b/src/app/backlog-table/backlog-table.component.ts similarity index 96% rename from src/app/backlog-table copy/backlog-table.component.ts rename to src/app/backlog-table/backlog-table.component.ts index 2d799c4..5968412 100644 --- a/src/app/backlog-table copy/backlog-table.component.ts +++ b/src/app/backlog-table/backlog-table.component.ts @@ -1,185 +1,185 @@ -import { Component } from '@angular/core'; -import { - BackendService, - ScrumTask, - ScrumUserstory, - ScrumStatus, - ScrumCategory, - ScrumSprint, - ScrumUser, -} from '../services/backend.service'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { TableComponentBase } from '../services/table-component.base'; -import { getNumberForPriority } from '../services/sorting.service'; -import { UserstoryFormComponent } from '../userstory-form/userstory-form.component'; -import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { SprintFormComponent } from '../sprint-form/sprint-form.component'; - - -@Component({ - selector: 'app-userstory-table', - templateUrl: './userstory-table.component.html', - styleUrls: ['./userstory-table.component.css'], -}) -export class UserstoryTableComponent extends TableComponentBase< - ScrumUserstory -> { - public tasks: ScrumTask[] = []; - public filterPriority: string | null = null; - public highlightId: number; - public status: ScrumStatus[] = []; - public categories: ScrumCategory[] = []; - - public choosen: ScrumUserstory[] = []; - - public get filteredItems() { - return this.items.filter( - (task) => - this.filterPriority === null || task.priority === this.filterPriority - ); - } - - constructor( - private backendService: BackendService, - private modalService: NgbModal, - private route: ActivatedRoute, - private router: Router - ) { - super(); - - this.applyFilterParameters(this.route.snapshot.paramMap); - this.route.paramMap.subscribe((map) => this.applyFilterParameters(map)); - - backendService.getUserstories().subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } else { - this.items.push(...response.body); - } - }); - backendService.getTasks().subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } else { - this.tasks.push(...response.body); - } - }); - backendService.getAllStatus().subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } else { - this.status.push(...response.body); - } - }); - backendService.getCategories().subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } else { - this.categories.push(...response.body); - } - }); - } - - private applyFilterParameters(params: ParamMap) { - if (params.has('id')) { - this.highlightId = parseInt(params.get('id')); - } - } - - public deleteUserstory(userstory: ScrumUserstory) { - this.backendService.deleteUserstory(userstory).subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } - }); - const index = this.items.indexOf(userstory); - if (index !== -1) { - this.items.splice(index, 1); - } - } - - public openUserstoryForm(editUserstory?: ScrumUserstory) { - const modalRef = this.modalService.open(UserstoryFormComponent, { - backdrop: 'static', - keyboard: true, - size: 'lg' - }); - if (editUserstory === null) { - modalRef.result.then((result) => { - this.items.push(result); - }); - } - modalRef.componentInstance.userstory = editUserstory; - } - - public getNumberOfTasks(userstory: ScrumUserstory) { - return this.tasks.filter((t) => t.userstoryid === userstory.id).length; - } - - public sortById() { - this.doNumericSort('id', (us) => us.id); - } - - public sortByTitle() { - this.doStringSort('title', (us) => us.title); - } - - public sortByPrio() { - this.doNumericSort('priority', (us) => getNumberForPriority(us.priority)); - } - - public sortByTasks() { - this.doNumericSort('tasks', (us) => this.getNumberOfTasks(us)); - } - - sortByStatus() { - this.doNumericSort('statusid', (us) => us.statusid); - } - sortByCategory() { - this.doNumericSort('categoryid', (us) => us.categoryid); - } - - getStatusTitleById(id) { - var status = this.status.find((x) => x.id === id); - if (!status) { - return 'N/A'; - } - return status.title; - } - - getCategoryTitleById(id) { - var category = this.categories.find((x) => x.id === id); - if (!category) { - return 'N/A'; - } - return category.title; - } - - // Sprint-Backlog - - public addToSprintBacklog(userstory: ScrumUserstory) { - this.choosen.push(userstory); - } - public deleteFromSprintBacklog(userstory: ScrumUserstory){ - - const index = this.choosen.indexOf(userstory); - this.choosen.splice(index, 1); - } - - public addToSprint(choosen: ScrumUserstory[]){ - - } - - public openSprintForm(editSprint?: ScrumSprint) { - const modalRef = this.modalService.open(SprintFormComponent, { - backdrop: 'static', - keyboard: true, - }); - if (editSprint === null) { - modalRef.result.then(result => { - this.items.push(result); - }); - } - modalRef.componentInstance.sprint = editSprint; - } -} +import { Component } from '@angular/core'; +import { + BackendService, + ScrumTask, + ScrumUserstory, + ScrumStatus, + ScrumCategory, + ScrumSprint, + ScrumUser, +} from '../services/backend.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TableComponentBase } from '../services/table-component.base'; +import { getNumberForPriority } from '../services/sorting.service'; +import { UserstoryFormComponent } from '../userstory-form/userstory-form.component'; +import { ActivatedRoute, ParamMap, Router } from '@angular/router'; +import { SprintFormComponent } from '../sprint-form/sprint-form.component'; + + +@Component({ + selector: 'app-userstory-table', + templateUrl: './userstory-table.component.html', + styleUrls: ['./userstory-table.component.css'], +}) +export class UserstoryTableComponent extends TableComponentBase< + ScrumUserstory +> { + public tasks: ScrumTask[] = []; + public filterPriority: string | null = null; + public highlightId: number; + public status: ScrumStatus[] = []; + public categories: ScrumCategory[] = []; + + public choosen: ScrumUserstory[] = []; + + public get filteredItems() { + return this.items.filter( + (task) => + this.filterPriority === null || task.priority === this.filterPriority + ); + } + + constructor( + private backendService: BackendService, + private modalService: NgbModal, + private route: ActivatedRoute, + private router: Router + ) { + super(); + + this.applyFilterParameters(this.route.snapshot.paramMap); + this.route.paramMap.subscribe((map) => this.applyFilterParameters(map)); + + backendService.getUserstories().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.items.push(...response.body); + } + }); + backendService.getTasks().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.tasks.push(...response.body); + } + }); + backendService.getAllStatus().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.status.push(...response.body); + } + }); + backendService.getCategories().subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.categories.push(...response.body); + } + }); + } + + private applyFilterParameters(params: ParamMap) { + if (params.has('id')) { + this.highlightId = parseInt(params.get('id')); + } + } + + public deleteUserstory(userstory: ScrumUserstory) { + this.backendService.deleteUserstory(userstory).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + const index = this.items.indexOf(userstory); + if (index !== -1) { + this.items.splice(index, 1); + } + } + + public openUserstoryForm(editUserstory?: ScrumUserstory) { + const modalRef = this.modalService.open(UserstoryFormComponent, { + backdrop: 'static', + keyboard: true, + size: 'lg' + }); + if (editUserstory === null) { + modalRef.result.then((result) => { + this.items.push(result); + }); + } + modalRef.componentInstance.userstory = editUserstory; + } + + public getNumberOfTasks(userstory: ScrumUserstory) { + return this.tasks.filter((t) => t.userstoryid === userstory.id).length; + } + + public sortById() { + this.doNumericSort('id', (us) => us.id); + } + + public sortByTitle() { + this.doStringSort('title', (us) => us.title); + } + + public sortByPrio() { + this.doNumericSort('priority', (us) => getNumberForPriority(us.priority)); + } + + public sortByTasks() { + this.doNumericSort('tasks', (us) => this.getNumberOfTasks(us)); + } + + sortByStatus() { + this.doNumericSort('statusid', (us) => us.statusid); + } + sortByCategory() { + this.doNumericSort('categoryid', (us) => us.categoryid); + } + + getStatusTitleById(id) { + var status = this.status.find((x) => x.id === id); + if (!status) { + return 'N/A'; + } + return status.title; + } + + getCategoryTitleById(id) { + var category = this.categories.find((x) => x.id === id); + if (!category) { + return 'N/A'; + } + return category.title; + } + + // Sprint-Backlog + + public addToSprintBacklog(userstory: ScrumUserstory) { + this.choosen.push(userstory); + } + public deleteFromSprintBacklog(userstory: ScrumUserstory){ + + const index = this.choosen.indexOf(userstory); + this.choosen.splice(index, 1); + } + + public addToSprint(choosen: ScrumUserstory[]){ + + } + + public openSprintForm(editSprint?: ScrumSprint) { + const modalRef = this.modalService.open(SprintFormComponent, { + backdrop: 'static', + keyboard: true, + }); + if (editSprint === null) { + modalRef.result.then(result => { + this.items.push(result); + }); + } + modalRef.componentInstance.sprint = editSprint; + } +} From 455728da5021ac71c1caf4b7c0d2fe6fa904ce2b Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 15:52:59 +0200 Subject: [PATCH 4/8] Renaming --- src/app/app.module.ts | 2 ++ ...{backlog-table.component.css => backlog.component.css} | 0 ...acklog-table.component.html => backlog.component.html} | 0 .../{backlog-table.component.ts => backlog.component.ts} | 8 ++++---- 4 files changed, 6 insertions(+), 4 deletions(-) rename src/app/backlog-table/{backlog-table.component.css => backlog.component.css} (100%) rename src/app/backlog-table/{backlog-table.component.html => backlog.component.html} (100%) rename src/app/backlog-table/{backlog-table.component.ts => backlog.component.ts} (92%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index df6ac7c..1a88640 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,6 +14,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { UserstoryTableComponent } from './userstory-table/userstory-table.component'; import { TaskTableComponent } from './task-table/task-table.component'; import { SprintTableComponent } from './sprint-table/sprint-table.component'; +import { BacklogComponent } from './backlog-table/backlog.component'; // import { DashboardComponent } from './dashboard/dashboard.component'; @NgModule({ @@ -27,6 +28,7 @@ import { SprintTableComponent } from './sprint-table/sprint-table.component'; SprintFormComponent, SprintTableComponent, // DashboardComponent, + BacklogComponent ], imports: [ BrowserModule, diff --git a/src/app/backlog-table/backlog-table.component.css b/src/app/backlog-table/backlog.component.css similarity index 100% rename from src/app/backlog-table/backlog-table.component.css rename to src/app/backlog-table/backlog.component.css diff --git a/src/app/backlog-table/backlog-table.component.html b/src/app/backlog-table/backlog.component.html similarity index 100% rename from src/app/backlog-table/backlog-table.component.html rename to src/app/backlog-table/backlog.component.html diff --git a/src/app/backlog-table/backlog-table.component.ts b/src/app/backlog-table/backlog.component.ts similarity index 92% rename from src/app/backlog-table/backlog-table.component.ts rename to src/app/backlog-table/backlog.component.ts index 5968412..24b87cd 100644 --- a/src/app/backlog-table/backlog-table.component.ts +++ b/src/app/backlog-table/backlog.component.ts @@ -17,11 +17,11 @@ import { SprintFormComponent } from '../sprint-form/sprint-form.component'; @Component({ - selector: 'app-userstory-table', - templateUrl: './userstory-table.component.html', - styleUrls: ['./userstory-table.component.css'], + selector: 'app-backlog', + templateUrl: './backlog.component.html', + styleUrls: ['./backlog.component.css'], }) -export class UserstoryTableComponent extends TableComponentBase< +export class BacklogComponent extends TableComponentBase< ScrumUserstory > { public tasks: ScrumTask[] = []; From eb177b468ff785eae608d862d93bc8976c2e365b Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 15:53:35 +0200 Subject: [PATCH 5/8] Added route for backlog --- src/app/app-routing.module.ts | 44 ++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 909fbbc..f0bec4f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,21 +1,23 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { UserstoryTableComponent } from './userstory-table/userstory-table.component'; -import { TaskTableComponent } from './task-table/task-table.component'; -import { SprintTableComponent } from './sprint-table/sprint-table.component'; -// import { DashboardComponent } from './dashboard/dashboard.component'; - -const routes: Routes = [ - { path: 'tasks', component: TaskTableComponent }, - { path: 'userstories', component: UserstoryTableComponent }, - { path: 'sprints', component: SprintTableComponent }, - // { path: 'dashboard', component: DashboardComponent }, - { path: '', redirectTo: '/tasks', pathMatch: 'full' }, -]; - -@NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule], -}) -export class AppRoutingModule {} +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { UserstoryTableComponent } from './userstory-table/userstory-table.component'; +import { TaskTableComponent } from './task-table/task-table.component'; +import { SprintTableComponent } from './sprint-table/sprint-table.component'; +import { BacklogComponent } from './backlog-table/backlog.component'; +// import { DashboardComponent } from './dashboard/dashboard.component'; + +const routes: Routes = [ + { path: 'tasks', component: TaskTableComponent }, + { path: 'userstories', component: UserstoryTableComponent }, + { path: 'sprints', component: SprintTableComponent }, + { path: 'backlog', component: BacklogComponent }, + // { path: 'dashboard', component: DashboardComponent }, + { path: '', redirectTo: '/tasks', pathMatch: 'full' }, +]; + +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule], +}) +export class AppRoutingModule {} From 7ed3c7657eac9e4dc571d639baa807e0e2579b75 Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 17:16:30 +0200 Subject: [PATCH 6/8] Added Card style --- src/app/backlog-table/backlog.component.html | 125 +++---------------- src/app/backlog-table/backlog.component.ts | 33 ++--- 2 files changed, 33 insertions(+), 125 deletions(-) diff --git a/src/app/backlog-table/backlog.component.html b/src/app/backlog-table/backlog.component.html index acd12f5..75d1fea 100644 --- a/src/app/backlog-table/backlog.component.html +++ b/src/app/backlog-table/backlog.component.html @@ -10,117 +10,32 @@
-

Verfügbare Userstories

- - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID - - - - - - - Titel - - - - - - - Tasks - - - - - - - Status - - - - - - -
-
- Priorität: -
- {{filterPriority || "All"}} -
- - -
-
- - - - - -
-
- 		- Category - - - - - -
{{userstory.id}}{{userstory.title}} - - {{getNumberOfTasks(userstory)}} Tasks - - - - {{getStatusTitleById(userstory.statusid)}} - - {{userstory.priority}} - - {{getCategoryTitleById(userstory.categoryid)}} - - - - -
+ +
+
+
+
-

Sprint-Backlog

+

Sprint-Backlog - y

@@ -196,7 +111,7 @@ - +
{{userstory.id}} {{userstory.title}} diff --git a/src/app/backlog-table/backlog.component.ts b/src/app/backlog-table/backlog.component.ts index 24b87cd..8c21895 100644 --- a/src/app/backlog-table/backlog.component.ts +++ b/src/app/backlog-table/backlog.component.ts @@ -26,30 +26,19 @@ export class BacklogComponent extends TableComponentBase< > { public tasks: ScrumTask[] = []; public filterPriority: string | null = null; - public highlightId: number; public status: ScrumStatus[] = []; public categories: ScrumCategory[] = []; + public currentSprint: ScrumSprint; public choosen: ScrumUserstory[] = []; - public get filteredItems() { - return this.items.filter( - (task) => - this.filterPriority === null || task.priority === this.filterPriority - ); - } - constructor( private backendService: BackendService, private modalService: NgbModal, private route: ActivatedRoute, - private router: Router ) { super(); - this.applyFilterParameters(this.route.snapshot.paramMap); - this.route.paramMap.subscribe((map) => this.applyFilterParameters(map)); - backendService.getUserstories().subscribe((response) => { if (response.status > 399) { alert('Fehler'); @@ -78,12 +67,7 @@ export class BacklogComponent extends TableComponentBase< this.categories.push(...response.body); } }); - } - - private applyFilterParameters(params: ParamMap) { - if (params.has('id')) { - this.highlightId = parseInt(params.get('id')); - } + this.getCurrentSprint(); } public deleteUserstory(userstory: ScrumUserstory) { @@ -135,6 +119,7 @@ export class BacklogComponent extends TableComponentBase< sortByStatus() { this.doNumericSort('statusid', (us) => us.statusid); } + sortByCategory() { this.doNumericSort('categoryid', (us) => us.categoryid); } @@ -159,6 +144,7 @@ export class BacklogComponent extends TableComponentBase< public addToSprintBacklog(userstory: ScrumUserstory) { this.choosen.push(userstory); + } public deleteFromSprintBacklog(userstory: ScrumUserstory){ @@ -166,8 +152,15 @@ export class BacklogComponent extends TableComponentBase< this.choosen.splice(index, 1); } - public addToSprint(choosen: ScrumUserstory[]){ - + public getCurrentSprint() + { + this.backendService.getSprints().subscribe((response) => { + if (response.status > 399) { + } else { + var currentDate = new Date(); + this.currentSprint = response.body.find(x => x.startDate < currentDate); + alert(this.currentSprint); + }}); } public openSprintForm(editSprint?: ScrumSprint) { From 6adb0c0401e51b42338b37fd0ca7ff1e47e6f369 Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 17:23:49 +0200 Subject: [PATCH 7/8] Now adding works (in UI only) --- src/app/backlog-table/backlog.component.html | 2 +- src/app/backlog-table/backlog.component.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/backlog-table/backlog.component.html b/src/app/backlog-table/backlog.component.html index 75d1fea..091a1a3 100644 --- a/src/app/backlog-table/backlog.component.html +++ b/src/app/backlog-table/backlog.component.html @@ -11,7 +11,7 @@

Backlog

-
+

{{story.title}}

diff --git a/src/app/backlog-table/backlog.component.ts b/src/app/backlog-table/backlog.component.ts index 8c21895..19b1e3d 100644 --- a/src/app/backlog-table/backlog.component.ts +++ b/src/app/backlog-table/backlog.component.ts @@ -30,6 +30,7 @@ export class BacklogComponent extends TableComponentBase< public categories: ScrumCategory[] = []; public currentSprint: ScrumSprint; + public backlog: ScrumUserstory[] = []; public choosen: ScrumUserstory[] = []; constructor( @@ -44,6 +45,7 @@ export class BacklogComponent extends TableComponentBase< alert('Fehler'); } else { this.items.push(...response.body); + this.backlog = this.items; } }); backendService.getTasks().subscribe((response) => { @@ -144,12 +146,15 @@ export class BacklogComponent extends TableComponentBase< public addToSprintBacklog(userstory: ScrumUserstory) { this.choosen.push(userstory); + const index = this.backlog.indexOf(userstory); + this.backlog.splice(index, 1); } public deleteFromSprintBacklog(userstory: ScrumUserstory){ const index = this.choosen.indexOf(userstory); this.choosen.splice(index, 1); + this.backlog.push(userstory); } public getCurrentSprint() From cfb2b7f98bffed95307537755baa7af7f8580bb7 Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 3 Jul 2020 17:27:19 +0200 Subject: [PATCH 8/8] Both sides w/ cards --- src/app/backlog-table/backlog.component.html | 122 +++---------------- src/app/backlog-table/backlog.component.ts | 1 - 2 files changed, 19 insertions(+), 104 deletions(-) diff --git a/src/app/backlog-table/backlog.component.html b/src/app/backlog-table/backlog.component.html index 091a1a3..486e3df 100644 --- a/src/app/backlog-table/backlog.component.html +++ b/src/app/backlog-table/backlog.component.html @@ -36,109 +36,25 @@

Sprint-Backlog - y

- - - - - - - - - - - - - - - - - - - - - - - - - - -
- ID - - - - - - - Titel - - - - - - - Tasks - - - - - - - Status - - - - - - -
-
- Priorität: -
- {{filterPriority || "All"}} -
- - -
-
- - - - - -
-
- 		- Category - - - - - -
{{userstory.id}}{{userstory.title}} - - {{getNumberOfTasks(userstory)}} Tasks - - - - {{getStatusTitleById(userstory.statusid)}} - - {{userstory.priority}} - - {{getCategoryTitleById(userstory.categoryid)}} - - - -
+
+
+
+

{{story.title}}

+
Prio: {{story.priority}}
+

{{story.content}}

+
+ Category: {{story.categoryid || "N/A"}} + Status: {{story.statusid || "N/A"}} +
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/app/backlog-table/backlog.component.ts b/src/app/backlog-table/backlog.component.ts index 19b1e3d..54769ea 100644 --- a/src/app/backlog-table/backlog.component.ts +++ b/src/app/backlog-table/backlog.component.ts @@ -164,7 +164,6 @@ export class BacklogComponent extends TableComponentBase< } else { var currentDate = new Date(); this.currentSprint = response.body.find(x => x.startDate < currentDate); - alert(this.currentSprint); }}); }