From be5e72136e63e4d3513c4c66979fad8e0109c42d Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 25 11월 2021 15:53:10 +0900 Subject: [PATCH] 이슈유형 - 업체,isp,호스팅 정보 Y/N 으로 변경 --- src/main/webapp/scripts/app/issue/issueDetail.controller.js | 131 +++++++++++++++++++------------------------ 1 files changed, 57 insertions(+), 74 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js index 065b0f6..3e01d52 100644 --- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js @@ -205,10 +205,12 @@ } // �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎. - function setRelTableColumn(issueTableConfig) { + function setRelTableColumn(Rel_issueTableConfig) { // �뿰愿� �씠�뒋 而щ읆 - switch(issueTableConfig.key) { + switch(Rel_issueTableConfig.key) { + + // �뿰愿� �씠�뒋 援щ텇 case "RELATION_ISSUE_TYPE" : $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueType") @@ -217,6 +219,7 @@ .setHSort(false) .setDRenderer("ISSUE_RELATION_TYPE")) break; + // �뿰愿� �씠�뒋 �젣紐� case "RELATION_ISSUE_TITLE" : $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueTitle") @@ -230,7 +233,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; @@ -239,46 +242,39 @@ .setHName("common.importance") .setDName("severityName") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_COMMON_SEVERITY")); break; - case "ISSUE_TYPE" : // �씠�뒋 ���엯 - $scope.vm.relTableConfigs.push($tableProvider.config() - .setHName("issue.issueType") - .setHWidth("bold " + issueTableConfig.width) - .setDAlign("text-center") - .setDName("issueTypeName")); - break; - case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌 + case "ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("ISSUE_DEPARTMENT")); + .setDRenderer("REL_ISSUE_DEPARTMENT")); break; - case "REGISTER" : // �벑濡앹옄 + case "REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄 $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; - case "PERIOD" : // 湲곌컙 + case "PERIOD" : // �뿰愿� �씠�뒋 湲곌컙 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.period") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("ISSUE_DUE_DATE")); + .setDRenderer("REL_ISSUE_DUE_DATE")); break; - case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪 + 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; @@ -293,19 +289,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; } } @@ -314,91 +310,85 @@ // �뀒�씠釉붿쓽 �븯�쐞 �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎. - function setDownTableColumn(issueTableConfig) { + function setDownTableColumn(Down_issueTableConfig) { // if (issueTableConfig == null) return; // �븯�쐞 �씠�뒋 而щ읆 - switch(issueTableConfig.key) { - case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐� + 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; - case "PRIORITY" : // �슦�꽑�닚�쐞 + case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.priority") .setDName("priorityName") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("COMMON_PRIORITY")); + .setDRenderer("DOWN_COMMON_PRIORITY")); break; case "SEVERITY" : // 以묒슂�룄 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.importance") .setDName("severityName") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("COMMON_SEVERITY")); - break; - case "ISSUE_TYPE" : // �씠�뒋 ���엯 - $scope.vm.downTableConfigs.push($tableProvider.config() - .setHName("issue.issueType") - .setHWidth("bold " + issueTableConfig.width) - .setDAlign("text-center") - .setDName("issueTypeName")); + .setDRenderer("DOWN_COMMON_SEVERITY")); break; case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("ISSUE_DEPARTMENT")); + .setDRenderer("DOWN_ISSUE_DEPARTMENT")); break; case "REGISTER" : // �벑濡앹옄 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.register") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("REGISTER")); + .setDRenderer("DOWN_REGISTER")); break; case "PERIOD" : // 湲곌컙 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.period") .setDType("renderer") - .setHWidth("bold " + issueTableConfig.width) + .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") - .setDRenderer("ISSUE_DUE_DATE")); + .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; } } @@ -432,11 +422,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); } }); } @@ -460,11 +450,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); } }); } @@ -507,11 +497,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); } }); @@ -562,11 +552,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() @@ -678,7 +668,8 @@ resolve : { parameter : function () { return { - issueIds : [$scope.vm.viewer.id] + issueIds : [$scope.vm.viewer.id], + projectId : $scope.vm.viewer.projectVo.id }; } } @@ -803,7 +794,6 @@ // �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎. $scope.fn.setUseValueByIssueTypeCustomFields(result.data.data.issueCustomFieldValueVos); - // �뿰愿� �씪媛� $scope.vm.issueName = ""; $scope.vm.form.issues = []; @@ -821,13 +811,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