From ab13ec078a26ec1439682ba579b710f6c390f035 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 01:58:54 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 130 +++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index b827d70..42f532e 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -41,6 +41,7 @@
$scope.fn.addDownIssueTableConfig = addDownIssueTableConfig; // �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
+ $scope.fn.containsPartner = containsPartner;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -205,10 +206,10 @@
}
// �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setRelTableColumn(issueTableConfig) {
+ function setRelTableColumn(Rel_issueTableConfig) {
// �뿰愿� �씠�뒋 而щ읆
- switch(issueTableConfig.key) {
+ switch(Rel_issueTableConfig.key) {
// �뿰愿� �씠�뒋 援щ텇
case "RELATION_ISSUE_TYPE" :
@@ -233,7 +234,7 @@
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_PRIORITY"));
break;
@@ -242,7 +243,7 @@
.setHName("common.importance")
.setDName("severityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_SEVERITY"));
break;
@@ -250,7 +251,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
@@ -259,7 +260,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
@@ -267,14 +268,14 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DUE_DATE"));
break;
case "MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
break;
@@ -289,19 +290,19 @@
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
+ if (Rel_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.tableConfigs.push($tableProvider.config()
+ if (customField.id === Number(Rel_issueTableConfig.key.substring(13))) {
+ $scope.vm.relTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDRenderer("REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
break;
}
}
@@ -310,17 +311,17 @@
// �뀒�씠釉붿쓽 �븯�쐞 �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setDownTableColumn(issueTableConfig) {
+ function setDownTableColumn(Down_issueTableConfig) {
// if (issueTableConfig == null) return;
// �븯�쐞 �씠�뒋 而щ읆
- switch(issueTableConfig.key) {
+ switch(Down_issueTableConfig.key) {
// �븯�쐞 �씠�뒋 �젣紐�
case "DOWN_ISSUE_TITLE" :
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_MOVE"));
break;
@@ -329,7 +330,7 @@
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_PRIORITY"));
break;
@@ -338,7 +339,7 @@
.setHName("common.importance")
.setDName("severityName")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_SEVERITY"));
break;
@@ -346,7 +347,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
@@ -354,7 +355,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_REGISTER"));
break;
@@ -362,33 +363,33 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") === -1) {
+ if (Down_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))) {
+ if (customField.id === Number(Down_issueTableConfig.key.substring(13))) {
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
+ .setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDRenderer("DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
break;
}
}
@@ -422,11 +423,11 @@
.setHSort(false)
.setDAlign("text-center"))
- angular.forEach($scope.vm.relTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
+ if (Rel_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(issueTableConfig);
+ $scope.fn.setRelTableColumn(Rel_issueTableConfig);
}
});
}
@@ -450,11 +451,11 @@
.setHSort(false)
.setDAlign("text-center"))
- angular.forEach($scope.vm.downTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
+ if (Down_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setDownTableColumn(issueTableConfig);
+ $scope.fn.setDownTableColumn(Down_issueTableConfig);
}
});
}
@@ -462,7 +463,8 @@
// �뿰愿� �씠�뒋 �긽�꽭 議고쉶
function getRelTableConfigs() {
var content = {
- issueId : $scope.vm.viewer.id
+ issueId : $scope.vm.viewer.id,
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
};
IssueTableConfig.relationDetail($resourceProvider.getContent(
@@ -497,11 +499,11 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
- angular.forEach($scope.vm.issueRelTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
+ if (Rel_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(issueTableConfig);
+ $scope.fn.setRelTableColumn(Rel_issueTableConfig);
}
});
@@ -526,7 +528,8 @@
// �븯�쐞 �씠�뒋 �긽�꽭 議고쉶
function getDownTableConfigs() {
var content = {
- issueId : $scope.vm.viewer.id
+ issueId : $scope.vm.viewer.id,
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
};
IssueTableConfig.downDetail($resourceProvider.getContent(
@@ -552,11 +555,11 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_DOWN_MOVE"))
- angular.forEach($scope.vm.issueDownTableConfigs, function (issueTableConfig) {
+ angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
+ if (Down_issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setDownTableColumn(issueTableConfig);
+ $scope.fn.setDownTableColumn(Down_issueTableConfig);
}
});
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -653,9 +656,9 @@
$scope.vm.editor.issueStatus = false;
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
- if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
+ /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
$scope.$apply();
- }
+ }*/
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -668,7 +671,8 @@
resolve : {
parameter : function () {
return {
- issueIds : [$scope.vm.viewer.id]
+ issueIds : [$scope.vm.viewer.id],
+ projectId : $scope.vm.viewer.projectVo.id
};
}
}
@@ -722,7 +726,14 @@
size : "lg",
controller : 'issueAddRelationTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id
+
+ };
+ }
+ }
});
}
@@ -733,7 +744,13 @@
size : "lg",
controller : 'issueAddDownTableConfigController',
backdrop : 'static',
- resolve : {}
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id
+ };
+ }
+ }
});
}
@@ -765,6 +782,21 @@
});
}
+ // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
+ function containsPartner(name) {
+ var result = false;
+
+ if ($scope.vm.viewer.usePartnerVo != null) {
+ $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
+ if (name === partnerVo.name) {
+ result = true;
+ }
+ });
+ }
+ return result;
+
+ }
+
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
function getIssueDetail() {
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
@@ -793,7 +825,6 @@
// �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎.
$scope.fn.setUseValueByIssueTypeCustomFields(result.data.data.issueCustomFieldValueVos);
-
// �뿰愿� �씪媛�
$scope.vm.issueName = "";
$scope.vm.form.issues = [];
@@ -811,13 +842,6 @@
angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
$scope.vm.form.issuesDown.push(issueDownVo.issue);
});
-
-
- // // wyu
- // angular.forEach(result.data.data.issueRelationVos, function (issueRelationColum){
- // issueRelationColum.issueRelation = $scope.vm.issueRelation;
- // $scope.vm.form.issues.push(issueRelationColum.issueRelation);
- // });
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
--
Gitblit v1.8.0