From b31979feb926bad9e0070332fb5ed7a896fd378d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 15 11월 2021 17:09:21 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/issue/issueAdd.html | 383 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 328 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 0eccfe0..578e9c1 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -136,7 +136,7 @@
<div class="row">
<div class="col-lg-4">
<div class="form-group mb10">
- <label class="issue-label"> <span translate="common.assignee">�떞�떦�옄</span> </label>
+ <label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
<js-input-autocomplete data-input-name="users"
selected-model="vm.form.users"
search="vm.userName"
@@ -148,7 +148,6 @@
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile',
type : 'user', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
- <small translate="issue.setUpUsersParticipatingInProject">�봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 �궗�슜�옄瑜� �꽕�젙�빀�땲�떎.</small>
<div class="select3-selection__choicediv">
<span class="select3-selection__choice" ng-repeat="user in vm.form.users">
<span class="avatar-w"><img ng-src="{{user.profile}}"></span>
@@ -158,10 +157,10 @@
</span>
</div>
</div>
-
+ </div>
+ <div class="col-lg-4">
<div class="form-group mb10">
- <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span>
- </label>
+ <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
<input id="issueAddForm5"
tabindex="-1"
type="text"
@@ -179,7 +178,8 @@
</div>
</div>
</div>
-
+ </div>
+ <div class="col-lg-4">
<div class="form-group mgb5">
<label class="issue-label"><span translate="common.attachFiles">�뙆�씪 泥⑤�</span></label>
<div class="filebox input-group">
@@ -196,9 +196,6 @@
multiple
ng-file-select="fn.onFileSelect($files)">
</div>
- <small translate="issue.attachOnlyFiles">hwp, jpg, png, txt, pptx, ppt, pdf, xlsx, xls, docx,
- zip, gif, jpeg, doc, tif, bmp, wmv, avi, mp4, mkv, mov �뙆�씪留� 泥⑤��븷 �닔 �엳�뒿�땲�떎.
- </small>
<div class="select2-selection__choicediv">
<div class="select2-selection__choice2" ng-repeat="file in vm.form.files">
@@ -230,59 +227,335 @@
</div>
</div>
</div>
+ </div>
- <div class="col-lg-8 bdl1">
- <div class="row">
- <div class="col-md-12">
- <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
- <label class="issue-label" translate="issue.notIssueTypeCustomFields">�씠�뒋 ���엯�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽
- �븘�뱶媛� �뾾�뒿�땲�떎.</label>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="detectingDateAddForm" class="issue-label"> <span translate="common.detectingData">�깘吏��씪�떆</span> </label>
+ <input id="detectingDateAddForm"
+ tabindex="-1"
+ type="text"
+ readonly
+ class="form-control cursor"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ ng-model="vm.form.startCompleteDateRange"
+ modal-form-auto-scroll
+ date-format="YYYY-MM-DD"
+ parent-el="'#createdWidget2'"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget2" class="bootstrap-datepicker"></div>
</div>
</div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="domainAddForm" class="issue-label"><span translate="companyField.domain">�룄硫붿씤</span></label>
+ <input id="domainAddForm"
+ name="domain"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.domain"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ipAdressAddForm" class="issue-label"><span translate="companyField.ipAdress">ip二쇱냼</span></label>
+ <input id="ipAdressAddForm"
+ name="ipAdress"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.ipAdress"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span></label>
+ <button class="btn btn-sm col-lg-6 btn-indigo" ng-click="fn.companyImport()">
+ <span translate="common.import">媛��졇�삤湲�</span>
+ </button>
+ </div>
+ </div>
- <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
- <div class="form-group mgb5">
- <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
-
- <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
- <!-- 湲곕낯 �엯�젰 -->
- <div ng-switch-when="INPUT">
- <input type="text" class="form-control input-sm"
- ng-model="issueCustomField.useValues"
- maxlength="100"
- autocomplete="off"
- kr-input
- ng-required="issueCustomField.fieldOption == '01'">
- </div>
-
- <!-- �떒�씪 ���젆�듃 -->
- <div ng-switch-when="SINGLE_SELECT">
- <select class="form-control input-sm issue-select-label"
- ng-required="issueCustomField.fieldOption == '01'"
- ng-model="issueCustomField.useValues">
- <option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
- <option ng-repeat="customFieldValueVo in issueCustomField.customFieldVo.customFieldValueVos"
- value="{{customFieldValueVo.value}}"
- ng-selected="$root.selectOption(issueCustomField.useValues, customFieldValueVo.value)">
- {{customFieldValueVo.value}}
- </option>
- </select>
- </div>
-
- <!-- 硫��떚 ���젆�듃 -->
- <div ng-switch-when="MULTI_SELECT">
- <ng-dropdown-multiselect class="multiSelect cursor"
- 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>
- </div>
- </div>
- </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="companyFieldNameAddForm" class="issue-label"> <span translate="companyField.name">�뾽泥대챸</span> </label>
+ <input id="companyFieldNameAddForm"
+ name="companyName"
+ 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.companyName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="companyFieldManagerAddForm" class="issue-label"><span translate="companyField.manager">�떞�떦�옄</span></label>
+ <input id="companyFieldManagerAddForm"
+ name="companyManager"
+ 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.companyManager"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldTelAddForm" class="issue-label"><span translate="companyField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="companyFieldTelAddForm"
+ name="companyTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.companyTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.companyTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
</div>
</div>
</div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldEmailAddForm" class="issue-label"><span translate="companyField.email">�씠硫붿씪</span></label>
+ <input id="companyFieldEmailAddForm"
+ name="companyEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.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"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.desc">鍮꾧퀬</span></label>
+ <input id="companyFieldDescAddForm"
+ name="companyDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.companyDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="ispFieldNameAddForm" class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
+ <input id="ispFieldNameAddForm"
+ name=ispName"
+ 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.ispName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="ispFieldManagerAddForm" class="issue-label"><span translate="ispField.manager">�떞�떦�옄</span></label>
+ <input id="ispFieldManagerAddForm"
+ name="ispManager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.ispManager"
+ ng-maxlength="100"
+ maxlength="100">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldTelAddForm" class="issue-label"><span translate="ispField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="ispFieldTelAddForm"
+ name="ispTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.ispTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.ispTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldEmailAddForm" class="issue-label"><span translate="ispField.email">�씠硫붿씪</span></label>
+ <input id="ispFieldEmailAddForm"
+ name="ispEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.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"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.desc">鍮꾧퀬</span></label>
+ <input id="ispFieldDescAddForm"
+ name="ispDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.ispDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="hostingFieldNameAdd" class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
+ <input id="hostingFieldNameAdd"
+ name="hostingName"
+ 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.hostingName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="hostingFieldManagerAdd" class="issue-label"><span translate="hostingField.manager">�떞�떦�옄</span></label>
+ <input id="hostingFieldManagerAdd"
+ name="hostingManager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.hostingManager"
+ ng-maxlength="100"
+ maxlength="100">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldTelAdd" class="issue-label"><span translate="hostingField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="hostingFieldTelAdd"
+ name="hostingTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.hostingTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldEmailAdd" class="issue-label"><span translate="hostingField.email">�씠硫붿씪</span></label>
+ <input id="hostingFieldEmailAdd"
+ name="hostingEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.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"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.desc">鍮꾧퀬</span></label>
+ <input id="hostingFieldDescAdd"
+ name="hostingDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.hostingDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
</div>
</form>
</div>
--
Gitblit v1.8.0