From f09af6f7e2780465539103a2e482d106c5e5b14d Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 3 Jan 2020 16:16:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=A7=81=EB=8F=84=20>=20=EB=B6=80?= =?UTF-8?q?=EC=84=9C=EC=9B=90=20::=20=ED=88=B4=ED=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/organization.component.html | 16 ++++++++++++++++ .../src/lib/protocols/dept-user.ts | 11 ++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) 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 71c6622a..a14d3e17 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 @@ -68,6 +68,14 @@ (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" (contextmenu)="onContextMenuOrgUser($event, userInfo)" + [matTooltip]=" + userInfo.companyName + + ' / ' + + userInfo.lineNumber + + ' / ' + + userInfo.hpNumber + " + matTooltipPosition="after" > @@ -90,6 +98,14 @@ (openProfile)="onClickOpenProfile($event)" (click)="onToggleUser(userInfo)" (contextmenu)="onContextMenuOrgUser($event, userInfo)" + [matTooltip]=" + userInfo.companyName + + ' / ' + + userInfo.lineNumber + + ' / ' + + userInfo.hpNumber + " + matTooltipPosition="after" > 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 d5280462..9ff08006 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 @@ -15,6 +15,7 @@ import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; import { DeptSearchType } from '../types/dept-search.type'; import { CallMode } from '@ucap-webmessenger/core'; import { UserInfoSS } from '../models/user-info-ss'; +import { WorkStatusType } from 'projects/ucap-webmessenger-protocol-status/src/lib/types/work-status.type'; export interface DeptUserRequest extends ProtocolRequest { /** DivCD(s) */ @@ -113,7 +114,15 @@ export const decodeDeptUserData: ProtocolDecoder = ( deptSeq: info[25], isPrivacyAgree: info[26] === 'Y' ? true : false, isValidLogin: info[27] === 'Y' ? true : false, - employeeType: info[28] as EmployeeType + employeeType: info[28] as EmployeeType, + + // [daesang] + companyName: info[29], + responsibilities: info[30], + workstatus: info[31] as WorkStatusType, + job: info[32], + customerInfo: info[33], + workplace: info[34] }); }); return decodeProtocolMessage(message, {