From 1835967da91223c050add8810582bd21a384afdc Mon Sep 17 00:00:00 2001
From: Max Ehrlicher-Schmidt <maxes2000@t-online.de>
Date: Thu, 19 Nov 2020 12:15:43 +0100
Subject: [PATCH] Improve filters

---
 src/app/pages/tables/bikes/bikes.component.html | 2 +-
 src/app/pages/tables/bikes/bikes.component.ts   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/tables/bikes/bikes.component.html b/src/app/pages/tables/bikes/bikes.component.html
index 4af4d67..61e0afb 100644
--- a/src/app/pages/tables/bikes/bikes.component.html
+++ b/src/app/pages/tables/bikes/bikes.component.html
@@ -188,7 +188,7 @@
             class="button-wrapper"
             *ngIf="element.newObject"
             [matTooltip]="
-              'Nicht ausgefüllte Felder: ' + countUnvalidFields(element)
+              'Nicht ausgefüllte Pflichtfelder (rot): ' + countUnvalidFields(element)
             "
           >
             <button
diff --git a/src/app/pages/tables/bikes/bikes.component.ts b/src/app/pages/tables/bikes/bikes.component.ts
index 0d125a9..d0902db 100644
--- a/src/app/pages/tables/bikes/bikes.component.ts
+++ b/src/app/pages/tables/bikes/bikes.component.ts
@@ -284,7 +284,7 @@ export class BikesComponent {
 
   addNewObject() {
     this.paginator.firstPage();
-    this.resetFilter();
+    this.setFilter({...this.filter, includesString: ""});
     this.resetSorting();
     this.data.data = [
       { newObject: true, id: this.getNewId() },
@@ -382,6 +382,7 @@ export class BikesComponent {
 
   showOnlyUnsavedElements(value: boolean) {
     this.filter.onlyUnsaved = value;
+    this.filter.includesString = "";
     this.applyFilter();
   }
 
@@ -392,8 +393,8 @@ export class BikesComponent {
     } as unknown) as string;
   }
 
-  resetFilter() {
-    this.filter = this.initialFilter;
+  setFilter(filterObject) {
+    this.filter = filterObject;
     this.applyFilter();
   }