From 279c4135ea0c0655b4c5b5b54f6340a5f80744f5 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 17:13:44 +0900
Subject: [PATCH] 부서 설정 변경[프론트]

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 3b68c16..a0df35a 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -41,6 +41,7 @@
 
                 //  蹂��닔
                 $scope.vm = {
+                    issueTypeId : "",
                     search : {
                         title : "", //  �젣紐�
                         description : "",   //  �궡�슜
@@ -73,6 +74,7 @@
                     priorities : [],    //  �슦�꽑 �닚�쐞
                     severities : [],    //  以묒슂�룄
                     users : [], //  �떞�떦�옄
+                    departments : [], //  �떞�떦遺��꽌
                     registers : [], //  �벑濡앹옄
                     customFields : [],  //  �궗�슜�옄 �젙�쓽 �븘�뱶
                     issueTableConfigs : [],  //  �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -103,6 +105,7 @@
                             search : $scope.vm.search,
                             projects : $scope.vm.projects,
                             users : $scope.vm.users,
+                            departments : $scope.vm.departments,
                             registers : $scope.vm.registers,
                             parentIssueId : $scope.vm.parentIssueId
                         })
@@ -130,9 +133,10 @@
                                 var issueListSearchObject = JSON.parse(result.data.data);
                                 //  �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
                                 $scope.vm.search = issueListSearchObject.search;
-                                /*$scope.vm.users = issueListSearchObject.users;
+                                $scope.vm.users = issueListSearchObject.users;
+                                $scope.vm.departments = issueListSearchObject.departments;
                                 $scope.vm.projects = issueListSearchObject.projects;
-                                $scope.vm.registers = issueListSearchObject.registers;*/
+                                $scope.vm.registers = issueListSearchObject.registers;
 
                                 $scope.fn.getPageList(0, true);
                             } else {
@@ -242,13 +246,13 @@
                                 .setDAlign("text-center")
                                 .setDName("issueTypeName"));
                             break;
-                        case "ASSIGNEETEAM" :   //  �떞�떦遺��꽌
+                        case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
-                                .setDRenderer("ISSUE_USER"));
+                                .setDRenderer("ISSUE_DEPARTMENT"));
                             break;
                         case "REGISTER" :   //  �벑濡앹옄
                             $scope.vm.tableConfigs.push($tableProvider.config()
@@ -377,6 +381,15 @@
 
                             return userIds;
                         })(),
+                        departmentIds : (function () {
+                            var departmentIds = [];
+
+                            angular.forEach($scope.vm.departments, function (department) {
+                                departmentIds.push(department.id);
+                            });
+
+                            return departmentIds;
+                        })(),
                         registerIds : (function () {
                             var registerIds = [];
 
@@ -478,6 +491,7 @@
                         $resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
 
                         if (result.data.message.status === "success") {
+                            $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
                             $scope.vm.page.selectedPage = currentPage + 1;
                             $scope.vm.responseData = result.data;
                             if (detail) {
@@ -660,7 +674,13 @@
                         size : "lg",
                         controller : 'issueAddTableConfigController',
                         backdrop : 'static',
-                        resolve : {}
+                        resolve : {
+                            parameter : function () {
+                                return {
+                                    issueTypeId : $scope.vm.issueTypeId
+                                };
+                            }
+                        }
                     });
                 }
 
@@ -869,7 +889,7 @@
                                     display : true
                                 }, {
                                     name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
-                                    key : "ASSIGNEETEAM",
+                                    key : "ASSIGNEE_TEAM",
                                     width : "width-140-p",
                                     position : 4,
                                     display : true

--
Gitblit v1.8.0