diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index cd36a8e1..a96b87a4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -80,13 +80,7 @@ (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" (contextmenu)="onContextMenuOrgUser($event, userInfo)" - [matTooltip]=" - userInfo.companyName + - ' / ' + - userInfo.lineNumber + - ' / ' + - userInfo.hpNumber - " + [matTooltip]="getTooltip(userInfo)" matTooltipPosition="after" > @@ -110,13 +104,7 @@ (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" (contextmenu)="onContextMenuOrgUser($event, userInfo)" - [matTooltip]=" - userInfo.companyName + - ' / ' + - userInfo.lineNumber + - ' / ' + - userInfo.hpNumber - " + [matTooltip]="getTooltip(userInfo)" matTooltipPosition="after" > diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 7f3c1029..ae643136 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -64,6 +64,7 @@ import { SelectedUserListDialogData } from '../../dialogs/organization/selected-user-list.dialog.component'; import { TranslateService } from '@ngx-translate/core'; +import { StringFormatterPhonePipe } from 'projects/ucap-webmessenger-ui/src/lib/pipes/string.pipe'; @Component({ selector: 'app-layout-chat-left-sidenav-organization', @@ -604,4 +605,12 @@ export class OrganizationComponent break; } } + + getTooltip(userInfo: UserInfoSS): string { + return `${ + userInfo.companyName + } / ${new StringFormatterPhonePipe().transform( + userInfo.lineNumber + )} / ${new StringFormatterPhonePipe().transform(userInfo.hpNumber)}`; + } } diff --git a/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts b/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts index cafa3318..385d0223 100644 --- a/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts +++ b/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts @@ -127,7 +127,7 @@ export const environment: Environment = { hostConfig: { protocol: 'http', domain: '15.164.139.105', - port: 9098 + port: 9097 }, urls: messageApiUrls }, diff --git a/projects/ucap-webmessenger-daesang/src/lib/protocols/data-user.ts b/projects/ucap-webmessenger-daesang/src/lib/protocols/data-user.ts index 50f02885..71fdb1cc 100644 --- a/projects/ucap-webmessenger-daesang/src/lib/protocols/data-user.ts +++ b/projects/ucap-webmessenger-daesang/src/lib/protocols/data-user.ts @@ -68,12 +68,12 @@ export const decodeDataUser: ProtocolDecoder = ( employeeType: info[28] as EmployeeType, // [daesang] - companyName: info[29], - responsibilities: info[30], + companyName: !!info[29] ? info[29].trim() : '', + responsibilities: !!info[30] ? info[30].trim() : '', workstatus: info[31] as WorkStatusType, - job: info[32], - customerInfo: info[33], - workplace: info[34] + job: !!info[32] ? info[32].trim() : '', + customerInfo: !!info[33] ? info[33].trim() : '', + workplace: !!info[34] ? info[34].trim() : '' }; } return decodeProtocolMessage(message, { diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts index f2a2a3ae..f8b67aba 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts @@ -117,12 +117,12 @@ export const decodeDeptUserData: ProtocolDecoder = ( employeeType: info[28] as EmployeeType, // [daesang] - companyName: info[29], - responsibilities: info[30], + companyName: !!info[29] ? info[29].trim() : '', + responsibilities: !!info[30] ? info[30].trim() : '', workstatus: info[31] as WorkStatusType, - job: info[32], - customerInfo: info[33], - workplace: info[34] + job: !!info[32] ? info[32].trim() : '', + customerInfo: !!info[33] ? info[33].trim() : '', + workplace: !!info[34] ? info[34].trim() : '' }); }); return decodeProtocolMessage(message, { diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index 99fd0666..82646bc9 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -170,11 +170,11 @@
{{ 'profile.fieldworkplace' | translate }}
{{ userInfo.workplace | ucapStringEmptycheck }}
-
  • +
  • {{ 'profile.fieldJob' | translate }}
    {{ userInfo.job | ucapStringEmptycheck }}
  • -
  • +
  • {{ 'profile.fieldCustomerInfo' | translate }}
    {{ userInfo.customerInfo | ucapStringEmptycheck }}