From b1834429716953b4d15b1f98e791c453e7f6d6dc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 11:38:14 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/project/projectAdd.html | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index c2393b0..d9933ff 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -67,14 +67,15 @@
<div class="row">
<div class="col-lg-6">
<div class="form-group">
- <label><span translate="common.period">湲곌컙</span> <code class="highlighter-rouge">*</code></label>
- <input type="text"
+ <label><span translate="common.period">湲곌컙</span></label>
+ <input tabindex="-1"
+ type="text"
class="form-control input-readonly"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
ng-model="vm.form.startEndDateRange"
modal-form-auto-scroll
+ date-format="YYYY-MM-DD"
parent-el="'#createdWidget'"
- range-type="date"
- onfocus="this.blur()"
date-range-picker>
<div class="row">
<div class="col-xs-12">
@@ -132,20 +133,20 @@
</div>
<div class="form-group">
- <label><span translate="project.projectTeam">�봽濡쒖젥�듃 ���썝</span> </label>
- <js-autocomplete-multi data-input-name="users"
- selected-model="vm.form.users"
- search="vm.userName"
- source="fn.getUserList(vm.userName, vm.form.users.concat(vm.form.managers))"
+ <label><span translate="project.projectDepartment">�봽濡쒖젥�듃 �떞�떦遺��꽌</span> </label>
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.form.departments"
+ search="vm.departmentName"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile', type : 'user', maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
<div class="select3-selection__choicediv mt-10">
<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.removeUsr($index)">횞</span>
+ <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
</div>
</div>
--
Gitblit v1.8.0