From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/companyField/companyFieldAdd.html |  189 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 133 insertions(+), 56 deletions(-)

diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index e4df3ef..54c55d0 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -24,12 +24,70 @@
                        input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
                        autocomplete="off"
                        ng-model="vm.form.name"
+                       ng-maxlength="100"
+                       maxlength="100"
+                       required>
+                <small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+            </div>
+
+            <div class="form-group">
+                <label class="issue-label">
+                    <span translate="ispField.select">ISP �꽑�깮</span>
+                </label>
+                <js-autocomplete-single data-input-name="ispField"
+                                    selected-model="vm.form.issueIspFields"
+                                    ng-model="vm.form.ispName"
+                                    custom-input="true"
+                                    search="vm.form.ispName"
+                                    source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.issueIspFields.page, fn.getIssueIspFieldListCallBack)"
+                                    page="vm.autoCompletePage.ispField.page"
+                                    total-page="vm.autoCompletePage.ispField.totalPage"
+                                    input-disabled="false"
+                                    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>
+            </div>
+
+            <div class="form-group">
+                <label class="issue-label">
+                    <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
+                </label>
+                <js-autocomplete-single data-input-name="hostingField"
+                                    selected-model="vm.form.issueHostingFields"
+                                    ng-model="vm.form.hostingName"
+                                    custom-input="true"
+                                    search="vm.hostingName"
+                                    source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
+                                    page="vm.autoCompletePage.hostingField.page"
+                                    total-page="vm.autoCompletePage.hostingField.totalPage"
+                                    input-disabled="false"
+                                    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>
+            </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"
+                       ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                        required>
-                <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+                <div ng-show="companyFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
+                     translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                </div>
             </div>
-            <div class="row">
+            <!--<div class="row">
                 <div class="col-md-3">
                     <div class="form-group mb10">
                         <label for="companyFieldAddForm2" class="issue-label"> <span
@@ -101,64 +159,83 @@
                        ng-maxlength="200"
                        maxlength="200"
                        >
-                <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+                &lt;!&ndash;<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>&ndash;&gt;
+            </div>-->
+            <div>
+                <div class="form-group">
+                    <label for="companyFieldAddForm9" class="issue-label">
+                        <span translate="companyField.manager">�떞�떦�옄</span>
+                    </label>
+                    <input id="companyFieldAddForm9"
+                           name="manager"
+                           type="text"
+                           class="form-control"
+                           kr-input
+                           input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+                           autocomplete="off"
+                           ng-model="vm.form.manager"
+                           ng-maxlength="100"
+                           maxlength="100"
+                    >
+                    <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+                </div>
             </div>
-            <div class="form-group">
-                <label for="companyFieldAddForm6" class="issue-label">
-                    <span translate="companyField.email">硫붿씪二쇱냼</span>
-                </label>
-                <input id="companyFieldAddForm6"
-                       name="email"
-                       type="text"
-                       class="form-control"
-                       kr-input
-                       input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
-                       autocomplete="off"
-                       ng-model="vm.form.email"
-                       ng-maxlength="200"
-                       maxlength="200"
-                       >
-                <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+            <div>
+                <div class="form-group">
+                    <label for="companyFieldAddForm7" class="issue-label"><span translate="companyField.tel">�쟾�솕踰덊샇</span></label>
+                    <input id="companyFieldAddForm7"
+                           name="tel"
+                           type="text"
+                           class="form-control"
+                           kr-input
+                           input-regex="[^0-9]"
+                           autocomplete="off"
+                           ng-model="vm.form.tel"
+                           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>-->
+                </div>
             </div>
-            <div class="row">
-                <div class="col-md-5">
-                    <div class="form-group">
-                        <label for="companyFieldAddForm7" class="issue-label">
-                            <span translate="companyField.tel">�뿰�씫泥�</span>
-                        </label>
-                        <input id="companyFieldAddForm7"
-                               name="tel"
-                               type="text"
-                               class="form-control"
-                               autofocus
-                               kr-input
-                               input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
-                               autocomplete="off"
-                               ng-model="vm.form.tel"
-                               ng-maxlength="200"
-                               maxlength="200"
-                        >
-                        <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+            <div>
+                <div class="form-group">
+                    <label for="companyFieldAddForm6" class="issue-label">
+                        <span translate="companyField.email">�씠硫붿씪</span>
+                    </label>
+                    <input id="companyFieldAddForm6"
+                           name="email"
+                           type="email"
+                           class="form-control"
+                           autocomplete="off"
+                           maxLength="50"
+                           ng-model="vm.form.email"
+                           kr-input
+                           ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+                    >
+                    <div ng-show="companyFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
+                         translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                     </div>
                 </div>
-                <div class="col-md-7">
-                    <div class="form-group">
-                        <label for="companyFieldAddForm8" class="issue-label">
-                            <span translate="companyField.desc">硫붾え</span>
-                        </label>
-                        <input id="companyFieldAddForm8"
-                               name="desc"
-                               type="text"
-                               class="form-control"
-                               autofocus
-                               kr-input
-                               input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
-                               autocomplete="off"
-                               ng-model="vm.form.desc"
-                               ng-maxlength="200"
-                               maxlength="200"
-                        >
-                    </div>
+            </div>
+            <div>
+                <div class="form-group">
+                    <label for="companyFieldAddForm8" class="issue-label">
+                        <span translate="companyField.memo">鍮꾧퀬</span>
+                    </label>
+                    <input id="companyFieldAddForm8"
+                           name="memo"
+                           type="text"
+                           class="form-control"
+                           kr-input
+                           autocomplete="off"
+                           ng-model="vm.form.memo"
+                           ng-maxlength="200"
+                           maxlength="200"
+                    >
                 </div>
             </div>
         </form>

--
Gitblit v1.8.0