From 726b916d69be892a576ca5fba5d0334de1d8a6eb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 17:38:53 +0900
Subject: [PATCH] 연관이슈, 하위이슈 정보 추가 수정

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

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 09e5b4e..7a8041e 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -73,9 +73,11 @@
                     priorities : [],    //  �슦�꽑 �닚�쐞
                     severities : [],    //  以묒슂�룄
                     users : [], //  �떞�떦�옄
+                    departments : [], //  �떞�떦遺��꽌
                     registers : [], //  �벑濡앹옄
                     customFields : [],  //  �궗�슜�옄 �젙�쓽 �븘�뱶
-                    issueTableConfigs : []  //  �씠�뒋 �뀒�씠釉� �꽕�젙
+                    issueTableConfigs : [],  //  �씠�뒋 �뀒�씠釉� �꽕�젙
+                    parentIssueId : ""
                 };
 
                 //  �뀒�씠釉� �씠踰ㅽ듃
@@ -102,7 +104,9 @@
                             search : $scope.vm.search,
                             projects : $scope.vm.projects,
                             users : $scope.vm.users,
-                            registers : $scope.vm.registers
+                            departments : $scope.vm.departments,
+                            registers : $scope.vm.registers,
+                            parentIssueId : $scope.vm.parentIssueId
                         })
                     };
 
@@ -120,6 +124,7 @@
 
                 //  �꽌踰꾩뿉 ���옣�븳 �씠�뒋 寃��깋 議곌굔�쓣 媛��졇�삩�떎.
                 function getVmSearchObject() {
+
                     IssueSearch.detail($resourceProvider.getContent({}, $resourceProvider.getPageContent(0, 0))).then(function (result) {
 
                         if (result.data.message.status === "success") {
@@ -127,9 +132,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 {
@@ -239,13 +245,13 @@
                                 .setDAlign("text-center")
                                 .setDName("issueTypeName"));
                             break;
-                        case "ASSIGNEE" :   //  �떞�떦�옄
+                        case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.tableConfigs.push($tableProvider.config()
-                                .setHName("common.assignee")
+                                .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()
@@ -374,6 +380,15 @@
 
                             return userIds;
                         })(),
+                        departmentIds : (function () {
+                            var departmentIds = [];
+
+                            angular.forEach($scope.vm.departments, function (department) {
+                                departmentIds.push(department.id);
+                            });
+
+                            return departmentIds;
+                        })(),
                         registerIds : (function () {
                             var registerIds = [];
 
@@ -447,6 +462,14 @@
                         currentPage = selectedPage;
                     }
 
+                    // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+                    if ($rootScope.issueTypeMenu != null) {
+                        // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+                        $scope.vm.search.issueTypeIds.push({
+                            fieldKey : $rootScope.issueTypeMenu.id,
+                            fieldValue : $rootScope.issueTypeMenu.name
+                        });
+                    }
 
                     //  寃��깋 議곌굔�쓣 ���옣�븳�떎.
                     //$scope.fn.makeVmSearchObject();
@@ -857,8 +880,8 @@
                                     position : 3,
                                     display : true
                                 }, {
-                                    name : $filter("translate")("common.assignee"), // �떞�떦�옄
-                                    key : "ASSIGNEE",
+                                    name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+                                    key : "ASSIGNEE_TEAM",
                                     width : "width-140-p",
                                     position : 4,
                                     display : true

--
Gitblit v1.8.0