From b69416fc721e8f0eb478536bf0d98ae3f6c4811e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 24 11월 2021 17:57:08 +0900
Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트]
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 deletions(-)
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 2e2c309..65f4db8 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -81,6 +81,13 @@
}
break;
+ // �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜)
+ case "PROJECT_BASIC_NAME" :
+ if (scope.data.projectVo != null) {
+ makeTag += "<span class='titlenameSelect'>" + myToken + scope.data.projectVo.name.replace(/</gi, '<') + "</span>";
+ }
+ break;
+
// �봽濡쒖젥�듃 紐⑸줉�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙 �몴�떆
case "CUSTOM_FIELD_CONFIG" :
// 愿�由ъ옄留� �닔�젙�븷 �닔 �엳�떎.
@@ -136,9 +143,9 @@
makeTag += "<ul class='ul-not-comma'>";
if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
}else{
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
angular.forEach(scope.data.departmentVos, function (departments) {
makeTag += "<li>" + departments.departmentName + "</li>";
});
@@ -153,7 +160,7 @@
// �씠�뒋 紐⑸줉�뿉�꽌 湲곌컙 �몴�떆
case "ISSUE_DUE_DATE" :
if (!$rootScope.isDefined(scope.data.startDate) && !$rootScope.isDefined(scope.data.completeDate)) {
- makeTag += "<span></span>";
+ makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
}
else {
makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
@@ -187,24 +194,42 @@
makeTag += '</div>';
break;
- case "ISSUE_DETAIL_MOVE" :
- makeTag += "<a ui-sref='issues.detail({ id : " + scope.data.id + " })'><span>" + scope.data.title + "</span></a>";
- break;
+ /* case "ISSUE_DETAIL_MOVE" :
+ makeTag += "<a class='text-center' ui-sref='issues.detail({ id : " + scope.data.id + " })'><span>" + scope.data.title + "</span></a>";
+ break;*/
-
- // �뿰愿��씪媛� �씠�룞
+ // �뿰愿� �씠�뒋 �씠�룞(�젣紐�)
case "ISSUE_RELATION_MOVE" :
- makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
+ makeTag += "<span class=\"titlename cursor text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
break;
- // �뿰愿��씪媛� 援щ텇
+ // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+ case "REL_COMMON_PRIORITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityVo.name + "'></span>";
+ break;
+ // �뿰愿� �씠�뒋 以묒슂�룄
+ case "REL_COMMON_SEVERITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.severityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityVo.name + "'></span>";
+ break;
+
+ // �븯�쐞 �씠�뒋 �씠�룞(�젣紐�)
+ case "ISSUE_DOWN_MOVE" :
+ makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.id)\">" + scope.data.title + "</span></a>";
+ break;
+
+ // �뿰愿��씠�뒋 援щ텇
case "ISSUE_RELATION_TYPE":
makeTag += "<span>" + scope.data.relationIssueTypeName + "</span>";
break;
- // �뿰愿��씪媛� �궘�젣
+ // �뿰愿��씠�뒋 �궘�젣
case "ISSUE_RELATION_DELETE":
makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ break;
+
+ // �븯�쐞 �씠�뒋 �궘�젣
+ case "ISSUE_DOWN_DELETE":
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
break;
// �씠由꾩쓣 �겢由��븯硫� �닔�젙 �뙘�뾽 �몴�떆
@@ -237,6 +262,7 @@
break;
+
case "COMMON_PRIORITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityName + "'></span>";
break;
@@ -245,13 +271,33 @@
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
break;
+ case "REL_REGISTER":
+ scope.data.registerVos = [scope.data.issueRelation.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
+ break;
+
+ case "ISSUE_DEPARTMENT" :
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='color: #000000'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
+ // angular.forEach(scope.data.departmentVos, function (departments) {
+ // makeTag += "<span>" + departments.departmentName + "</span>"
+ // });
+ // break;
+
case "ISSUE_USER" :
makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
break;
case "REGISTER" :
- scope.data.registsrVos = [scope.data.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registsrVos"></div>';
+ scope.data.registerVos = [scope.data.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
break;
case "WORKFLOW_NAME":
@@ -352,6 +398,10 @@
}
break;
+ case "DEPARTMENT_EX":
+ makeTag += "<div style='margin-top: 5px;'>" + scope.data.departmentDescription + "</div>";
+ break;
+
case "DEPARTMENT_COUNT":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>";
--
Gitblit v1.8.0