From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 160 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 128 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 0768ab3..f3534dd 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);
}
@@ -68,35 +87,69 @@
.setDName("name")
.setDType("renderer")
.setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDRenderer("COMPANYFIELD_MODIFY"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.manager")
.setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDName("manager")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.tel")
- .setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setHWidth("width-200-p bold")
+ .setDName("tel")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.email")
- .setHWidth("bold")
- .setDName("name")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setHWidth("width-200-p bold")
+ .setDName("email")
+ .setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("companyField.desc")
- .setHWidth("bold")
- .setDName("name")
+ .setHName("companyField.url")
+ .setHWidth("width-200-p bold")
+ .setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.ipRange")
+ .setHWidth("width-120-p bold")
+ .setDName("ipRange")
.setDType("renderer")
.setDAlign("text-center")
- .setDRenderer("COMMON_MODIFY"));
+ .setDRenderer("COMPANYFIELD_IP"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.isp")
+ .setHWidth("bold")
+ .setDName("ispName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.hosting")
+ .setHWidth("bold")
+ .setDName("hostingName")
+ .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("width-80-p bold")
+ .setDName("regionName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.status")
+ .setHWidth("bold")
+ .setDName("statusName")
+ .setDAlign("text-center"));
}
// �뾽泥� 愿�由� 紐⑸줉 議고쉶
@@ -115,9 +168,8 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name //�뾽泥대챸
- };
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
CompanyField.find($resourceProvider.getContent(conditions,
@@ -125,8 +177,49 @@
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();
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ 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();
+ data.tel = data.tel.replace(/\,/g,"</br>");
+ }
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
+ if (data.email.indexOf("[") !== -1){
+ data.email = data.email.substr(1, data.email.indexOf("]")-1);
+ }
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
+ }
+ // url 議고쉶�떆 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.url)) {
+ data.url = data.url.trim();
+ if (data.url.indexOf(",") !== -1) {
+ data.url = data.url.replace(/\,/g,"</br>");
+ }
+ }
+ });
+
+ $scope.vm.responseData = result.data;
}
else {
SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
@@ -139,7 +232,7 @@
$uibModal.open({
templateUrl : 'views/companyField/companyFieldAdd.html',
size : "md",
- controller : 'companyFieldModifyController',
+ controller : 'companyFieldAddController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -164,6 +257,16 @@
};
}
}
+ });
+ }
+
+ // �뿊�� import �뙘�뾽 �샇異�
+ function importExcel() {
+ $uibModal.open({
+ templateUrl : 'views/companyField/companyFieldExcelImport.html',
+ size : "lg",
+ controller : 'companyFieldImportExcelController',
+ backdrop : 'static'
});
}
@@ -225,13 +328,6 @@
});
}
});
- }
-
- function makeSearchConditions() {
- var conditions = {
- name: $scope.vm.search.name
- }
- return conditions;
}
$scope.fn.makeTableConfigs();
--
Gitblit v1.8.0