From 6c9202de3a38ea7c4d32d229e890a5bb8fff9509 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 17 12월 2021 18:23:29 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/common/common.controller.js | 7 +++++--
src/main/webapp/scripts/app/issue/issueList.controller.js | 7 ++++---
src/main/webapp/assets/styles/main.css | 25 +++++++++++++++++++++----
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 3 ++-
src/main/webapp/views/common/sidebar.html | 16 ++++++----------
5 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 9f6259f..78474af 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -907,6 +907,10 @@
}
.offset-detail-5 {
+ margin-left: 11%;
+}
+
+.offset-detail-7 {
margin-left: 30%;
}
@@ -12653,7 +12657,7 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 40%;
+ top: 60%;
right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
@@ -12665,7 +12669,7 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 32%;
+ top: 58%;
right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
@@ -12698,7 +12702,7 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 40%;
+ top: 60%;
right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
@@ -12710,7 +12714,7 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 32%;
+ top: 58%;
right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
@@ -21152,6 +21156,14 @@
.titlenameRegister {
font-size: 0.8rem;
color: #0066ff;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+.titlenameAccount {
+ font-size: 0.1rem;
+ color: #000000;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -30112,6 +30124,11 @@
color: #777;
}
+.issue-main-label {
+ font-size: 0.6rem;
+ color: #d0cece;
+}
+
.issue-detail-tab {
font-size: 0.9rem;
font-weight: 800;
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 2c29fd0..45accfa 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -479,7 +479,8 @@
makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\" class='ul-not-comma cursor'>";
makeTag += "<div style='color: #000000'>";
angular.forEach(scope.data.registerVos, function (registers) {
- makeTag += "<li class='titlenameRegister cursor'>" + registers.byName + "</li>";
+ makeTag += "<li class='titlenameRegister cursor'>" + registers.name + "</li>";
+ makeTag += "<li class='titlenameAccount cursor'>" + registers.account + "</li>";
});
makeTag += "</div>";
makeTag += "</ul>";
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index c9fa6ee..f23c5db 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -284,8 +284,11 @@
var selectIssueTypeId = null;
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
- $scope.fn.changeIssueListMenu(issueType.id, false);
- // $state.go('dashboards.dashboard');
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.fn.changeIssueListMenu(selectIssueTypeId, true);
+ //$scope.fn.changeIssueListMenu(issueType.id, false);
+ //$rootScope.$broadcast("getIssueList", {id: selectIssueTypeId})
+ //$state.go('dashboards.dashboard');
}
if (selectIssueTypeId == null) {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index cb5a1cb..62648a8 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -109,6 +109,9 @@
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
+ // �씠�뒋 紐⑸줉 �깉濡쒓퀬移�
+ $rootScope.$on("getIssueList", function (event, args) {})
+
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� 媛깆떊
$scope.$on("getIssueTableConfigs", function () {
$scope.fn.startExecute();
@@ -595,15 +598,13 @@
currentPage = selectedPage;
}
-
-
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
if (!$rootScope.isMainSearch) {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
- // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+ //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
$scope.vm.search.issueTypeIds.push({
fieldKey: $rootScope.issueTypeMenu.id,
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 3bccf52..73a3c59 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -182,7 +182,12 @@
<div class="logo-element"></div>
</a>
</div>
+
<div class="logged-user-w avatar-inline">
+ <div class="row mb-1" ng-if="$root.myLevel != null" >
+ <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.myLevel}}</span>
+ <span class="issue-main-label offset-detail-1 badge badge-success">{{$root.myDepartments}}</span>
+ </div>
<div class="logged-user-i">
<div class="avatar-w">
<img alt="" ng-src="{{$root.user.profile}}">
@@ -192,10 +197,7 @@
{{$root.user.name}}
</div>
</div>
- <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="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -236,12 +238,6 @@
</li>
</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>
--
Gitblit v1.8.0