From 3f45ec1851bf75f10b1cacf9d5ead89f875d3217 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 14:03:50 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/config.js | 22 ++++++++++
src/main/webapp/views/issue/issueDetail.html | 14 +++---
src/main/webapp/assets/styles/main.css | 57 ++++++++++++++++++++++++----
src/main/webapp/views/common/sidebar.html | 11 +++++
4 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 85568ee..19b6b3e 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -891,14 +891,23 @@
}
.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%;
+}
+
+.offset-detail-5 {
+ margin-left: 30%;
}
.offset-1 {
@@ -12644,13 +12653,26 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 50%;
- right: 15px;
+ top: 40%;
+ right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background-color: rgba(0, 0, 0, 0.08);
border-radius: 6px;
}
+
+.logged-user-w .logged-user-toggler-arrow_change {
+ padding: 3px;
+ font-size: 14px;
+ position: absolute;
+ top: 32%;
+ right: 5%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ background-color: rgba(0, 0, 0, 0.08);
+ border-radius: 6px;
+}
+
.logged-user-w.avatar-inline {
text-align: left;
@@ -12676,13 +12698,26 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 50%;
- right: 15px;
+ top: 40%;
+ right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background-color: rgba(0, 0, 0, 0.08);
border-radius: 6px;
}
+
+.logged-user-w.avatar-inline .logged-user-toggler-arrow_change {
+ padding: 3px;
+ font-size: 14px;
+ position: absolute;
+ top: 32%;
+ right: 5%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ background-color: rgba(0, 0, 0, 0.08);
+ border-radius: 6px;
+}
+
.logged-user-w.avatar-inline .logged-user-avatar-info {
display: -webkit-box;
@@ -19364,7 +19399,7 @@
-webkit-box-align: center;
-ms-flex-align: center;
/*align-items: center;*/
- padding: 20px;
+ padding: 15px;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
position: relative;
@@ -20489,7 +20524,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 +30088,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..3622771 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;
@@ -281,6 +287,18 @@
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.checkMngPermissionViewIssueAndProject = function (userPermission) {
if (!$rootScope.isDefined($rootScope.user)) {
@@ -538,7 +556,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -591,4 +610,5 @@
return ctxPath;
})());
+
});
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index bd62f4c..3bccf52 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -192,7 +192,10 @@
{{$root.user.name}}
</div>
</div>
- <div class="logged-user-toggler-arrow">
+ <div ng-if="$root.myDepartments == null" class="logged-user-toggler-arrow">
+ <div class="os-icon os-icon-chevron-down"></div>
+ </div>
+ <div ng-if="$root.myDepartments != null" class="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -234,6 +237,12 @@
</ul>
</div>
</div>
+ <div ng-if="$root.myLevel != null" class="issue-main-label offset-detail-5 mt-1">
+ <span>{{$root.myLevel}}</span>
+ </div>
+ <div ng-if="$root.myDepartments != null" class="issue-main-label offset-detail-5 mt-1">
+ <span>{{$root.myDepartments}}</span>
+ </div>
</div>
<ul class="main-menu">
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 1fb0269..3e26ae3 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -166,12 +166,12 @@
<div class="col-md-4">
<div class="form-group">
<label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label>
- <label class="issue-detail-label offset-detail-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
- <label class="issue-detail-label offset-detail-2"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
+ <label class="issue-detail-label offset-detail-2"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
+ <label class="issue-detail-label offset-detail-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
<div class="">
<span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span>
- <span class="badge offset-1" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
+ <span class="badge offset-detail-4" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
<!-- 沅뚰븳�쓣 媛뽮퀬 �엳�쓣 �븣 -->
<span ng-if="vm.viewer.modifyPermissionCheck">
@@ -494,7 +494,7 @@
<!-- �뿰愿� �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
- event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
<div class="col-sm-4">
@@ -553,7 +553,7 @@
<!-- �븯�쐞 �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
- event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
@@ -762,9 +762,9 @@
translate="common.noRecord">
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <div>
+ <!--<div>
{{vm.viewer.issueHistoryVos}}
- </div>
+ </div>-->
<div class="activity-item"
ng-repeat="issueHistory in vm.viewer.issueHistoryVos">
--
Gitblit v1.8.0