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

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss

@@ -77,14 +77,14 @@
     width: 100%;
 
     .mat-tab-header {
-      width: 160px;
+      width: 170px;
       flex-flow: column;
       border-right: 1px solid #dddddd;
       .mat-tab-label-container {
         .mat-tab-list {
           .mat-tab-labels {
             border-bottom: 0;
-            padding-right: 10px;
+            //padding-right: 10px;
             .mat-tab-label {
               padding: 0 10px;
             }

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

@@ -13,7 +13,7 @@
   <mat-card-content>
     <div fxFlex class="setting-tab">
       <mat-tab-group animationDuration="0ms">
-        <mat-tab>
+        <mat-tab class="setting">
           <ng-template mat-tab-label>
             <span class="mdi mdi-settings"></span>
             {{ 'settings.typeGenernal' | translate }}
@@ -36,7 +36,7 @@
             class="setting-category"
           ></ucap-settings-privacy>
         </mat-tab> -->
-        <mat-tab>
+        <mat-tab class="setting">
           <ng-template mat-tab-label>
             <span class="mdi mdi-bell"></span>
             {{ 'settings.typeNotification' | translate }}
@@ -72,7 +72,7 @@
           </ng-template>
           <ucap-settings-call class="setting-category"></ucap-settings-call>
         </mat-tab> -->
-        <mat-tab>
+        <mat-tab class="setting">
           <ng-template mat-tab-label>
             <span class="mdi mdi-chat"></span>
             {{ 'settings.typeChat' | translate }}

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss

@@ -1,4 +1,4 @@
-::ng-deep .setting-frame {
+.setting-frame {
   padding: 16px;
   height: 100%;
   min-width: 500px;
@@ -33,23 +33,11 @@
       width: 100%;
       height: 100%;
       .mat-tab-group {
+        display: flex;
         flex-direction: row;
-        .mat-tab-header {
+        position: relative;
-          width: 160px;
+        height: 100%;
-          .mat-tab-labels {
+        width: 100%;
-            flex-direction: column;
-            .mat-tab-label {
-              padding: 0 10px;
-              align-content: flex-start;
-              text-align: left;
-              align-items: center;
-              justify-content: flex-start;
-            }
-          }
-          .mat-ink-bar {
-            display: none;
-          }
-        }
       }
     }
   }
@@ -65,21 +53,46 @@
   }
 }
 
-::ng-deep .setting-tab {
+.setting-category {
-  .mat-tab-group {
+}
-    position: relative;
-    height: 100%;
-    width: 100%;
 
+::ng-deep .setting-tab {
+  .mat-tab-header {
+    border: none !important;
+    .mat-tab-labels {
+      flex-direction: column;
+      border: none;
+      .mat-tab-label {
+        padding: 0 10px;
+        align-content: flex-start;
+        text-align: left;
+        align-items: center;
+        justify-content: flex-start;
+      }
+    }
+    .mat-ink-bar {
+      display: none;
+    }
+  }
+
+  .mat-tab-body-wrapper {
+    flex: 1 1 auto;
+    border-left: 1px solid #dddddd;
+  }
+}
+
+/*::ng-deep .setting-tab {
+  .mat-tab-group {
     .mat-tab-header {
       width: 160px;
       flex-flow: column;
+      flex: 0 0 auto;
       border-right: 1px solid #dddddd;
       .mat-tab-label-container {
         .mat-tab-list {
           .mat-tab-labels {
             border-bottom: 0;
-            padding-right: 10px;
+            //padding-right: 10px;
             .mat-tab-label {
               padding: 0 10px;
             }
@@ -120,3 +133,4 @@
     }
   }
 }
+*/

projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss

@@ -62,7 +62,7 @@
 ::ng-deep .mat-tab-labels {
   display: flex;
   width: 100%;
-  border-bottom: 2px solid #dddddd;
+  //border-bottom: 2px solid #dddddd;
   flex: 1 1 auto;
   justify-content: space-around;
 }

projects/ucap-webmessenger-app/src/app/services/notification.service.ts

@@ -661,24 +661,9 @@ export class AppNotificationService {
                 >(KEY_APP_USER_INFO, environment.customConfig.appKey);
 
                 const modifiedSettings: Settings = clone(appUserInfo.settings);
-                modifiedSettings.notification.method = noti.notificationMethod;
+                // 모바일에서 해당 값만 수정함.
-                modifiedSettings.notification.method = noti.notificationMethod0;
                 modifiedSettings.notification.receiveForMobile =
                   noti.mobileNotification;
-                modifiedSettings.notification.use = noti.receiveNotification;
-                modifiedSettings.notification.alertExposureTime =
-                  noti.notificationExposureTime;
-
-                modifiedSettings.chat.fontFamily = noti.fontFamily;
-                modifiedSettings.chat.fontSize = noti.fontSize;
-
-                modifiedSettings.presence.absenceTime = noti.absenceTime;
-
-                modifiedSettings.general.timezone = noti.timeZone;
-                modifiedSettings.general.locale = noti.menuLanguage;
-                modifiedSettings.general.hrInfoLocale =
-                  noti.hrInformationLanguage;
-
                 appUserInfo.settings = modifiedSettings;
 
                 this.localStorageService.encSet<AppUserInfo>(

projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts

@@ -178,10 +178,6 @@ export class MessagesComponent implements OnInit, OnDestroy {
       this.loginRes = loginRes;
     });
     this.roomInfoSubscription = this.roomInfo$.subscribe(roomInfo => {
-      if (!this.roomInfo || this.roomInfo.roomSeq !== roomInfo.roomSeq) {
-        this.baseEventSeq = 0;
-      }
-
       this.roomInfo = roomInfo;
       this.showMore = false;
 
@@ -196,7 +192,11 @@ export class MessagesComponent implements OnInit, OnDestroy {
       this.firstCheckReadHere = true;
       /** [E] initializing by changed room */
 
-      if (!this.roomInfo || this.roomInfo.roomSeq !== roomInfo.roomSeq) {
+      if (
+        !this.roomInfo ||
+        (!!this.roomInfo && this.roomInfo.roomSeq !== roomInfo.roomSeq)
+      ) {
+        this.baseEventSeq = 0;
         this.initEventMore();
       }
     });

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

@@ -59,6 +59,7 @@
       <span class="number">{{ userInfo.employeeNum }}</span>
     </mat-card-title>
     <mat-card-subtitle>
+      <span class="company">{{ userInfo.companyName | ucapStringEmptycheck }}</span>
       <span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span>
       <span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span>
     </mat-card-subtitle>
@@ -177,6 +178,14 @@
         <dt class="division">{{ 'profile.fieldCompany' | translate }}</dt>
         <dd>{{ userInfo.companyName | ucapStringEmptycheck }}</dd>
       </li>
+      <li class="deptName">
+        <dt class="division">{{ 'search.fieldDeptartment' | translate }}</dt>
+        <dd>{{ userInfo | ucapTranslate: 'deptName' }}</dd>
+      </li>
+      <li class="grade">
+        <dt class="division">{{ 'search.fieldGrade' | translate }}</dt>
+        <dd>{{ userInfo | ucapTranslate: 'grade' }}</dd>
+      </li>
       <li>
         <dt class="division">
           {{ 'profile.fieldResponsibilities' | translate }}

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

@@ -120,9 +120,11 @@ $login-max-height: 800px;
       flex-flow: column;
       span {
         @include ellipsis(1);
-        &.deptName {
+        font-size: 1em;
-          font-size: 1.2em;
+        margin-bottom: 8px;
-          line-height: 1.4em;
+        &.company {
+          font-weight: 600;
+          font-size: 1.1em;
         }
       }
     }
@@ -170,13 +172,15 @@ $login-max-height: 800px;
     ul {
       display: flex;
       flex-flow: column;
+      height: calc(100% - 80px);
+      overflow-y: auto;
       li {
         display: flex;
         flex-direction: row;
-        height: 30px;
+        height: 26px;
         align-items: center;
         flex-flow: row;
-        margin-bottom: 14px;
+        margin-bottom: 10px;
         dt {
           width: 100px;
           font-weight: 800;
@@ -224,16 +228,16 @@ $login-max-height: 800px;
 ::ng-deep .userInfo-call {
   position: relative;
   display: flex;
-  flex: 0 0 auto;
+  flex: 0 0 26px;
-  width: 34px;
+  width: 26x;
-  height: 34px;
+  height: 26px;
-  line-height: 34px;
+  line-height: 26px;
   justify-content: center;
   justify-items: center;
   .mat-button-wrapper {
     padding: 0;
-    width: 20px;
+    width: 18px;
-    height: 20px;
+    height: 18px;
     justify-content: center;
     text-align: center;
     svg {
@@ -252,8 +256,9 @@ $login-max-height: 800px;
     &.mat-mini-fab {
       position: relative;
       display: flex;
-      width: 40px;
+      width: 36px;
-      height: 40px;
+      height: 36px;
+      flex: 0 0 36px;
       //line-height: 40px;
       .mat-button-wrapper {
         padding: 0;

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

@@ -1,4 +1,4 @@
-<div>
+<div class="set-general">
   <mat-list>
     <h1 mat-subheader>{{ 'settings.genernal.theme' | translate }}</h1>
     <!--<ul class="theme-list">

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

@@ -41,15 +41,31 @@
   }
 }
 
-.theme-item {
+/*
-  width: 140px;
+.mat-list-item {
-  height: 98px;
+  margin-bottom: 10px;
-  margin-right: 10px;
-  border: 1px solid #dddddd;
-  background-size: 100% auto;
-  background-repeat: no-repeat;
-  opacity: 0.7;
 }
+.set-general {
+  .theme-select {
+    position: relative;
+    width: 100%;
+    height: 160px;
+    .theme-list {
+      position: relative;
+      height: 160px;
+      .theme-item {
+        width: 140px;
+        height: 98px;
+        margin-right: 10px;
+        border: 1px solid #dddddd;
+        background-size: 100% auto;
+        background-repeat: no-repeat;
+        opacity: 0.7;
+      }
+    }
+  }
+}
+*/
 .theme-box {
   width: 140px;
   height: 98px;
@@ -70,3 +86,8 @@
   display: flex;
   flex-direction: row;
 }
+
+.mat-divider {
+  position: relative;
+  padding-top: 10px;
+}