From a2229f73ae01005a519c7e1b29ddb239356de0f8 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 11 Feb 2020 16:37:04 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20-=20=ED=9A=8C?= =?UTF-8?q?=EC=82=AC=20(=EA=B8=B0=EB=B3=B8=EC=A0=95=EB=B3=B4)=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20,=20=EB=B6=80=EC=84=9C,=20=EC=A7=81?= =?UTF-8?q?=EA=B8=89(=EC=84=B8=EB=B6=80=EC=A0=95=EB=B3=B4)=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/profile.component.html | 9 ++++++ .../src/lib/components/profile.component.scss | 31 +++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) 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 4e96341d..235c1272 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 @@ -59,6 +59,7 @@ {{ userInfo.employeeNum }} + {{ userInfo.companyName | ucapStringEmptycheck }} {{ userInfo | ucapTranslate: 'deptName' }} {{ userInfo | ucapTranslate: 'grade' }} @@ -177,6 +178,14 @@
{{ 'profile.fieldCompany' | translate }}
{{ userInfo.companyName | ucapStringEmptycheck }}
+
  • +
    {{ 'search.fieldDeptartment' | translate }}
    +
    {{ userInfo | ucapTranslate: 'deptName' }}
    +
    • +
  • +
    {{ 'search.fieldGrade' | translate }}
    +
    {{ userInfo | ucapTranslate: 'grade' }}
    +
  • {{ 'profile.fieldResponsibilities' | translate }} diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss index 4f62ada3..a32114bb 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss +++ b/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: 1.2em; - line-height: 1.4em; + font-size: 1em; + margin-bottom: 8px; + &.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; - width: 34px; - height: 34px; - line-height: 34px; + flex: 0 0 26px; + width: 26x; + height: 26px; + line-height: 26px; justify-content: center; justify-items: center; .mat-button-wrapper { padding: 0; - width: 20px; - height: 20px; + width: 18px; + 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; - height: 40px; + width: 36px; + height: 36px; + flex: 0 0 36px; //line-height: 40px; .mat-button-wrapper { padding: 0; From b80f895989053022407ddf1d9547980e35870183 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 11 Feb 2020 17:11:55 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#=20=EC=8B=9C=ED=97=98=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EB=B6=84=EC=84=9D=20PC=20=EA=B8=B0=EB=8A=A5=20=20=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC=EC=97=90=EC=84=9C=20=ED=95=AD=EC=83=81=20?= =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=95=8C=EB=A6=BC=EC=9D=84=20?= =?UTF-8?q?=EB=B0=9B=EC=9D=8C=20=EC=84=A4=EC=A0=95=EC=8B=9C=20PC=EC=9D=98?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=EB=B0=9B=EA=B8=B0=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EA=B0=92=EB=8F=84=20=EC=98=81=ED=96=A5=EC=9D=84=20=EB=B0=9B?= =?UTF-8?q?=EC=9D=8C=20=EB=AC=B8=EC=A0=9C=EC=A0=90=202=EC=9B=9411=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/services/notification.service.ts | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts index bec1bd25..2cc63bad 100644 --- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts +++ b/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( From 6ed31ffd62ad82126b6ab9ca8abbe7dec1f794f4 Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 11 Feb 2020 17:13:46 +0900 Subject: [PATCH 3/4] =?UTF-8?q?ng-deep=20=EC=82=AD=EC=A0=9C=20=ED=9B=84=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88:=20=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/clipboard.dialog.component.scss | 4 +- .../messenger-settings.dialog.component.html | 6 +- .../messenger-settings.dialog.component.scss | 60 ++++++++++++------- .../components/main.page.component.scss | 2 +- .../src/lib/components/general.component.html | 2 +- .../src/lib/components/general.component.scss | 37 +++++++++--- 6 files changed, 73 insertions(+), 38 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss index 58580a0a..c2da493c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss +++ b/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; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html index 3f30b878..ec3d2e2c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html @@ -13,7 +13,7 @@
    - + {{ 'settings.typeGenernal' | translate }} @@ -36,7 +36,7 @@ class="setting-category" > --> - + {{ 'settings.typeNotification' | translate }} @@ -72,7 +72,7 @@ --> - + {{ 'settings.typeChat' | translate }} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss index c4ad3975..3c8237c9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss +++ b/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 { - width: 160px; - .mat-tab-labels { - 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; - } - } + position: relative; + height: 100%; + width: 100%; } } } @@ -65,21 +53,46 @@ } } -::ng-deep .setting-tab { - .mat-tab-group { - position: relative; - height: 100%; - width: 100%; +.setting-category { +} +::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 @@ } } } +*/ diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss index c416a80d..faa5a584 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.scss +++ b/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; } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html index 5538ded6..01e12359 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html @@ -1,4 +1,4 @@ -
    +

    {{ 'settings.genernal.theme' | translate }}