commit 492ba6b14f48d902686c82206b52e1b97fba1505
author Dennis Schmitt <dennis.schmitt@pta.de> Thu Feb 27 09:35:17 2020 +0100
committer Dennis Schmitt <dennis.schmitt@pta.de> Thu Feb 27 09:35:17 2020 +0100
tree fcd9add81fa96f7c519bb9a8158e28c0199b234f
parent 075de8a84c627550131010eab14b16a292638593

[KON-685]: Remove sorting by street
[KON-682]: Reset DSGVO-filter after close

Signed-off-by: Dennis Schmitt <dennis.schmitt@pta.de>

src/app/pages/contacts/contacts-list/contacts-list.component.html

diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.html b/src/app/pages/contacts/contacts-list/contacts-list.component.html
index 37e26c1..317039b 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.html
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.html
@@ -116,7 +116,6 @@
           <option value="name">{{ 'Contacts.Name' | translate }}</option>
           <option value="contactType">{{ 'Contacts.ContactType' | translate }}</option>
           <option value="note">{{ 'Contacts.Note' | translate }}</option>
-          <option value="street">{{ 'Contacts.Street' | translate }}</option>
           <option value="community">{{ 'Contacts.Community' | translate }}</option>
           <option value="department">{{ 'Contacts.Department' | translate }}</option>
           <option value="" selected>{{ 'NoSorting' | translate }}</option>

src/app/pages/contacts/contacts-list/contacts-list.component.ts

diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.ts b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
index 7a631da..f3bfda1 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.ts
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.ts
@@ -205,7 +205,7 @@
     sessionStorage.setItem(Globals.SESSSION_STORAGE_KEYS.contactListSearchFilterKey, JSON.stringify(this.modifiedContacts));
   }
 
-  public showAdvancedDSGVOFilter() {
+  public setDSGVOFilterAdvancedVisible() {
     this.isDSGVOFilterAdvancedVisible = !this.isDSGVOFilterAdvancedVisible;
     if (
       !this.isDSGVOFilterAdvancedVisible &&
@@ -216,6 +216,8 @@
     ) {
       this._resetDSGVOFilter();
     }
+    this.modifiedContacts.isDSGVOFilterAdvancedVisible = this.isDSGVOFilterAdvancedVisible;
+    sessionStorage.setItem(Globals.SESSSION_STORAGE_KEYS.contactListSearchFilterKey, JSON.stringify(this.modifiedContacts));
   }
 
   private _resetDSGVOFilter() {
@@ -239,12 +241,6 @@
     }
   }
 
-  public setDSGVOFilterAdvancedVisible() {
-    this.isDSGVOFilterAdvancedVisible = !this.isDSGVOFilterAdvancedVisible;
-    this.modifiedContacts.isDSGVOFilterAdvancedVisible = this.isDSGVOFilterAdvancedVisible;
-    sessionStorage.setItem(Globals.SESSSION_STORAGE_KEYS.contactListSearchFilterKey, JSON.stringify(this.modifiedContacts));
-  }
-
   ngOnDestroy() {
     this._subscription.unsubscribe();
   }