From 4af75fe18d97960fabea0fadb28a69c01a038bc4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 25 1월 2022 17:01:37 +0900
Subject: [PATCH] - 파트너명 특수문자 입력 가능하도록 수정 - 이슈 import/export 시 파트너 정보 추가 - 이슈상세 - 메일 기록 추가

---
 src/main/webapp/views/ispField/ispFieldModify.html |  125 +++++++++++++++++++++++++----------------
 1 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 0598f3d..f65b565 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -9,32 +9,31 @@
     </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"
                        autofocus
                        kr-input
-                       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="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 +45,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,43 +63,65 @@
                            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>
-                    <input id="hostingFieldModifyForm7"
-                           name="tel"
-                           type="text"
-                           class="form-control"
-                           kr-input
-                           input-regex="[^0-9]"
-                           autocomplete="off"
-                           ng-model="vm.form.tel"
-                           maxlength="20"
-                    >
-                    <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+            <div class="row">
+                <div class="col-lg-4">
+                    <div class="form-group">
+                        <label class="issue-label">
+                            <span translate="ispField.tel">�쟾�솕踰덊샇</span>
+                        </label>
+                        <div class="input-group" ng-repeat="tell in vm.form.inputTels">
+                            <input name="tel"
+                                   type="text"
+                                   class="form-control"
+                                   kr-input
+                                   input-regex="[^0-9]"
+                                   autocomplete="off"
+                                   ng-model="vm.form.tels[$index]"
+                            >
+                            <span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
+                        </div>
+                        <!--<div ng-show="ispFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+                             translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
+                        </div>-->
+                    </div>
                 </div>
-            </div>
-            <div>
-                <div class="form-group">
-                    <label for="hostingFieldModifyForm6" class="issue-label">
-                        <span translate="hostingField.email">�씠硫붿씪</span>
-                    </label>
-                    <input id="hostingFieldModifyForm6"
-                           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}$/"
-                    >
-                    <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+                <div class="col-lg-2 mt-25" style="margin-left: -15px">
+                    <div>
+                        <button type="button" class="btn btn-secondary" ng-click="fn.addTel()">
+                            <span translate="common.add">異붽�</span>
+                        </button>
+                    </div>
+                </div>
+                <div class="col-lg-5">
+                    <div class="form-group">
+                        <label class="issue-label">
+                            <span translate="ispField.email">�씠硫붿씪</span>
+                        </label>
+                        <div class="input-group" ng-repeat="mail in vm.form.inputMails">
+                            <input name="email"
+                                   type="email"
+                                   class="form-control"
+                                   autocomplete="off"
+                                   maxLength="50"
+                                   ng-model="vm.form.emails[$index]"
+                                   kr-input
+                                   ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+                            >
+                            <span class="select3-selection__email__remove" ng-click="fn.removeMailInput($index)">횞</span>
+                        </div>
+                        <div ng-show="ispFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+                             translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-2 mt-25" style="margin-left: -15px; margin-right: -16px;">
+                    <div>
+                        <button type="button" class="btn btn-secondary" ng-click="fn.addMail()">
+                            <span translate="common.add">異붽�</span>
+                        </button>
+                    </div>
                 </div>
             </div>
             <div>
@@ -117,15 +138,19 @@
                            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@:%_\+.~#?&//=]*)/"
                     >
+                    <div ng-show="ispFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+                         translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                    </div>
                 </div>
             </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 +169,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>

--
Gitblit v1.8.0