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

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts

@@ -137,7 +137,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
           for (const ru of roomUserShort) {
             for (const u of ru.userInfos) {
               if (u.seq !== this.loginRes.userSeq) {
-                if (!!u.name && '' !== u.name.trim()) {
+                if (!!u.name && '' !== u.name.trim() && u.isJoinRoom) {
                   recommendedWordList.push(u.name);
                 }
               }
@@ -285,7 +285,9 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
         value => roomInfo.roomSeq === value.roomSeq
       );
       if (-1 < i) {
-        return this.roomUserShortList[i].userInfos;
+        return this.roomUserShortList[i].userInfos.filter(
+          user => user.isJoinRoom
+        );
       }
     }
   }

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts

@@ -608,6 +608,10 @@ export class OrganizationComponent
     event.preventDefault();
     event.stopPropagation();
 
+    if (userInfo.seq === this.loginRes.userSeq) {
+      return;
+    }
+
     this.orgUserContextMenuPosition.x = event.clientX + 'px';
     this.orgUserContextMenuPosition.y = event.clientY + 'px';
     this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse');

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html

@@ -1,4 +1,4 @@
-<mat-card class="confirm-card mat-elevation-z">
+<mat-card class="confirm-card mat-elevation-z dialog-creat-chat">
   <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
     <mat-card-title>{{ data.title }}</mat-card-title>
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
@@ -59,7 +59,9 @@
                 <path d="M23 21v-2a4 4 0 0 0-3-3.87"></path>
                 <path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
               </svg>-->
-              <button class="icon-button"><i class="mid mid-24 mdi-account-multiple"></i></button>
+              <button class="icon-button">
+                <i class="mid mid-24 mdi-account-multiple"></i>
+              </button>
             </ng-template>
             <div class="mat-tab-frame">
               <div>
@@ -88,6 +90,7 @@
                   <ucap-profile-user-list-item
                     *ucapGroupExpansionPanelItem="let userInfo"
                     [userInfo]="userInfo"
+                    [showPresence]="false"
                     [sessionVerinfo]="sessionVerinfo"
                     [selectedUserList]="selectedUserList"
                     [isChecked]="getCheckedUser(userInfo)"
@@ -123,6 +126,7 @@
                 <ucap-profile-user-list-item
                   *ngFor="let userInfo of searchUserInfos"
                   [userInfo]="userInfo"
+                  [showPresence]="false"
                   [sessionVerinfo]="sessionVerinfo"
                   [selectedUserList]="selectedUserList"
                   [isChecked]="getCheckedUser(userInfo)"
@@ -141,7 +145,9 @@
                 matTooltip="{{ 'organization.chart' | translate }}"
                 matTooltipPosition="after"
                 >device_hub</mat-icon>-->
-                <button class="icon-button"><i class="mid mid-24 mdi-file-tree"></i></button>
+              <button class="icon-button">
+                <i class="mid mid-24 mdi-file-tree"></i>
+              </button>
             </ng-template>
             <div>
               <app-layout-chat-left-sidenav-organization
@@ -165,8 +171,7 @@
                 matTooltipPosition="before"
                 class="icon-button"
                 ><i class="mid mid-24 mdi-chat"></i>
-                </mat-icon
+              </mat-icon>
-              >
             </ng-template>
             <div>
               <ucap-room-list-item

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

@@ -168,6 +168,10 @@
   </mat-card-header>
 
   <mat-card-content>
+    <button class="icon-button btn-dialog-close" (click)="onClose()">
+      <i class="mdi mdi-window-close"></i>
+    </button>
+
     <ul class="userInfo-list">
       <li class="company">
         <dt class="division">{{ 'profile.fieldCompany' | translate }}</dt>
@@ -384,8 +388,4 @@
       </div>
     </mat-card-actions>
   </mat-card-content>
-
-  <button class="icon-button btn-dialog-close" (click)="onClose()">
-    <i class="mdi mdi-window-close"></i>
-  </button>
 </mat-card>

projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss

@@ -1,3 +1,16 @@
+$desktop-l-width: 1440px;
+$tablet-l-width: 1024px;
+$tablet-s-width: 768px;
+$mob-l-width: 640px;
+$login-max-height: 800px;
+// 태블릿
+
+@mixin tab {
+  @media screen and (max-width: #{$tablet-l-width}) {
+    @content;
+  }
+}
+
 @mixin ellipsis($row) {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -22,7 +35,7 @@
   display: flex;
   flex-flow: row;
   flex: 0 0 auto;
-  width: 700px;
+  width: 100%;
   height: 450px;
   position: relative;
   padding: 0;
@@ -30,7 +43,7 @@
     position: relative;
     justify-content: flex-start;
     flex-flow: column;
-    width: 260px;
+    width: 38%;
     height: 100%;
     background: #64cddf;
     color: #ffffff;
@@ -150,9 +163,9 @@
   }
   .mat-card-content {
     position: relative;
-    width: 440px;
+    width: 62%;
     height: 100%;
-    padding: 10px 0;
+    padding-bottom: 10px;
     margin-left: 30px;
     ul {
       display: flex;
@@ -260,10 +273,13 @@
     justify-content: center;
     align-self: center;
     margin-left: 8px;
+    display: inline-flex;
+    @media screen and (max-width: #{$tablet-s-width}) {
+      display: none;
+    }
   }
 }
 
-
 .btn-dialog-close {
-
+  margin-left: auto;
-}
+}

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

@@ -3,6 +3,7 @@
   <!--pcOn , pcOut  pcOff , pcOther-->
   <span
     class="presence"
+    *ngIf="showPresence"
     [ngClass]="getPresence(PresenceType.PC)"
     [matTooltip]="getPresenceMsg()"
     matTooltipPosition="after"

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

@@ -35,6 +35,8 @@ export class UserListItemComponent implements OnInit {
   @Input()
   presence: StatusBulkInfo | StatusInfo;
   @Input()
+  showPresence = true;
+  @Input()
   checkable = false;
   @Input()
   checkDisabled = false;
@@ -77,21 +79,19 @@ export class UserListItemComponent implements OnInit {
         break;
     }
 
-    if (!!status) {
+    switch (status) {
-      switch (status) {
+      case StatusCode.OnLine:
-        case StatusCode.OnLine:
+        rtnClass = type + 'On';
-          rtnClass = type + 'On';
+        break;
-          break;
+      case StatusCode.Away:
-        case StatusCode.Away:
+        rtnClass = type + 'Out';
-          rtnClass = type + 'Out';
+        break;
-          break;
+      case StatusCode.Busy:
-        case StatusCode.Busy:
+        rtnClass = type + 'Other';
-          rtnClass = type + 'Other';
+        break;
-          break;
+      default:
-        default:
+        rtnClass = type + 'Off';
-          rtnClass = type + 'Off';
+        break;
-          break;
-      }
     }
 
     return rtnClass;

projects/ucap-webmessenger-ui/src/assets/scss/partials/_dialogs.scss

@@ -1,24 +1 @@
-/*.dialog-org {
+$tablet-s-width: 768px;
-  .oraganization-tab {
-    width: 100%;
-    height:380px;
-    border-bottom: 1px solid #dddddd;
-    .oraganization-tab-tree {
-      display: inline-flex;
-      width: 50%;
-      height:100%;
-      border-right: 1px solid #dddddd;
-      overflow: auto;
-    }
-    .select-list {
-      display: inline-flex;
-      flex-direction: column;
-      width: 50%;
-      height:100%;
-      overflow: auto;
-      .search-list {
-        overflow: auto;
-      }
-    }
-  }
-}*/