Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/store/messenger/status/reducers.ts

@@ -48,8 +48,18 @@ export const reducer = createReducer(
   }),
 
   on(statusSuccess, (state, action) => {
+    const statusBulkInfoState: StatusBulkInfo = {
+      ...state.statusBulkInfo.entities[action.res.SENDER_SEQ],
+      pcStatus: action.res.statusType,
+      statusMessage: action.res.statusMessage
+    };
+
     return {
       ...state,
+      statusBulkInfo: adapterStatusBulkInfo.updateOne(
+        { id: action.res.SENDER_SEQ, changes: statusBulkInfoState },
+        { ...state.statusBulkInfo }
+      ),
       myStatus: {
         ...state.myStatus,
         pcStatus: action.res.statusType,

projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html

@@ -1,7 +1,13 @@
 <!--체크박스 보여줄때는 <div class="list-item checkbox" matRipple>  클래스에 checkbox만 추가-->
 <div class="list-item checkbox" *ngIf="userInfo" matRipple>
   <!--pcOn , pcOut  pcOff , pcOther-->
-  <span class="presence" [ngClass]="getPresence(PresenceType.PC)"> </span>
+  <span
+    class="presence"
+    [ngClass]="getPresence(PresenceType.PC)"
+    [matTooltip]="getPresenceMsg()"
+    matTooltipPosition="after"
+  >
+  </span>
   <dl class="item-default">
     <dt>
       <div class="thumbnail-mask">

projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts

@@ -96,6 +96,17 @@ export class UserListItemComponent implements OnInit {
 
     return rtnClass;
   }
+  getPresenceMsg(): string {
+    if (
+      !!this.presence &&
+      !!this.presence.statusMessage &&
+      this.presence.statusMessage !== '.'
+    ) {
+      return this.presence.statusMessage;
+    } else {
+      return '';
+    }
+  }
 
   /** 리스트가 checkable 할 경우 checkbox 의 change 이벤트를 상위 컴포넌트로 전달한다. */
   onChangeCheck(

projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.html

@@ -32,6 +32,8 @@
                 <span
                   class="presence"
                   [ngClass]="getPresence(element, PresenceType.PC)"
+                  [matTooltip]="getPresenceMsg(element)"
+                  matTooltipPosition="after"
                 ></span>
                 <span class="thumbnail-mask">
                   <img

projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts

@@ -130,6 +130,21 @@ export class IntegratedSearchComponent implements OnInit {
 
     return rtnClass;
   }
+  getPresenceMsg(userInfo: UserInfoSS): string {
+    const presences = this.presence.filter(p => p.userSeq === userInfo.seq);
+
+    if (!!presences && presences.length > 0) {
+      const presence = presences[0];
+      if (
+        !!presence &&
+        !!presence.statusMessage &&
+        presence.statusMessage !== '.'
+      ) {
+        return presence.statusMessage;
+      }
+    }
+    return '';
+  }
   getWorkstatusInfo(userInfo: UserInfoSS, type: string): string {
     let workstatus = userInfo.workstatus;