From 18eb95191d1ba64c839bc6a210c686429392a41a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 16:54:27 +0900
Subject: [PATCH] - 업체 기준 isp/호스팅 연동 - 전화번호,이메일 유효성 검사 수정
---
src/main/webapp/views/issue/issueAdd.html | 30 ++++---
src/main/webapp/views/hostingField/hostingFieldModify.html | 14 ++-
src/main/webapp/views/ispField/ispFieldModify.html | 53 +++++++------
src/main/webapp/views/companyField/companyFieldModify.html | 44 ++++++-----
src/main/webapp/views/companyField/companyFieldAdd.html | 38 ++++----
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 20 ++--
6 files changed, 108 insertions(+), 91 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5da56d6..429a84e 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -417,16 +417,16 @@
});
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
- $scope.$on("ispFieldEvent", function (event, result) {
- $scope.vm.ispId = result[0].id;
- $scope.vm.ispName = result[0].name;
- $scope.vm.ispCode = result[0].code;
- $scope.vm.ispManager = result[0].manager;
- $scope.vm.ispTel = result[0].tel;
- $scope.vm.ispEmail = result[0].email;
- $scope.vm.ispUrl = result[0].url;
- $scope.vm.ispMemo = result[0].memo;
- });
+ // $scope.$on("ispFieldEvent", function (event, result) {
+ // $scope.vm.ispId = result[0].id;
+ // $scope.vm.ispName = result[0].name;
+ // $scope.vm.ispCode = result[0].code;
+ // $scope.vm.ispManager = result[0].manager;
+ // $scope.vm.ispTel = result[0].tel;
+ // $scope.vm.ispEmail = result[0].email;
+ // $scope.vm.ispUrl = result[0].url;
+ // $scope.vm.ispMemo = result[0].memo;
+ // });
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index b7e8dab..0198f99 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -29,6 +29,25 @@
required>
<small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm10" class="issue-label">
+ <span translate="companyField.url">url</span>
+ <code class="highlighter-rouge">*</code>
+ </label>
+ <input id="companyFieldAddForm10"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ required
+ >
+ </div>
+ </div>
<!--<div class="row">
<div class="col-md-3">
<div class="form-group mb10">
@@ -160,25 +179,6 @@
<div ng-show="companyFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- </div>
- </div>
- <div>
- <div class="form-group">
- <label for="companyFieldAddForm10" class="issue-label">
- <span translate="companyField.url">url</span>
- <code class="highlighter-rouge">*</code>
- </label>
- <input id="companyFieldAddForm10"
- name="url"
- type="text"
- class="form-control"
- kr-input
- autocomplete="off"
- ng-model="vm.form.url"
- ng-maxlength="200"
- maxlength="200"
- required
- >
</div>
</div>
<div>
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 56652a2..9404e5c 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -27,7 +27,24 @@
ng-maxlength="100"
maxlength="100"
required>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+ </div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm10" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="companyFieldAddForm10"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
</div>
<!--<div class="row">
<div class="col-md-3">
@@ -137,7 +154,9 @@
ng-model="vm.form.tel"
maxlength="20"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="companyFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
</div>
</div>
<div>
@@ -155,24 +174,9 @@
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
- </div>
- </div>
- <div>
- <div class="form-group">
- <label for="companyFieldAddForm10" class="issue-label">
- <span translate="companyField.url">url</span>
- </label>
- <input id="companyFieldAddForm10"
- name="url"
- type="text"
- class="form-control"
- kr-input
- autocomplete="off"
- ng-model="vm.form.url"
- ng-maxlength="200"
- maxlength="200"
- >
+ <div ng-show="companyFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index dbc2191..1c3d192 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -27,7 +27,7 @@
ng-maxlength="100"
maxlength="100"
required>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <small translate="hostingField.enterSpecialCharacters">�샇�뒪�똿 �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
<div class="form-group">
<label for="hostingFieldModifyForm10">
@@ -46,6 +46,7 @@
ng-maxlength="100"
maxlength="100"
required>
+ <small translate="hostingField.invalidCodeFormat">肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
<div>
<div class="form-group">
@@ -63,7 +64,6 @@
ng-maxlength="100"
maxlength="100"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
</div>
<div>
@@ -76,12 +76,14 @@
type="text"
class="form-control"
kr-input
- input-regex="[^0-9]"
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
ng-model="vm.form.tel"
maxlength="20"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="hostingFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
</div>
</div>
<div>
@@ -99,7 +101,9 @@
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="hostingFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 0598f3d..9910310 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -9,13 +9,13 @@
</div>
<div class="modal-body">
- <form role="form" name="hostingFieldModifyForm">
+ <form role="form" name="ispFieldModifyForm">
<div class="form-group">
- <label for="hostingFieldModifyForm1">
+ <label for="ispFieldModifyForm1">
<span translate="ispField.name">ISP紐�</span>
<code class="highlighter-rouge">*</code>
</label>
- <input id="hostingFieldModifyForm1"
+ <input id="ispFieldModifyForm1"
name="name"
type="text"
class="form-control"
@@ -27,14 +27,14 @@
ng-maxlength="100"
maxlength="100"
required>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <small translate="ispField.enterSpecialCharacters">ISP �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
<div class="form-group">
- <label for="hostingFieldModifyForm10">
+ <label for="ispFieldModifyForm10">
<span translate="ispField.code">肄붾뱶</span>
<code class="highlighter-rouge">*</code>
</label>
- <input id="hostingFieldModifyForm10"
+ <input id="ispFieldModifyForm10"
name="code"
type="text"
class="form-control"
@@ -46,14 +46,14 @@
ng-maxlength="100"
maxlength="100"
required>
- <small translate="hostingField.invalidCodeFormat">肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+ <small translate="ispField.invalidCodeFormat">肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
<div>
<div class="form-group">
- <label for="hostingFieldModifyForm9" class="issue-label">
- <span translate="hostingField.manager">�떞�떦�옄</span>
+ <label for="ispFieldModifyForm9" class="issue-label">
+ <span translate="ispField.manager">�떞�떦�옄</span>
</label>
- <input id="hostingFieldModifyForm9"
+ <input id="ispFieldModifyForm9"
name="manager"
type="text"
class="form-control"
@@ -64,33 +64,34 @@
ng-maxlength="100"
maxlength="100"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
</div>
<div>
<div class="form-group">
- <label for="hostingFieldModifyForm7" class="issue-label">
- <span translate="hostingField.tel">�쟾�솕踰덊샇</span>
+ <label for="ispFieldModifyForm7" class="issue-label">
+ <span translate="ispField.tel">�쟾�솕踰덊샇</span>
</label>
- <input id="hostingFieldModifyForm7"
+ <input id="ispFieldModifyForm7"
name="tel"
type="text"
class="form-control"
kr-input
- input-regex="[^0-9]"
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
ng-model="vm.form.tel"
maxlength="20"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="ispFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
</div>
</div>
<div>
<div class="form-group">
- <label for="hostingFieldModifyForm6" class="issue-label">
- <span translate="hostingField.email">�씠硫붿씪</span>
+ <label for="ispFieldModifyForm6" class="issue-label">
+ <span translate="ispField.email">�씠硫붿씪</span>
</label>
- <input id="hostingFieldModifyForm6"
+ <input id="ispFieldModifyForm6"
name="email"
type="email"
class="form-control"
@@ -100,7 +101,9 @@
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="ispFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
@@ -122,10 +125,10 @@
</div>
<div>
<div class="form-group">
- <label for="hostingFieldModifyForm8" class="issue-label">
- <span translate="hostingField.memo">鍮꾧퀬</span>
+ <label for="ispFieldModifyForm8" class="issue-label">
+ <span translate="ispField.memo">鍮꾧퀬</span>
</label>
- <input id="hostingFieldModifyForm8"
+ <input id="ispFieldModifyForm8"
name="memo"
type="text"
class="form-control"
@@ -144,8 +147,8 @@
<button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(hostingFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(hostingFieldModifyForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(ispFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(ispFieldModifyForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 57e7322..3e24f7a 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -372,7 +372,8 @@
<div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>
+ �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�릺硫�, 媛숈� url�쓣 媛�吏�怨좎엳�뒗 ISP, �샇�뒪�똿 �젙蹂대�� 遺덈윭�샃�땲�떎.</span>
</label>
</div>
</div>
@@ -478,7 +479,7 @@
<div ng-show="fn.containsPartner('ISP')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -487,18 +488,15 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
- <!--<input ng-click="show==false"
- ng-show="show"
- ng-hide="!show"
- name="ispName"
+ <input name="ispName"
type="text"
class="form-control"
kr-input
autocomplete="off"
ng-model="vm.ispName"
ng-maxlength="100"
- maxlength="100">-->
- <js-autocomplete-single data-input-name="ispField"
+ maxlength="100">
+ <!--<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
search="vm.ispName"
source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
@@ -508,7 +506,7 @@
translation-texts="{ empty : 'common.emptyIsp' }"
broad-cast="ispFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
- type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
</div>
</div>
<div class="col-lg-4">
@@ -609,7 +607,7 @@
<div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -618,7 +616,15 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
- <js-autocomplete-single data-input-name="hostingField"
+ <input name="hostingName"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.hostingName"
+ ng-maxlength="100"
+ maxlength="100">
+ <!--<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
ng-model="vm.hostingName"
search="vm.hostingName"
@@ -629,7 +635,7 @@
translation-texts="{ empty : 'common.emptyHosting' }"
broad-cast="hostingFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
- type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
</div>
</div>
<div class="col-lg-4">
--
Gitblit v1.8.0