From ae77ec7553ed5b741f049f9a66daa9095e7ffa66 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Fri, 10 Jul 2020 19:00:20 +0200
Subject: [PATCH] Aggregated some Stuff

---
 src/app/app.module.ts                            |  2 +-
 .../tabels/sprint/sprint-table.component.ts      |  2 +-
 .../tabels}/table-component.base.ts              | 12 ++++++++++--
 .../tabels/task/task-table.component.html        |  2 +-
 .../tabels/task/task-table.component.ts          | 10 +---------
 .../userstory-inner-table.component.css          |  0
 .../userstory-inner-table.component.html         |  0
 .../userstory-inner-table.component.ts           | 16 ++++------------
 8 files changed, 18 insertions(+), 26 deletions(-)
 rename src/app/{services => components/tabels}/table-component.base.ts (82%)
 rename src/app/components/{ => tabels}/userstory-inner-table/userstory-inner-table.component.css (100%)
 rename src/app/components/{ => tabels}/userstory-inner-table/userstory-inner-table.component.html (100%)
 rename src/app/components/{ => tabels}/userstory-inner-table/userstory-inner-table.component.ts (89%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 583b131..294e574 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,7 +15,7 @@ import { UserstoryTableComponent } from './components/tabels/userstory/userstory
 import { TaskTableComponent } from './components/tabels/task/task-table.component';
 import { SprintTableComponent } from './components/tabels/sprint/sprint-table.component';
 import { DashboardComponent } from './components/dashboard/dashboard.component';
-import { UserstoryInnerTableComponent } from './components/userstory-inner-table/userstory-inner-table.component';
+import { UserstoryInnerTableComponent } from './components/tabels/userstory-inner-table/userstory-inner-table.component';
 import { BacklogComponent } from './components/backlog/backlog.component';
 
 @NgModule({
diff --git a/src/app/components/tabels/sprint/sprint-table.component.ts b/src/app/components/tabels/sprint/sprint-table.component.ts
index e349984..837b760 100644
--- a/src/app/components/tabels/sprint/sprint-table.component.ts
+++ b/src/app/components/tabels/sprint/sprint-table.component.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {BackendService, ScrumSprint} from '../../../services/backend.service';
-import {TableComponentBase} from '../../../services/table-component.base';
+import {TableComponentBase} from '../table-component.base';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {ActivatedRoute, ParamMap, Router} from '@angular/router';
 import { SprintFormComponent } from '../../sprint-form/sprint-form.component';
diff --git a/src/app/services/table-component.base.ts b/src/app/components/tabels/table-component.base.ts
similarity index 82%
rename from src/app/services/table-component.base.ts
rename to src/app/components/tabels/table-component.base.ts
index 6206c42..9f1424d 100644
--- a/src/app/services/table-component.base.ts
+++ b/src/app/components/tabels/table-component.base.ts
@@ -1,5 +1,5 @@
-import {sortByNumberAscending, sortByStringAscending, sortByDateAscending} from './sorting.service';
-import {Priority} from './backend.service';
+import {sortByNumberAscending, sortByStringAscending, sortByDateAscending} from '../../services/sorting.service';
+import {Priority, ScrumTask} from '../../services/backend.service';
 
 export abstract class TableComponentBase<T> {
   public sortBy: string;
@@ -48,4 +48,12 @@ export abstract class TableComponentBase<T> {
   public getAllPriorities(): string[] {
     return Object.values(Priority);
   }
+
+  public sortById() {
+    this.doNumericSort('id', (obj) => obj.id);
+  }
+
+  public sortByTitle() {
+    this.doStringSort('title', (obj) => obj.title);
+  }
 }
diff --git a/src/app/components/tabels/task/task-table.component.html b/src/app/components/tabels/task/task-table.component.html
index e3760f6..c089e9f 100644
--- a/src/app/components/tabels/task/task-table.component.html
+++ b/src/app/components/tabels/task/task-table.component.html
@@ -21,7 +21,7 @@
             <span>
               <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
               <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
-              <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
+              <span *ngIf="sortDescending === false && sortBy === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
             </span>
           </th>
           <th (click)="sortByTitle()" class="sortable">
diff --git a/src/app/components/tabels/task/task-table.component.ts b/src/app/components/tabels/task/task-table.component.ts
index d86ebfd..8979d9c 100644
--- a/src/app/components/tabels/task/task-table.component.ts
+++ b/src/app/components/tabels/task/task-table.component.ts
@@ -8,7 +8,7 @@ import {
 } 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 { TableComponentBase } from '../table-component.base';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { getNumberForPriority } from '../../../services/sorting.service';
 import { NONE_TYPE } from '@angular/compiler';
@@ -113,14 +113,6 @@ export class TaskTableComponent extends TableComponentBase<ScrumTask> {
     modalRef.componentInstance.task = editTask;
   }
 
-  sortById() {
-    this.doNumericSort('id', (task) => task.id);
-  }
-
-  sortByTitle() {
-    this.doStringSort('title', (task) => task.title);
-  }
-
   sortByPrio() {
     this.doNumericSort('priority', (task) =>
       getNumberForPriority(task.priority)
diff --git a/src/app/components/userstory-inner-table/userstory-inner-table.component.css b/src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.css
similarity index 100%
rename from src/app/components/userstory-inner-table/userstory-inner-table.component.css
rename to src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.css
diff --git a/src/app/components/userstory-inner-table/userstory-inner-table.component.html b/src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.html
similarity index 100%
rename from src/app/components/userstory-inner-table/userstory-inner-table.component.html
rename to src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.html
diff --git a/src/app/components/userstory-inner-table/userstory-inner-table.component.ts b/src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.ts
similarity index 89%
rename from src/app/components/userstory-inner-table/userstory-inner-table.component.ts
rename to src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.ts
index 7a82081..6e099a9 100644
--- a/src/app/components/userstory-inner-table/userstory-inner-table.component.ts
+++ b/src/app/components/tabels/userstory-inner-table/userstory-inner-table.component.ts
@@ -5,11 +5,11 @@ import {
   ScrumUserstory,
   ScrumStatus,
   ScrumCategory,
-} from '../../services/backend.service';
+} 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 { TableComponentBase } from '../table-component.base';
+import { getNumberForPriority } from '../../../services/sorting.service';
+import { UserstoryFormComponent } from '../../userstory-form/userstory-form.component';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 
 @Component({
@@ -102,14 +102,6 @@ export class UserstoryInnerTableComponent extends TableComponentBase<ScrumUserst
     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));
   }