diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index b66399de6c..d4cd4ad24f 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -718,6 +718,7 @@ export class EntityService { entityFieldKeys.push(entityFields.email.keyName); entityFieldKeys.push(entityFields.firstName.keyName); entityFieldKeys.push(entityFields.lastName.keyName); + entityFieldKeys.push(entityFields.phone.keyName); break; case EntityType.TENANT: case EntityType.CUSTOMER: diff --git a/ui-ngx/src/app/modules/home/pages/profile/profile.component.html b/ui-ngx/src/app/modules/home/pages/profile/profile.component.html index 3a15616055..bdcee70c67 100644 --- a/ui-ngx/src/app/modules/home/pages/profile/profile.component.html +++ b/ui-ngx/src/app/modules/home/pages/profile/profile.component.html @@ -56,6 +56,11 @@ user.last-name + + language.language diff --git a/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts b/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts index 9e43b369e6..e48471867b 100644 --- a/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts +++ b/ui-ngx/src/app/modules/home/pages/profile/profile.component.ts @@ -63,6 +63,7 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir email: ['', [Validators.required, Validators.email]], firstName: [''], lastName: [''], + phone: [''], language: [''], homeDashboardId: [null], homeDashboardHideToolbar: [true] @@ -87,6 +88,7 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir tenantId: user.tenantId, customerId: user.customerId, email: user.email, + phone: user.phone, firstName: user.firstName, id: user.id, lastName: user.lastName, diff --git a/ui-ngx/src/app/modules/home/pages/user/user.component.html b/ui-ngx/src/app/modules/home/pages/user/user.component.html index 563146d9c9..bd7bb56d99 100644 --- a/ui-ngx/src/app/modules/home/pages/user/user.component.html +++ b/ui-ngx/src/app/modules/home/pages/user/user.component.html @@ -92,6 +92,11 @@ user.last-name + +
user.description diff --git a/ui-ngx/src/app/modules/home/pages/user/user.component.ts b/ui-ngx/src/app/modules/home/pages/user/user.component.ts index 474467fbe7..5c40e66a66 100644 --- a/ui-ngx/src/app/modules/home/pages/user/user.component.ts +++ b/ui-ngx/src/app/modules/home/pages/user/user.component.ts @@ -73,6 +73,7 @@ export class UserComponent extends EntityComponent { email: [entity ? entity.email : '', [Validators.required, Validators.email]], firstName: [entity ? entity.firstName : ''], lastName: [entity ? entity.lastName : ''], + phone: [entity ? entity.phone : ''], additionalInfo: this.fb.group( { description: [entity && entity.additionalInfo ? entity.additionalInfo.description : ''], @@ -91,6 +92,7 @@ export class UserComponent extends EntityComponent { this.entityForm.patchValue({email: entity.email}); this.entityForm.patchValue({firstName: entity.firstName}); this.entityForm.patchValue({lastName: entity.lastName}); + this.entityForm.patchValue({phone: entity.phone}); this.entityForm.patchValue({additionalInfo: {description: entity.additionalInfo ? entity.additionalInfo.description : ''}}); this.entityForm.patchValue({additionalInfo: {defaultDashboardId: entity.additionalInfo ? entity.additionalInfo.defaultDashboardId : null}}); @@ -112,7 +114,7 @@ export class UserComponent extends EntityComponent { verticalPosition: 'bottom', horizontalPosition: 'right' } - )) + )); } } diff --git a/ui-ngx/src/app/shared/models/user.model.ts b/ui-ngx/src/app/shared/models/user.model.ts index 42e6407c12..87be63ef74 100644 --- a/ui-ngx/src/app/shared/models/user.model.ts +++ b/ui-ngx/src/app/shared/models/user.model.ts @@ -24,6 +24,7 @@ export interface User extends BaseData { tenantId: TenantId; customerId: CustomerId; email: string; + phone: string; authority: Authority; firstName: string; lastName: string;