From f2fcf329cea64d71c671f1ab17f17d1634d1464d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:08:23 +0900
Subject: [PATCH] - API로 이슈 추가 시 하위이슈처리기준 항목으로 동일한 업체 정보로 이슈 생성하여 하위이슈로 넣기 - 업체 테이블에 ip_start, ip_end 컬럼 추가

---
 src/main/webapp/views/project/projectAdd.html |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index c2393b0..44e3b4f 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -19,7 +19,7 @@
                        autofocus
                        autocomplete="off"
                        ng-model="vm.form.name"
-                       input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+                       input-regex="/[^?a-zA-Z0-9/]/"
                        ng-maxlength="50"
                        maxlength="50"
                        kr-input
@@ -27,7 +27,7 @@
                 <small ng-show="projectAddForm.name.$error.maxlength" class="help-block form-text text-danger" translate="common.upTo50Characters">
                     理쒕� 50湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
                 </small>
-                <small translate="project.limitNameToSpecialCharacters">�봽濡쒖젥�듃 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+                <!--<small translate="project.limitNameToSpecialCharacters">�봽濡쒖젥�듃 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
             </div>
 
             <div class="form-group">
@@ -64,17 +64,19 @@
                 </small>
             </div>
 
-            <div class="row">
-                <div class="col-lg-6">
+            <!--<div class="row">-->
+            <div>
+                <div class="form-group">
                     <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">
@@ -83,7 +85,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-6">
+                <!--<div class="col-lg-6">
                     <div class="form-group mb10">
                         <label> <span translate="common.parentProject">�긽�쐞 �봽濡쒖젥�듃</span></label>
                         <js-autocomplete-single data-input-name="project"
@@ -98,7 +100,7 @@
                                             type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }">
                         </js-autocomplete-single>
                     </div>
-                </div>
+                </div>-->
             </div>
 
 
@@ -132,20 +134,19 @@
             </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 class="select3-selection__choice" ng-repeat="department in vm.form.departments">
+                       <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+                        <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
                     </span>
                 </div>
             </div>

--
Gitblit v1.8.0