From e2c9d5c6cc9bf4a4314dcbce17e1336e8f78ebf8 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 16 12월 2021 11:20:10 +0900 Subject: [PATCH] 사이드바 프로필 사용자등급, 부서표시 --- src/main/webapp/scripts/config.js | 20 ++++++++++++++++++++ src/main/webapp/assets/styles/main.css | 17 ++++++++++++++--- src/main/webapp/views/common/sidebar.html | 8 ++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css index 85568ee..cb78f54 100644 --- a/src/main/webapp/assets/styles/main.css +++ b/src/main/webapp/assets/styles/main.css @@ -891,13 +891,16 @@ } .offset-detail-1 { - margin-left: 5.8%; + margin-left: 4% } .offset-detail-2 { - margin-left: 4%; + margin-left: 5.8%; } .offset-detail-3 { + margin-left: 8%; +} +.offset-detail-4 { margin-left: 9.2%; } @@ -17449,6 +17452,8 @@ .os-icon-chevron-down:before { content: "\e9b4"; + position: relative; + bottom: 1.1rem; } .os-icon-chevron-left:before { @@ -20489,7 +20494,8 @@ .full-chat-w .user-intro .user-intro-info .user-sub { color: rgba(0, 0, 0, 0.7); - font-size: 0.72rem; + font-size: 1rem; + font-weight: 600; margin-top: 5px; margin-bottom: 5px; } @@ -30052,6 +30058,11 @@ /* color: #777*/ /*}*/ +.issue-main-label { + font-size: 0.6rem; + color: #777; +} + .issue-detail-tab { font-size: 0.9rem; font-weight: 800; diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js index 920039d..44c2d61 100644 --- a/src/main/webapp/scripts/config.js +++ b/src/main/webapp/scripts/config.js @@ -61,6 +61,12 @@ // 臾몄쓽�븯湲� $rootScope.information = false; + // �궗�슜�옄 �벑湲됰챸 + $rootScope.myLevel = ""; + + // 遺��꽌紐� + $rootScope.myDepartments = ""; + // PrimaryWorkspace $rootScope.hasPrimaryWorkspace = false; @@ -282,6 +288,20 @@ return false; }; + $rootScope.getMyInfo = function () { + + User.findMyLevelAndDepartment($resourceProvider.getContent({}, + $resourceProvider.getPageContent(0, 0))).then(function (result) { + + if (result.data.message.status === "success") { + $rootScope.myLevel = result.data.data.levelName + $rootScope.myDepartments = result.data.data.departmentName + } + }); + } + // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎. + $rootScope.getMyInfo(); + /*$rootScope.checkMngPermissionViewIssueAndProject = function (userPermission) { if (!$rootScope.isDefined($rootScope.user)) { return false; diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html index bd62f4c..9c8f9b6 100644 --- a/src/main/webapp/views/common/sidebar.html +++ b/src/main/webapp/views/common/sidebar.html @@ -234,6 +234,14 @@ </ul> </div> </div> + <div ng-if="$root.myLevel != null" class="issue-main-label offset-detail-3 mt-1"> + <span translate="users.myLevel">�벑湲�</span>: + <span>{{$root.myLevel}}</span> + </div> + <div ng-if="$root.myDepartments != null" class="issue-main-label offset-detail-3 mt-1"> + <span translate="users.myDepartments">�떞�떦遺��꽌</span>: + <span>{{$root.myDepartments}}</span> + </div> </div> <ul class="main-menu"> -- Gitblit v1.8.0