From 71b4c4bd1f27314caaac6d245c460032f79ce830 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 14:18:06 +0900
Subject: [PATCH] 전체 이슈 키워드 검색 후 하위이슈 숨기기 버튼 활성화 또는 비활성화 시 검색되는 이슈가 다른 문제 해결 (projectId, issuetypeId가 조건에 들어가면서 생긴 문제)
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 110 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 99d318e..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, //�뾽泥� �궘�젣
- makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
+ importExcel : importExcel, // �뿊�� import 湲곕뒫 �뙘�뾽 �샇異�
};
// 蹂��닔
@@ -48,9 +50,26 @@
$scope.fn.getPageList(0);
});
+ // �뾽泥� 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ $scope.$on("getCompanyFieldList", function () {
+ $scope.fn.getPageList(0);
+ });
+
// 寃��깋 議곌굔 珥덇린�솕
function initSearch() {
$scope.vm.search.name = "";
+ $scope.fn.getPageList(0);
+ }
+
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ function makeSearchConditions() {
+ return{
+ name: $scope.vm.search.name
+ };
+ }
+
+ // �럹�씠吏� 蹂�寃�
+ function changePageRowCount() {
$scope.fn.getPageList(0);
}
@@ -76,16 +95,46 @@
.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()
- .setHName("companyField.desc")
+ .setHName("companyField.url")
+ .setHWidth("bold")
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.companyType")
+ .setHWidth("bold")
+ .setDName("companyTypeName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.parentSector")
+ .setHWidth("bold")
+ .setDName("parentSectorName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.childSector")
+ .setHWidth("bold")
+ .setDName("childSectorName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.region")
+ .setHWidth("bold")
+ .setDName("regionName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.status")
+ .setHWidth("bold")
+ .setDName("statusName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.memo")
.setHWidth("bold")
.setDName("memo")
.setDAlign("text-center"));
@@ -107,9 +156,8 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name //�뾽泥대챸
- };
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
CompanyField.find($resourceProvider.getContent(conditions,
@@ -117,8 +165,37 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
+
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
+ result.data.data.forEach(function (data) {
+ if (data.tel != null && data.tel !== "") {
+ 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++) {
+ let hyphen = telArr[i].trim();
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ if (telArr[i] === "") {
+ telArr.splice(i,1);
+ }
+ }
+ data.tel = telArr.join();
+ }
+ });
+
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
+ result.data.data.forEach(function (data) {
+ if (data.email != null && data.email !== "") {
+ if (data.email.indexOf("[") !== -1){
+ data.email = data.email.substr(1, data.email.indexOf("]")-1);
+ }
+ }
+ });
+
+ $scope.vm.responseData = result.data;
}
else {
SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
@@ -156,6 +233,16 @@
};
}
}
+ });
+ }
+
+ // �뿊�� import �뙘�뾽 �샇異�
+ function importExcel() {
+ $uibModal.open({
+ templateUrl : 'views/companyField/companyFieldExcelImport.html',
+ size : "lg",
+ controller : 'companyFieldImportExcelController',
+ backdrop : 'static'
});
}
@@ -217,13 +304,6 @@
});
}
});
- }
-
- function makeSearchConditions() {
- var conditions = {
- name: $scope.vm.search.name
- }
- return conditions;
}
$scope.fn.makeTableConfigs();
--
Gitblit v1.8.0