From 12a790240ef0301f839a55e1846ed0c5a32dffee Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 13:29:34 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js |   59 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 314fc34..9c5ef09 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -8,8 +8,8 @@
         'angular'
     ],
     function (app, angular) {
-        app.controller('issueAddDownTableConfigController', ['$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('issueAddDownTableConfigController', ['$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 = {
@@ -23,55 +23,49 @@
                 //  蹂��닔 紐⑥쓬
                 $scope.vm = {
                     issueId : "",
-                    issueTableConfigs : [{
-                        name : $filter("translate")("issue.downIssueTitle"), //
-                        key : "DOWN_ISSUE_TITLE",
-                        width : "width-100-p",
-                        position : 1,
-                        display : true
-                    }, {
+                    issueDownTableConfigs : [{
                         name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
                         key : "PRIORITY",
                         width : "width-80-p",
-                        position : 2,
-                        display : true
+                        position : 1,
+                        display : false
                     }, {
                         name : $filter("translate")("common.importance"), // 以묒슂�룄
                         key : "SEVERITY",
                         width : "width-80-p",
-                        position : 3,
-                        display : true
-                    }, {
-                        name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
-                        key : "ISSUE_TYPE",
-                        width : "width-140-p",
-                        position : 4,
-                        display : true
+                        position : 2,
+                        display : false
                     }, {
                         name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
                         key : "ASSIGNEE_TEAM",
                         width : "width-100-p",
-                        position : 5,
-                        display : true
+                        position : 3,
+                        display : false
                     }, {
                         name : $filter("translate")("common.register"), // �벑濡앹옄
                         key : "REGISTER",
                         width : "width-100-p",
-                        position : 6,
+                        position : 4,
                         display : false
                     }, {
                         name : $filter("translate")("common.period"), // 湲곌컙
                         key : "PERIOD",
                         width : "width-140-p",
-                        position : 7,
+                        position : 5,
                         display : false
                     }, {
                         name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
                         key : "MODIFY_DATE",
                         width : "width-100-p",
-                        position : 8,
+                        position : 6,
                         display : false
                     }, {
+                        name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭
+                        key : "ISSUE_DOWN_STATUS_TYPE",
+                        width : "width-100-p",
+                        position : 7,
+                        display : false
+                    },{
                     }]
                 };
 
@@ -90,8 +84,8 @@
                     $rootScope.spinner = true;
 
                     var content = {
-                        issueId : $rootScope.currentDetailIssueId,
-                        issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
+                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
+                        issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
                     };
 
                     IssueTableConfig.downAdd($resourceProvider.getContent(content,
@@ -102,7 +96,7 @@
                             swal.close();
                             $scope.fn.cancel();
                             //  蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
-                            $rootScope.$broadcast("getDownIssueTableConfigs", {});
+                            $rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId});
 
                         }
                         else {
@@ -140,9 +134,12 @@
                 //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
                 function getDownIssueTableConfigs() {
                     var deferred = $q.defer();
+
                     var content = {
                         issueId : $rootScope.currentDetailIssueId,
-                        issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
+                        delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
+                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
+                        issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
                     };
 
                     IssueTableConfig.downDetail($resourceProvider.getContent(content,
@@ -161,7 +158,7 @@
                 $scope.fn.getCustomFields().then(function (result) {
                     var count = 8;
                     angular.forEach(result, function (customField) {
-                        $scope.vm.issueTableConfigs.push({
+                        $scope.vm.issueDownTableConfigs.push({
                             name : customField.name,
                             key : "CUSTOM_FIELD_" + customField.id,
                             width : "width-100-p",
@@ -181,8 +178,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.issueDownTableConfigs) {
+                                    var issueTableConfig = $scope.vm.issueDownTableConfigs[count];
 
                                     if (issueTableConfig.key === saveTableConfig.key) {
                                         issueTableConfig.display = saveTableConfig.display;

--
Gitblit v1.8.0