From d3a588c41660508fb494ba55c6d0d6ead0b1db27 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 16 11월 2021 12:51:28 +0900
Subject: [PATCH] 이슈 만들기 진행[프론트]
---
src/main/webapp/views/issue/issueAdd.html | 180 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 85 insertions(+), 95 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 578e9c1..c85f722 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -41,7 +41,7 @@
total-page="vm.autoCompletePage.project.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyProject' }"
- extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ extra-settings="{ displayProp : '' , idProp : '', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
</div>
@@ -117,47 +117,29 @@
</div>
</div>
</div>
-
</div>
-
- <div class="form-group mb10">
- <label class="issue-label"><span translate="common.content">�궡�슜</span></label>
- <summernote
- class="summernote"
- lang="ko-KR"
- summer-note-auto-focus
- ng-model="vm.form.description"
- data-editor="vm.summerNote.editor"
- data-editable="vm.summerNote.editable"
- on-image-upload="fn.imageUpload(files)"
- target=".note-editable"></summernote>
- </div>
-
+ <hr>
<div class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<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"
- page="vm.autoCompletePage.user.page"
- total-page="vm.autoCompletePage.user.totalPage"
- source="fn.getUserList(vm.userName, vm.form.users, vm.autoCompletePage.user.page, fn.getUserListCallBack)"
- input-disabled="vm.form.projects.length == 0"
- translation-texts="{ empty : 'common.emptyUser'}"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile',
- type : 'user', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
+ <js-autocomplete-multi data-input-name="department�꽩"
+ selected-model="vm.form.departments"
+ search="vm.departmentName"
+ source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ input-disabled="false"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment'}"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
- <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>
- <span>{{user.name}}({{user.account}})</span>
- <span class="select3-selection__choice__remove"
- ng-click="fn.removeManager($index)">횞</span>
+ <div class="select3-selection__choicediv mt-10">
+ <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
+ <span>{{department.byName}}</span>
+ <span class="select3-selection__choice__remove" ng-click="fn.removeManager($index)">횞</span>
</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>
@@ -228,7 +210,6 @@
</div>
</div>
</div>
-
<div class="row">
<div class="col-lg-4 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
@@ -245,7 +226,7 @@
readonly
class="form-control cursor"
placeholder="{{'issue.clickToSelectDate' | translate}}"
- ng-model="vm.form.startCompleteDateRange"
+ ng-model="vm.form.detectingDateRange"
modal-form-auto-scroll
date-format="YYYY-MM-DD"
parent-el="'#createdWidget2'"
@@ -288,31 +269,28 @@
</div>
</div>
</div>
+ <hr>
<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="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>
+ <label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
+ <js-autocomplete-single data-input-name="companyField"
+ selected-model="vm.form.companyFields"
+ search="vm.companyName"
+ source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ page="vm.autoCompletePage.companyField.page"
+ total-page="vm.autoCompletePage.companyField.totalPage"
+ input-disabled="false"
+ translation-texts="{ empty : 'common.emptyCompany' }"
+ broad-cast="companyFieldEvent"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
</div>
<div class="col-lg-4">
@@ -326,10 +304,10 @@
kr-input
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
- ng-model="vm.form.companyManager"
+ ng-model="vm.companyManager"
ng-maxlength="100"
maxlength="100"
- required>
+ >
</div>
</div>
<div class="col-lg-4">
@@ -342,7 +320,7 @@
kr-input
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
- ng-model="vm.form.companyTel"
+ ng-model="vm.companyTel"
maxlength="20">
<div ng-show="issueAddForm.companyTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
@@ -358,7 +336,7 @@
class="form-control"
autocomplete="off"
maxLength="50"
- ng-model="vm.form.companyEmail"
+ 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"
@@ -368,15 +346,15 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
- <label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.desc">鍮꾧퀬</span></label>
+ <label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.memo">鍮꾧퀬</span></label>
<input id="companyFieldDescAddForm"
- name="companyDesc"
+ name="companyMemo"
type="text"
class="form-control"
kr-input
autocomplete="off"
- ng-model="vm.form.companyDesc"
ng-maxlength="200"
+ ng-model="vm.companyMemo"
maxlength="200">
</div>
</div>
@@ -390,19 +368,18 @@
<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>
+ <label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
+ <js-autocomplete-single data-input-name="ispField"
+ selected-model="vm.form.ispFields"
+ search="vm.ispName"
+ source="fn.getIspFieldList(vm.ispName, vm.form.ispFields, vm.autoCompletePage.ispField.page, fn.getIspFieldListCallBack)"
+ 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>
<div class="col-lg-4">
@@ -415,7 +392,7 @@
kr-input
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
- ng-model="vm.form.ispManager"
+ ng-model="vm.ispManager"
ng-maxlength="100"
maxlength="100">
</div>
@@ -430,7 +407,7 @@
kr-input
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
- ng-model="vm.form.ispTel"
+ ng-model="vm.ispTel"
maxlength="20">
<div ng-show="issueAddForm.ispTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
@@ -446,7 +423,7 @@
class="form-control"
autocomplete="off"
maxLength="50"
- ng-model="vm.form.ispEmail"
+ 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"
@@ -456,14 +433,14 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
- <label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.desc">鍮꾧퀬</span></label>
+ <label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.memo">鍮꾧퀬</span></label>
<input id="ispFieldDescAddForm"
- name="ispDesc"
+ name="ispMemo"
type="text"
class="form-control"
kr-input
autocomplete="off"
- ng-model="vm.form.ispDesc"
+ ng-model="vm.ispMemo"
ng-maxlength="200"
maxlength="200">
</div>
@@ -478,19 +455,18 @@
<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>
+ <label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
+ <js-autocomplete-single data-input-name="hostingField"
+ selected-model="vm.form.hostingFields"
+ search="vm.hostingName"
+ source="fn.getHostingFieldList(vm.hostingName, vm.form.hostingFields, vm.autoCompletePage.hostingField.page, fn.getHostingFieldListCallBack)"
+ 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="col-lg-4">
@@ -503,7 +479,7 @@
kr-input
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
- ng-model="vm.form.hostingManager"
+ ng-model="vm.hostingManager"
ng-maxlength="100"
maxlength="100">
</div>
@@ -518,7 +494,7 @@
kr-input
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
- ng-model="vm.form.hostingTel"
+ ng-model="vm.hostingTel"
maxlength="20">
<div ng-show="issueAddForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
@@ -534,7 +510,7 @@
class="form-control"
autocomplete="off"
maxLength="50"
- ng-model="vm.form.hostingEmail"
+ 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"
@@ -544,23 +520,37 @@
</div>
<div class="col-lg-4">
<div class="form-group mgb5">
- <label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.desc">鍮꾧퀬</span></label>
+ <label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.memo">鍮꾧퀬</span></label>
<input id="hostingFieldDescAdd"
- name="hostingDesc"
+ name="hostingMemo"
type="text"
class="form-control"
kr-input
autocomplete="off"
- ng-model="vm.form.hostingDesc"
+ ng-model="vm.hostingMemo"
ng-maxlength="200"
maxlength="200">
</div>
</div>
</div>
</form>
+ <hr>
+ <div class="form-group mb10">
+ <label class="issue-label"><span translate="common.content">�궡�슜</span></label>
+ <summernote
+ class="summernote"
+ lang="ko-KR"
+ summer-note-auto-focus
+ ng-model="vm.form.description"
+ data-editor="vm.summerNote.editor"
+ data-editable="vm.summerNote.editable"
+ on-image-upload="fn.imageUpload(files)"
+ target=".note-editable"></summernote>
+ </div>
</div>
</div>
+
<div class="modal-footer buttons-on-right">
<div class="pull-left">
<label>
--
Gitblit v1.8.0