From 5d9dba7601c1c0f50c835afd1b805c9da41bd0cb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 07 1월 2022 13:38:58 +0900
Subject: [PATCH] 연락처 입력시 하이픈 X 조회할때만 하이픈 구분 (지역, 핸드폰 번호)
---
src/main/webapp/views/hostingField/hostingFieldAdd.html | 7
src/main/webapp/scripts/app/user/userModify.controller.js | 5
src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js | 57 -------
src/main/webapp/views/user/superUserAdd.html | 14 +
src/main/webapp/views/user/userAdd.html | 11
src/main/webapp/views/ispField/ispFieldAdd.html | 7
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 52 ------
src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js | 58 -------
src/main/webapp/views/ispField/ispFieldModify.html | 7
src/main/webapp/views/user/userModify.html | 4
src/main/webapp/views/companyField/companyFieldModify.html | 7
src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js | 57 -------
src/main/webapp/scripts/app/user/userDetail.controller.js | 8
src/main/webapp/i18n/ko/global.json | 2
src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js | 54 ------
src/main/webapp/views/hostingField/hostingFieldModify.html | 8
src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js | 51 ------
src/main/webapp/views/companyField/companyFieldAdd.html | 11
src/main/webapp/scripts/app/user/userAdd.controller.js | 36 ----
19 files changed, 70 insertions(+), 386 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index d904946..01a1d9d 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -706,6 +706,8 @@
"send": "蹂대궡湲�",
"emailExplain": "諛쏅뒗 �궗�엺�쓽 �씠硫붿씪 �삎�떇�쓣 �엯�젰�븯�뀛�빞 �빀�땲�떎.",
"sendToPerson" : "�떎瑜� �궗�슜�옄�뿉寃� 硫붿씪�쓣 蹂대깄�땲�떎.",
+ "least10CharactersPhone" : "�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)",
+ "least9CharactersTel" : "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)",
"selected": "�꽑�깮�맖",
"selectable": "�꽑�깮 媛��뒫",
"password": "鍮꾨�踰덊샇",
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 1457b34..8da6eeb 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -15,8 +15,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
- getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack,
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
};
$scope.vm = {
@@ -73,60 +72,11 @@
$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), // �뾽泥대챸
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
index 3623ed9..6b99e3c 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldModify.controller.js
@@ -17,8 +17,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
- getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack,
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
};
$scope.vm = {
@@ -58,56 +57,6 @@
// �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
function getIssueHostingFieldListCallBack(result) {
$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;
}
// �뤌 泥댄겕
@@ -199,10 +148,6 @@
$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/hostingField/hostingFieldAdd.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
index 24727b6..1ab079f 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldAdd.controller.js
@@ -13,8 +13,7 @@
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ formCheck : formCheck // �뤌 泥댄겕
};
$scope.vm = {
@@ -29,53 +28,6 @@
}
};
- 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) {
@@ -87,7 +39,6 @@
// �뤌 �쟾�넚
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/hostingFieldModify.controller.js b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
index 27f391b..b643107 100644
--- a/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/hostingField/hostingFieldModify.controller.js
@@ -15,8 +15,7 @@
detail : detail, // �긽�꽭 議고쉶
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ formCheck : formCheck // �뤌 泥댄겕
};
$scope.vm = {
@@ -32,55 +31,6 @@
}
};
- 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) {
@@ -93,7 +43,6 @@
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
- $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
id : parameter.id,
@@ -150,10 +99,6 @@
$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 830e8ac..139308c 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldAdd.controller.js
@@ -13,8 +13,7 @@
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ formCheck : formCheck // �뤌 泥댄겕
};
$scope.vm = {
@@ -37,60 +36,9 @@
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/ispFieldModify.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
index 35e430c..896eeea 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldModify.controller.js
@@ -15,8 +15,7 @@
detail : detail, // �긽�꽭 議고쉶
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ formCheck : formCheck // �뤌 泥댄겕
};
$scope.vm = {
@@ -32,56 +31,6 @@
}
};
- // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
- 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;
@@ -93,7 +42,6 @@
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
- $scope.vm.form.tel = $scope.vm.form.tel.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
var content = {
id : parameter.id,
@@ -150,10 +98,6 @@
$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 c2a5bb8..2fc0221 100644
--- a/src/main/webapp/scripts/app/user/userAdd.controller.js
+++ b/src/main/webapp/scripts/app/user/userAdd.controller.js
@@ -14,8 +14,7 @@
$scope.fn = {
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
- onFileSelect : onFileSelect, // �봽濡쒗븘 �뾽濡쒕뱶
- autoHyphenPhone : autoHyphenPhone // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
+ onFileSelect : onFileSelect // �봽濡쒗븘 �뾽濡쒕뱶
};
$scope.vm = {
@@ -43,38 +42,6 @@
else {
$scope.vm.form.profileImageName = "";
}
- }
-
- // �뿰�씫泥� �엯�젰�떆 �븯�씠�뵂 �옄�룞 �엯�젰
- 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) {
- tmp += str.substr(0, 3);
- tmp += '-';
- tmp += str.substr(3);
- $scope.vm.form.phone = tmp;
- } else if (str.length < 11) {
- tmp += str.substr(0, 3);
- tmp += '-';
- tmp += str.substr(3, 3);
- tmp += '-';
- tmp += str.substr(6);
- $scope.vm.form.phone = tmp;
- } else {
- tmp += str.substr(0, 3);
- tmp += '-';
- tmp += str.substr(3, 4);
- tmp += '-';
- tmp += str.substr(7);
- $scope.vm.form.phone = tmp;
- }
- return str
}
// �뤌 泥댄겕
@@ -111,7 +78,6 @@
content.workspaceName = $rootScope.preventXss(content.workspaceName);
content.password = CryptoJS.SHA512(content.password).toString();
content.language = $rootScope.language; // 湲곕낯 �뼵�뼱
- content.phone = content.phone.replace(/\-/g,''); // �쟾�솕踰덊샇瑜� 蹂대궪�븧 �븯�씠�뵂�쓣 �젣嫄고빐�꽌 DB�뿉 ���옣
User.add({
method : "POST",
diff --git a/src/main/webapp/scripts/app/user/userDetail.controller.js b/src/main/webapp/scripts/app/user/userDetail.controller.js
index 227b6d8..2ef6651 100644
--- a/src/main/webapp/scripts/app/user/userDetail.controller.js
+++ b/src/main/webapp/scripts/app/user/userDetail.controller.js
@@ -28,7 +28,8 @@
issueHistoryVos : [], // �씠�뒋 湲곕줉 �젙蹂�
issueHistoryDates : [], // �씠�뒋 湲곕줉 �젙蹂� �궇吏�
myLevel : "",
- myDepartments : []
+ myDepartments : [],
+ phone : ""
};
// 吏곸젒 �엯�젰�뿉�꽌 �궇吏� �꽑�깮�떆 �씠�뒋 湲곕줉 �젙蹂� 議고쉶
@@ -81,6 +82,11 @@
if (result.data.message.status === "success") {
$scope.vm.myLevel = result.data.data.levelName;
$scope.vm.myDepartments = result.data.data.departmentName;
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ $scope.vm.phone = $rootScope.user.phone;
+ let hyphen = $scope.vm.phone.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ $rootScope.user.phone = phone;
}
else {
SweetAlert.swal($filter("translate")("users.failedToRetrieveIssueHistory"), result.data.message.message, "error"); // "�씠�뒋 湲곕줉 �젙蹂� 議고쉶 �떎�뙣"
diff --git a/src/main/webapp/scripts/app/user/userModify.controller.js b/src/main/webapp/scripts/app/user/userModify.controller.js
index a9ffc1a..1387840 100644
--- a/src/main/webapp/scripts/app/user/userModify.controller.js
+++ b/src/main/webapp/scripts/app/user/userModify.controller.js
@@ -148,6 +148,11 @@
if (result.message.status === "success") {
if (result.data != null) {
$rootScope.user = result.data; // �쟾�뿭�쑝濡� �궗�슜�븯�뒗 濡쒓렇�씤 �궗�슜�옄 �젙蹂�.
+ // �쟾�솕踰덊샇 �븯�씠�뵂 異붽��븯�뿬 議고쉶
+ $scope.vm.phone = $rootScope.user.phone;
+ let hyphen = $scope.vm.phone.trim();
+ let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+ $rootScope.user.phone = phone;
}
else {
throw {message: $filter("translate")("users.notExistUserSession")}; // "�궗�슜�옄 �꽭�뀡�씠 議댁옱�븯吏� �븡�뒿�땲�떎."
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 935f9f9..54c55d0 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -182,9 +182,7 @@
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm7" class="issue-label">
- <span translate="companyField.tel">�쟾�솕踰덊샇</span>
- </label>
+ <label for="companyFieldAddForm7" class="issue-label"><span translate="companyField.tel">�쟾�솕踰덊샇</span></label>
<input id="companyFieldAddForm7"
name="tel"
type="text"
@@ -192,9 +190,12 @@
kr-input
input-regex="[^0-9]"
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="companyFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="companyFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 46f85e3..8211942 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -192,9 +192,12 @@
kr-input
input-regex="[^0-9]"
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="companyFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="companyFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/hostingField/hostingFieldAdd.html b/src/main/webapp/views/hostingField/hostingFieldAdd.html
index ecf26cc..586f56a 100644
--- a/src/main/webapp/views/hostingField/hostingFieldAdd.html
+++ b/src/main/webapp/views/hostingField/hostingFieldAdd.html
@@ -78,8 +78,11 @@
input-regex="[^0-9]"
autocomplete="off"
ng-model="vm.form.tel"
- ng-keyup="fn.autoHyphenPhone()"
- maxlength="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="hostingFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="hostingFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index a9539bf..86643ab 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -77,11 +77,13 @@
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="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="hostingFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="hostingFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/ispField/ispFieldAdd.html b/src/main/webapp/views/ispField/ispFieldAdd.html
index 9a9f8ef..40b3553 100644
--- a/src/main/webapp/views/ispField/ispFieldAdd.html
+++ b/src/main/webapp/views/ispField/ispFieldAdd.html
@@ -77,9 +77,12 @@
kr-input
input-regex="[^0-9]"
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="ispFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="ispFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 55c6521..7804225 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -78,9 +78,12 @@
kr-input
input-regex="[^0-9]"
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.tel"
- maxlength="30">
+ maxlength="11"
+ minlength="9">
+ <div ng-show="ispFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+ </div>
<!-- <div ng-show="ispFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"-->
<!-- translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.-->
<!-- </div>-->
diff --git a/src/main/webapp/views/user/superUserAdd.html b/src/main/webapp/views/user/superUserAdd.html
index e68e621..dc39217 100644
--- a/src/main/webapp/views/user/superUserAdd.html
+++ b/src/main/webapp/views/user/superUserAdd.html
@@ -116,8 +116,7 @@
ng-model="vm.form.workspaceName"
kr-input
autocomplete="off"
- maxLength="20"
- >
+ maxLength="20">
<small class="fc-grey" translate="users.enterTheNameInWorkspace">�궗�슜�븯怨� �떢�� �뾽臾닿났媛꾩쓽 �씠由꾩쓣 �엯�젰�븯�꽭�슂.
</small>
</div>
@@ -128,15 +127,18 @@
<label for="userAddForm6"><span translate="users.phoneNumber">�뿰�씫泥�</span> </label>
<input id="userAddForm6"
type="text"
- maxlength="30"
+ name="phone"
+ maxlength="11"
+ minlength="10"
class="form-control"
input-regex="[^0-9]"
kr-input
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.phone">
- <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
- </small>
+ <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span></small>
+ <div ng-show="userAddForm.phone.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least10CharactersPhone">�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)
+ </div>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/user/userAdd.html b/src/main/webapp/views/user/userAdd.html
index e71b7e3..b36c13d 100644
--- a/src/main/webapp/views/user/userAdd.html
+++ b/src/main/webapp/views/user/userAdd.html
@@ -134,15 +134,18 @@
<label for="userAddForm6"><span translate="users.phoneNumber">�뿰�씫泥�</span> </label>
<input id="userAddForm6"
type="text"
- maxlength="30"
+ name="phone"
+ maxlength="11"
+ minlength="10"
class="form-control"
input-regex="[^0-9]"
kr-input
autocomplete="off"
- ng-keyup="fn.autoHyphenPhone()"
ng-model="vm.form.phone">
- <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span>
- </small>
+ <small class="fc-grey"><span translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</span></small>
+ <div ng-show="userAddForm.phone.$error.minlength" class="help-block form-text text-danger"
+ translate="common.least10CharactersPhone">�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)
+ </div>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/user/userModify.html b/src/main/webapp/views/user/userModify.html
index 923e526..d19b579 100644
--- a/src/main/webapp/views/user/userModify.html
+++ b/src/main/webapp/views/user/userModify.html
@@ -59,10 +59,12 @@
<input class="form-control"
type="text"
id="userModifyForm4"
- maxLength="20"
+ maxLength="11"
kr-input
input-regex="[^0-9]"
+ autocomplete="off"
ng-model="vm.form.phone">
+ <small class="fc-grey" translate="users.contactedEnterPhone">�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.</small>
</div>
</div>
</div>
--
Gitblit v1.8.0