From 831283c10a824e1f7821e8b37e1f994f606e206d Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 10 Jan 2020 15:57:12 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=EC=98=B5=EC=85=98=ED=99=94=20/=20=EC=A7=81?=
 =?UTF-8?q?=EB=AC=B4,=20=EA=B1=B0=EB=9E=98=EC=B2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../left-sidenav/organization.component.html     | 16 ++--------------
 .../left-sidenav/organization.component.ts       |  9 +++++++++
 .../src/environments/environment.daesang.dev.ts  |  2 +-
 .../src/lib/protocols/data-user.ts               | 10 +++++-----
 .../src/lib/protocols/dept-user.ts               | 10 +++++-----
 .../src/lib/components/profile.component.html    |  4 ++--
 6 files changed, 24 insertions(+), 27 deletions(-)

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"
         >
         </ucap-profile-user-list-item>
@@ -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"
         >
         </ucap-profile-user-list-item>
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<DataUserResponse> = (
       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<DeptUserData> = (
       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 @@
         <dt>{{ 'profile.fieldworkplace' | translate }}</dt>
         <dd>{{ userInfo.workplace | ucapStringEmptycheck }}</dd>
       </li>
-      <li>
+      <li *ngIf="userInfo.job">
         <dt class="division">{{ 'profile.fieldJob' | translate }}</dt>
         <dd>{{ userInfo.job | ucapStringEmptycheck }}</dd>
       </li>
-      <li>
+      <li *ngIf="userInfo.customerInfo">
         <dt>{{ 'profile.fieldCustomerInfo' | translate }}</dt>
         <dd>{{ userInfo.customerInfo | ucapStringEmptycheck }}</dd>
       </li>