From e20d45b8eb6f2c0b627de1281db9618131d8f68a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 16:28:21 +0900
Subject: [PATCH] 테이블 표시 설정 로딩 화면 표시 오류 연관, 하위 spinner 타이밍 수정
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 44 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..a4e5e62 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -8,8 +8,9 @@
'angular'
],
function (app, angular) {
- 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) {
+ app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter', 'parameter',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter, parameter) {
+
// �븿�닔 紐⑥쓬
$scope.fn = {
@@ -17,54 +18,68 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getCustomFields : getCustomFields, // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 媛��졇�삩�떎.
- getIssueTableConfigs : getIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
+ getRelIssueTableConfigs : getRelIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
};
// 蹂��닔 紐⑥쓬
$scope.vm = {
- issueId: "",
- issueTableConfigs : [{
+ issueTypeId: "",
+ issueRelTableConfigs : [{
+ name : $filter("translate")("issue.relationIssueType"), // �뿰愿� �씠�뒋 援щ텇
+ key : "RELATION_ISSUE_TYPE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
+ name : $filter("translate")("issue.relationIssueTitle"), // �뿰愿� �씠�뒋 �젣紐�
+ key : "RELATION_ISSUE_TITLE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-100-p",
+ key : "RELATION_PRIORITY",
+ width : "width-50-p",
position : 1,
- display : true
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
+ key : "RELATION_SEVERITY",
+ width : "width-50-p",
position : 2,
- display : true
+ display : false,
+ checkboxShow : true
}, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "RELATION_ASSIGNEE_TEAM",
+ width : "width-50-p",
position : 3,
- display : true
- }, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
- width : "width-100-p",
- position : 4,
- display : true
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
- key : "REGISTER",
- width : "width-100-p",
- position : 5,
- display : false
+ key : "RELATION_REGISTER",
+ width : "width-50-p",
+ position : 4,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.period"), // 湲곌컙
- key : "PERIOD",
- width : "width-140-p",
- position : 6,
- display : false
+ key : "RELATION_PERIOD",
+ width : "width-100-p",
+ position : 5,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
- key : "MODIFY_DATE",
+ key : "RELATION_MODIFY_DATE",
width : "width-100-p",
- position : 7,
- display : false
+ position : 6,
+ display : false,
+ checkboxShow : true
}, {
}]
};
@@ -84,8 +99,8 @@
$rootScope.spinner = true;
var content = {
- issueId : $rootScope.currentDetailIssueId,
- issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
+ issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
IssueTableConfig.relationAdd($resourceProvider.getContent(content,
@@ -93,14 +108,14 @@
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); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣
}
-
- $rootScope.spinner = false;
});
}
@@ -128,13 +143,17 @@
return deferred.promise;
}
+
+
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
- function getIssueTableConfigs() {
+ function getRelIssueTableConfigs() {
var deferred = $q.defer();
var content = {
issueId : $rootScope.currentDetailIssueId,
- issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
+ delValue : $scope.vm.issueRelTableConfigs.splice(8,1),
+ issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
IssueTableConfig.relationDetail($resourceProvider.getContent(content,
@@ -151,13 +170,14 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 8;
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",
display : false,
+ checkboxShow : true,
position : count
});
@@ -165,16 +185,17 @@
});
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
- $scope.fn.getIssueTableConfigs().then(function (issueTableConfigs) {
+ $scope.fn.getRelIssueTableConfigs().then(function (issueTableConfigs) {
if ($rootScope.isDefined(issueTableConfigs)) {
$rootScope.spinner = true;
+ // var saveTableConfigs = JSON.parse(issueTableConfigs);
var saveTableConfigs = JSON.parse(issueTableConfigs);
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