From f2fcf329cea64d71c671f1ab17f17d1634d1464d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:08:23 +0900
Subject: [PATCH] - API로 이슈 추가 시 하위이슈처리기준 항목으로 동일한 업체 정보로 이슈 생성하여 하위이슈로 넣기 - 업체 테이블에 ip_start, ip_end 컬럼 추가
---
src/main/webapp/views/companyField/companyFieldAdd.html | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 6a8450b..2f7d840 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -21,20 +21,22 @@
class="form-control"
autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
autocomplete="off"
ng-model="vm.form.name"
ng-maxlength="100"
maxlength="100"
required>
- <small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
<label for="companyFieldAddForm10" class="issue-label">
<span translate="companyField.url">url</span>
- <code class="highlighter-rouge">*</code>
</label>
+ <div class="help-block form-text text-danger fs-09">
+ <small translate="companyField.multiUrlWithComma">�뿬�윭媛쒖쓽 url�쓣 �엯�젰 �븷 �닔 �엳�뒿�땲�떎. (援щ텇: ',') ex: www.test.com, www.test2.com</small>
+ </div>
<input id="companyFieldAddForm10"
name="url"
type="text"
@@ -44,10 +46,53 @@
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>
- <div ng-show="companyFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<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="col-lg-6 mw-49">
+ <div class="form-group">
+ <label for="companyFieldAddForm11" class="issue-label">
+ <span translate="companyField.ipRange">ip ���뿭��</span>
+ </label>
+ <input id="companyFieldAddForm11"
+ 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.form.ipStart"
+ >
+ <div ng-if="companyFieldAddForm.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-6 mw-49">
+ <div class="form-group">
+ <label for="companyFieldAddForm12" class="issue-label"></label>
+ <input id="companyFieldAddForm12"
+ 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.form.ipEnd"
+ >
+ <div ng-if="companyFieldAddForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
</div>
</div>
@@ -105,14 +150,12 @@
kr-input
ng-model="vm.form.tels[$index]"
input-regex="[^0-9]"
- maxlength="11"
- minlength="9"
autocomplete="off">
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="companyFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="companyFieldAddForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
@@ -184,6 +227,7 @@
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>
@@ -205,8 +249,9 @@
total-page="vm.autoCompletePage.parentSector.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyParentSector' }"
+ broad-cast="parentSectorEvent"
extra-settings="{ displayProp : 'useValue' , 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 class="form-group">
<label class="issue-label">
@@ -215,6 +260,7 @@
<js-autocomplete-single data-input-name="childSector"
selected-model="vm.form.childSectors"
ng-model="vm.form.childSector"
+ ng-value="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)"
@@ -222,6 +268,7 @@
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyChildSector' }"
+ broad-cast="childSectorEvent"
extra-settings="{ displayProp : 'useValue' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
@@ -241,6 +288,7 @@
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>
@@ -260,6 +308,7 @@
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>
--
Gitblit v1.8.0