From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 10:40:00 +0900
Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정

---
 src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index d64ece1..683c1ef 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -23,6 +23,7 @@
 
                 //  蹂��닔 紐⑥쓬
                 $scope.vm = {
+                    allIssue : parameter.allIssue,
                     issueTableConfigs : [{
                         name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
                         key : "ISSUE_TITLE",
@@ -104,7 +105,15 @@
                     $rootScope.spinner = true;
 
                     var content = {
-                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
+                        issueTypeId : (function () {
+                            var id = "";
+                            if ($rootScope.allIssueList) {
+                                id = -1;
+                            } else {
+                                id = $rootScope.getCurrentIssueTypeId();
+                            }
+                            return id;
+                        })(),
                         issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
                     };
 
@@ -114,15 +123,14 @@
                         if (result.data.message.status === "success") {
                             SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."
 
-                            //  蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
-                            swal.close();
+                            //swal.close();
                             $scope.fn.cancel();
+                            //  蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
                             $rootScope.$broadcast("getIssueTableConfigs", {});
                         }
                         else {
                             SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣
                         }
-
                         $rootScope.spinner = false;
                     });
                 }
@@ -172,7 +180,15 @@
                 var content = {
                     //delValue : $scope.vm.issueTableConfigs.splice(12,1),
                     issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs),
-                    issueTypeId : $rootScope.getCurrentIssueTypeId()
+                    issueTypeId : (function () {
+                        var id = "";
+                        if ($rootScope.allIssueList) {
+                            id = -1;
+                        } else {
+                            id = $rootScope.getCurrentIssueTypeId();
+                        }
+                        return id;
+                    })()
                 };
                 //  �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
                 function getIssueAddTableConfigs() {
@@ -250,7 +266,7 @@
                                         if (issueTableConfig.key === saveTableConfig.key) {
                                             issueTableConfig.display = saveTableConfig.display;
                                             issueTableConfig.width = saveTableConfig.width;
-                                            issueTableConfig.position = saveTableConfig.position;
+                                            issueTableConfig.position = parseInt(saveTableConfig.position);
                                             break;
                                         }
                                     }

--
Gitblit v1.8.0