[KON-583] BugFixing
diff --git a/i18n/contacts.de.json b/i18n/contacts.de.json index 2fc1b31..8b4205b 100644 --- a/i18n/contacts.de.json +++ b/i18n/contacts.de.json
@@ -24,6 +24,8 @@ "WithoutModuleAssignment": "Keine Modulzuordnung", "DSGVO-advanced-filter": "DSGVO - Filtererweiterung", "DSGVO-advanced-filter-deletion-lock-exceeded": "Filterung nach Kontakten mit abgelaufener Löschsperre", - "DSGVO-advanced-filter-expiring-data-in-past": "Filterung nach Kontakten mit überschrittenem Ablaufdatum" + "DSGVO-advanced-filter-expiring-data-in-past": "Filterung nach Kontakten mit überschrittenem Ablaufdatum", + "DeleteLockExpired": "Löschsperre abgelaufen", + "ExpieringDateExceed": "Ablaufdatum überschritten" } }
diff --git a/src/app/pages/company/company-details/company-details.resolver.ts b/src/app/pages/company/company-details/company-details.resolver.ts index 53a382b..8e01843 100644 --- a/src/app/pages/company/company-details/company-details.resolver.ts +++ b/src/app/pages/company/company-details/company-details.resolver.ts
@@ -37,6 +37,7 @@ this.companySandbox.loadCompanyAddresses(contactId); this.companySandbox.loadContactPersons(contactId); this.userModuleAssignmentSandbox.loadUserModuleAssignments(contactId); + this.userModuleAssignmentSandbox.loadFilteredUserModuleTypes(); } else { this.companySandbox.clearCompany(); }
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 2524723..5ee3de8 100644 --- a/src/app/pages/contacts/contacts-list/contacts-list.component.html +++ b/src/app/pages/contacts/contacts-list/contacts-list.component.html
@@ -21,6 +21,7 @@ type="text" class="item" id="search-text" + style="position: 0px;font-size: 13px; line-height:21px; color: #495057;" placeholder="Suche" (keyup)="setModifiedContactsSearchText($event.target.value); searchContacts($event)" /> @@ -41,6 +42,7 @@ <div class="dsgvo-filter-container search-btn"> <button type="button" + style="color: #495057;" class="btn btn-default btn-sm" (click)="isDSGVOFilterAdvancedVisible = !isDSGVOFilterAdvancedVisible" title="{{ 'Contacts.DSGVO-advanced-filter' | translate }}" @@ -62,24 +64,39 @@ <div class="dsgvo-filter-item custom-control custom-switch" title="{{ 'Contacts.DSGVO-advanced-filter-expiring-data-in-past' | translate }}"> <input type="checkbox" class="custom-control-input" id="expiry-date" (change)="setModifiedContactsExpiryDateFilter(); searchContacts($event)" /> - <label class="custom-control-label" style="position: 0px;" for="expiry-date"></label> + <label + class="custom-control-label" + style="position: 0px;font-size: 13px; white-space: nowrap; line-height:21px; color: #495057;" + for="expiry-date" + > + {{ 'Contacts.ExpieringDateExceed' | translate }}</label + > </div> - <div class="dsgvo-filter-item custom-control custom-switch" title="{{ 'Contacts.DSGVO-advanced-filter-deletion-lock-exceeded' | translate }}"> + <div + class="dsgvo-filter-item custom-control custom-switch" + style="margin-left:21px; " + title="{{ 'Contacts.DSGVO-advanced-filter-deletion-lock-exceeded' | translate }}" + > <input type="checkbox" class="custom-control-input" id="deletion-lock-until" (change)="setModifiedContactsDeletionLockExceedFilter(); searchContacts($event)" /> - <label class="custom-control-label" for="deletion-lock-until"></label> + <label + class="custom-control-label" + for="deletion-lock-until" + style="position: 0px;font-size: 13px; white-space: nowrap;line-height:21px; color: #495057;" + >{{ 'Contacts.DeleteLockExpired' | translate }}</label + > </div> </div> </div> <div class="search-btn"> <button type="button" class="btn btn-default btn-sm" (click)="searchContacts($event)" title="suchen"> - <em class="fa fa-search fa-lg " aria-hidden="true "></em> + <em style="color: #495057;" class="fa fa-search fa-lg " aria-hidden="true "></em> </button> </div> </div>
diff --git a/src/app/shared/components/anonymizer/anonymizer.component.ts b/src/app/shared/components/anonymizer/anonymizer.component.ts index b843de9..7dc2348 100644 --- a/src/app/shared/components/anonymizer/anonymizer.component.ts +++ b/src/app/shared/components/anonymizer/anonymizer.component.ts
@@ -11,22 +11,24 @@ * SPDX-License-Identifier: EPL-2.0 ********************************************************************************/ import { AnonymizerSandbox } from '@shared/components/anonymizer/anonymizer.sandbox'; -import { Component, Input } from '@angular/core'; +import { Component, Input, OnInit, OnDestroy } from '@angular/core'; @Component({ selector: 'app-anonymizer', templateUrl: './anonymizer.component.html', styleUrls: ['./anonymizer.component.scss'], }) -export class AnonymizerComponent { +export class AnonymizerComponent implements OnInit, OnDestroy { @Input() contactId: string; constructor(private _sandbox: AnonymizerSandbox) {} - public anonymizeContact() { + public anonymizeContact(): void { this._sandbox.anonymizeContact(this.contactId); } - + ngOnInit() { + this._sandbox.init(); + } ngOnDestroy() { this._sandbox.endSubscriptions(); this.contactId = null;
diff --git a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts index 15084e4..f6898bd 100644 --- a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts +++ b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
@@ -25,6 +25,8 @@ export class AnonymizerSandbox extends BaseSandbox { constructor(protected appState$: Store<store.State>, protected actionsSubject: ActionsSubject, protected router: Router, protected modalService: NgbModal) { super(appState$); + } + public init() { this.actionsSubject.pipe(ofType(contactsActions.anonymizeContactSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => { this.router.navigateByUrl(`/overview`); });
diff --git a/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts b/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts index a48f908..915fe65 100644 --- a/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts +++ b/src/app/shared/components/list-details-view/user-module-assignment/user-module-assignment.sandbox.ts
@@ -53,14 +53,12 @@ protected modalService: NgbModal ) { super(appState$); - this.loadFilteredUserModuleTypes(); } public dateValueConverter: NgrxValueConverter<Date | null | Moment, string | null> = dateValueConverter; public loadUserModuleAssignments(contactId: string): void { this.contactId = contactId; - this.actionsSubject .pipe( ofType(userModuleAssignmentActions.loadFilteredUserModuleTypesSuccess),