From 05e233c05e579601c7f1f5e220e85504fd6e13c4 Mon Sep 17 00:00:00 2001 From: Niggl Date: Fri, 10 Jul 2020 19:32:58 +0200 Subject: [PATCH] Cleaned up the sprint table --- .../tabels/sprint/sprint-table.component.html | 2 +- .../tabels/sprint/sprint-table.component.ts | 47 +++++++------------ 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/app/components/tabels/sprint/sprint-table.component.html b/src/app/components/tabels/sprint/sprint-table.component.html index 251698b..bc9b627 100644 --- a/src/app/components/tabels/sprint/sprint-table.component.html +++ b/src/app/components/tabels/sprint/sprint-table.component.html @@ -45,7 +45,7 @@ - + {{sprint.id}} {{sprint.title}} {{sprint.startDate | date:'dd.MM.yyyy'}} diff --git a/src/app/components/tabels/sprint/sprint-table.component.ts b/src/app/components/tabels/sprint/sprint-table.component.ts index 837b760..be40019 100644 --- a/src/app/components/tabels/sprint/sprint-table.component.ts +++ b/src/app/components/tabels/sprint/sprint-table.component.ts @@ -11,14 +11,8 @@ import { SprintFormComponent } from '../../sprint-form/sprint-form.component'; styleUrls: ['./sprint-table.component.css'] }) export class SprintTableComponent extends TableComponentBase { - public filterSprintId: number | null = null; public highlightId: number; - public get filteredItems() { - return this.items.filter(sprint => - (this.filterSprintId === null || sprint.id === this.filterSprintId) - ); - } constructor( private backendService: BackendService, private modalService: NgbModal, @@ -26,9 +20,6 @@ export class SprintTableComponent extends TableComponentBase { ) { super(); - this.applyFilterParameters(route.snapshot.paramMap); - route.paramMap.subscribe(map => this.applyFilterParameters(map)); - backendService.getSprints().subscribe(response => { if (response.status > 399) { alert('Fehler'); @@ -38,12 +29,10 @@ export class SprintTableComponent extends TableComponentBase { }); } - private applyFilterParameters(params: ParamMap) { - if (params.has('id')) { - this.highlightId = parseInt(params.get('id')); - } - } + //#region getters + //#endregion getters + //#region sprintTableFunctions public deleteSprint(sprint: ScrumSprint) { this.backendService.deleteSprint(sprint).subscribe(response => { if (response.status > 399) { @@ -55,11 +44,24 @@ export class SprintTableComponent extends TableComponentBase { this.items.splice(index, 1); } } + //#endregion sprintTableFunctions + //#region sorters + sortByStartDate() { + this.doStringSort('startDate', sprint => sprint.startDate); + } + + sortByEndDate() { + this.doStringSort('endDate', sprint => sprint.endDate); + } + //#endregion sorters + + //#region modals public openSprintForm(editSprint?: ScrumSprint) { const modalRef = this.modalService.open(SprintFormComponent, { backdrop: 'static', keyboard: true, + size: "md", }); if (editSprint === null) { modalRef.result.then(result => { @@ -68,20 +70,5 @@ export class SprintTableComponent extends TableComponentBase { } modalRef.componentInstance.sprint = editSprint; } - - sortById() { - this.doNumericSort('id', sprint => sprint.id); - } - - sortByTitle() { - this.doStringSort('title', sprint => sprint.title); - } - - sortByStartDate() { - this.doStringSort('startDate', sprint => sprint.startDate); - } - - sortByEndDate() { - this.doStringSort('endDate', sprint => sprint.endDate); - } + //#endregion modals }