From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 234 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 117 insertions(+), 117 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 7bc7528..cdbf380 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -235,148 +235,148 @@
break;*/
// �뿰愿� �씠�뒋 �씠�룞(�젣紐�)
- case "ISSUE_RELATION_MOVE" :
- makeTag += "<span class=\"titlename cursor text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
- break;
+ // case "ISSUE_RELATION_MOVE" :
+ // makeTag += "<span class=\"titlename cursor text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
+ // break;
// �뿰愿��씠�뒋 援щ텇
- case "ISSUE_RELATION_TYPE":
- makeTag += "<span>" + scope.data.relationIssueTypeName + "</span>";
- break;
+ // case "ISSUE_RELATION_TYPE":
+ // makeTag += "<span>" + scope.data.relationIssueTypeName + "</span>";
+ // break;
// �뿰愿��씠�뒋 �궘�젣
- case "ISSUE_RELATION_DELETE":
- if (scope.data.modifyPermissionCheck) {
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
- }
- break;
+ // case "ISSUE_RELATION_DELETE":
+ // if (scope.data.modifyPermissionCheck) {
+ // makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ // }
+ // 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_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 "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 "REL_REGISTER":
- scope.data.registerVos = [scope.data.issueRelation.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
- break;
-
- 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;
+ //
+ // break;
// �뿰愿� �씠�뒋 �떞�떦遺��꽌
- case "REL_ISSUE_DEPARTMENT" :
- makeTag += "<ul class='ul-not-comma'>";
- makeTag += "<div style='color: #000000'>";
- angular.forEach(scope.data.issueRelation.departmentVos, function (departments) {
- makeTag += "<li>" + departments.departmentName + "</li>";
- });
- makeTag += "</div>";
- makeTag += "</ul>";
- break;
+ // case "REL_ISSUE_DEPARTMENT" :
+ // makeTag += "<ul class='ul-not-comma'>";
+ // makeTag += "<div style='color: #000000'>";
+ // angular.forEach(scope.data.issueRelation.departmentVos, function (departments) {
+ // makeTag += "<li>" + departments.departmentName + "</li>";
+ // });
+ // makeTag += "</div>";
+ // makeTag += "</ul>";
+ // break;
// �뿰愿� �씠�뒋 紐⑸줉�뿉�꽌 湲곌컙 �몴�떆
- case "REL_ISSUE_DUE_DATE" :
- if (!$rootScope.isDefined(scope.data.issueRelation.startDate) && !$rootScope.isDefined(scope.data.issueRelation.completeDate)) {
- makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
- }
- else {
- makeTag += "<span>" + scope.data.issueRelation.startDate + " ~ " + scope.data.issueRelation.completeDate + "</span>";
- }
- break;
+ // case "REL_ISSUE_DUE_DATE" :
+ // if (!$rootScope.isDefined(scope.data.issueRelation.startDate) && !$rootScope.isDefined(scope.data.issueRelation.completeDate)) {
+ // makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
+ // }
+ // else {
+ // makeTag += "<span>" + scope.data.issueRelation.startDate + " ~ " + scope.data.issueRelation.completeDate + "</span>";
+ // }
+ // break;
// �뿰愿� �씠�뒋 �궗�슜�옄 �젙�쓽 �븘�뱶
- case "REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
- var values = [];
-
- for (var count in scope.data.issueRelation.issueCustomFieldValueVos) {
- var issueCustomFieldValueVo = scope.data.issueRelation.issueCustomFieldValueVos[count];
- // �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
- if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.id) {
- values.push(issueCustomFieldValueVo.useValue);
- }
- }
- angular.forEach(values, function (value) {
- makeTag += '<span class="table-word-break-all cursor">' + value + '<span><br>';
- });
-
- break;
+ // case "REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
+ // var values = [];
+ //
+ // for (var count in scope.data.issueRelation.issueCustomFieldValueVos) {
+ // var issueCustomFieldValueVo = scope.data.issueRelation.issueCustomFieldValueVos[count];
+ // // �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
+ // if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.id) {
+ // values.push(issueCustomFieldValueVo.useValue);
+ // }
+ // }
+ // angular.forEach(values, function (value) {
+ // makeTag += '<span class="table-word-break-all cursor">' + value + '<span><br>';
+ // });
+ //
+ // break;
// �븯�쐞 �씠�뒋 �씠�룞(�젣紐�)
- case "ISSUE_DOWN_MOVE" :
- makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data)\">" + scope.data.title + "</span></a>";
- break;
-
- // �븯�쐞 �씠�뒋 ���엯
- case "ISSUE_DOWN_STATUS_TYPE" :
- makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.issueStatusVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.issueStatusVo.color + "\", \"color\": \"#FFFFFF\" }'>" + scope.data.issueStatusVo.name + "</span>";
- break;
-
+ // case "ISSUE_DOWN_MOVE" :
+ // makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data)\">" + scope.data.title + "</span></a>";
+ // break;
+ //
+ // // �븯�쐞 �씠�뒋 ���엯
+ // case "ISSUE_DOWN_STATUS_TYPE" :
+ // makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.issueStatusVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.issueStatusVo.color + "\", \"color\": \"#FFFFFF\" }'>" + scope.data.issueStatusVo.name + "</span>";
+ // break;
+ //
// �븯�쐞 �씠�뒋 �궘�젣
- case "ISSUE_DOWN_DELETE":
- if (scope.data.modifyPermissionCheck) {
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
- }
- break;
-
+ // case "ISSUE_DOWN_DELETE":
+ // if (scope.data.modifyPermissionCheck) {
+ // makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
+ // }
+ // break;
+ //
// �븯�쐞 �씠�뒋 �슦�꽑 �닚�쐞
- case "DOWN_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 "DOWN_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 "DOWN_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 "DOWN_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 "DOWN_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;
-
+ // case "DOWN_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;
+ //
// �븯�쐞 �씠�뒋 �벑濡앹옄
- case "DOWN_REGISTER":
- scope.data.registerVos = [scope.data.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
- break;
-
+ // case "DOWN_REGISTER":
+ // scope.data.registerVos = [scope.data.registerVo];
+ // makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
+ // break;
+ //
// �븯�쐞 �씠�뒋 湲곌컙
- case "DOWN_ISSUE_DUE_DATE" :
- if (!$rootScope.isDefined(scope.data.startDate) && !$rootScope.isDefined(scope.data.completeDate)) {
- makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
- }
- else {
- makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
- }
- break;
-
+ // case "DOWN_ISSUE_DUE_DATE" :
+ // if (!$rootScope.isDefined(scope.data.startDate) && !$rootScope.isDefined(scope.data.completeDate)) {
+ // makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
+ // }
+ // else {
+ // makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
+ // }
+ // break;
+ //
// �븯�쐞 �씠�뒋 �궗�슜�옄 �젙�쓽 �븘�뱶
- case "DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
- var values = [];
-
- for (var count in scope.data.issueCustomFieldValueVos) {
- var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
- // �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
- if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.id) {
- values.push(issueCustomFieldValueVo.useValue);
- }
- }
- angular.forEach(values, function (value) {
- makeTag += '<span class="table-word-break-all">' + value + '<span><br>';
- });
-
- break;
+ // case "DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
+ // var values = [];
+ //
+ // for (var count in scope.data.issueCustomFieldValueVos) {
+ // var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
+ // // �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
+ // if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.id) {
+ // values.push(issueCustomFieldValueVo.useValue);
+ // }
+ // }
+ // angular.forEach(values, function (value) {
+ // makeTag += '<span class="table-word-break-all">' + value + '<span><br>';
+ // });
+ //
+ // break;
// �씠由꾩쓣 �겢由��븯硫� �닔�젙 �뙘�뾽 �몴�떆
case "COMMON_MODIFY" :
--
Gitblit v1.8.0