From c3b8248962bd9b78a8207d5d275395a886d2ee5a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 15 12월 2021 10:31:02 +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 | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 8 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 3e2403e..1e6f3f7 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -101,6 +101,16 @@
makeTag += '<div owl-profile-over class="" table-user-image="data" target="projectUserVos"></div>';
break;
+ case "PROJECT_DEPARTMENT":
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='cursor: pointer; color: #000000'>";
+ angular.forEach(scope.data.projectDepartmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
case "ISSUE_STATUS_TYPE" :
switch (scope.data.issueStatusType) {
case "READY":
@@ -179,8 +189,13 @@
makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
}
else {
- makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
+ makeTag += '<span class="cursor" ng-click="event.changeDetailView(data.id)">' + scope.data.startDate + ' ~ ' + scope.data.completeDate + '</span>';
}
+ break;
+
+ // �븯�쐞�씠�뒋 移댁슫�듃
+ case "DOWN_ISSUE_COUNT" :
+ makeTag += '<span>' + scope.data.downIssueCount + ' / ' + scope.data.downIssueAllCount + '</span>';
break;
// �봽濡쒖젥�듃 湲곌컙 �몴�떆
@@ -280,14 +295,19 @@
}
}
angular.forEach(values, function (value) {
- makeTag += '<span class="table-word-break-all">' + value + '<span><br>';
+ 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.id)\">" + scope.data.title + "</span></a>";
+ 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;
// �븯�쐞 �씠�뒋 �궘�젣
@@ -376,22 +396,65 @@
case "SINGLE_SELECT" :
makeTag += "<span translate='common.singleSelectionField'>�떒�씪 �꽑�깮 �븘�뱶</span>";
break;
+ case "NUMBER" :
+ makeTag += "<span translate='common.numberField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "DATETIME" :
+ makeTag += "<span translate='common.datetimeField'>�궇吏� �븘�뱶</span>";
+ break;
+ case "IP_ADDRESS" :
+ makeTag += "<span translate='common.ipAddressField'>IP ADDRESS �븘�뱶</span>";
+ break;
+ case "EMAIL" :
+ makeTag += "<span translate='common.emailField'>�씠硫붿씪 �븘�뱶</span>";
+ break;
+ case "SITE" :
+ makeTag += "<span translate='common.siteField'>URL �븘�뱶</span>";
+ break;
+ case "TEL" :
+ makeTag += "<span translate='common.telField'>�쟾�솕踰덊샇 �븘�뱶</span>";
+ break;
}
break;
+ // �씠�뒋 �젣紐쯵cope.data.isApi
+ case "ISSUE_TITLE" :
+ makeTag += '<div class="tags text-left">';
+ makeTag += '<i class="fa fa-star move-star" ng-show="$root.currentDetailIssueId == data.id"> </i>';
+ makeTag += '<span class="number-tag">' + scope.data.projectKey + ' - ' + scope.data.issueNumber + '</span>';
+ makeTag += ' <span class="tag"> / </span> ';
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.issueStatusColor + "\"," + "\"border-color\"" + " : \"" + scope.data.issueStatusColor + "\", \"color\": \"#FFFFFF\" }'>" + scope.data.issueStatusName + "</span>";
+ if (scope.data.isApi === 'Y') {
+ makeTag += '<span class="tag"> / </span> ';
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"#EF8D9A" + "\"," + "\"border-color\"" + " : \"#EF8D9A" + "\", \"color\": \"#FFFFFF\" }'>" + "<span>API</span>" + "</span>";
+ }
+ makeTag += '</div>';
+ makeTag += '<div class="titlename cursor text-left" ng-click="event.changeDetailView(data.id)">' + scope.data.title.replace(/</gi, '<') + '</div>';
+ makeTag += '<div class="extra-infodiv text-left">';
+ makeTag += '<span class="extra-info">';
+ makeTag += '<i class="os-icon os-icon-mail-12"></i>';
+ makeTag += '<span>' + scope.data.issueCommentCount + '</span>';
+ makeTag += '</span>';
+ makeTag += '<span class="extra-info">';
+ makeTag += '<i class="os-icon os-icon-ui-51"></i>';
+ makeTag += '<span>' + scope.data.attachedFileCount + '</span>';
+ makeTag += '</span>';
+ makeTag += '</div>';
+ 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>";
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='badge cursor' ng-style='{ \"background-color\" : \"" + scope.data.priorityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityName + "'></span>";
break;
// 以묒슂�룄
case "COMMON_SEVERITY" :
- makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='badge cursor' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
break;
// �떞�떦 遺��꽌
case "ISSUE_DEPARTMENT" :
- makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\" class='ul-not-comma cursor'>";
makeTag += "<div style='color: #000000'>";
angular.forEach(scope.data.departmentVos, function (departments) {
makeTag += "<li>" + departments.departmentName + "</li>";
@@ -408,7 +471,7 @@
// �벑濡앹옄
case "REGISTER" :
scope.data.registerVos = [scope.data.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
+ makeTag += '<div ng-click=\"event.changeDetailView(data.id)\" owl-profile-over class="cursor" table-user-image="data" target="registerVos"></div>';
break;
case "WORKFLOW_NAME":
@@ -474,6 +537,14 @@
case "ISSUE_SETTING_PERM_YN" :
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ break;
+
+ case "All_ISSUE_PROJECT_SETTING_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permAllIssueAndProjectSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ break;
+
+ case "PARTNER_SETTING_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permPartnerSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "API_PERM_YN" :
@@ -581,7 +652,7 @@
}
angular.forEach(values, function (value) {
- makeTag += '<span class="table-word-break-all">' + value + '<span><br>';
+ makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + value + '<span><br>';
});
break;
--
Gitblit v1.8.0