From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가

---
 src/main/webapp/views/issue/issueModify.html |  377 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 274 insertions(+), 103 deletions(-)

diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index a41fb5f..50cf7d7 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -39,7 +39,6 @@
                                                 source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
                                                 page="vm.autoCompletePage.project.page"
                                                 total-page="vm.autoCompletePage.project.totalPage"
-                                                input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
                                                 translation-texts="{ empty : 'common.emptyProject' }"
                                                 extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                                                 type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -222,7 +221,7 @@
             <div class="col-lg-12">
                 <div class="row">
                     <div class="col-md-12">
-                        <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
+                        <div class="form-group mgb5" ng-if="vm.form.issueCustomFields.length < 1">
                             <label class="issue-label" translate="issue.notIssueTypeCustomFields">�씠�뒋 ���엯�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽
                                 �븘�뱶媛� �뾾�뒿�땲�떎.</label>
                         </div>
@@ -230,104 +229,145 @@
 
                     <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
                         <div class="form-group mgb5">
-                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
+                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}&nbsp;<code ng-if="issueCustomField.customFieldVo.requiredData == 'Y'" class="highlighter-rouge">*</code>&nbsp;&nbsp;</label>
 
                             <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
                                 <!-- 湲곕낯 �엯�젰 -->
                                 <div ng-switch-when="INPUT">
                                     <input type="text" class="form-control input-sm"
-                                           name="input"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
-                                           maxlength="100"
                                            autocomplete="off"
                                            kr-input
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.input.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.inputValue.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
                                 </div>
 
                                 <div ng-switch-when="NUMBER">
                                     <input type="text" class="form-control input-sm"
-                                           name="number"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
                                            maxlength="100"
                                            autocomplete="off"
                                            kr-input
+                                           ng-pattern="/^[0-9]*$/"
+                                           placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.number.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.numberType.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
+                                    <div ng-if="issueModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
+                                         translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+                                    </div>
                                 </div>
 
                                 <div ng-switch-when="DATETIME">
-                                    <input type="text" class="form-control input-sm"
-                                           name="dateTime"
+                                    <input class="form-control input-sm input-readonly"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
-                                           maxlength="100"
-                                           autocomplete="off"
+                                           placeholder="{{'issue.clickToSelectDate' | translate}}"
+                                           modal-form-auto-scroll
+                                           range-type="singleDate"
+                                           date-range-picker
                                            kr-input
+                                           autocomplete="off"
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.dateTime.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.dateTime.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
                                 </div>
 
                                 <div ng-switch-when="IP_ADDRESS">
                                     <input type="text" class="form-control input-sm"
-                                           name="ipAddress"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
                                            maxlength="100"
                                            autocomplete="off"
                                            kr-input
+                                           ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
+                                           placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.ipAddress.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.ipAddress.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
+                                    <div ng-if="issueModifyForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+                                         translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                                    </div>
+                                </div>
+
+                                <div ng-switch-when="EMAIL">
+                                    <input type="email" class="form-control input-sm"
+                                           name="item_{{$index}}"
+                                           maxlength="30"
+                                           ng-model="issueCustomField.useValues"
+                                           kr-input
+                                           ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+                                           placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+                                           ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.ipAddress.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
+                                    <div ng-if="issueModifyForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+                                         translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                                    </div>
                                 </div>
 
                                 <div ng-switch-when="SITE">
                                     <input type="text" class="form-control input-sm"
-                                           name="site"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
                                            maxlength="100"
                                            autocomplete="off"
                                            kr-input
+                                           ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
+                                           placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.site.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.site.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
+                                    <div ng-if="issueModifyForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+                                         translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+                                    </div>
                                 </div>
 
                                 <div ng-switch-when="TEL">
                                     <input type="text" class="form-control input-sm"
-                                           name="tel"
+                                           name="item_{{$index}}"
                                            ng-model="issueCustomField.useValues"
-                                           maxlength="100"
+                                           maxlength="30"
                                            autocomplete="off"
                                            kr-input
+                                           ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+                                           placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.tel.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.tel.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
+                                    <!--<div ng-if="issueModifyForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
+                                         translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                                    </div>-->
                                 </div>
 
                                 <!-- �떒�씪 ���젆�듃 -->
                                 <div ng-switch-when="SINGLE_SELECT">
                                     <select class="form-control input-sm issue-select-label"
-                                            name="singleSelect"
+                                            name="item_{{$index}}"
                                             ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'"
                                             ng-model="issueCustomField.useValues">
                                         <option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
@@ -337,11 +377,11 @@
                                             {{customFieldValueVo.value}}
                                         </option>
                                     </select>
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.singleSelect.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.singleSelect.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
                                 </div>
 
                                 <!-- 硫��떚 ���젆�듃 -->
@@ -355,11 +395,11 @@
                                     <input class="form-control input-sm issue-select-label"
                                            type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
                                            ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
-                                    <small class="help-block form-text text-danger"
-                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
-                                           ng-if="issueModifyForm.multiSelect.$error.required"
-                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
-                                    </small>
+<!--                                    <small class="help-block form-text text-danger"-->
+<!--                                           ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!--                                           ng-if="issueModifyForm.multiSelect.$error.required"-->
+<!--                                           translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!--                                    </small>-->
                                 </div>
                             </div>
                         </div>
@@ -383,9 +423,10 @@
                         <js-autocomplete-single data-input-name="issueCompanyField"
                                                 selected-model="vm.form.issueCompanyFields"
                                                 search="vm.companyName"
+                                                custom-input="true"
                                                 source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
                                                 page="vm.autoCompletePage.companyField.page"
-                                                total-page="vm.autoCompletePage.companyField.totalPage"
+                                                total-page="vm.autoCompletePage.issueCompanyField.totalPage"
                                                 input-disabled="false"
                                                 translation-texts="{ empty : 'common.emptyCompany' }"
                                                 broad-cast="companyFieldEvent"
@@ -418,13 +459,12 @@
                                type="text"
                                class="form-control"
                                kr-input
-                               ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                                autocomplete="off"
                                ng-model="vm.companyTel"
-                               maxlength="20">
-                        <div ng-show="issueModifyForm.companyTel.$error.pattern" class="help-block form-text text-danger"
+                               >
+                        <!--<div ng-show="issueModifyForm.companyTel.$error.pattern" class="help-block form-text text-danger"
                              translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -432,19 +472,17 @@
                         <label for="companyFieldEmailAddForm" class="issue-label"><span translate="companyField.email">�씠硫붿씪</span></label>
                         <input id="companyFieldEmailAddForm"
                                name="companyEmail"
-                               type="email"
+                               type="text"
                                class="form-control"
                                autocomplete="off"
-                               maxLength="50"
                                ng-model="vm.companyEmail"
-                               kr-input
-                               ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
-                        <div ng-show="issueModifyForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
+                               kr-input>
+                        <!--<div ng-show="issueModifyForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
                              translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
-                <div class="col-lg-4">
+                <div class="col-lg-3-2">
                     <div class="form-group mgb5">
                         <label for="companyFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
                         <input id="companyFieldUrlAddForm"
@@ -455,10 +493,48 @@
                                autocomplete="off"
                                ng-maxlength="200"
                                ng-model="vm.companyUrl"
-                               ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                                maxlength="200">
-                        <div ng-show="issueModifyForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+                        <!--<div ng-show="issueModifyForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
                              translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                        </div>-->
+                    </div>
+                </div>
+                <div class="col-lg-2">
+                    <div class="form-group mgb5">
+                        <label for="companyFieldIpStartAddForm" class="issue-label"><span translate="companyField.ipRange">ip ���뿭��</span></label>
+                        <input id="companyFieldIpStartAddForm"
+                               name="ipStart"
+                               type="text"
+                               class="form-control"
+                               kr-input
+                               ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
+                               placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+                               autocomplete="off"
+                               ng-model="vm.ipStart"
+                        >
+                        <div ng-if="issueModifyForm.ipStart.$error.pattern" class="help-block form-text text-danger"
+                             translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-30">
+                    <label class="issue-label">~</label>
+                </div>
+                <div class="col-lg-2 mt-1">
+                    <div class="form-group mgb5">
+                        <label for="companyFieldIpEndAddForm"></label>
+                        <input id="companyFieldIpEndAddForm"
+                               name="ipEnd"
+                               type="text"
+                               class="form-control"
+                               kr-input
+                               ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
+                               placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+                               autocomplete="off"
+                               ng-model="vm.ipEnd"
+                        >
+                        <div ng-if="issueModifyForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+                             translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                         </div>
                     </div>
                 </div>
@@ -476,6 +552,106 @@
                                maxlength="200">
                     </div>
                 </div>
+                <div class="col-lg-4">
+                    <div class="form-group mgb5">
+                        <label class="issue-label">
+                            <span translate="companyField.companyType">湲곗뾽援щ텇</span>
+                        </label>
+                        <js-autocomplete-single data-input-name="companyType"
+                                                selected-model="vm.form.companyTypes"
+                                                ng-model="vm.form.companyType"
+                                                custom-input="false"
+                                                search="vm.form.companyType"
+                                                source="fn.getCompanyTypeCategory(vm.typeCategory.companyType, vm.form.companyType, vm.form.companyTypes, vm.autoCompletePage.companyType.page, fn.getCompanyTypeListCallBack)"
+                                                page="vm.autoCompletePage.companyType.page"
+                                                total-page="vm.autoCompletePage.companyType.totalPage"
+                                                input-disabled="false"
+                                                broad-cast="companyTypeEvent"
+                                                translation-texts="{ empty : 'common.emptyCompanyType' }"
+                                                extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
+                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                    </div>
+                </div>
+                <div class="col-lg-4">
+                    <div class="form-group mgb5">
+                        <label class="issue-label">
+                            <span translate="companyField.parentSector">�뾽醫�(��遺꾨쪟)</span>
+                        </label>
+                        <js-autocomplete-single data-input-name="parentSector"
+                                                selected-model="vm.form.parentSectors"
+                                                ng-model="vm.form.parentSector"
+                                                custom-input="false"
+                                                search="vm.form.parentSector"
+                                                source="fn.getCompanyTypeCategory(vm.typeCategory.parentSector, vm.form.parentSector, vm.form.parentSectors, vm.autoCompletePage.parentSector.page, fn.getParentSectorListCallBack)"
+                                                page="vm.autoCompletePage.parentSector.page"
+                                                total-page="vm.autoCompletePage.parentSector.totalPage"
+                                                input-disabled="false"
+                                                broad-cast="parentSectorEvent"
+                                                translation-texts="{ empty : 'common.emptyParentSector' }"
+                                                extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
+                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                    </div>
+                </div>
+                <div class="col-lg-4">
+                    <div class="form-group mgb5">
+                        <label class="issue-label">
+                            <span translate="companyField.childSector">�뾽醫�(以묐텇瑜�)</span>
+                        </label>
+                        <js-autocomplete-single data-input-name="childSector"
+                                                selected-model="vm.form.childSectors"
+                                                ng-model="vm.form.childSector"
+                                                custom-input="false"
+                                                search="vm.form.childSector"
+                                                source="fn.getCompanyChildSector(vm.form.parentSectorId, vm.form.parentSectors[0].id, vm.typeCategory.childSector, vm.form.childSector, vm.form.childSectors, vm.autoCompletePage.childSector.page, fn.getChildSectorListCallBack)"
+                                                page="vm.autoCompletePage.childSector.page"
+                                                total-page="vm.autoCompletePage.childSector.totalPage"
+                                                input-disabled="false"
+                                                broad-cast="childSectorEvent"
+                                                translation-texts="{ empty : 'common.emptyChildSector' }"
+                                                extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
+                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                    </div>
+                </div>
+                <div class="col-lg-4">
+                    <div class="form-group mgb5">
+                        <label class="issue-label">
+                            <span translate="companyField.region">吏��뿭</span>
+                        </label>
+                        <js-autocomplete-single data-input-name="region"
+                                                selected-model="vm.form.regions"
+                                                ng-model="vm.form.region"
+                                                custom-input="false"
+                                                search="vm.form.region"
+                                                source="fn.getCompanyTypeCategory(vm.typeCategory.region, vm.form.region, vm.form.regions, vm.autoCompletePage.region.page, fn.getRegionListCallBack)"
+                                                page="vm.autoCompletePage.region.page"
+                                                total-page="vm.autoCompletePage.region.totalPage"
+                                                input-disabled="false"
+                                                broad-cast="regionEvent"
+                                                translation-texts="{ empty : 'common.emptyRegion' }"
+                                                extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
+                    type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                    </div>
+                </div>
+                <div class="col-lg-4">
+                    <div class="form-group mgb5">
+                        <label class="issue-label">
+                            <span translate="companyField.status">�긽�깭</span>
+                        </label>
+                        <js-autocomplete-single data-input-name="status"
+                                                selected-model="vm.form.statuses"
+                                                ng-model="vm.form.status"
+                                                custom-input="false"
+                                                search="vm.form.status"
+                                                source="fn.getCompanyTypeCategory(vm.typeCategory.status, vm.form.status, vm.form.statuses, vm.autoCompletePage.status.page, fn.getStatusListCallBack)"
+                                                page="vm.autoCompletePage.status.page"
+                                                total-page="vm.autoCompletePage.status.totalPage"
+                                                input-disabled="false"
+                                                broad-cast="statusEvent"
+                                                translation-texts="{ empty : 'common.emptyStatus' }"
+                                                extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
+                    type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+                    </div>
+                </div>
             </div>
             <p></p>
             <div ng-show="fn.containsPartner('ISP')" class="row">
@@ -490,25 +666,26 @@
                 <div class="col-lg-4">
                     <div class="form-group mb10">
                         <label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
-                        <input 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)"
                                                 page="vm.autoCompletePage.ispField.page"
                                                 total-page="vm.autoCompletePage.ispField.totalPage"
                                                 input-disabled="false"
+                                                custom-input="true"
                                                 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">
@@ -550,13 +727,12 @@
                                type="text"
                                class="form-control"
                                kr-input
-                               ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                                autocomplete="off"
                                ng-model="vm.ispTel"
-                               maxlength="20">
-                        <div ng-show="issueModifyForm.ispTel.$error.pattern" class="help-block form-text text-danger"
+                               >
+                        <!--<div ng-show="issueModifyForm.ispTel.$error.pattern" class="help-block form-text text-danger"
                              translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -564,16 +740,15 @@
                         <label for="ispFieldEmailAddForm" class="issue-label"><span translate="ispField.email">�씠硫붿씪</span></label>
                         <input id="ispFieldEmailAddForm"
                                name="ispEmail"
-                               type="email"
+                               type="text"
                                class="form-control"
                                autocomplete="off"
-                               maxLength="50"
                                ng-model="vm.ispEmail"
                                kr-input
-                               ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
-                        <div ng-show="issueModifyForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
+                               >
+                        <!--<div ng-show="issueModifyForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
                              translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -587,11 +762,10 @@
                                autocomplete="off"
                                ng-maxlength="200"
                                ng-model="vm.ispUrl"
-                               ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                                maxlength="200">
-                        <div ng-show="issueModifyForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+                        <!--<div ng-show="issueModifyForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
                              translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -622,15 +796,15 @@
                 <div class="col-lg-4">
                     <div class="form-group mb10">
                         <label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
-                        <input name="hostingName"
+                        <!--<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"
+                               maxlength="100">-->
+                        <js-autocomplete-single data-input-name="hostingField"
                                                 selected-model="vm.form.issueHostingFields"
                                                 ng-model="vm.hostingName"
                                                 search="vm.hostingName"
@@ -638,15 +812,16 @@
                                                 page="vm.autoCompletePage.hostingField.page"
                                                 total-page="vm.autoCompletePage.hostingField.totalPage"
                                                 input-disabled="false"
+                                                custom-input="true"
                                                 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">
                     <div class="form-group mb10">
-                        <label for="hostingCodeManagerAdd" class="issue-label"><span translate="hostingField.code">�떞�떦�옄</span></label>
+                        <label for="hostingCodeManagerAdd" class="issue-label"><span translate="hostingField.code">肄붾뱶</span></label>
                         <input id="hostingCodeManagerAdd"
                                name="hostingCode"
                                type="text"
@@ -683,13 +858,12 @@
                                type="text"
                                class="form-control"
                                kr-input
-                               ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                                autocomplete="off"
                                ng-model="vm.hostingTel"
-                               maxlength="20">
-                        <div ng-show="issueModifyForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
+                               >
+                        <!--<div ng-show="issueModifyForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
                              translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -697,16 +871,14 @@
                         <label for="hostingFieldEmailAdd" class="issue-label"><span translate="hostingField.email">�씠硫붿씪</span></label>
                         <input id="hostingFieldEmailAdd"
                                name="hostingEmail"
-                               type="email"
+                               type="text"
                                class="form-control"
                                autocomplete="off"
-                               maxLength="50"
                                ng-model="vm.hostingEmail"
-                               kr-input
-                               ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
-                        <div ng-show="issueModifyForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
+                               kr-input>
+                        <!--div ng-show="issueModifyForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
                              translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">
@@ -720,11 +892,10 @@
                                autocomplete="off"
                                ng-maxlength="200"
                                ng-model="vm.hostingUrl"
-                               ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                                maxlength="200">
-                        <div ng-show="issueModifyForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+                        <!--<div ng-show="issueModifyForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
                              translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
-                        </div>
+                        </div>-->
                     </div>
                 </div>
                 <div class="col-lg-4">

--
Gitblit v1.8.0