- 업체 기준 isp/호스팅 연동 - 전화번호,이메일 유효성 검사 수정

이민희

2021-12-09 18eb95191d1ba64c839bc6a210c686429392a41a

- 업체 기준 isp/호스팅 연동
- 전화번호,이메일 유효성 검사 수정

 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) {

 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>

 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>

 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>

 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>

 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>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;업체 이름 클릭시 선택된 이름의 업체 정보가 조회됩니다.</span>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;
                            &nbsp;업체 이름 클릭시 선택된 이름의 업체 정보가 조회되며, 같은 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>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;ISP 이름 클릭시 선택된 이름의 ISP 정보가 조회됩니다.</span>
                        &nbsp;&nbsp;<!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;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>
                        &nbsp;&nbsp;<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</span>
                        &nbsp;&nbsp;<!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>&nbsp;&nbsp;호스팅 이름 클릭시 선택된 이름의 호스팅 정보가 조회됩니다.</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">