From 911e65ca7d4f47ec18212375b4eb479c1c40acbe Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 07 1월 2022 10:03:18 +0900
Subject: [PATCH] 연락처 입력시 하이픈 자동 입력 (지역, 핸드폰 번호)
---
src/main/webapp/views/hostingField/hostingFieldAdd.html | 12
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 64 +++++++
src/main/webapp/views/user/superUserAdd.html | 2
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 9 +
src/main/webapp/views/user/userAdd.html | 2
src/main/webapp/views/ispField/ispFieldAdd.html | 12
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 56 ++++++
src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js | 56 +++++++
src/main/webapp/views/ispField/ispFieldModify.html | 12
src/main/webapp/views/companyField/companyFieldModify.html | 12
src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js | 56 +++++++
src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js | 9 +
src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js | 52 ++++++
src/main/webapp/views/hostingField/hostingFieldModify.html | 11
src/main/webapp/scripts/app/ispField/ispFieldList.controller.js | 9 +
src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js | 49 ++++++
src/main/webapp/views/companyField/companyFieldAdd.html | 12
src/main/webapp/scripts/app/user/userAdd.controller.js | 12 +
18 files changed, 397 insertions(+), 50 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 41c6544..1457b34 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -15,7 +15,8 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
- getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack,
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -72,9 +73,60 @@
$scope.vm.form.hostingId = result[0].id;
});
+ // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ function autoHyphenPhone() {
+ let phone = $scope.vm.form.tel
+ let seoul = $scope.vm.form.tel
+
+ // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ phone.replace(/^[0-9]/g, '');
+ // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ seoul.replace(/^[0-9]/g, '');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 9) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 10) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
// �뤌 �쟾�넚
function formSubmit(condition) {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
@@ -122,9 +174,7 @@
$uibModalInstance.dismiss('cancel');
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
-
}
-
]);
}
);
\ No newline at end of file
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index d3acb3c..3c387b3 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -128,8 +128,15 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
+
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
+ result.data.data.forEach(function (telData) {
+ let hyphen = telData.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ telData.tel = phone;
+ });
+ $scope.vm.responseData = result.data;
}
else {
SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 30b0a5b..3623ed9 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -17,7 +17,8 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
- getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack,
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -59,6 +60,57 @@
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
+ // �뿰�씫泥� �엯�젰�떆 - �옄�룞 �엯�젰
+ function autoHyphenPhone() {
+ let phone = $scope.vm.form.tel
+ let seoul = $scope.vm.form.tel
+
+ // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ phone.replace(/^[0-9]/g, '');
+ // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ seoul.replace(/^[0-9]/g, '');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 9) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 10) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
+ // �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
return true;
@@ -78,6 +130,7 @@
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
id : parameter.id,
@@ -146,13 +199,18 @@
$scope.vm.form.name = result.data.content.name;
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ let hyphen = result.data.content.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ result.data.content.tel = phone;
$scope.vm.form.tel = result.data.content.tel;
$scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
- if(result.data.content.ispFieldVo != null){
+
+ if (result.data.content.ispFieldVo != null) {
$scope.vm.form.ispName = result.data.content.ispFieldVo.name;
}
- if(result.data.content.hostingFieldVo != null){
+ if (result.data.content.hostingFieldVo != null) {
$scope.vm.form.hostingName = result.data.content.hostingFieldVo.name;
}
}
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
index f9ed321..24727b6 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
@@ -14,6 +14,7 @@
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -28,6 +29,53 @@
}
};
+ function autoHyphenPhone() {
+ let phone = $scope.vm.form.tel;
+ let seoul = $scope.vm.form.tel;
+
+ phone.replace(/^[0-9]/g, '');
+ seoul.replace(/^[0-9]/g, '');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 9) {
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 10) {
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
// �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
@@ -39,6 +87,7 @@
// �뤌 �쟾�넚
function formSubmit(condition) {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,'');
var content = {
code : $rootScope.preventXss($scope.vm.form.code), //肄붾뱶
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
index 8f1ce26..c57c3ac 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldList.controller.js
@@ -127,8 +127,15 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
+ result.data.data.forEach(function (telDatas) {
+ let hyphen = telDatas.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ telDatas.tel = phone;
+ });
+
+ $scope.vm.responseData = result.data;
}
else {
SweetAlert.error($filter("translate")("hostingField.failedToSelectHostingFieldFullList"), result.data.message.message); // �샇�뒪�똿 愿�由� 紐⑸줉 議고쉶 �떎�뙣
diff --git a/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
index 86c33ff..27f391b 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
@@ -16,6 +16,7 @@
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -31,6 +32,56 @@
}
};
+ function autoHyphenPhone () {
+ let phone = $scope.vm.form.tel;
+ let seoul = $scope.vm.form.tel;
+
+ // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ phone.replace(/^[0-9]/g,'');
+ // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ seoul.replace(/^[0-9]/g,'');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3)
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 9) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 10) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
+ // �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
return true;
@@ -42,6 +93,7 @@
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
id : parameter.id,
@@ -98,6 +150,10 @@
$scope.vm.form.name = result.data.content.name;
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ let hyphen = result.data.content.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ result.data.content.tel = phone;
$scope.vm.form.tel = result.data.content.tel;
$scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
index 701a6d1..830e8ac 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
@@ -14,6 +14,7 @@
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -36,9 +37,60 @@
return false;
}
+ // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ function autoHyphenPhone() {
+ let phone = $scope.vm.form.tel
+ let seoul = $scope.vm.form.tel
+
+ // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ phone.replace(/^[0-9]/g, '');
+ // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ seoul.replace(/^[0-9]/g, '');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 9) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) === "02" && seoul.length === 10) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
// �뤌 �쟾�넚
function formSubmit(condition) {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
code : $rootScope.preventXss($scope.vm.form.code), //肄붾뱶
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
index d0090cf..c9028dd 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
@@ -127,8 +127,15 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
+ result.data.data.forEach(function (telData) {
+ let hyphen = telData.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ telData.tel = phone
+ });
+
+ $scope.vm.responseData = result.data;
}
else {
SweetAlert.error($filter("translate")("ispField.failedToSelectIspFieldFullList"), result.data.message.message); // 紐⑸줉 議고쉶 �떎�뙣
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
index 4182144..35e430c 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
@@ -16,6 +16,7 @@
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -31,6 +32,56 @@
}
};
+ // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ function autoHyphenPhone() {
+ let phone = $scope.vm.form.tel
+ let seoul = $scope.vm.form.tel
+
+ // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ phone.replace(/^[0-9]/g, '');
+ // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ seoul.replace(/^[0-9]/g, '');
+ var tmp = '';
+
+ if (phone.length < 4) {
+ return phone;
+ } else if (phone.length < 7) {
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 9) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 5);
+ tmp += '-';
+ tmp += seoul.substr(5);
+ $scope.vm.form.tel = tmp;
+ } else if (seoul.substring(0, 2) == "02" && seoul.length == 10) { // �꽌�슱 吏��뿭踰덊샇 議곌굔
+ tmp += seoul.substring(0, 2);
+ tmp += '-';
+ tmp += seoul.substring(2, 6);
+ tmp += '-';
+ tmp += seoul.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else if (phone.length < 11) { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 3);
+ tmp += '-';
+ tmp += phone.substr(6);
+ $scope.vm.form.tel = tmp;
+ } else { // �빖�뱶�룿 諛� 吏�諛� 吏��뿭踰덊샇 議곌굔
+ tmp += phone.substr(0, 3);
+ tmp += '-';
+ tmp += phone.substr(3, 4);
+ tmp += '-';
+ tmp += phone.substr(7);
+ $scope.vm.form.tel = tmp;
+ }
+ return phone;
+ }
+
function formCheck(formInvalid) {
if (formInvalid) {
return true;
@@ -42,6 +93,7 @@
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
+ $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
id : parameter.id,
@@ -98,6 +150,10 @@
$scope.vm.form.name = result.data.content.name;
$scope.vm.form.manager = result.data.content.manager;
$scope.vm.form.email = result.data.content.email;
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ let hyphen = result.data.content.tel.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ result.data.content.tel = phone;
$scope.vm.form.tel = result.data.content.tel;
$scope.vm.form.url = result.data.content.url;
$scope.vm.form.memo = result.data.content.memo;
diff --git a/src/main/webapp/scripts/app/user/userAdd.controller.js b/src/main/webapp/scripts/app/user/userAdd.controller.js
index 851e786..c2a5bb8 100644
--- a/src/main/webapp/scripts/app/user/userAdd.controller.js
+++ b/src/main/webapp/scripts/app/user/userAdd.controller.js
@@ -15,7 +15,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
onFileSelect : onFileSelect, // �봽濡쒗븘 �뾽濡쒕뱶
- autoHypenPhone : autoHypenPhone // �뿰�씫泥� �엯�젰�떆 - �옄�룞 �엯�젰
+ autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
};
$scope.vm = {
@@ -45,11 +45,13 @@
}
}
- // �뿰�씫泥� �엯�젰�떆 - �옄�룞 �엯�젰
- function autoHypenPhone() {
+ // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ function autoHyphenPhone() {
+ // �빖�뱶�룿 踰덊샇 議곌굔
var str = $scope.vm.form.phone
str.replace(/^[0-9]/g, '');
var tmp = '';
+
if (str.length < 4) {
return str;
} else if (str.length < 7) {
@@ -75,6 +77,7 @@
return str
}
+ // �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
return true;
@@ -99,6 +102,7 @@
return false;
}
+ // �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
@@ -107,7 +111,7 @@
content.workspaceName = $rootScope.preventXss(content.workspaceName);
content.password = CryptoJS.SHA512(content.password).toString();
content.language = $rootScope.language; // 湲곕낯 �뼵�뼱
- content.phone = content.phone.replace(/\-/g,'');
+ content.phone = content.phone.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
User.add({
method : "POST",
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 71a999d..935f9f9 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -190,14 +190,14 @@
type="text"
class="form-control"
kr-input
- ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ input-regex="[^0-9]"
autocomplete="off"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="companyFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ maxlength="30">
+<!-- <div ng-show="companyFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index ceabdac..46f85e3 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -190,14 +190,14 @@
type="text"
class="form-control"
kr-input
- ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ input-regex="[^0-9]"
autocomplete="off"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="companyFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ maxlength="30">
+<!-- <div ng-show="companyFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/hostingField/hostingFieldAdd.html b/src/main/webapp/views/hostingField/hostingFieldAdd.html
index 5e1ea4f..ecf26cc 100644
--- a/src/main/webapp/views/hostingField/hostingFieldAdd.html
+++ b/src/main/webapp/views/hostingField/hostingFieldAdd.html
@@ -75,14 +75,14 @@
type="text"
class="form-control"
kr-input
- ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="hostingFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ ng-keyup="fn.autoHyphenPhone()"
+ maxlength="30">
+<!-- <div ng-show="hostingFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index ef46f19..a9539bf 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -76,14 +76,15 @@
type="text"
class="form-control"
kr-input
+ input-regex="[^0-9]"
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="hostingFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ maxlength="30">
+<!-- <div ng-show="hostingFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/ispField/ispFieldAdd.html b/src/main/webapp/views/ispField/ispFieldAdd.html
index b856d71..9a9f8ef 100644
--- a/src/main/webapp/views/ispField/ispFieldAdd.html
+++ b/src/main/webapp/views/ispField/ispFieldAdd.html
@@ -75,14 +75,14 @@
type="text"
class="form-control"
kr-input
- ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ input-regex="[^0-9]"
autocomplete="off"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="ispFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ maxlength="30">
+<!-- <div ng-show="ispFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index f66076b..55c6521 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -76,14 +76,14 @@
type="text"
class="form-control"
kr-input
- ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ input-regex="[^0-9]"
autocomplete="off"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="20"
- >
- <div ng-show="ispFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
- </div>
+ maxlength="30">
+<!-- <div ng-show="ispFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
+<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
+<!-- </div>-->
</div>
</div>
<div>
diff --git a/src/main/webapp/views/user/superUserAdd.html b/src/main/webapp/views/user/superUserAdd.html
index 33483a7..e68e621 100644
--- a/src/main/webapp/views/user/superUserAdd.html
+++ b/src/main/webapp/views/user/superUserAdd.html
@@ -133,7 +133,7 @@
input-regex="[^0-9]"
kr-input
autocomplete="off"
- ng-keyup="fn.autoHypenPhone()"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.phone">
<small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
</small>
diff --git a/src/main/webapp/views/user/userAdd.html b/src/main/webapp/views/user/userAdd.html
index 7ea99e2..e71b7e3 100644
--- a/src/main/webapp/views/user/userAdd.html
+++ b/src/main/webapp/views/user/userAdd.html
@@ -139,7 +139,7 @@
input-regex="[^0-9]"
kr-input
autocomplete="off"
- ng-keyup="fn.autoHypenPhone()"
+ ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.phone">
<small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
</small>
--
Gitblit v1.8.0