From 2b5c6c4c2b6d54ec4a2f2ba57561d8912065e0ee Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 15:48:28 +0900
Subject: [PATCH] - 전체프로젝트가 선택 된 상태에서 ISSUE TYPE LIST 선택 시에도 전체프로젝트로 유지되도록 수정 - 전체 프로젝트 또는 전체 이슈 일 경우에도 '이슈 만들기' 버튼 보이도록 수정(만들기 폼에서 프로젝트,이슈유형 수정가능하도록)

---
 src/main/webapp/scripts/app/companyField/companyFieldList.controller.js |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 902cadf..be4e4a0 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -15,10 +15,12 @@
                 $scope.fn = {
                     getPageList : getPageList, // �뾽泥� 愿�由� 由ъ뒪�듃
                     makeTableConfigs : makeTableConfigs, //  �뀒�씠釉� �꽕�젙
+                    changePageRowCount : changePageRowCount,    //  �럹�씠吏� 蹂�寃�
                     initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
                     add : add, //�뾽泥� �깮�꽦
                     makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
                     removes : removes, //�뾽泥� �궘�젣
+                    importExcel : importExcel,  //  �뿊�� import 湲곕뒫 �뙘�뾽 �샇異�
                 };
 
                 //  蹂��닔
@@ -48,6 +50,11 @@
                     $scope.fn.getPageList(0);
                 });
 
+                //  �뾽泥� 紐⑸줉 �뜲�씠�꽣 媛깆떊
+                $scope.$on("getCompanyFieldList", function () {
+                    $scope.fn.getPageList(0);
+                });
+
                 //  寃��깋 議곌굔 珥덇린�솕
                 function initSearch() {
                     $scope.vm.search.name = "";
@@ -59,6 +66,11 @@
                     return{
                         name: $scope.vm.search.name
                     };
+                }
+
+                //  �럹�씠吏� 蹂�寃�
+                function changePageRowCount() {
+                    $scope.fn.getPageList(0);
                 }
 
                 //  �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -83,12 +95,12 @@
                         .setDAlign("text-center"));
                     $scope.vm.tableConfigs.push($tableProvider.config()
                         .setHName("companyField.tel")
-                        .setHWidth("bold")
+                        .setHWidth("width-200-p bold")
                         .setDName("tel")
                         .setDAlign("text-center"));
                     $scope.vm.tableConfigs.push($tableProvider.config()
                         .setHName("companyField.email")
-                        .setHWidth("bold")
+                        .setHWidth("width-200-p bold")
                         .setDName("email")
                         .setDAlign("text-center"));
                     $scope.vm.tableConfigs.push($tableProvider.config()
@@ -157,7 +169,10 @@
                             // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
                             result.data.data.forEach(function (data) {
                                 if (data.tel != null && data.tel !== "") {
-                                    var tels = data.tel.substr(1, data.tel.indexOf("]")-1);
+                                    var tels = data.tel;
+                                    if (data.tel.indexOf("[") !== -1){
+                                        tels = data.tel.substr(1, data.tel.indexOf("]")-1);
+                                    }
                                     var telArr = tels.split(",");
 
                                     for (var i = 0; i < telArr.length; i++) {
@@ -174,7 +189,9 @@
                             // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
                             result.data.data.forEach(function (data) {
                                 if (data.email != null && data.email !== "") {
-                                    data.email = data.email.substr(1, data.email.indexOf("]")-1);
+                                    if (data.email.indexOf("[") !== -1){
+                                        data.email = data.email.substr(1, data.email.indexOf("]")-1);
+                                    }
                                 }
                             });
 
@@ -219,6 +236,16 @@
                     });
                 }
 
+                //  �뿊�� import �뙘�뾽 �샇異�
+                function importExcel() {
+                    $uibModal.open({
+                        templateUrl : 'views/companyField/companyFieldExcelImport.html',
+                        size : "lg",
+                        controller : 'companyFieldImportExcelController',
+                        backdrop : 'static'
+                    });
+                }
+
                 //  �뾽泥� �궘�젣
                 function removes() {
                     var removeIds = [];

--
Gitblit v1.8.0