From 8fab2c64de2185fb905a9f63ff92c205cc8c75ca Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 수, 16 3월 2022 18:26:35 +0900 Subject: [PATCH] - 이슈목록 - 테이블표시설정에 등록일 추가 --- src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js index d64ece1..c27a17a 100644 --- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js @@ -23,6 +23,7 @@ // 蹂��닔 紐⑥쓬 $scope.vm = { + allIssue : parameter.allIssue, issueTableConfigs : [{ name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐� key : "ISSUE_TITLE", @@ -86,6 +87,13 @@ position : 8, display : false, checkboxShow : true + }, { + name : $filter("translate")("common.registerDate"), // �벑濡앹씪 + key : "REGISTER_DATE", + width : "width-80-p", + position : 9, + display : false, + checkboxShow : true }] }; @@ -104,7 +112,15 @@ $rootScope.spinner = true; var content = { - issueTypeId : $rootScope.getCurrentIssueTypeId(), + issueTypeId : (function () { + var id = ""; + if ($rootScope.allIssueList) { + id = -1; + } else { + id = $rootScope.getCurrentIssueTypeId(); + } + return id; + })(), issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) }; @@ -114,15 +130,14 @@ if (result.data.message.status === "success") { SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎." - // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎. - swal.close(); + //swal.close(); $scope.fn.cancel(); + // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎. $rootScope.$broadcast("getIssueTableConfigs", {}); } else { SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣 } - $rootScope.spinner = false; }); } @@ -172,7 +187,15 @@ var content = { //delValue : $scope.vm.issueTableConfigs.splice(12,1), issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs), - issueTypeId : $rootScope.getCurrentIssueTypeId() + issueTypeId : (function () { + var id = ""; + if ($rootScope.allIssueList) { + id = -1; + } else { + id = $rootScope.getCurrentIssueTypeId(); + } + return id; + })() }; // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. function getIssueAddTableConfigs() { @@ -199,7 +222,7 @@ // �뙆�듃�꼫瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. $scope.fn.getUsePartner().then(function (result) { - var count = 9; + let count = 10; angular.forEach(result, function (partner) { $scope.vm.issueTableConfigs.push({ name : partner.name, @@ -219,7 +242,7 @@ checkboxShow : true, position : count }); - count++; + count ++; }); // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. $scope.fn.getCustomFields().then(function (result) { @@ -250,7 +273,7 @@ if (issueTableConfig.key === saveTableConfig.key) { issueTableConfig.display = saveTableConfig.display; issueTableConfig.width = saveTableConfig.width; - issueTableConfig.position = saveTableConfig.position; + issueTableConfig.position = parseInt(saveTableConfig.position); break; } } -- Gitblit v1.8.0