From 2ffa64e0b88f73c531b61afd590b7be3d8bfa6bc Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 23 11월 2021 20:52:37 +0900 Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트] --- src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js index ff5f903..bbe519e 100644 --- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js @@ -11,19 +11,20 @@ app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter', function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter) { + // �븿�닔 紐⑥쓬 $scope.fn = { cancel : cancel, // �뙘�뾽 李� �떕湲� formSubmit : formSubmit, // �뤌 �쟾�넚 formCheck : formCheck, // �뤌 泥댄겕 getCustomFields : getCustomFields, // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 媛��졇�삩�떎. - getIssueTableConfigs : getIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. + getRelIssueTableConfigs : getRelIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. }; // 蹂��닔 紐⑥쓬 $scope.vm = { issueId: "", - issueTableConfigs : [{ + issueRelTableConfigs : [{ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞 key : "PRIORITY", width : "width-100-p", @@ -32,39 +33,39 @@ }, { name : $filter("translate")("common.importance"), // 以묒슂�룄 key : "SEVERITY", - width : "width-80-p", + width : "width-100-p", position : 2, display : true }, { name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯 key : "ISSUE_TYPE", - width : "width-140-p", + width : "width-100-p", position : 3, display : true }, { - name : $filter("translate")("common.assignee"), // �떞�떦�옄 - key : "ASSIGNEE", - width : "width-100-p", + name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌 + key : "ASSIGNEE_TEAM", + width : "width-50-p", position : 4, display : true }, { name : $filter("translate")("common.register"), // �벑濡앹옄 key : "REGISTER", - width : "width-100-p", + width : "width-50-p", position : 5, - display : false + display : true }, { name : $filter("translate")("common.period"), // 湲곌컙 key : "PERIOD", - width : "width-140-p", + width : "width-100-p", position : 6, - display : false + display : true }, { name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪 key : "MODIFY_DATE", width : "width-100-p", position : 7, - display : false + display : true }, { }] }; @@ -85,7 +86,7 @@ var content = { issueId : $rootScope.currentDetailIssueId, - issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) + issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs) }; IssueTableConfig.relationAdd($resourceProvider.getContent(content, @@ -93,8 +94,10 @@ if (result.data.message.status === "success") { SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎." + swal.close(); + $scope.fn.cancel(); // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎. - $rootScope.$broadcast("getIssueTableConfigs", {}); + $rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId}); } else { SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣 @@ -129,12 +132,12 @@ } // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. - function getIssueTableConfigs() { + function getRelIssueTableConfigs() { var deferred = $q.defer(); var content = { issueId : $rootScope.currentDetailIssueId, - issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) + issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs) }; IssueTableConfig.relationDetail($resourceProvider.getContent(content, @@ -151,9 +154,9 @@ // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. $scope.fn.getCustomFields().then(function (result) { - var count = 7; + var count = 9; angular.forEach(result, function (customField) { - $scope.vm.issueTableConfigs.push({ + $scope.vm.issueRelTableConfigs.push({ name : customField.name, key : "CUSTOM_FIELD_" + customField.id, width : "width-100-p", @@ -165,7 +168,7 @@ }); // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. - $scope.fn.getIssueTableConfigs().then(function (issueTableConfigs) { + $scope.fn.getRelIssueTableConfigs().then(function (issueTableConfigs) { if ($rootScope.isDefined(issueTableConfigs)) { $rootScope.spinner = true; @@ -173,8 +176,8 @@ angular.forEach(saveTableConfigs, function (saveTableConfig) { - for (var count in $scope.vm.issueTableConfigs) { - var issueTableConfig = $scope.vm.issueTableConfigs[count]; + for (var count in $scope.vm.issueRelTableConfigs) { + var issueTableConfig = $scope.vm.issueRelTableConfigs[count]; if (issueTableConfig.key === saveTableConfig.key) { issueTableConfig.display = saveTableConfig.display; -- Gitblit v1.8.0