From f2fcf329cea64d71c671f1ab17f17d1634d1464d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:08:23 +0900
Subject: [PATCH] - API로 이슈 추가 시 하위이슈처리기준 항목으로 동일한 업체 정보로 이슈 생성하여 하위이슈로 넣기 - 업체 테이블에 ip_start, ip_end 컬럼 추가
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index fa84c74..f3534dd 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -15,6 +15,7 @@
$scope.fn = {
getPageList : getPageList, // �뾽泥� 愿�由� 由ъ뒪�듃
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
+ changePageRowCount : changePageRowCount, // �럹�씠吏� 蹂�寃�
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //�뾽泥� �깮�꽦
makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
@@ -67,6 +68,11 @@
};
}
+ // �럹�씠吏� 蹂�寃�
+ function changePageRowCount() {
+ $scope.fn.getPageList(0);
+ }
+
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
@@ -89,18 +95,35 @@
.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.url")
- .setHWidth("bold")
+ .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("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")
@@ -119,18 +142,13 @@
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.region")
- .setHWidth("bold")
+ .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"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("companyField.memo")
- .setHWidth("bold")
- .setDName("memo")
.setDAlign("text-center"));
}
@@ -160,31 +178,44 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
if (data.tel != null && data.tel !== "") {
+ var tels = data.tel;
if (data.tel.indexOf("[") !== -1){
- var 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();
+ tels = data.tel.substr(1, data.tel.indexOf("]")-1);
}
- }
- });
+ var telArr = tels.split(",");
- // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄�
- result.data.data.forEach(function (data) {
- if (data.email != null && data.email !== "") {
+ 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>");
+ }
}
});
--
Gitblit v1.8.0