From aa223ffa1016c32593b0d12805a3bcda5a26cca5 Mon Sep 17 00:00:00 2001 From: test Date: Thu, 18 Jun 2020 10:45:31 +0200 Subject: [PATCH 01/30] styling userstory-form modal --- .../userstory-form.component.css | 12 +++ .../userstory-form.component.html | 87 +++++++++++++------ 2 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src/app/userstory-form/userstory-form.component.css b/src/app/userstory-form/userstory-form.component.css index e69de29..cb7d33d 100644 --- a/src/app/userstory-form/userstory-form.component.css +++ b/src/app/userstory-form/userstory-form.component.css @@ -0,0 +1,12 @@ +.modal-footer{ + border-top: 0px solid; + padding-top: 5%; +} +.modal-lg{ + width: 1040px; +} + + .modal{ + margin: 0 auto; + + } \ No newline at end of file diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index 70f3d0b..416f3df 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -1,30 +1,61 @@ -
-
- +
+
+
+

Neue Userstory anlegen

+ +
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
-
-
- - -
- -
- - -
- -
- - -
- - - -
\ No newline at end of file From 53dd69ed563811566607686842422d6139a9fa0e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 21 Jun 2020 18:00:09 +0200 Subject: [PATCH 02/30] better positioning for userstory modal --- package.json | 10 ++- src/app/app-routing.module.ts | 13 ++-- src/app/task-form/task-form.component.html | 2 +- .../userstory-form.component.css | 18 ++--- .../userstory-form.component.html | 4 +- .../userstory-form.component.ts | 72 +++++++++---------- 6 files changed, 60 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index 22bbf00..f1353ed 100644 --- a/package.json +++ b/package.json @@ -45,5 +45,13 @@ "ts-node": "~8.3.0", "tslint": "~6.1.0", "typescript": "~3.8.3" - } + }, + "description": "This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.7.", + "main": "karma.conf.js", + "repository": { + "type": "git", + "url": "https://git.informatik.fh-nuernberg.de/scrum-taskboard/frontend.git" + }, + "author": "", + "license": "ISC" } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7e0c37c..a59d88d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,15 +4,14 @@ import { Routes, RouterModule } from '@angular/router'; import { TaskListComponent } from './task-list/task-list.component'; import { UserstoryListComponent } from './userstory-list/userstory-list.component'; - const routes: Routes = [ - { path: 'tasks', component: TaskListComponent }, - { path: 'userstories', component: UserstoryListComponent }, - { path: '', redirectTo: '/tasks', pathMatch: 'full' }, + { path: 'tasks', component: TaskListComponent }, + { path: 'userstories', component: UserstoryListComponent }, + { path: '', redirectTo: '/tasks', pathMatch: 'full' } ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] + imports: [ RouterModule.forRoot(routes) ], + exports: [ RouterModule ] }) -export class AppRoutingModule { } +export class AppRoutingModule {} diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index b0a5f4e..f61d287 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -21,7 +21,7 @@ - +
diff --git a/src/app/userstory-form/userstory-form.component.css b/src/app/userstory-form/userstory-form.component.css index cb7d33d..cc04e06 100644 --- a/src/app/userstory-form/userstory-form.component.css +++ b/src/app/userstory-form/userstory-form.component.css @@ -1,12 +1,12 @@ -.modal-footer{ - border-top: 0px solid; - padding-top: 5%; +.modal-footer { + border-top: 0px solid; + padding-top: 5%; } -.modal-lg{ - width: 1040px; +.modal-content { + width: 1040px; + right: 55%; } - .modal{ - margin: 0 auto; - - } \ No newline at end of file +.modal { + margin: 0 auto; +} diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index 416f3df..4773281 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -1,4 +1,4 @@ -
+

Neue Userstory anlegen

@@ -58,4 +58,4 @@
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts index 28f605f..0312338 100644 --- a/src/app/userstory-form/userstory-form.component.ts +++ b/src/app/userstory-form/userstory-form.component.ts @@ -3,48 +3,42 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { BackendService, ScrumUserstory, Priority } from '../services/backend.service'; @Component({ - selector: 'app-userstory-form', - templateUrl: './userstory-form.component.html', - styleUrls: ['./userstory-form.component.css'] + selector: 'app-userstory-form', + templateUrl: './userstory-form.component.html', + styleUrls: [ './userstory-form.component.css' ] }) export class UserstoryFormComponent implements OnInit { + @Input() public userstory: ScrumUserstory; + private editing: boolean; + constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {} - @Input() - public userstory: ScrumUserstory; - private editing: boolean; + ngOnInit(): void { + if (this.userstory === null || this.userstory === undefined) { + this.userstory = { title: '' }; + this.editing = false; + } else { + this.editing = true; + } + } - constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) { } - - ngOnInit(): void { - if (this.userstory === null || this.userstory === undefined) { - this.userstory = {title: ""}; - this.editing = false; - } - else - { - this.editing = true; - } - } - - onSubmit() { - if (this.editing) { - this.backendService.putUserstory(this.userstory).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } - else { - this.backendService.postUserstory(this.userstory).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } - this.activeModalService.close(this.userstory); - } - onClose(){ - this.activeModalService.dismiss(this.userstory); - } + onSubmit() { + if (this.editing) { + this.backendService.putUserstory(this.userstory).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } else { + this.backendService.postUserstory(this.userstory).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } + this.activeModalService.close(this.userstory); + } + onClose() { + this.activeModalService.dismiss(this.userstory); + } } From 03e8c96a1e647a9c51d940fa0d44668831513d93 Mon Sep 17 00:00:00 2001 From: Jakob Fahr Date: Mon, 22 Jun 2020 03:38:23 +0200 Subject: [PATCH 03/30] Replace task-list/userstory-list with task-table/userstory-table --- src/app/app-routing.module.ts | 8 +- src/app/app.module.ts | 11 +- src/app/services/backend.service.ts | 32 +++--- src/app/services/sorting.service.ts | 20 ++++ src/app/services/table-component.base.ts | 33 ++++++ src/app/task-list/task-list.component.css | 0 src/app/task-list/task-list.component.html | 14 --- src/app/task-list/task-list.component.ts | 54 --------- src/app/task-table/task-table.component.css | 4 + src/app/task-table/task-table.component.html | 77 +++++++++++++ src/app/task-table/task-table.component.ts | 105 ++++++++++++++++++ .../userstory-list.component.css | 0 .../userstory-list.component.html | 14 --- .../userstory-list.component.ts | 54 --------- .../userstory-table.component.css | 4 + .../userstory-table.component.html | 69 ++++++++++++ .../userstory-table.component.ts | 103 +++++++++++++++++ src/assets/env.js | 6 +- 18 files changed, 444 insertions(+), 164 deletions(-) create mode 100644 src/app/services/sorting.service.ts create mode 100644 src/app/services/table-component.base.ts delete mode 100644 src/app/task-list/task-list.component.css delete mode 100644 src/app/task-list/task-list.component.html delete mode 100644 src/app/task-list/task-list.component.ts create mode 100644 src/app/task-table/task-table.component.css create mode 100644 src/app/task-table/task-table.component.html create mode 100644 src/app/task-table/task-table.component.ts delete mode 100644 src/app/userstory-list/userstory-list.component.css delete mode 100644 src/app/userstory-list/userstory-list.component.html delete mode 100644 src/app/userstory-list/userstory-list.component.ts create mode 100644 src/app/userstory-table/userstory-table.component.css create mode 100644 src/app/userstory-table/userstory-table.component.html create mode 100644 src/app/userstory-table/userstory-table.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7e0c37c..3df3eb8 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { TaskListComponent } from './task-list/task-list.component'; -import { UserstoryListComponent } from './userstory-list/userstory-list.component'; +import {UserstoryTableComponent} from './userstory-table/userstory-table.component'; +import {TaskTableComponent} from './task-table/task-table.component'; const routes: Routes = [ - { path: 'tasks', component: TaskListComponent }, - { path: 'userstories', component: UserstoryListComponent }, + { path: 'tasks', component: TaskTableComponent }, + { path: 'userstories', component: UserstoryTableComponent }, { path: '', redirectTo: '/tasks', pathMatch: 'full' }, ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e6c683f..3824996 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,19 +7,20 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { BackendService } from './services/backend.service'; -import { TaskListComponent } from './task-list/task-list.component'; import { TaskFormComponent } from './task-form/task-form.component'; -import { UserstoryListComponent } from './userstory-list/userstory-list.component'; import { UserstoryFormComponent } from './userstory-form/userstory-form.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { UserstoryTableComponent } from './userstory-table/userstory-table.component'; +import { TaskTableComponent } from './task-table/task-table.component'; @NgModule({ declarations: [ AppComponent, - TaskListComponent, + TaskTableComponent, TaskFormComponent, - UserstoryListComponent, - UserstoryFormComponent + UserstoryTableComponent, + UserstoryFormComponent, + UserstoryTableComponent ], imports: [ BrowserModule, diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index 239f82a..6d52bf4 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -9,7 +9,7 @@ export class BackendService { constructor(private httpClient: HttpClient) {} - + // Tasks public getTasks(): Observable> { const url = `${environment.apiUrl}/tasks`; @@ -117,7 +117,7 @@ export class BackendService { return this.httpClient.delete(url, { observe: 'response' }); } - + // Status public getAllStatus(): Observable> { const url = `${environment.apiUrl}/status`; @@ -143,8 +143,8 @@ export class BackendService { const url = `${environment.apiUrl}/status/${status.id}`; return this.httpClient.delete(url, { observe: 'response' }); } - - + + // Users public getUsers(): Observable> { const url = `${environment.apiUrl}/users`; @@ -171,7 +171,7 @@ export class BackendService { return this.httpClient.delete(url, { observe: 'response' }); } - + // Projects public getProjects(): Observable> { const url = `${environment.apiUrl}/projects`; @@ -209,12 +209,12 @@ export interface ScrumTask { id?: number; title: string; content?: string; - status?: number; - category?: number; - assignedto?: number; - sprint?: number; - project?: number; - userstory?: number; + statusid?: number; + categoryid?: number; + assignedtoid?: number; + sprintid?: number; + projectid?: number; + userstoryid?: number; priority?: Priority; } @@ -223,10 +223,10 @@ export interface ScrumUserstory { title: string; content?: string; priority?: Priority; - status?: number; - category?: number; - createdby?: number; - project?: number; + statusid?: number; + categoryid?: number; + createdbyid?: number; + projectid?: number; } export interface ScrumSprint{ @@ -262,4 +262,4 @@ export interface ScrumProject { id?: number; title: string; isprivate: boolean; -} \ No newline at end of file +} diff --git a/src/app/services/sorting.service.ts b/src/app/services/sorting.service.ts new file mode 100644 index 0000000..9837ffe --- /dev/null +++ b/src/app/services/sorting.service.ts @@ -0,0 +1,20 @@ +import {Priority} from './backend.service'; + +export function sortByNumberAscending(items: T[], key: (T) => number) { + return items.sort((a, b) => key(a) - key(b)); +} + +export function sortByStringAscending(items: T[], key: (T) => string) { + return items.sort((a, b) => key(a).localeCompare(key(b))); +} + +export function getNumberForPriority(priority: Priority): number { + switch (priority) { + case Priority.High: + return 2; + case Priority.Medium: + return 1; + case Priority.Low: + return 0; + } +}; diff --git a/src/app/services/table-component.base.ts b/src/app/services/table-component.base.ts new file mode 100644 index 0000000..4e22e3f --- /dev/null +++ b/src/app/services/table-component.base.ts @@ -0,0 +1,33 @@ +import {sortByNumberAscending, sortByStringAscending} from './sorting.service'; + +export abstract class TableComponentBase { + public sortBy: string; + public sortDescending = false; + public items: T[] = []; + + protected doNumericSort(by: string, key: (ScrumTask) => number) { + if (this.sortBy === by) { + this.sortDescending = !this.sortDescending; + } else { + this.sortBy = by; + } + + this.items = sortByNumberAscending(this.items, key); + if (this.sortDescending) { + this.items = this.items.reverse(); + } + } + + protected doStringSort(by: string, key: (ScrumTask) => string) { + if (this.sortBy === by) { + this.sortDescending = !this.sortDescending; + } else { + this.sortBy = by; + } + + this.items = sortByStringAscending(this.items, key); + if (this.sortDescending) { + this.items = this.items.reverse(); + } + } +} diff --git a/src/app/task-list/task-list.component.css b/src/app/task-list/task-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/task-list/task-list.component.html b/src/app/task-list/task-list.component.html deleted file mode 100644 index 1f501a3..0000000 --- a/src/app/task-list/task-list.component.html +++ /dev/null @@ -1,14 +0,0 @@ - - -
    -
  • - Titel: {{task.title}} -
    - Inhalt: {{task.content}} -
    - Priotität: {{task.priority}} -
    - - -
    • -
diff --git a/src/app/task-list/task-list.component.ts b/src/app/task-list/task-list.component.ts deleted file mode 100644 index b8daf28..0000000 --- a/src/app/task-list/task-list.component.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { BackendService, ScrumTask } from '../services/backend.service'; -import { TaskFormComponent } from '../task-form/task-form.component'; - -@Component({ - selector: 'app-task-list', - templateUrl: './task-list.component.html', - styleUrls: ['./task-list.component.css'] -}) -export class TaskListComponent implements OnInit { - - public tasks: ScrumTask[] = []; - - constructor(private backendService: BackendService, private modalService: NgbModal) { - backendService.getTasks().subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - else { - this.tasks.push(...response.body); - } - }); - } - - ngOnInit(): void { - } - - public deleteTask(task: ScrumTask) { - this.backendService.deleteTask(task).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - const index = this.tasks.indexOf(task); - if (index !== -1) { - this.tasks.splice(index, 1); - } - } - - public openTaskForm(editTask: ScrumTask) { - const modalRef = this.modalService.open(TaskFormComponent, { - backdrop: 'static', - keyboard: true, - }); - if (editTask === null) { - modalRef.result.then(result => { - this.tasks.push(result); - }); - } - modalRef.componentInstance.task = editTask; - } - -} diff --git a/src/app/task-table/task-table.component.css b/src/app/task-table/task-table.component.css new file mode 100644 index 0000000..c1ce646 --- /dev/null +++ b/src/app/task-table/task-table.component.css @@ -0,0 +1,4 @@ +table { + table-layout: fixed; +} + diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html new file mode 100644 index 0000000..4a2df3e --- /dev/null +++ b/src/app/task-table/task-table.component.html @@ -0,0 +1,77 @@ +
+ +

+ + Userstory #{{filterUserstoryId}} > + + Tasks +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + ▲ + ▼ + + + Titel + + ▲ + ▼ + + + Inhalt + + ▲ + ▼ + + + Tasks + + ▲ + ▼ + + + Priorität + + ▲ + ▼ + +
{{task.id}}{{task.title}}{{task.content}} + + US #{{task.userstoryid}} + + {{task.priority}} + + +
+
diff --git a/src/app/task-table/task-table.component.ts b/src/app/task-table/task-table.component.ts new file mode 100644 index 0000000..c4d7434 --- /dev/null +++ b/src/app/task-table/task-table.component.ts @@ -0,0 +1,105 @@ +import {Component} from '@angular/core'; +import {BackendService, Priority, ScrumTask, ScrumUserstory} from '../services/backend.service'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {TaskFormComponent} from '../task-form/task-form.component'; +import {TableComponentBase} from '../services/table-component.base'; +import {ActivatedRoute, Router} from '@angular/router'; + +@Component({ + selector: 'app-userstory-table', + templateUrl: './task-table.component.html', + styleUrls: ['./task-table.component.css'] +}) +export class TaskTableComponent extends TableComponentBase { + public filterUserstoryId: number | null = null; + public get filteredItems() { + if (this.filterUserstoryId === null || isNaN(this.filterUserstoryId)) { + return this.items; + } + return this.items.filter(task => task.userstoryid === this.filterUserstoryId); + } + + constructor( + private backendService: BackendService, private modalService: NgbModal, + private route: ActivatedRoute, private router: Router + ) { + super(); + + const params = route.snapshot.paramMap; + if (params.has('userstoryId')) { + this.filterUserstoryId = parseInt(params.get('userstoryId')); + } + if (params.has('id')) { + const id = parseInt(params.get('id')); + this.openTaskForm(this.items.find(t => t.id === id)); + } + + backendService.getTasks().subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.items.push(...response.body); + } + }); + } + + public deleteTask(task: ScrumTask) { + this.backendService.deleteTask(task).subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } + }); + const index = this.items.indexOf(task); + if (index !== -1) { + this.items.splice(index, 1); + } + } + + public openTaskForm(editTask?: ScrumTask) { + const modalRef = this.modalService.open(TaskFormComponent, { + backdrop: 'static', + keyboard: true, + }); + if (editTask === null) { + modalRef.result.then(result => { + this.items.push(result); + }); + } + modalRef.componentInstance.task = editTask; + } + + sortById() { + this.doNumericSort('id', us => us.id); + } + + sortByTitle() { + this.doStringSort('title', us => us.title); + } + + sortByContent() { + this.doStringSort('content', us => us.content); + } + + private getNumberForPriority(priority: Priority): number { + switch (priority) { + case Priority.High: + return 2; + case Priority.Medium: + return 1; + case Priority.Low: + return 0; + } + } + + sortByPrio() { + this.doNumericSort('priority', us => this.getNumberForPriority(us.priority)); + } + + getNumberOfTasks(userstory: ScrumUserstory) { + return this.items.filter(t => t.userstoryid === userstory.id).length; + } + + sortByTasks() { + this.doNumericSort('tasks', us => this.getNumberOfTasks(us)); + } +} diff --git a/src/app/userstory-list/userstory-list.component.css b/src/app/userstory-list/userstory-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/userstory-list/userstory-list.component.html b/src/app/userstory-list/userstory-list.component.html deleted file mode 100644 index fbee073..0000000 --- a/src/app/userstory-list/userstory-list.component.html +++ /dev/null @@ -1,14 +0,0 @@ - - -
    -
  • - Titel: {{userstory.title}} -
    - Inhalt: {{userstory.content}} -
    - Priotität: {{userstory.priority}} -
    - - -
    • -
diff --git a/src/app/userstory-list/userstory-list.component.ts b/src/app/userstory-list/userstory-list.component.ts deleted file mode 100644 index 526f825..0000000 --- a/src/app/userstory-list/userstory-list.component.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { BackendService, ScrumUserstory } from '../services/backend.service'; -import { UserstoryFormComponent } from '../userstory-form/userstory-form.component'; - -@Component({ - selector: 'app-userstory-list', - templateUrl: './userstory-list.component.html', - styleUrls: ['./userstory-list.component.css'] -}) -export class UserstoryListComponent implements OnInit { - - public userstories: ScrumUserstory[] = []; - - constructor(private backendService: BackendService, private modalService: NgbModal) { - backendService.getUserstories().subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - else { - this.userstories.push(...response.body); - } - }); - } - - ngOnInit(): void { - } - - public deleteUserstory(userstory: ScrumUserstory) { - this.backendService.deleteUserstory(userstory).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - const index = this.userstories.indexOf(userstory); - if (index !== -1) { - this.userstories.splice(index, 1); - } - } - - public openUserstoryForm(editUserstory: ScrumUserstory) { - const modalRef = this.modalService.open(UserstoryFormComponent, { - backdrop: 'static', - keyboard: true, - }); - if (editUserstory === null) { - modalRef.result.then(result => { - this.userstories.push(result); - }); - } - modalRef.componentInstance.userstory = editUserstory; - } - -} diff --git a/src/app/userstory-table/userstory-table.component.css b/src/app/userstory-table/userstory-table.component.css new file mode 100644 index 0000000..c1ce646 --- /dev/null +++ b/src/app/userstory-table/userstory-table.component.css @@ -0,0 +1,4 @@ +table { + table-layout: fixed; +} + diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html new file mode 100644 index 0000000..4dfcdff --- /dev/null +++ b/src/app/userstory-table/userstory-table.component.html @@ -0,0 +1,69 @@ +
+ +

Userstories

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ID + + ▲ + ▼ + + + Titel + + ▲ + ▼ + + + Inhalt + + ▲ + ▼ + + + Tasks + + ▲ + ▼ + + + Priorität + + ▲ + ▼ + +
{{userstory.id}}{{userstory.title}}{{userstory.content}} + + {{getNumberOfTasks(userstory)}} Tasks + + {{userstory.priority}} + + +
+
diff --git a/src/app/userstory-table/userstory-table.component.ts b/src/app/userstory-table/userstory-table.component.ts new file mode 100644 index 0000000..7d03e10 --- /dev/null +++ b/src/app/userstory-table/userstory-table.component.ts @@ -0,0 +1,103 @@ +import {Component} from '@angular/core'; +import {BackendService, ScrumTask, ScrumUserstory} 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, Router} from '@angular/router'; + +@Component({ + selector: 'app-userstory-table', + templateUrl: './userstory-table.component.html', + styleUrls: ['./userstory-table.component.css'] +}) +export class UserstoryTableComponent extends TableComponentBase { + public tasks: ScrumTask[] = []; + + constructor( + private backendService: BackendService, private modalService: NgbModal, + private route: ActivatedRoute, private router: Router + ) { + super(); + + const params = route.snapshot.paramMap; + + backendService.getUserstories().subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.items.push(...response.body); + + // Wenn /userstories;id=3 aufgerufen wird, öffne die Userstory mit ID 3 + const userstory = this.findUserstoryById(parseInt(params.get('id'))); + if (userstory !== null) { + this.openUserstoryForm(userstory); + } + } + }); + backendService.getTasks().subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.tasks.push(...response.body); + } + }); + } + + private findUserstoryById(id: number): ScrumUserstory { + const userstoriesWithId = this.items.filter(us => us.id === id); + if (userstoriesWithId.length === 0) { + return null; + } + return userstoriesWithId[0]; + } + + 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, + }); + 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 sortByContent() { + this.doStringSort('content', us => us.content); + } + + public sortByPrio() { + this.doNumericSort('priority', us => getNumberForPriority(us.priority)); + } + + public sortByTasks() { + this.doNumericSort('tasks', us => this.getNumberOfTasks(us)); + } +} diff --git a/src/assets/env.js b/src/assets/env.js index 5b334ef..8c8469b 100644 --- a/src/assets/env.js +++ b/src/assets/env.js @@ -1,7 +1,7 @@ (function(window) { window["env"] = window["env"] || {}; - + // Environment variables - window["env"]["apiUrl"] = "http://localhost:5001"; + window["env"]["apiUrl"] = "https://localhost:5001"; window["env"]["debug"] = false; - })(this); \ No newline at end of file + })(this); From a81a26d9896337fd603a0ad423fcf9a6f4a51645 Mon Sep 17 00:00:00 2001 From: Jakob Fahr Date: Mon, 22 Jun 2020 11:21:25 +0200 Subject: [PATCH 04/30] Add filters by priority + highlighting --- src/app/services/table-component.base.ts | 55 +++++++++------- src/app/task-table/task-table.component.css | 3 + src/app/task-table/task-table.component.html | 27 +++++--- src/app/task-table/task-table.component.ts | 66 +++++++++---------- .../userstory-table.component.css | 3 + .../userstory-table.component.html | 18 +++-- .../userstory-table.component.ts | 25 ++++--- 7 files changed, 110 insertions(+), 87 deletions(-) diff --git a/src/app/services/table-component.base.ts b/src/app/services/table-component.base.ts index 4e22e3f..d62d356 100644 --- a/src/app/services/table-component.base.ts +++ b/src/app/services/table-component.base.ts @@ -1,33 +1,38 @@ import {sortByNumberAscending, sortByStringAscending} from './sorting.service'; +import {Priority} from './backend.service'; export abstract class TableComponentBase { - public sortBy: string; - public sortDescending = false; - public items: T[] = []; + public sortBy: string; + public sortDescending = false; + public items: T[] = []; - protected doNumericSort(by: string, key: (ScrumTask) => number) { - if (this.sortBy === by) { - this.sortDescending = !this.sortDescending; - } else { - this.sortBy = by; - } - - this.items = sortByNumberAscending(this.items, key); - if (this.sortDescending) { - this.items = this.items.reverse(); - } + protected doNumericSort(by: string, key: (item: T) => number) { + if (this.sortBy === by) { + this.sortDescending = !this.sortDescending; + } else { + this.sortBy = by; } - protected doStringSort(by: string, key: (ScrumTask) => string) { - if (this.sortBy === by) { - this.sortDescending = !this.sortDescending; - } else { - this.sortBy = by; - } - - this.items = sortByStringAscending(this.items, key); - if (this.sortDescending) { - this.items = this.items.reverse(); - } + this.items = sortByNumberAscending(this.items, key); + if (this.sortDescending) { + this.items = this.items.reverse(); } + } + + protected doStringSort(by: string, key: (item: T) => string) { + if (this.sortBy === by) { + this.sortDescending = !this.sortDescending; + } else { + this.sortBy = by; + } + + this.items = sortByStringAscending(this.items, key); + if (this.sortDescending) { + this.items = this.items.reverse(); + } + } + + public getAllPriorities(): string[] { + return Object.values(Priority); + } } diff --git a/src/app/task-table/task-table.component.css b/src/app/task-table/task-table.component.css index c1ce646..a7c065c 100644 --- a/src/app/task-table/task-table.component.css +++ b/src/app/task-table/task-table.component.css @@ -2,3 +2,6 @@ table { table-layout: fixed; } +th.sortable:hover { + text-decoration: underline; +} diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html index 4a2df3e..09f9851 100644 --- a/src/app/task-table/task-table.component.html +++ b/src/app/task-table/task-table.component.html @@ -9,6 +9,9 @@ Tasks + @@ -16,37 +19,43 @@ - + ID ▲ ▼ - + Titel ▲ ▼ - + Inhalt ▲ ▼ - - Tasks - + + Userstory + ▲ ▼ - + Priorität - + + ▲ ▼ @@ -56,7 +65,7 @@ - + {{task.id}} {{task.title}} {{task.content}} diff --git a/src/app/task-table/task-table.component.ts b/src/app/task-table/task-table.component.ts index c4d7434..8de5b15 100644 --- a/src/app/task-table/task-table.component.ts +++ b/src/app/task-table/task-table.component.ts @@ -1,9 +1,10 @@ import {Component} from '@angular/core'; -import {BackendService, Priority, ScrumTask, ScrumUserstory} from '../services/backend.service'; +import {BackendService, ScrumTask} from '../services/backend.service'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {TaskFormComponent} from '../task-form/task-form.component'; import {TableComponentBase} from '../services/table-component.base'; -import {ActivatedRoute, Router} from '@angular/router'; +import {ActivatedRoute, ParamMap, Router} from '@angular/router'; +import {getNumberForPriority} from '../services/sorting.service'; @Component({ selector: 'app-userstory-table', @@ -12,11 +13,14 @@ import {ActivatedRoute, Router} from '@angular/router'; }) export class TaskTableComponent extends TableComponentBase { public filterUserstoryId: number | null = null; + public filterPriority: string | null = null; + public highlightId: number; + public get filteredItems() { - if (this.filterUserstoryId === null || isNaN(this.filterUserstoryId)) { - return this.items; - } - return this.items.filter(task => task.userstoryid === this.filterUserstoryId); + return this.items.filter(task => + (this.filterUserstoryId === null || task.userstoryid === this.filterUserstoryId) + && (this.filterPriority === null || task.priority === this.filterPriority) + ); } constructor( @@ -25,14 +29,8 @@ export class TaskTableComponent extends TableComponentBase { ) { super(); - const params = route.snapshot.paramMap; - if (params.has('userstoryId')) { - this.filterUserstoryId = parseInt(params.get('userstoryId')); - } - if (params.has('id')) { - const id = parseInt(params.get('id')); - this.openTaskForm(this.items.find(t => t.id === id)); - } + this.applyFilterParameters(route.snapshot.paramMap); + route.paramMap.subscribe(map => this.applyFilterParameters(map)); backendService.getTasks().subscribe(response => { if (response.status > 399) { @@ -43,6 +41,17 @@ export class TaskTableComponent extends TableComponentBase { }); } + private applyFilterParameters(params: ParamMap) { + if (params.has('userstoryId')) { + this.filterUserstoryId = parseInt(params.get('userstoryId')); + } else { + this.filterUserstoryId = null; + } + if (params.has('id')) { + this.highlightId = parseInt(params.get('id')); + } + } + public deleteTask(task: ScrumTask) { this.backendService.deleteTask(task).subscribe(response => { if (response.status > 399) { @@ -69,37 +78,26 @@ export class TaskTableComponent extends TableComponentBase { } sortById() { - this.doNumericSort('id', us => us.id); + this.doNumericSort('id', task => task.id); } sortByTitle() { - this.doStringSort('title', us => us.title); + this.doStringSort('title', task => task.title); } sortByContent() { - this.doStringSort('content', us => us.content); - } - - private getNumberForPriority(priority: Priority): number { - switch (priority) { - case Priority.High: - return 2; - case Priority.Medium: - return 1; - case Priority.Low: - return 0; - } + this.doStringSort('content', task => task.content); } sortByPrio() { - this.doNumericSort('priority', us => this.getNumberForPriority(us.priority)); - } - - getNumberOfTasks(userstory: ScrumUserstory) { - return this.items.filter(t => t.userstoryid === userstory.id).length; + this.doNumericSort('priority', task => getNumberForPriority(task.priority)); } sortByTasks() { - this.doNumericSort('tasks', us => this.getNumberOfTasks(us)); + this.doNumericSort('userstory', task => task.userstoryid); + } + + private findTaskById(id: number): ScrumTask { + return this.items.find(t => t.id === id); } } diff --git a/src/app/userstory-table/userstory-table.component.css b/src/app/userstory-table/userstory-table.component.css index c1ce646..a7c065c 100644 --- a/src/app/userstory-table/userstory-table.component.css +++ b/src/app/userstory-table/userstory-table.component.css @@ -2,3 +2,6 @@ table { table-layout: fixed; } +th.sortable:hover { + text-decoration: underline; +} diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html index 4dfcdff..dfa125a 100644 --- a/src/app/userstory-table/userstory-table.component.html +++ b/src/app/userstory-table/userstory-table.component.html @@ -8,36 +8,42 @@ - + ID ▲ ▼ - + Titel ▲ ▼ - + Inhalt ▲ ▼ - + Tasks ▲ ▼ - + Priorität + ▲ ▼ @@ -48,7 +54,7 @@ - + {{userstory.id}} {{userstory.title}} {{userstory.content}} diff --git a/src/app/userstory-table/userstory-table.component.ts b/src/app/userstory-table/userstory-table.component.ts index 7d03e10..dd86eff 100644 --- a/src/app/userstory-table/userstory-table.component.ts +++ b/src/app/userstory-table/userstory-table.component.ts @@ -4,7 +4,7 @@ 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, Router} from '@angular/router'; +import {ActivatedRoute, ParamMap, Router} from '@angular/router'; @Component({ selector: 'app-userstory-table', @@ -13,6 +13,12 @@ import {ActivatedRoute, Router} from '@angular/router'; }) export class UserstoryTableComponent extends TableComponentBase { public tasks: ScrumTask[] = []; + public filterPriority: string | null = null; + public highlightId: number; + + public get filteredItems() { + return this.items.filter(task => this.filterPriority === null || task.priority === this.filterPriority); + } constructor( private backendService: BackendService, private modalService: NgbModal, @@ -20,19 +26,14 @@ export class UserstoryTableComponent extends TableComponentBase ) { super(); - const params = route.snapshot.paramMap; + 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); - - // Wenn /userstories;id=3 aufgerufen wird, öffne die Userstory mit ID 3 - const userstory = this.findUserstoryById(parseInt(params.get('id'))); - if (userstory !== null) { - this.openUserstoryForm(userstory); - } } }); backendService.getTasks().subscribe(response => { @@ -44,12 +45,10 @@ export class UserstoryTableComponent extends TableComponentBase }); } - private findUserstoryById(id: number): ScrumUserstory { - const userstoriesWithId = this.items.filter(us => us.id === id); - if (userstoriesWithId.length === 0) { - return null; + private applyFilterParameters(params: ParamMap) { + if (params.has('id')) { + this.highlightId = parseInt(params.get('id')); } - return userstoriesWithId[0]; } public deleteUserstory(userstory: ScrumUserstory) { From 07dba527944139e298720b95e7284e77d89e21bb Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 22 Jun 2020 12:02:11 +0200 Subject: [PATCH 05/30] edited taskform --- src/app/task-form/task-form.component.css | 12 +++ src/app/task-form/task-form.component.html | 90 +++++++++++++++------- src/app/task-form/task-form.component.ts | 81 +++++++++---------- 3 files changed, 115 insertions(+), 68 deletions(-) diff --git a/src/app/task-form/task-form.component.css b/src/app/task-form/task-form.component.css index e69de29..cc04e06 100644 --- a/src/app/task-form/task-form.component.css +++ b/src/app/task-form/task-form.component.css @@ -0,0 +1,12 @@ +.modal-footer { + border-top: 0px solid; + padding-top: 5%; +} +.modal-content { + width: 1040px; + right: 55%; +} + +.modal { + margin: 0 auto; +} diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index f61d287..e1abec3 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -1,30 +1,62 @@ -
-
- + +
+
+

Neuen Task anlegen

+
Userstory:
+ +
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
-
-
- - -
- -
- - -
- -
- - -
- - - -
-
\ No newline at end of file + \ 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 154e22f..60dd90b 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -1,50 +1,53 @@ import { Component, OnInit, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { BackendService, ScrumTask, Priority, ScrumStatus, ScrumCategory, ScrumUser, ScrumProject } from '../services/backend.service'; +import { + BackendService, + ScrumTask, + Priority, + ScrumStatus, + ScrumCategory, + ScrumUser, + ScrumProject +} from '../services/backend.service'; @Component({ - selector: 'app-task-form', - templateUrl: './task-form.component.html', - styleUrls: ['./task-form.component.css'] + selector: 'app-task-form', + templateUrl: './task-form.component.html', + styleUrls: [ './task-form.component.css' ] }) export class TaskFormComponent implements OnInit { + @Input() public task: ScrumTask; + public editing: Boolean; - @Input() - public task: ScrumTask; - public editing: Boolean; + constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {} - constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) { } + ngOnInit(): void { + if (this.task === null || this.task === undefined) { + this.task = { title: '' }; + this.editing = false; + } else { + this.editing = true; + } + } - ngOnInit(): void { - if (this.task === null || this.task === undefined) { - this.task = {title: ""}; - this.editing = false; - } - else - { - this.editing = true; - } - } + onSubmit() { + if (this.editing) { + this.backendService.putTask(this.task).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } else { + this.backendService.postTask(this.task).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } + this.activeModalService.close(this.task); + } - onSubmit() { - if (this.editing) { - this.backendService.putTask(this.task).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } - else { - this.backendService.postTask(this.task).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } - this.activeModalService.close(this.task); - } - - onClose(){ - this.activeModalService.dismiss(this.task); - } + onClose() { + this.activeModalService.dismiss(this.task); + } } From 68e4362fe232eb4a795e3354eb48916798e2b22b Mon Sep 17 00:00:00 2001 From: test Date: Mon, 22 Jun 2020 13:56:30 +0200 Subject: [PATCH 06/30] styling changes dropdown, color, linebreak... --- src/app/task-form/task-form.component.html | 111 ++++++++++-------- .../userstory-form.component.html | 7 +- 2 files changed, 64 insertions(+), 54 deletions(-) diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index e1abec3..4b01472 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -1,62 +1,69 @@ -
-
-

Neuen Task anlegen

-
Userstory:
- -
-
-
+
+
+ + +

Neuen Task anlegen

+ + +
Gehört zu Story:
+ + +
+ +
+
+ -
-
-
- - -
-
-
-
- - -
+
+
+
+ +
-
-
-
- - -
-
-
-
- - -
-
- - -
+
+
+
+ +
- -
- -
+
+
+
+ + +
+
+
+
+
+ + +
+
+ + +
+
+
+ +
+ +
+
\ No newline at end of file diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index 4773281..7701d59 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -1,5 +1,5 @@ -
+

Neue Userstory anlegen

+
-
+
+
From 80fd5c4f096b6f92900691df9ddd318aecb6c35e Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 22 Jun 2020 14:40:00 +0200 Subject: [PATCH 07/30] added autofocus --- src/app/userstory-form/userstory-form.component.html | 4 ++-- src/app/userstory-form/userstory-form.component.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index 7701d59..1d86b8b 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -13,8 +13,8 @@
- +
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts index 0312338..8ff39bb 100644 --- a/src/app/userstory-form/userstory-form.component.ts +++ b/src/app/userstory-form/userstory-form.component.ts @@ -20,6 +20,7 @@ export class UserstoryFormComponent implements OnInit { } else { this.editing = true; } + this.focusTitleField(); } onSubmit() { @@ -41,4 +42,8 @@ export class UserstoryFormComponent implements OnInit { onClose() { this.activeModalService.dismiss(this.userstory); } + + focusTitleField() { + document.getElementById('titleField').focus(); + } } From bac2e90d23713b1eac3a08b204ebf0ba7c97629a Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 22 Jun 2020 14:58:14 +0200 Subject: [PATCH 08/30] added right focus for tasks --- src/app/task-form/task-form.component.html | 2 +- src/app/task-form/task-form.component.ts | 1 + src/app/userstory-form/userstory-form.component.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index 4b01472..6bb32ef 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -22,7 +22,7 @@
+ [(ngModel)]="task.title" id="titleField">
diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts index 60dd90b..8a9fab7 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -28,6 +28,7 @@ export class TaskFormComponent implements OnInit { } else { this.editing = true; } + document.getElementById('titleField').focus(); } onSubmit() { diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index 1d86b8b..e23e626 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -13,7 +13,7 @@
-
From aba077cc14f2c5d22a52c8d0d74c6635c33cc9fa Mon Sep 17 00:00:00 2001 From: test Date: Mon, 22 Jun 2020 16:28:40 +0200 Subject: [PATCH 09/30] minor changes --- src/app/task-form/task-form.component.css | 1 + src/app/task-form/task-form.component.ts | 14 +++++++++++++- src/app/userstory-form/userstory-form.component.ts | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/app/task-form/task-form.component.css b/src/app/task-form/task-form.component.css index cc04e06..2b8a6fe 100644 --- a/src/app/task-form/task-form.component.css +++ b/src/app/task-form/task-form.component.css @@ -5,6 +5,7 @@ .modal-content { width: 1040px; right: 55%; + border: 0px; } .modal { diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts index 8a9fab7..07abbe5 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -7,8 +7,11 @@ import { ScrumStatus, ScrumCategory, ScrumUser, - ScrumProject + ScrumProject, + ScrumUserstory } from '../services/backend.service'; +import { Observable } from 'rxjs'; +import { HttpResponse } from '@angular/common/http'; @Component({ selector: 'app-task-form', @@ -29,6 +32,8 @@ export class TaskFormComponent implements OnInit { this.editing = true; } document.getElementById('titleField').focus(); + + this.getRelatedStory(); } onSubmit() { @@ -51,4 +56,11 @@ export class TaskFormComponent implements OnInit { onClose() { this.activeModalService.dismiss(this.task); } + + getRelatedStory(): any{ + + console.log(this.backendService.getUserstory(1)); + + } + } diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/userstory-form/userstory-form.component.ts index 8ff39bb..c3ca4c5 100644 --- a/src/app/userstory-form/userstory-form.component.ts +++ b/src/app/userstory-form/userstory-form.component.ts @@ -20,7 +20,7 @@ export class UserstoryFormComponent implements OnInit { } else { this.editing = true; } - this.focusTitleField(); + document.getElementById('titleField').focus(); } onSubmit() { @@ -43,7 +43,7 @@ export class UserstoryFormComponent implements OnInit { this.activeModalService.dismiss(this.userstory); } - focusTitleField() { - document.getElementById('titleField').focus(); - } + //focusTitleField() { + // document.getElementById('titleField').focus(); + //} } From 34611039302b43523e299fc99a75a06fd8c59fbf Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 22 Jun 2020 16:34:57 +0200 Subject: [PATCH 10/30] Get Userstory by ID --- src/app/task-form/task-form.component.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/task-form/task-form.component.ts b/src/app/task-form/task-form.component.ts index 07abbe5..635191e 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -58,9 +58,13 @@ export class TaskFormComponent implements OnInit { } getRelatedStory(): any{ - - console.log(this.backendService.getUserstory(1)); - + this.backendService.getUserstory(1).subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } + else { + console.log(response); + } + }); } - } From 834680107474580e30d080cd3ff015dc26ad91d1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 22 Jun 2020 17:12:09 +0200 Subject: [PATCH 11/30] added related user story --- src/app/task-form/task-form.component.html | 9 +- src/app/task-form/task-form.component.ts | 110 +++++++++++---------- src/assets/env.js | 12 +-- 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html index 6bb32ef..d63239f 100644 --- a/src/app/task-form/task-form.component.html +++ b/src/app/task-form/task-form.component.html @@ -1,4 +1,3 @@ -
@@ -6,7 +5,7 @@

Neuen Task anlegen

-
Gehört zu Story:
+
Gehört zu Story: {{this.userstoryId}}
@@ -59,11 +58,11 @@
- +
+
-
- \ No newline at end of file +
\ 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 635191e..4c4ca34 100644 --- a/src/app/task-form/task-form.component.ts +++ b/src/app/task-form/task-form.component.ts @@ -1,70 +1,72 @@ import { Component, OnInit, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { - BackendService, - ScrumTask, - Priority, - ScrumStatus, - ScrumCategory, - ScrumUser, - ScrumProject, - ScrumUserstory + BackendService, + ScrumTask, + Priority, + ScrumStatus, + ScrumCategory, + ScrumUser, + ScrumProject, + ScrumUserstory, } from '../services/backend.service'; import { Observable } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; @Component({ - selector: 'app-task-form', - templateUrl: './task-form.component.html', - styleUrls: [ './task-form.component.css' ] + selector: 'app-task-form', + templateUrl: './task-form.component.html', + styleUrls: ['./task-form.component.css'], }) export class TaskFormComponent implements OnInit { - @Input() public task: ScrumTask; - public editing: Boolean; + @Input() public task: ScrumTask; + public editing: Boolean; + public userstoryId: string; - constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {} + constructor( + private backendService: BackendService, + private activeModalService: NgbActiveModal + ) {} - ngOnInit(): void { - if (this.task === null || this.task === undefined) { - this.task = { title: '' }; - this.editing = false; - } else { - this.editing = true; - } - document.getElementById('titleField').focus(); + ngOnInit(): void { + if (this.task === null || this.task === undefined) { + this.task = { title: '' }; + this.editing = false; + } else { + this.editing = true; + } + document.getElementById('titleField').focus(); + this.getRelatedStory(); + } - this.getRelatedStory(); - } + onSubmit() { + if (this.editing) { + this.backendService.putTask(this.task).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } else { + this.backendService.postTask(this.task).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } + this.activeModalService.close(this.task); + } - onSubmit() { - if (this.editing) { - this.backendService.putTask(this.task).subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } else { - this.backendService.postTask(this.task).subscribe((response) => { - if (response.status > 399) { - alert('Fehler'); - } - }); - } - this.activeModalService.close(this.task); - } + onClose() { + this.activeModalService.dismiss(this.task); + } - onClose() { - this.activeModalService.dismiss(this.task); - } - - getRelatedStory(): any{ - this.backendService.getUserstory(1).subscribe(response => { - if (response.status > 399) { - alert('Fehler'); - } - else { - console.log(response); - } - }); - } + getRelatedStory() { + this.backendService.getUserstory(2).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } else { + this.userstoryId = response.body.title; + } + }); + } } diff --git a/src/assets/env.js b/src/assets/env.js index 5b334ef..38fc952 100644 --- a/src/assets/env.js +++ b/src/assets/env.js @@ -1,7 +1,7 @@ (function(window) { - window["env"] = window["env"] || {}; - - // Environment variables - window["env"]["apiUrl"] = "http://localhost:5001"; - window["env"]["debug"] = false; - })(this); \ No newline at end of file + window['env'] = window['env'] || {}; + + // Environment variables + window['env']['apiUrl'] = 'http://taskboard.dev.nig.gl/api'; + window['env']['debug'] = false; +})(this); From 39e403a8a78bead3e41b538d1c3513661c52cf80 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 23 Jun 2020 11:16:02 +0200 Subject: [PATCH 12/30] added submit button to form --- src/app/userstory-form/userstory-form.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html index e23e626..0b2ddc8 100644 --- a/src/app/userstory-form/userstory-form.component.html +++ b/src/app/userstory-form/userstory-form.component.html @@ -53,12 +53,12 @@
+
+ + +
-
- - -
\ No newline at end of file From 7c26e91b2a6b480126d75df16974c11c615b1432 Mon Sep 17 00:00:00 2001 From: test Date: Fri, 26 Jun 2020 13:26:00 +0200 Subject: [PATCH 13/30] created new sprint form component draft --- src/app/app.module.ts | 4 +- src/app/services/backend.service.ts | 2 +- src/app/sprint-component/sprint.component.css | 0 .../sprint-component/sprint.component.html | 1 + src/app/sprint-component/sprint.component.ts | 54 ++++++++++++++++ src/app/sprint-form/sprint-form.component.css | 4 ++ .../sprint-form/sprint-form.component.html | 33 ++++++++++ src/app/sprint-form/sprint-form.component.ts | 62 +++++++++++++++++++ 8 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 src/app/sprint-component/sprint.component.css create mode 100644 src/app/sprint-component/sprint.component.html create mode 100644 src/app/sprint-component/sprint.component.ts create mode 100644 src/app/sprint-form/sprint-form.component.css create mode 100644 src/app/sprint-form/sprint-form.component.html create mode 100644 src/app/sprint-form/sprint-form.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e6c683f..a724a81 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,6 +11,7 @@ import { TaskListComponent } from './task-list/task-list.component'; import { TaskFormComponent } from './task-form/task-form.component'; import { UserstoryListComponent } from './userstory-list/userstory-list.component'; import { UserstoryFormComponent } from './userstory-form/userstory-form.component'; +import { SprintFormComponent } from './sprint-form/sprint-form.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ @@ -19,7 +20,8 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; TaskListComponent, TaskFormComponent, UserstoryListComponent, - UserstoryFormComponent + UserstoryFormComponent, + SprintFormComponent ], imports: [ BrowserModule, diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index 239f82a..8682de8 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -232,7 +232,7 @@ export interface ScrumUserstory { export interface ScrumSprint{ id?: number; title: string; - description: string; + description?: string; startDate: Date; endDate: Date; project: number; diff --git a/src/app/sprint-component/sprint.component.css b/src/app/sprint-component/sprint.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/sprint-component/sprint.component.html b/src/app/sprint-component/sprint.component.html new file mode 100644 index 0000000..9190d3a --- /dev/null +++ b/src/app/sprint-component/sprint.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/sprint-component/sprint.component.ts b/src/app/sprint-component/sprint.component.ts new file mode 100644 index 0000000..d47b86b --- /dev/null +++ b/src/app/sprint-component/sprint.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { BackendService, ScrumSprint } from '../services/backend.service'; +import { SprintFormComponent } from '../sprint-form/sprint-form.component'; + +@Component({ + selector: 'app-sprint', + templateUrl: './sprint.component.html', + styleUrls: ['./sprint.component.css'] +}) +export class SprintComponent implements OnInit { + + public sprints: ScrumSprint[] = []; + + constructor(private backendService: BackendService, private modalService: NgbModal) { + backendService.getSprints().subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } + else { + this.sprints.push(...response.body); + } + }); + } + + ngOnInit(): void { + } + + public deleteSprint(sprint: ScrumSprint) { + this.backendService.deleteSprint(sprint).subscribe(response => { + if (response.status > 399) { + alert('Fehler'); + } + }); + const index = this.sprints.indexOf(sprint); + if (index !== -1) { + this.sprints.splice(index, 1); + } + } + + public openSprintForm(editSprint: ScrumSprint) { + const modalRef = this.modalService.open(SprintFormComponent, { + backdrop: 'static', + keyboard: true, + }); + if (editSprint === null) { + modalRef.result.then(result => { + this.sprints.push(result); + }); + } + modalRef.componentInstance.userstory = editSprint; + } + +} diff --git a/src/app/sprint-form/sprint-form.component.css b/src/app/sprint-form/sprint-form.component.css new file mode 100644 index 0000000..717de4c --- /dev/null +++ b/src/app/sprint-form/sprint-form.component.css @@ -0,0 +1,4 @@ +.modal-footer { + border-top: 0px solid; + padding-top: 5%; +} \ No newline at end of file diff --git a/src/app/sprint-form/sprint-form.component.html b/src/app/sprint-form/sprint-form.component.html new file mode 100644 index 0000000..641a485 --- /dev/null +++ b/src/app/sprint-form/sprint-form.component.html @@ -0,0 +1,33 @@ +
+
+

Neuen Sprint anlegen

+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+
+
\ No newline at end of file diff --git a/src/app/sprint-form/sprint-form.component.ts b/src/app/sprint-form/sprint-form.component.ts new file mode 100644 index 0000000..f19c1bb --- /dev/null +++ b/src/app/sprint-form/sprint-form.component.ts @@ -0,0 +1,62 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { + BackendService, + ScrumTask, + Priority, + ScrumStatus, + ScrumCategory, + ScrumUser, + ScrumProject, + ScrumUserstory, + ScrumSprint +} from '../services/backend.service'; +import { Observable } from 'rxjs'; +import { HttpResponse } from '@angular/common/http'; + +@Component({ + selector: 'app-task-form', + templateUrl: './sprint-form.component.html', + styleUrls: ['./sprint-form.component.css'], +}) +export class SprintFormComponent implements OnInit { + @Input() public sprint: ScrumSprint; + public editing: Boolean; + public sprintid: string; + + constructor( + private backendService: BackendService, + private activeModalService: NgbActiveModal + ) { } + + ngOnInit(): void { + if (this.sprint === null || this.sprint === undefined) { + this.sprint = { title: '', startDate: new Date(), endDate: new Date(), project: 0 }; //project id: static counter? + this.editing = false; + } else { + this.editing = true; + } + document.getElementById('titleField').focus(); + } + + onSubmit() { + if (this.editing) { + this.backendService.putSprint(this.sprint).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } else { + this.backendService.postSprint(this.sprint).subscribe((response) => { + if (response.status > 399) { + alert('Fehler'); + } + }); + } + this.activeModalService.close(this.sprint); + } + + onClose() { + this.activeModalService.dismiss(this.sprint); + } +} From 9c14fc4bd5dd419754fd1b82b9f42e31f39d652a Mon Sep 17 00:00:00 2001 From: test Date: Sun, 28 Jun 2020 12:07:30 +0200 Subject: [PATCH 14/30] modified task-list to "enable" sprint-form. --- src/app/task-list/task-list.component.html | 2 ++ src/app/task-list/task-list.component.ts | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/app/task-list/task-list.component.html b/src/app/task-list/task-list.component.html index 1f501a3..58e444a 100644 --- a/src/app/task-list/task-list.component.html +++ b/src/app/task-list/task-list.component.html @@ -1,4 +1,6 @@ + +
  • diff --git a/src/app/task-list/task-list.component.ts b/src/app/task-list/task-list.component.ts index b8daf28..598f5ce 100644 --- a/src/app/task-list/task-list.component.ts +++ b/src/app/task-list/task-list.component.ts @@ -1,7 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { BackendService, ScrumTask } from '../services/backend.service'; +import { BackendService, ScrumTask, ScrumSprint } from '../services/backend.service'; import { TaskFormComponent } from '../task-form/task-form.component'; +import { SprintFormComponent } from '../sprint-form/sprint-form.component'; + @Component({ selector: 'app-task-list', @@ -11,6 +13,8 @@ import { TaskFormComponent } from '../task-form/task-form.component'; export class TaskListComponent implements OnInit { public tasks: ScrumTask[] = []; + public sprints: ScrumSprint[] = []; + constructor(private backendService: BackendService, private modalService: NgbModal) { backendService.getTasks().subscribe(response => { @@ -51,4 +55,17 @@ export class TaskListComponent implements OnInit { modalRef.componentInstance.task = editTask; } + public openSprintForm(editSprint: ScrumSprint) { + const modalRef = this.modalService.open(SprintFormComponent, { + backdrop: 'static', + keyboard: true, + }); + if (editSprint === null) { + modalRef.result.then(result => { + this.sprints.push(result); + }); + } + modalRef.componentInstance.userstory = editSprint; + } + } From 75b964402a9f3d8e03c427837a25886dc1ae5c45 Mon Sep 17 00:00:00 2001 From: test Date: Sun, 28 Jun 2020 12:13:45 +0200 Subject: [PATCH 15/30] . --- src/app/sprint-form/sprint-form.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/sprint-form/sprint-form.component.html b/src/app/sprint-form/sprint-form.component.html index 641a485..d8b7ecd 100644 --- a/src/app/sprint-form/sprint-form.component.html +++ b/src/app/sprint-form/sprint-form.component.html @@ -13,13 +13,13 @@ id="titleField">
- - Startdatum +
- - Enddatum +
From 9bcf7b70d0ea8b03c83d16a328376458ddbeb774 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 29 Jun 2020 14:29:57 +0200 Subject: [PATCH 16/30] Removed collum "Inhalt" from Task Table --- src/app/task-table/task-table.component.html | 8 -------- src/app/task-table/task-table.component.ts | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html index 09f9851..7cbd4df 100644 --- a/src/app/task-table/task-table.component.html +++ b/src/app/task-table/task-table.component.html @@ -33,13 +33,6 @@ ▼ - - Inhalt - - ▲ - ▼ - - Userstory @@ -68,7 +61,6 @@ {{task.id}} {{task.title}} - {{task.content}} US #{{task.userstoryid}} diff --git a/src/app/task-table/task-table.component.ts b/src/app/task-table/task-table.component.ts index 8de5b15..50dd98c 100644 --- a/src/app/task-table/task-table.component.ts +++ b/src/app/task-table/task-table.component.ts @@ -85,10 +85,6 @@ export class TaskTableComponent extends TableComponentBase { this.doStringSort('title', task => task.title); } - sortByContent() { - this.doStringSort('content', task => task.content); - } - sortByPrio() { this.doNumericSort('priority', task => getNumberForPriority(task.priority)); } From eefa6de6783979f88622bd6fe80c819832c183a6 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 29 Jun 2020 14:31:09 +0200 Subject: [PATCH 17/30] Removed collum "Inhalt" from Userstory Table --- src/app/userstory-table/userstory-table.component.html | 8 -------- src/app/userstory-table/userstory-table.component.ts | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html index dfa125a..de1b587 100644 --- a/src/app/userstory-table/userstory-table.component.html +++ b/src/app/userstory-table/userstory-table.component.html @@ -22,13 +22,6 @@ ▼ - - Inhalt - - ▲ - ▼ - - Tasks @@ -57,7 +50,6 @@ {{userstory.id}} {{userstory.title}} - {{userstory.content}} {{getNumberOfTasks(userstory)}} Tasks diff --git a/src/app/userstory-table/userstory-table.component.ts b/src/app/userstory-table/userstory-table.component.ts index dd86eff..dc245ec 100644 --- a/src/app/userstory-table/userstory-table.component.ts +++ b/src/app/userstory-table/userstory-table.component.ts @@ -88,10 +88,6 @@ export class UserstoryTableComponent extends TableComponentBase this.doStringSort('title', us => us.title); } - public sortByContent() { - this.doStringSort('content', us => us.content); - } - public sortByPrio() { this.doNumericSort('priority', us => getNumberForPriority(us.priority)); } From 781165e97454faf76023cfdb08778a2da75da7a5 Mon Sep 17 00:00:00 2001 From: Niggl Date: Mon, 29 Jun 2020 15:29:14 +0200 Subject: [PATCH 18/30] Added new collumns to task and userstory table (no logic yet) --- src/app/task-table/task-table.component.html | 36 +++++++++++++++++++ src/app/task-table/task-table.component.ts | 12 +++++++ .../userstory-table.component.html | 24 +++++++++++++ .../userstory-table.component.ts | 7 ++++ 4 files changed, 79 insertions(+) diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html index 7cbd4df..1eb3b65 100644 --- a/src/app/task-table/task-table.component.html +++ b/src/app/task-table/task-table.component.html @@ -40,6 +40,13 @@ ▼ + + Status + + ▲ + ▼ + + Priorität + + Assigned To + + ▲ + ▼ + + + + Category + + ▲ + ▼ + + @@ -66,7 +87,22 @@ US #{{task.userstoryid}} + + + Status: {{task.statusid}} + + {{task.priority}} + + + Status: {{task.assignedtoid}} + + + + + Status: {{task.categoryid}} + + diff --git a/src/app/task-table/task-table.component.ts b/src/app/task-table/task-table.component.ts index 50dd98c..20ded7a 100644 --- a/src/app/task-table/task-table.component.ts +++ b/src/app/task-table/task-table.component.ts @@ -5,6 +5,8 @@ import {TaskFormComponent} from '../task-form/task-form.component'; import {TableComponentBase} from '../services/table-component.base'; import {ActivatedRoute, ParamMap, Router} from '@angular/router'; import {getNumberForPriority} from '../services/sorting.service'; +import { Title } from '@angular/platform-browser'; +import { isNumber } from 'util'; @Component({ selector: 'app-userstory-table', @@ -93,6 +95,16 @@ export class TaskTableComponent extends TableComponentBase { this.doNumericSort('userstory', task => task.userstoryid); } + sortByStatus() { + this.doStringSort('title', task => task.title); + } + sortByAssigned() { + this.doStringSort('title', task => task.title); + } + sortByCategory() { + this.doStringSort('title', task => task.title); + } + private findTaskById(id: number): ScrumTask { return this.items.find(t => t.id === id); } diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html index de1b587..704f977 100644 --- a/src/app/userstory-table/userstory-table.component.html +++ b/src/app/userstory-table/userstory-table.component.html @@ -29,6 +29,13 @@ ▼ + + Status + + ▲ + ▼ + + Priorität