From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정

---
 src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index 8b844bd..1de28b2 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -8,8 +8,8 @@
         'angular'
     ],
     function (app, angular) {
-        app.controller('issueAddTableConfigController', ['$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('issueAddTableConfigController', ['$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,13 +17,13 @@
                     formSubmit : formSubmit,    //  �뤌 �쟾�넚
                     formCheck : formCheck,  //  �뤌 泥댄겕
                     getCustomFields : getCustomFields,   //  �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 媛��졇�삩�떎.
-                    getIssueTableConfigs : getIssueTableConfigs //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
+                    getIssueAddTableConfigs : getIssueAddTableConfigs //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
                 };
 
                 //  蹂��닔 紐⑥쓬
                 $scope.vm = {
                     issueTableConfigs : [{
-                        name : $filter("translate")("common.importance"), // �슦�꽑�닚�쐞
+                        name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
                         key : "PRIORITY",
                         width : "width-80-p",
                         position : 1,
@@ -51,19 +51,19 @@
                         key : "REGISTER",
                         width : "width-100-p",
                         position : 5,
-                        display : true
+                        display : false
                     }, {
                         name : $filter("translate")("common.period"), // 湲곌컙
                         key : "PERIOD",
                         width : "width-140-p",
                         position : 6,
-                        display : true
+                        display : false
                     }, {
                         name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
                         key : "MODIFY_DATE",
                         width : "width-100-p",
                         position : 7,
-                        display : true
+                        display : false
                     }, {
                     }]
                 };
@@ -83,6 +83,7 @@
                     $rootScope.spinner = true;
 
                     var content = {
+                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                         issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
                     };
 
@@ -129,15 +130,27 @@
                     return deferred.promise;
                 }
 
+                var content = {
+                    delValue : $scope.vm.issueTableConfigs.splice(7,1),
+                    issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs),
+                    issueTypeId : $rootScope.getCurrentIssueTypeId()
+                };
                 //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
-                function getIssueTableConfigs() {
+                function getIssueAddTableConfigs() {
                     var deferred = $q.defer();
 
-                    IssueTableConfig.detail($resourceProvider.getContent({},
+                    IssueTableConfig.detail($resourceProvider.getContent(content,
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
                         if (result.data.message.status !== "success") {
                             SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
                         }
+
+                        // for (var i = 0; i < result.data.name; i++) {
+                        //     if (result.data.name === '') {
+                        //         result.splice(i,1);
+                        //         i--;
+                        //     }
+                        // }
 
                         deferred.resolve(result.data.data);
                     });
@@ -161,7 +174,7 @@
                     });
 
                     //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
-                    $scope.fn.getIssueTableConfigs().then(function (issueTableConfigs) {
+                    $scope.fn.getIssueAddTableConfigs().then(function (issueTableConfigs) {
                         if ($rootScope.isDefined(issueTableConfigs)) {
                             $rootScope.spinner = true;
 

--
Gitblit v1.8.0