From c5ce099b314be4b296137415a146c610095ae92e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 11 3월 2022 13:54:09 +0900
Subject: [PATCH] - api로 이슈 추가 시 하위이슈기준이 2개 일 경우 코드 수정 - 업체 추가/수정 시 ip대역대 중복 체크 - 이슈 추가/수정 시 ip대역대 수정불가
---
src/main/webapp/views/issue/issueAddRelation.html | 379 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 323 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 6b0e512..4796601 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -9,11 +9,11 @@
</div>
<div class="modal-body">
- <form role="form" name="issueAddForm">
+ <form role="form" name="issueAddRelationForm">
<div class="form-group mb10">
- <label for="issueAddForm1" class="issue-label"><span translate="issue.issueTitle">�씠�뒋 �젣紐�</span> <code
+ <label for="issueAddRelationForm1" class="issue-label"><span translate="issue.issueTitle">�씠�뒋 �젣紐�</span> <code
class="highlighter-rouge">*</code></label>
- <input id="issueAddForm1"
+ <input id="issueAddRelationForm1"
class="form-control input-sm"
ng-model="vm.form.title"
name="title"
@@ -24,10 +24,23 @@
autofocus
owl-auto-focus>
<small class="help-block form-text text-danger"
- ng-if="issueAddForm.title.$touched && issueAddForm.title.$error.required"
+ ng-if="issueAddRelationForm.title.$touched && issueAddRelationForm.title.$error.required"
translate="issue.requireIssueTitle">�씠�뒋 �젣紐⑹쓣 �엯�젰�븯�꽭�슂.
</small>
</div>
+
+ <div class="form-group mb10">
+ <label class="issue-label"><span class="highlighter-rouge">�뿰愿� �씠�뒋 援щ텇</span></label>
+ <select id="relationIssueType"
+ name="relationIssueType"
+ class="form-control input-sm"
+ ng-options="option.name for option in vm.relationIssueTypes track by option.id"
+ ng-model="vm.relationIssueType"
+ required>
+ </select>
+
+ </div>
+
<div class="row">
<div class="col-lg-4">
<div class="form-group mb10">
@@ -35,10 +48,13 @@
class="highlighter-rouge">*</code></label>
<js-autocomplete-single data-input-name="project"
selected-model="vm.form.projects"
+ ng-model="vm.form.projects"
+ ng-change="fn.getIssueTypeOfProject()"
search="vm.projectName"
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="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>
@@ -49,10 +65,10 @@
<div class="row">
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm4" class="issue-label"> <span
+ <label for="issueAddRelationForm4" class="issue-label"> <span
translate="issue.issueType">�씠�뒋 ���엯</span>
<code class="highlighter-rouge">*</code></label>
- <select id="issueAddForm4"
+ <select id="issueAddRelationForm4"
name="issueType"
class="form-control input-sm issue-select-label"
ng-model="vm.form.issueTypeId"
@@ -71,11 +87,11 @@
</div>
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm2" class="issue-label">
+ <label for="issueAddRelationForm2" class="issue-label">
<span translate="common.priority">�슦�꽑 �닚�쐞</span>
<code class="highlighter-rouge">*</code>
</label>
- <select id="issueAddForm2"
+ <select id="issueAddRelationForm2"
name="priority"
class="form-control input-sm issue-select-label"
ng-model="vm.form.priorityId"
@@ -94,10 +110,10 @@
</div>
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm3" class="issue-label"> <span
+ <label for="issueAddRelationForm3" class="issue-label"> <span
translate="common.importance">以묒슂�룄</span> <code
class="highlighter-rouge">*</code></label>
- <select id="issueAddForm3"
+ <select id="issueAddRelationForm3"
name="severity"
class="form-control input-sm issue-select-label"
ng-model="vm.form.severityId"
@@ -125,7 +141,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
@@ -141,8 +157,8 @@
<div class="col-lg-4">
<div class="form-group mb10">
- <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
- <input id="issueAddForm5"
+ <label for="issueAddRelationForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
+ <input id="issueAddRelationForm5"
tabindex="-1"
type="text"
readonly
@@ -216,7 +232,7 @@
</div>
</div>
- <div class="col-lg-8">
+ <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">
@@ -225,7 +241,7 @@
</div>
</div>
- <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
+ <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>
@@ -233,62 +249,98 @@
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
+ name="input"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.input.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="NUMBER">
<input type="text" class="form-control input-sm"
+ name="number"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.number.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="DATETIME">
<input type="text" class="form-control input-sm"
+ name="dateTime"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.dateTime.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="IP_ADDRESS">
<input type="text" class="form-control input-sm"
+ name="ipAddress"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.ipAddress.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="SITE">
<input type="text" class="form-control input-sm"
+ name="site"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.site.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
+ name="tel"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
- ng-required="issueCustomField.fieldOption == '01'">
+ 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="issueAddRelationForm.tel.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
- ng-required="issueCustomField.fieldOption == '01'"
+ name="singleSelect"
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'"
ng-model="issueCustomField.useValues">
<option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
<option ng-repeat="customFieldValueVo in issueCustomField.customFieldVo.customFieldValueVos"
@@ -297,16 +349,28 @@
{{customFieldValueVo.value}}
</option>
</select>
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.singleSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<ng-dropdown-multiselect class="multiSelect cursor"
+ name="multiSelect"
+ ng-required="issueCustomField.customFieldVo.requiredData == 'Y'"
data-input-name=""
modal-form-auto-scroll
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueAddRelationForm.multiSelect.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
</div>
</div>
</div>
@@ -317,7 +381,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>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>
+ �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�릺硫�, �뾽泥댁젙蹂댁뿉�꽌 異붽��븳 ISP, �샇�뒪�똿 �젙蹂대�� 遺덈윭�샃�땲�떎.</span>
</label>
</div>
</div>
@@ -329,6 +394,7 @@
<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"
@@ -364,13 +430,11 @@
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="issueAddForm.companyTel.$error.pattern" class="help-block form-text text-danger"
+ ng-model="vm.companyTel">
+ <!--<div ng-show="issueAddRelationForm.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">
@@ -378,15 +442,70 @@
<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="issueAddForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<div ng-show="issueAddRelationForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>-->
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="companyFieldUrlAddForm"
+ name="companyUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.companyUrl"
+ maxlength="200">
+ <!--<div ng-show="issueAddRelationForm.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]?)$/"
+ autocomplete="off"
+ ng-model="vm.ipStart"
+ disabled
+ >
+ <div ng-if="issueAddRelationForm.ipStart.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="mt-30 ml--4 mr--4">
+ <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]?)$/"
+ autocomplete="off"
+ ng-model="vm.ipEnd"
+ disabled
+ >
+ <div ng-if="issueAddRelationForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
</div>
@@ -404,12 +523,112 @@
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">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -418,6 +637,14 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
+ <!--<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"
selected-model="vm.form.issueIspFields"
search="vm.ispName"
@@ -425,6 +652,7 @@
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 : '',
@@ -470,13 +698,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="issueAddForm.ispTel.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<div ng-show="issueAddRelationForm.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">
@@ -484,16 +711,32 @@
<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="issueAddForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<div ng-show="issueAddRelationForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
+ </div>-->
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="ispFieldUrlAddForm"
+ name="ispUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.ispUrl"
+ maxlength="200">
+ <!--<div ng-show="issueAddRelationForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>-->
</div>
</div>
<div class="col-lg-4">
@@ -515,7 +758,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>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -524,6 +767,14 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
+ <!--<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"
search="vm.hostingName"
@@ -531,6 +782,7 @@
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 : '',
@@ -539,7 +791,7 @@
</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"
@@ -576,13 +828,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="issueAddForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<div ng-show="issueAddRelationForm.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">
@@ -590,16 +841,32 @@
<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="issueAddForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
+ >
+ <!--<div ng-show="issueAddRelationForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
+ </div>-->
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
+ <input id="hostingFieldUrlAddForm"
+ name="hostingUrl"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-maxlength="200"
+ ng-model="vm.hostingUrl"
+ maxlength="200">
+ <!--<div ng-show="issueAddRelationForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>-->
</div>
</div>
<div class="col-lg-4">
@@ -647,8 +914,8 @@
translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(issueAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(issueAddForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(issueAddRelationForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(issueAddRelationForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
--
Gitblit v1.8.0