From 217af5887703c41854605ad5fd7793f64d052a22 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:04:06 +0200
Subject: [PATCH 1/6] Fancyer sorting #1

---
 src/app/task-table/task-table.component.html  | 19 +++++-----
 .../userstory-table.component.html            | 36 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 68019f9..5483525 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -54,13 +54,11 @@
                                 <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
                             </div>
                         </div>
-                        <div (click)="sortByPrio()">
-                            <i class="fa fa-sort"></i>
-                            <span *ngIf="sortBy === 'priority'" (click)="sortByPrio()" class="pl-3">
-                                <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                                <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-                            </span>
-                        </div>
+                        <span (click)="sortByPrio()">
+                                <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                                <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                                <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+                        </span>
                     </div>
                 </th>
                 <th (click)="sortByAssigned()" class="sortable">
@@ -72,9 +70,10 @@
                 </th>
                 <th (click)="sortByCategory()" class="sortable">
                     <span>Category</span>
-                    <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th></th>
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index d06db1c..26d24a6 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -36,25 +36,29 @@
           <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
         </span>
       </th>
-      <th (click)="sortByPrio()" class="sortable">
-        <span>Priorität</span>
-        <label class="pl-3" (click)="$event.stopPropagation()">
-          <select [(ngModel)]="filterPriority">
-            <option [ngValue]="null" selected></option>
-            <option *ngFor="let p of getAllPriorities()" [ngValue]="p">{{p}}</option>
-          </select>
-        </label>
-        <span *ngIf="sortBy === 'priority'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+      <th class="sortable">
+        <div class="d-inline-block">
+          <div ngbDropdown class="d-inline-block">
+              <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
+              <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+                  <option (click)="filterPriority=null">All</option>
+                  <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+              </div>
+          </div>
+          <span (click)="sortByPrio()">
+                  <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                  <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                  <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
+      </div>
       </th>
       <th (click)="sortByCategory()" class="sortable">
         <span>Category</span>
-        <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th></th>
     </tr>

From 7166415d5b2ea6f96846c16cc00b37c536abdc79 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:07:35 +0200
Subject: [PATCH 2/6] Task Table now w/ 100% fancy sorting

---
 src/app/task-table/task-table.component.html | 35 +++++++++++---------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 5483525..7910234 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -19,30 +19,34 @@
             <tr>
                 <th (click)="sortById()" class="sortable">
                     <span>ID</span>
-                    <span *ngIf="sortBy === 'id'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <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 === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTitle()" class="sortable">
                     <span>Titel</span>
-                    <span *ngIf="sortBy === 'title'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'title'"><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>
                 </th>
                 <th (click)="sortByTasks()" class="sortable">
                     <span>Userstory</span>
-                    <span *ngIf="sortBy === 'userstory'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'userstory'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'userstory'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'userstory'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByStatus()" class="sortable">
                     <span>Status</span>
-                    <span *ngIf="sortBy === 'statusid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th class="sortable">
@@ -63,9 +67,10 @@
                 </th>
                 <th (click)="sortByAssigned()" class="sortable">
                     <span>Assigned To</span>
-                    <span *ngIf="sortBy === 'assignedtoid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'assignedtoid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'assignedtoid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'assignedtoid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByCategory()" class="sortable">

From 815d2e9a5d1dd9dcbc6a0297265a7a4842223cde Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:10:03 +0200
Subject: [PATCH 3/6] Sprint Table now w/ 100% fancy sorting

---
 .../sprint-table/sprint-table.component.html  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/app/sprint-table/sprint-table.component.html b/src/app/sprint-table/sprint-table.component.html
index e824be9..b0c66c3 100644
--- a/src/app/sprint-table/sprint-table.component.html
+++ b/src/app/sprint-table/sprint-table.component.html
@@ -10,31 +10,35 @@
       <tr>
         <th (click)="sortById()" class="sortable">
           <span>ID</span>
-          <span *ngIf="sortBy === 'id'" class="pl-3">
-            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-          </span>
+          <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 === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
+        </span>
         </th>
         <th (click)="sortByTitle()" class="sortable">
           <span>Titel</span>
-          <span *ngIf="sortBy === 'title'" class="pl-3">
-            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-          </span>
+          <span>
+            <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+            <span *ngIf="sortDescending && sortBy === 'title'"><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>
         </th>
         <th (click)="sortByStartDate()" class="sortable">
             <span>Start</span>
-            <span *ngIf="sortBy === 'startDate'" class="pl-3">
-              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-            </span>
+            <span>
+              <span *ngIf="sortBy != 'startDate'"><i class="fa fa-sort fa-lg"></i></span>
+              <span *ngIf="sortDescending && sortBy === 'startDate'"><i class="fa fa-sort-up fa-lg"></i></span>
+              <span *ngIf="sortDescending === false && sortBy === 'startDate'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
           </th>
-          <th (click)="sortByEndDate()" class="endDate">
+          <th (click)="sortByEndDate()" class="sortable">
             <span>End</span>
-            <span *ngIf="sortBy === 'endDate'" class="pl-3">
-              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-            </span>
+            <span>
+              <span *ngIf="sortBy != 'endDate'"><i class="fa fa-sort fa-lg"></i></span>
+              <span *ngIf="sortDescending && sortBy === 'endDate'"><i class="fa fa-sort-up fa-lg"></i></span>
+              <span *ngIf="sortDescending === false && sortBy === 'endDate'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
           </th>
         <th></th>
       </tr>

From c8e02a78608c9c38fe272a8e5495f0ff16db8e81 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:10:20 +0200
Subject: [PATCH 4/6] Userstory Table now w/ 100% Fancyer sorting

---
 .../userstory-table.component.html             | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index 26d24a6..f8b15b2 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -10,17 +10,19 @@
     <tr>
       <th (click)="sortById()" class="sortable">
         <span>ID</span>
-        <span *ngIf="sortBy === 'id'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <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 === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th (click)="sortByTitle()" class="sortable">
         <span>Titel</span>
-        <span *ngIf="sortBy === 'title'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'title'"><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>
       </th>
       <th (click)="sortByTasks()" class="sortable">
         <span>Tasks</span>

From 13d91f7804e3cffd34583fa05ccf34ce45ec91c8 Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:11:48 +0200
Subject: [PATCH 5/6] Userstory Table now with fancy sort

---
 .../userstory-table.component.html             | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index f8b15b2..5c063d4 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -26,17 +26,19 @@
       </th>
       <th (click)="sortByTasks()" class="sortable">
         <span>Tasks</span>
-        <span *ngIf="sortBy === 'tasks'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'tasks'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'tasks'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'tasks'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th (click)="sortByStatus()" class="sortable">
         <span>Status</span>
-        <span *ngIf="sortBy === 'statusid'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th class="sortable">
         <div class="d-inline-block">

From 75a7a6534051689dc8ceeeaa8dd68f573f1fcf3b Mon Sep 17 00:00:00 2001
From: Niggl <info@nicolai-ort.com>
Date: Tue, 30 Jun 2020 14:25:11 +0200
Subject: [PATCH 6/6] Better Prio Filtering

---
 src/app/task-table/task-table.component.html  |  9 ++++---
 .../userstory-table.component.html            | 27 ++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 7910234..821a305 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -22,7 +22,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 === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTitle()" class="sortable">
@@ -51,11 +51,12 @@
                 </th>
                 <th class="sortable">
                     <div class="d-inline-block">
+                        <span (click)="sortByPrio()">Priorität: </span>
                         <div ngbDropdown class="d-inline-block">
-                            <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
+                            <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
                             <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                                <option (click)="filterPriority=null">All</option>
-                                <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+                                <option ngbDropdownItem (click)="filterPriority=null">All</option>
+                                <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
                             </div>
                         </div>
                         <span (click)="sortByPrio()">
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index 5c063d4..0a0242a 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -42,18 +42,21 @@
       </th>
       <th class="sortable">
         <div class="d-inline-block">
-          <div ngbDropdown class="d-inline-block">
-              <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
-              <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                  <option (click)="filterPriority=null">All</option>
-                  <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
-              </div>
-          </div>
-          <span (click)="sortByPrio()">
-                  <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
-                  <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
-                  <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
-          </span>
+          <div class="d-inline-block">
+            <span (click)="sortByPrio()">Priorität: </span>
+            <div ngbDropdown class="d-inline-block">
+                <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
+                <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+                    <option ngbDropdownItem (click)="filterPriority=null">All</option>
+                    <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+                </div>
+            </div>
+            <span (click)="sortByPrio()">
+                    <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                    <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                    <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+            </span>
+        </div>
       </div>
       </th>
       <th (click)="sortByCategory()" class="sortable">