From 719c18acfac48943d3a7e83d632234c1f8b3dab6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 18:43:44 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 7cbdfe6..265a815 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -8,9 +8,9 @@
'angular'
],
function (app, angular) {
- app.controller('issueListController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
+ app.controller('issueListController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$treeProvider', '$state', '$uibModal', '$q',
'$controller', '$injector', 'SweetAlert', 'Issue', 'IssueType', 'Priority', 'Severity', 'IssueStatus', 'CustomField', 'IssueSearch', 'IssueTableConfig', '$timeout', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, Issue, IssueType, Priority, Severity, IssueStatus, CustomField,
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $treeProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, Issue, IssueType, Priority, Severity, IssueStatus, CustomField,
IssueSearch, IssueTableConfig, $timeout, $filter) {
// �븿�닔
@@ -20,6 +20,7 @@
changePageRowCount : changePageRowCount, // �럹�씠吏� 蹂�寃�
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
setTableColumn : setTableColumn, // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ setTreeColumn : setTreeColumn,
add : add, // �씠�뒋 �깮�꽦
modify : modify, // �씠�뒋 �닔�젙
addRelationIssueForm : addRelationIssueForm, // �뿰愿� �씠�뒋 異붽�
@@ -39,7 +40,8 @@
makeSearchConditions : makeSearchConditions, // 寃��깋 議곌굔�쓣 留뚮뱺�떎.
getIssueTableConfigs : getIssueTableConfigs, // �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- getResponseData : getResponseData // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ getResponseData : getResponseData, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ onClickListMode : onClickListMode // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
};
// 蹂��닔
@@ -67,6 +69,7 @@
selectedPageRowCount : String(10)
},
tableConfigs : [], // �뀒�씠釉� �뀑�똿 �젙蹂�
+ treeConfigs : [], // �듃由� �뀑�똿 �젙蹂�
responseData : {
data : []
},
@@ -85,7 +88,8 @@
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false
+ hideIssue : false,
+ listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
};
// �뀒�씠釉� �씠踰ㅽ듃
@@ -233,8 +237,109 @@
if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
$scope.fn.setTableColumn(issueTableConfig);
+ $scope.fn.setTreeColumn(issueTableConfig);
}
});
+ }
+
+ // �듃由� 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ function setTreeColumn(issueTableConfig) {
+
+ // �씪諛� 而щ읆
+ switch(issueTableConfig.key) {
+ case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("issue.issueTitle")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_TITLE"));
+ break;
+
+ case "PRIORITY" : // �슦�꽑�닚�쐞
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.priority")
+ .setDName("priorityName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("COMMON_PRIORITY"));
+ break;
+ case "SEVERITY" : // 以묒슂�룄
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.importance")
+ .setDName("severityName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("COMMON_SEVERITY"));
+ break;
+ case "ISSUE_TYPE" : // �씠�뒋 ���엯
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("issue.issueType")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("issueTypeName"));
+ break;
+ case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.assigneeTeam")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DEPARTMENT"));
+ break;
+ case "REGISTER" : // �벑濡앹옄
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.register")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("REGISTER"));
+ break;
+ case "PERIOD" : // 湲곌컙
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.period")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DUE_DATE"));
+ break;
+ case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.lastChangeDate")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("modifyDate"));
+ break;
+ case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName("common.countDownIssue")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("DOWN_ISSUE_COUNT"));
+ break;
+ }
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
+ if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
+ // 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
+ for (var count in $scope.vm.customFields) {
+ var customField = $scope.vm.customFields[count];
+
+ if (customField.id === Number(issueTableConfig.key.substring(13))) {
+ $scope.vm.treeConfigs.push($treeProvider.config()
+ .setHName(customField.name)
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setColumnHint(customField)
+ .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ break;
+ }
+ }
+ }
}
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -367,6 +472,7 @@
beginCompleteDate : "",
endCompleteDate : "",
hideIssue : $scope.vm.hideIssue,
+ isTree : $scope.vm.listMode === 1,
projectIds : (function () {
var projectIds = [];
@@ -485,6 +591,10 @@
}
return conditions;
+ }
+
+ function getTreeList() {
+
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
@@ -1055,6 +1165,19 @@
return deferred.promise;
}
+ // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾
+ function onClickListMode(listMode) {
+ if ($scope.vm.listMode !== listMode) {
+ $scope.vm.listMode = listMode;
+
+ if ($scope.vm.listMode === 0) {
+ $scope.fn.getPageList(0);
+ } else {
+ $scope.fn.getPageList(0);
+ }
+ }
+ }
+
// 理쒖큹 �떎�뻾
function startExecute() {
// �뙆�씪誘명꽣 �씫湲�
--
Gitblit v1.8.0