This commit is contained in:
Chneemann 2024-05-18 11:54:42 +02:00
parent 211b68b41c
commit e7b950c246
5 changed files with 46 additions and 21 deletions

View file

@ -5,7 +5,7 @@
</p> </p>
<div class="btns"> <div class="btns">
<div class="btn"> <div class="btn">
<div class="btn-cancle" (click)="deleteCancle()"> <div class="btn-cancle" (click)="cancelDeleteContact()">
{{ "contactDeleteDialog.btnCancle" | translate }} {{ "contactDeleteDialog.btnCancle" | translate }}
</div> </div>
</div> </div>

View file

@ -43,7 +43,7 @@ export class ContactDeleteComponent {
}); });
} }
deleteCancle() { cancelDeleteContact() {
this.sharedService.isDeleteContactDialogOpen = false; this.sharedService.isDeleteContactDialogOpen = false;
if (!this.sharedService.isEditContactDialogOpen) { if (!this.sharedService.isEditContactDialogOpen) {
this.sharedService.isAnyDialogOpen = false; this.sharedService.isAnyDialogOpen = false;

View file

@ -18,12 +18,19 @@
}" }"
> >
<div class="initials"> <div class="initials">
{{ firebaseService.getUserDetails(currentUserId, "initials") }} @if (!userInitials) {
{{ firebaseService.getUserDetails(currentUserId, "initials") }} }
@else {
{{ userInitials }}
}
</div> </div>
</div> </div>
</div> </div>
<div class="form"> <div class="form">
<app-contact-form [currentUserId]="currentUserId"></app-contact-form> <app-contact-form
(inititalsEmitter)="inititalsEmitter($event)"
[currentUserId]="currentUserId"
></app-contact-form>
</div> </div>
</div> </div>
</div> </div>

View file

@ -84,8 +84,9 @@
} @else { @if (email.touched && } @else { @if (email.touched &&
!checkIfUserEmailIsValid(contactData.email)) { !checkIfUserEmailIsValid(contactData.email)) {
<p>{{ "contactDialogForm.invalidMail1" | translate }}</p> <p>{{ "contactDialogForm.invalidMail1" | translate }}</p>
} @else { @if (existEmailonServer(contactData.email).length > 0) { } @else { @if (existEmailonServer(contactData.email).length > 0 &&
<p>{{ "regiscontactDialogFormter.invalidMail2" | translate }}</p> !contactData.email) {
<p>{{ "contactDialogForm.invalidMail2" | translate }}</p>
} } } } } }
</div> </div>
<input <input

View file

@ -38,6 +38,7 @@ export class ContactFormComponent implements OnInit, OnChanges {
lastName: '', lastName: '',
email: '', email: '',
phone: '', phone: '',
initials: '',
}; };
userData: User = { userData: User = {
@ -69,25 +70,31 @@ export class ContactFormComponent implements OnInit, OnChanges {
} }
updateFormData() { updateFormData() {
if (!this.currentUserId) {
this.updateInitials(); this.updateInitials();
this.updateUserData(); this.updateUserData();
} }
}
updateInitials() { updateInitials() {
const initials = this.contactData const initials = this.contactData
? this.contactData.firstName.slice(0, 1).toUpperCase() + ? this.contactData.firstName.slice(0, 1).toUpperCase() +
this.contactData.lastName.slice(0, 1).toUpperCase() this.contactData.lastName.slice(0, 1).toUpperCase()
: ''; : '';
if (!this.currentUserId) {
this.userData = { this.userData = {
...this.userData, ...this.userData,
initials: initials, initials: initials,
}; };
} else {
this.contactData = {
...this.contactData,
initials: initials,
};
}
this.inititalsEmitter.emit(initials); this.inititalsEmitter.emit(initials);
} }
updateUserData() { updateUserData() {
if (!this.currentUserId) {
this.userData = { this.userData = {
...this.userData, ...this.userData,
firstName: this.capitalizeFirstLetter(this.contactData.firstName), firstName: this.capitalizeFirstLetter(this.contactData.firstName),
@ -95,6 +102,13 @@ export class ContactFormComponent implements OnInit, OnChanges {
email: this.contactData.email, email: this.contactData.email,
phone: this.contactData.phone, phone: this.contactData.phone,
}; };
} else {
this.contactData = {
...this.contactData,
firstName: this.capitalizeFirstLetter(this.contactData.firstName),
lastName: this.capitalizeFirstLetter(this.contactData.lastName),
};
}
} }
capitalizeFirstLetter(name: string) { capitalizeFirstLetter(name: string) {
@ -130,6 +144,9 @@ export class ContactFormComponent implements OnInit, OnChanges {
this.contactData.phone = this.firebaseService this.contactData.phone = this.firebaseService
.getUserDetails(this.currentUserId, 'phone') .getUserDetails(this.currentUserId, 'phone')
.join(', '); .join(', ');
this.contactData.initials = this.firebaseService
.getUserDetails(this.currentUserId, 'initials')
.join(', ');
} }
onSubmit(ngForm: NgForm) { onSubmit(ngForm: NgForm) {