From 3d1d29425c873257a65f4fde8a4bfc43d6211b83 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 15:58:50 +0900
Subject: [PATCH] - 완료이슈 숨기기 기능 - 업체관리 오류 해결
---
src/main/webapp/views/issue/issueListNormal.html | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 6fec887..c6e249c 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -38,9 +38,7 @@
<!-- �봽濡쒖젥�듃 -->
<issue-search-array-view-element lists="vm.projects"
type="'project'"></issue-search-array-view-element>
- <p ng-if="$root.isDefined(vm.projectKey)">
- {{vm.projectKey}}
- </p>
+
<!-- �씠�뒋 ���엯 -->
<issue-search-field-key-view-element lists="vm.issueTypes"
keys="vm.search.issueTypeIds"></issue-search-field-key-view-element>
@@ -48,16 +46,6 @@
<!-- �씠�뒋 �긽�깭 -->
<issue-search-field-key-view-element lists="vm.issueStatuses"
keys="vm.search.issueStatusIds"></issue-search-field-key-view-element>
-
- <!-- �씠�뒋 踰덊샇 -->
- <p ng-if="$root.isDefined(vm.issueNumber)">
- {{vm.issueNumber}}
- </p>
-
- <p ng-if="$root.isDefined(vm.search.combinationIssueNumber)">
- {{vm.search.combinationIssueNumber}}
- <span ng-click="vm.search.combinationIssueNumber = ''">횞</span>
- </p>
<!-- �씠�뒋 �궡�슜 -->
<p ng-if="$root.isDefined(vm.search.description)">
@@ -159,7 +147,9 @@
options="::vm.issueStatuses"></ng-dropdown-multiselect>
</div>
</div>
+ </div>
+ <div class="row">
<div class="col-lg-3">
<div class="form-group">
<label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
@@ -169,13 +159,10 @@
autocomplete="off"
kr-input
maxlength="20"
- ng-model="vm.issueNumber">
-<!-- ng-model="vm.search.combinationIssueNumber">-->
+ ng-model="vm.search.combinationIssueNumber">
</div>
</div>
- </div>
- <div class="row">
<div class="col-lg-3">
<div class="form-group">
<label> <span translate="issue.issueContent">�씠�뒋 �궡�슜</span></label>
@@ -206,20 +193,6 @@
data-input-name="severities"
selected-model="vm.search.severityIds"
options="::vm.severities"></ng-dropdown-multiselect>
- </div>
- </div>
-
- <div class="col-lg-3">
- <div class="form-group">
- <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
- <js-autocomplete-multi data-input-name="departments"
- selected-model="vm.departments"
- search="vm.departmentName"
- input-disabled="false"
- source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
- </js-autocomplete-multi>
</div>
</div>
</div>
@@ -277,6 +250,20 @@
date-format="YY-MM-DD"
parent-el="'#createdWidget'"
date-range-picker>
+ </div>
+ </div>
+
+ <div class="col-lg-3">
+ <div class="form-group">
+ <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.departments"
+ search="vm.departmentName"
+ input-disabled="false"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.departments)"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment' }"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', widthable : false, width : '', imageable : true, imagePathProp : 'profile', type : 'department', maxlength : 100 }">
+ </js-autocomplete-multi>
</div>
</div>
@@ -346,6 +333,11 @@
<form class="form-inline justify-content-sm-end pull-right" method="post" action="/issue/downloadExcel" name="issueListForm" >
<!--span class="badge-tip" function-tool-tip data-placement="top" data-toggle="tooltip" data-original-title="�뿊�� �떎�슫濡쒕뱶, �씪愿� 蹂�寃� �벑 �떎�뼇�븳 湲곕뒫�쓣 �젣怨듯빀�땲�떎.">?</span-->
<input type="hidden" name="conditions">
+ <div>
+ �셿猷� �씠�뒋 �닲湲곌린
+ <label class='switch'><input type='checkbox' ng-model='vm.hideIssue' ng-click='fn.getPageList(0)'><span class='slider round'></span></label>
+ </div>
+
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
tabindex="-1"
--
Gitblit v1.8.0