KON-652
Signed-off-by: Ina Curdt <Ina.Curdt@pta.de>
diff --git a/i18n/general.de.json b/i18n/general.de.json
index 3856877..582671f 100644
--- a/i18n/general.de.json
+++ b/i18n/general.de.json
@@ -31,6 +31,7 @@
"SubmitBtn": "Ja",
"CancelBtn": "Nein",
"Anonymization": "Wollen Sie diesen Kontakt wirklich anonymisieren? Dieser Vorgang kann nicht rückgängig gemacht werden. Sämtliche zu diesem Kontakt gehörenden Daten werden anonymisiert. Diese Daten können nicht wiederhergestellt werden.",
+ "AnonymizationWithAssignment": "Zu diesem Kontakt existieren aktive Modulzuordnungen. Wollen Sie diesen Kontakt wirklich anonymisieren? Dieser Vorgang kann nicht rückgängig gemacht werden. Sämtliche zu diesem Kontakt gehörenden Daten werden anonymisiert. Diese Daten können nicht wiederhergestellt werden.",
"MainAddressModification": "Es existiert schon eine Hauptadresse. Wollen Sie sie wirklich ändern?",
"Action": {
"delete": "Datensatz löschen",
diff --git a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
index d20b5a1..045e6fb 100644
--- a/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
+++ b/src/app/shared/components/anonymizer/anonymizer.sandbox.ts
@@ -44,19 +44,19 @@
public anonymizeContact(contactId: string): void {
let noExclamationMark: boolean = true;
-
+
this._userModuls.forEach(item => console.log(item.deletionLockUntil));
noExclamationMark = this._userModuls.every(this.hasNoActiveAssignments);
-
+
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.anonymize';
if(noExclamationMark){
modalRef.componentInstance.body = 'ConfirmDialog.Anonymization';
- modalRef.componentInstance.noExclamationMark = true;
+ modalRef.componentInstance.showExclamationMarkIcon = false;
}
else{
modalRef.componentInstance.body = 'ConfirmDialog.AnonymizationWithAssignment';
- modalRef.componentInstance.noExclamationMark = false;
+ modalRef.componentInstance.showExclamationMarkIcon = true;
}
modalRef.result.then(
@@ -71,6 +71,6 @@
let dateNow: number = Date.now();
let dateUntil: number = Date.parse(element.deletionLockUntil)
return dateUntil < dateNow;
-
+
}
}
diff --git a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.html b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.html
index 21cf1fa..5d9af44 100644
--- a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.html
+++ b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.html
@@ -14,17 +14,16 @@
<h4 class="modal-title">{{title | translate}}</h4>
</div>
<div class="modal-body">
- <p *ngIf="!noExclamationMark" class="exclamation-icon">
+ <p *ngIf="showExclamationMarkIcon" class="exclamation-icon">
<i class="fa fa-exclamation fa-5x" aria-hidden="true" ></i>
</p>
- <p float:right>
- {{body | translate}}
-</p>
+ <p class="text-body">
+ {{body | translate}}
+ </p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-danger" (click)="activeModal.close()">{{ 'ConfirmDialog.SubmitBtn' | translate }}</button>
<button type="button" class="btn btn-outline-secondary" (click)="activeModal.dismiss()">{{ 'ConfirmDialog.CancelBtn' | translate }}</button>
-
</div>
diff --git a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.scss b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.scss
index d99a1b9..f82530b 100644
--- a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.scss
+++ b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.scss
@@ -16,4 +16,9 @@
padding-right: 25px;
padding-top: 6%;
float: left;
+}
+
+.body {
+ border-style: none;
+ float: right;
}
\ No newline at end of file
diff --git a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.ts b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.ts
index 4a66dd0..9003da0 100644
--- a/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.ts
+++ b/src/app/shared/components/dialogs/safety-query-dialog/safety-query-dialog.component.ts
@@ -22,11 +22,11 @@
@Input() title;
@Input() body;
- @Input() noExclamationMark;
+ @Input() showExclamationMarkIcon;
constructor(public activeModal: NgbActiveModal) {}
- ngOnInit() {
+ ngOnInit() {
}
}
