From fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 10:37:28 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/companyField/companyFieldModify.html | 106 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index b9a7793..d9c912c 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -9,13 +9,13 @@
</div>
<div class="modal-body">
- <form role="form" name="companyFieldAddForm">
+ <form role="form" name="companyFieldModifyForm">
<div class="form-group">
- <label for="companyFieldAddForm1">
+ <label for="companyFieldModifyForm1">
<span translate="companyField.name">�뾽泥대챸</span>
<code class="highlighter-rouge">*</code>
</label>
- <input id="companyFieldAddForm1"
+ <input id="companyFieldModifyForm1"
name="name"
type="text"
class="form-control"
@@ -27,15 +27,67 @@
ng-maxlength="100"
maxlength="100"
required>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+ </div>
+ <div class="form-group">
+ <label class="issue-label">
+ <span translate="ispField.select">ISP �꽑�깮</span>
+ </label>
+ <js-autocomplete-single data-input-name="ispField"
+ selected-model="vm.form.issueIspFields"
+ ng-model="vm.form.ispName"
+ search="vm.form.ispName"
+ source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.issueIspFields.page, fn.getIssueIspFieldListCallBack)"
+ page="vm.autoCompletePage.ispField.page"
+ total-page="vm.autoCompletePage.ispField.totalPage"
+ input-disabled="false"
+ translation-texts="{ empty : 'common.emptyIsp' }"
+ broad-cast="ispFieldEvent"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
+
+ <div class="form-group">
+ <label class="issue-label">
+ <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
+ </label>
+ <js-autocomplete-single data-input-name="hostingField"
+ selected-model="vm.form.issueHostingFields"
+ ng-model="vm.form.hostingName"
+ search="vm.form.hostingName"
+ source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
+ page="vm.autoCompletePage.hostingField.page"
+ total-page="vm.autoCompletePage.hostingField.totalPage"
+ input-disabled="false"
+ translation-texts="{ empty : 'common.emptyHosting' }"
+ broad-cast="hostingFieldEvent"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
+ <div>
+ <div class="form-group">
+ <label for="companyFieldAddForm10" class="issue-label">
+ <span translate="companyField.url">url</span>
+ </label>
+ <input id="companyFieldAddForm10"
+ name="url"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.url"
+ ng-maxlength="200"
+ maxlength="200"
+ >
+ </div>
</div>
<!--<div class="row">
<div class="col-md-3">
<div class="form-group mb10">
- <label for="companyFieldAddForm2" class="issue-label"> <span
+ <label for="companyFieldModifyForm2" class="issue-label"> <span
translate="companyField.company">�뾽泥� 遺꾨쪟</span>
</label>
- <select id="companyFieldAddForm2"
+ <select id="companyFieldModifyForm2"
name="companyType"
class="form-control input-sm issue-select-label"
ng-model="vm.form.companyType"
@@ -50,10 +102,10 @@
</div>
<div class="col-md-3">
<div class="form-group mb10">
- <label for="companyFieldAddForm3" class="issue-label">
+ <label for="companyFieldModifyForm3" class="issue-label">
<span translate="companyField.profitYN">�쁺由�/鍮꾩쁺由�</span>
</label>
- <select id="companyFieldAddForm3"
+ <select id="companyFieldModifyForm3"
name="profitYN"
class="form-control input-sm issue-select-label"
ng-model="vm.form.profitYN"
@@ -68,10 +120,10 @@
</div>
<div class="col-md-6">
<div class="form-group mb10">
- <label for="companyFieldAddForm4" class="issue-label"> <span
+ <label for="companyFieldModifyForm4" class="issue-label"> <span
translate="companyField.industry">�궛�뾽 遺꾨쪟</span>
</label>
- <input id="companyFieldAddForm4"
+ <input id="companyFieldModifyForm4"
name="industry"
type="text"
class="form-control"
@@ -87,10 +139,10 @@
</div>
<div class="form-group">
- <label for="companyFieldAddForm5" class="issue-label">
+ <label for="companyFieldModifyForm5" class="issue-label">
<span translate="companyField.domain">�룄硫붿씤</span>
</label>
- <input id="companyFieldAddForm5"
+ <input id="companyFieldModifyForm5"
name="domain"
type="text"
class="form-control"
@@ -105,10 +157,10 @@
</div>-->
<div>
<div class="form-group">
- <label for="companyFieldAddForm9" class="issue-label">
+ <label for="companyFieldModifyForm9" class="issue-label">
<span translate="companyField.manager">�떞�떦�옄</span>
</label>
- <input id="companyFieldAddForm9"
+ <input id="companyFieldModifyForm9"
name="manager"
type="text"
class="form-control"
@@ -124,10 +176,10 @@
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm7" class="issue-label">
+ <label for="companyFieldModifyForm7" class="issue-label">
<span translate="companyField.tel">�쟾�솕踰덊샇</span>
</label>
- <input id="companyFieldAddForm7"
+ <input id="companyFieldModifyForm7"
name="tel"
type="text"
class="form-control"
@@ -137,15 +189,17 @@
ng-model="vm.form.tel"
maxlength="20"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="companyFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
</div>
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm6" class="issue-label">
+ <label for="companyFieldModifyForm6" class="issue-label">
<span translate="companyField.email">�씠硫붿씪</span>
</label>
- <input id="companyFieldAddForm6"
+ <input id="companyFieldModifyForm6"
name="email"
type="email"
class="form-control"
@@ -155,15 +209,17 @@
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
>
- <!--<small translate="notice.enterSpecialCharacters">�젣紐⑹뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
+ <div ng-show="companyFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
<div class="form-group">
- <label for="companyFieldAddForm8" class="issue-label">
- <span translate="companyField.desc">鍮꾧퀬</span>
+ <label for="companyFieldModifyForm8" class="issue-label">
+ <span translate="companyField.memo">鍮꾧퀬</span>
</label>
- <input id="companyFieldAddForm8"
+ <input id="companyFieldModifyForm8"
name="memo"
type="text"
class="form-control"
@@ -182,8 +238,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(companyFieldAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(companyFieldAddForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(companyFieldModifyForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
--
Gitblit v1.8.0