From 13df3419f367b1448a844120840459a17df02f3a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 11:17:02 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 62648a8..5ce58c6 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -104,6 +104,13 @@
 
                 angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
 
+                // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+                $scope.$on("findIssueListOK", function (event, args) {
+                    if (args != null) {
+                        $scope.fn.startExecute();
+                    }
+                });
+
                 //  �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
                 $scope.$on("getIssueList", function () {
                     $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
@@ -325,6 +332,7 @@
                         case "ISSUE_TITLE" :   //  �씠�뒋 �젣紐�
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("issue.issueTitle")
+                                .setDName("issueTitle")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -334,7 +342,7 @@
                         case "PRIORITY" :   //  �슦�꽑�닚�쐞
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.priority")
-                                .setDName("priorityName")
+                                .setDName("priority")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -343,22 +351,25 @@
                         case "SEVERITY" :   //  以묒슂�룄
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.importance")
-                                .setDName("severityName")
+                                .setDName("severity")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
                                 .setDRenderer("COMMON_SEVERITY"));
                             break;
-                        case "ISSUE_TYPE" : //  �씠�뒋 ���엯
+                        case "ISSUE_TYPE" : //  �씠�뒋 �쑀�삎
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("issue.issueType")
+                                .setDName("issueType")
+                                .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
-                                .setDName("issueTypeName"));
+                                .setDRenderer("COMMON_ISSUE_TYPE"));
                             break;
                         case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
+                                .setDName("assigneeTeam")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -367,6 +378,7 @@
                         case "REGISTER" :   //  �벑濡앹옄
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.register")
+                                .setDName("register")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -375,6 +387,7 @@
                         case "PERIOD" : //  湲곌컙
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.period")
+                                .setDName("period")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -390,6 +403,7 @@
                         case "COUNT_DOWN_ISSUE" : //  �븯�쐞 �씠�뒋 媛쒖닔
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.countDownIssue")
+                                .setDName("countDownIssue")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -407,6 +421,7 @@
                                 $scope.vm.tableConfigs.push($tableProvider.config()
                                     .setHName(customField.name)
                                     .setDType("renderer")
+                                    .setDName("customFieldName" + [count])
                                     .setHWidth("bold " + issueTableConfig.width)
                                     .setDAlign("text-center")
                                     .setColumnHint(customField)
@@ -1278,6 +1293,12 @@
                     });
                 }
 
+                // this.router.navigate(['path/to'])
+                //     .then(() => {
+                //         window.location.reload();
+                //     });
+
+
                 $scope.fn.startExecute();
             }
 

--
Gitblit v1.8.0