From 612b5a21417f3c8dcaed84c1c0691dc883088f61 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 18:04:14 +0900
Subject: [PATCH] 이슈 컬럼 정렬 진행
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 406 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 352 insertions(+), 54 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 90d340b..4e39a14 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -37,12 +37,12 @@
if (tableConfig.dType === "checkbox") {
// 泥댄겕 諛뺤뒪�씪�븣
- if (scope.data.defaultYn) {
+ /*if (scope.data.defaultYn) {
makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" disabled ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
}
- else {
+ else {*/
makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
- }
+ //}
tableConfig.hChecked = false;
}
@@ -74,10 +74,14 @@
// �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜)
case "PROJECT_NAME" :
- if ($rootScope.workProject != null && $rootScope.workProject.id == scope.data.id) {
- makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
- } else {
- makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ if (!scope.data.parentYn) {
+ if ($rootScope.workProject != null && $rootScope.workProject.id == scope.data.id) {
+ makeTag += "<span class='titlenameSelect cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ } else {
+ makeTag += "<span class='titlename cursor table-word-break-all sub-line' ng-click='event.changeLastProject(data.id)'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
+ }
+ }else {
+ makeTag += "<span class='titlename cursor table-word-break-all sub-line'>" + myToken + scope.data.name.replace(/</gi, '<') + "</span>";
}
break;
@@ -86,6 +90,17 @@
if (scope.data.projectVo != null) {
makeTag += "<span class='titlenameSelect'>" + myToken + scope.data.projectVo.name.replace(/</gi, '<') + "</span>";
}
+ break;
+
+ // �궗�슜 �뙆�듃�꼫 �씠由�(�씠�뒋 �쑀�삎 由ъ뒪�듃�뿉�꽌 �궗�슜)
+ case "USE_PARTNERS" :
+ if (scope.data.usePartnerVos != null) {
+ var usePartners = [];
+ for (var i=0; i<scope.data.usePartnerVos.length; i++) {
+ usePartners.push(scope.data.usePartnerVos[i].byName);
+ }
+ makeTag += "<span>" + usePartners + "</span>";
+ }
break;
// �봽濡쒖젥�듃 紐⑸줉�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙 �몴�떆
@@ -99,6 +114,16 @@
// �봽濡쒖젥�듃 ���썝 �젙蹂�
case "PROJECT_USER":
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" :
@@ -141,13 +166,30 @@
case "USE_DEPARTMENT_LIST" :
makeTag += "<ul class='ul-not-comma'>";
+ if (scope.data.managerYn !== 'Y'){
+ if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ }else{
+ 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>";
+ });
+ makeTag += "</div>";
+ }
+ makeTag += "</ul>";
+ }
+ break;
- if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
- }else{
- 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>";
+ case "WORKFLOW_DEPARTMENT_LIST" :
+ makeTag += "<ul class='ul-not-comma'>";
+
+ if(scope.data.issueStatusVos != null && scope.data.issueStatusVos.length > 0){
+ makeTag += "<div>";
+ angular.forEach(scope.data.issueStatusVos, function (issueStatusVo) {
+ let workflowDepartments = new Set(issueStatusVo.workflowDepartmentVos);
+ angular.forEach(workflowDepartments, function (workflowDepartmentVo) {
+ makeTag += "<li>" + workflowDepartmentVo.departmentVo.departmentName + "</li>";
+ });
});
makeTag += "</div>";
}
@@ -160,11 +202,16 @@
// �씠�뒋 紐⑸줉�뿉�꽌 湲곌컙 �몴�떆
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>";
+ makeTag += '<span class="cursor" ng-click="event.changeDetailView(data.id)">' + scope.data.startDate + ' ~ ' + scope.data.completeDate + '</span>';
}
+ break;
+
+ // �븯�쐞�씠�뒋 移댁슫�듃
+ case "DOWN_ISSUE_COUNT" :
+ makeTag += '<span ng-click="event.changeDetailView(data.id)" class="ul-not-comma cursor">' + scope.data.downIssueCount + ' / ' + scope.data.downIssueAllCount + '</span>';
break;
// �봽濡쒖젥�듃 湲곌컙 �몴�떆
@@ -194,35 +241,153 @@
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 text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + 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>";
- break;
+ // �뿰愿��씠�뒋 援щ텇
+ // case "ISSUE_RELATION_TYPE":
+ // makeTag += "<span>" + scope.data.relationIssueTypeName + "</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_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_TYPE":
- makeTag += "<span>" + scope.data.relationIssueTypeName + "</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 "ISSUE_RELATION_DELETE":
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
- 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_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_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_DELETE":
- 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_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_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_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" :
@@ -233,6 +398,7 @@
makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>";
}
break;
+
// �꽕�젙 踰꾪듉 �겢由��븯硫� �닔�젙 �뙘�뾽 �몴�떆
case "BUTTON_MODIFY" :
makeTag += '<button class="btn btn-info" ng-if="data.modifyPermissionCheck" ng-click="event.modify(data.id)"><i class="os-icon os-icon-ui-46" uib-tooltip="�봽濡쒖젥�듃 �꽕�젙"></i></button>';
@@ -250,30 +416,128 @@
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;
+ // �씠�뒋 �젣紐�
+ case "ISSUE_TITLE" :
+ scope.data.title = scope.data.title.replace(/</gi, '<');
+ 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)" translate="' + scope.data.title + '">' + '</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 "COMMON_ISSUE_TYPE" :
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueTypeName + "'></span>";
+ break;
+
+ // �떞�떦 遺��꽌
case "ISSUE_DEPARTMENT" :
- makeTag += "<span>" + scope.data.departmentVos.departmentName + "</span>";
+ 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) {
+ scope.data.departmentName = departments.departmentName;
+ makeTag += "<li translate='" + scope.data.departmentName + "'>" + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
break;
+ // �떞�떦�옄
case "ISSUE_USER" :
makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
break;
+ // �벑濡앹옄
+ /* case "REGISTER" :
+ scope.data.registerVos = [scope.data.registerVo];
+ makeTag += '<div ng-click=\"event.changeDetailView(data.id)\" owl-profile-over class="cursor" table-user-image="data" target="registerVos"></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 += "<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.name + "</li>";
+ makeTag += "<li class='titlenameAccount cursor'>" + registers.account + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
+ // �뾽泥�
+ case "USE_COMPANY" :
+ if (scope.data.companyName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // ISP
+ case "USE_ISP" :
+ if (scope.data.ispName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // �샇�뒪�똿
+ case "USE_HOSTING" :
+ if (scope.data.hostingName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
break;
case "WORKFLOW_NAME":
@@ -341,6 +605,14 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
+ case "ISSUE_SYSTEM_SETTING_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSystemSetting' 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" :
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permApi' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
@@ -400,11 +672,17 @@
case "LEVEL_OPTION" :
//makeTag += "<select class='form-control input-sm' ng-model='data.levels[0].id' ng-options='levelName.id as levelName.levelName for levelName in data.levels' ></select>";
- makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ if (scope.data.managerYn === 'Y'){
+ makeTag +="<span>理쒓퀬愿�由ъ옄</span>";
+ } else {
+ makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ }
break;
case "WORKSPACE_USE_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ if (scope.data.managerYn !== 'Y'){
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ }
break;
case "COMPANYFIELD_MODIFY" :
@@ -436,17 +714,34 @@
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
var values = [];
+ let valueMap = new Map();
+ //scope.data.useValue = "";
for (var count in scope.data.issueCustomFieldValueVos) {
var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
+
+ valueMap.set("useValue"+count, issueCustomFieldValueVo.useValue);
+
+ $window[scope.data.useValue+count] = valueMap.get("useValue"+count);
+ //window["scope.data.useValue"+count] = scope.data.useValue+count;
+ //console.log(scope.data.useValue+count);
+
+ /*window[scope.data.useValue+count] = valueMap.get("useValue"+count);
+ console.log("window" + window[scope.data.useValue+count]);
+ console.log("map" + valueMap.get("useValue"+count));*/
+
+ scope.data.useValue = valueMap.get("useValue"+count);
+ makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue+count + '<span>';
+
// �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
- if (tableConfig.columnHint.id == issueCustomFieldValueVo.customFieldVo.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>';
+ angular.forEach(values, function (useValue) {
+ scope.data.useValue = useValue;
+ makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue + '<span>';
});
break;
@@ -462,7 +757,8 @@
break;
case "NOTICE_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
+ //makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">OWL ITS TEAM</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer+ '</span>';
break;
case "GUIDE_MODIFY":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_GUIDE')) {
@@ -475,7 +771,7 @@
break;
case "GUIDE_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
case "GUIDE_ACTIVE" :
@@ -515,14 +811,16 @@
break;
case "FAQ_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
case "FAQ_ACTIVE" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_FAQ')) {
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.activation' ng-click='event.activation(data)'><span class='slider round'></span></label>";
+ }
break;
case "QNA_MODIFY":
- if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA')) {
+ if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_QNA') || $rootScope.user.id === scope.data.registerId) {
makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.title.replace(/</gi, '<') + "</span>";
}
else {
@@ -531,7 +829,7 @@
break;
case "QNA_REGISTER":
- makeTag += '<img src="/assets/images/logineyes.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
+ makeTag += '<img src="/assets/images/logo-kisa.png" style="width:30px;"> <span class="fc-blue bold">' + scope.data.writer + '</span>';
break;
}
}
--
Gitblit v1.8.0