From 71a5ce92795fb1a4fbff5fceab8135ec98a691e5 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:07:52 +0900
Subject: [PATCH] 이슈 목록 조회 방식 - 전체이슈 보기 / 상위 이슈만 보기 / 하위 이슈만 보기로 수정
---
src/main/webapp/views/issue/issueListNormal.html | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index c8594be..964d140 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -87,6 +87,12 @@
<span ng-click="vm.search.completeDateRange = ''">횞</span>
</p>
+ <!-- 湲곌컙 -->
+ <p ng-if="$root.isDefined(vm.search.dateRange)">
+ {{vm.search.dateRange}}
+ <span ng-click="vm.search.dateRange = ''">횞</span>
+ </p>
+
<!-- �벑濡앹씪 -->
<p ng-if="$root.isDefined(vm.search.registerDateRange)">
{{vm.search.registerDateRange}}
@@ -264,6 +270,33 @@
</div>
</div>
+ <div class="col-lg-3">
+ <div class="form-group">
+ <label> <span translate="common.dateRange">湲곌컙</span></label>
+ <input type="text"
+ readonly
+ class="form-control input-sm input-readonly"
+ ng-model="vm.search.dateRange"
+ modal-form-auto-scroll
+ 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.registrationDate">�벑濡앹씪</span></label>
+ <input type="text"
+ readonly
+ class="form-control input-sm input-readonly"
+ ng-model="vm.search.registerDateRange"
+ modal-form-auto-scroll
+ date-format="YY-MM-DD"
+ parent-el="'#createdWidget'"
+ date-range-picker>
+ </div>
+ </div>
<div class="col-lg-3" ng-repeat="customField in vm.customFields">
@@ -274,7 +307,7 @@
<input type="text"
class="form-control input-sm"
ng-model="customField.useValues"
- maxlength="100">
+ >
</div>
<div ng-switch-when="NUMBER">
<input type="text"
@@ -296,7 +329,7 @@
ng-model="customField.useValues"
placeholder="{{'issue.clickToSelectDate' | translate}}"
modal-form-auto-scroll
- range-type="singleDate"
+ range-type="multiDate"
date-range-picker
autocomplete="off">
<div class="row">
@@ -420,14 +453,17 @@
<!-- �슦痢� -->
<div class="col-5" >
- <span class="issue-detail-label" ng-if="vm.listMode === 0" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
- <label class='switch' ng-if="vm.listMode === 0" style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
- <span class='slider round'></span>
- </label>
- <span class="issue-detail-label" style="position: relative; left: 5.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
+ <span class="issue-detail-label" style="position: relative; left: 5.8rem; bottom: 7px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
<label class='switch' style="left: 6.3rem"><input type='checkbox' ng-model='vm.hideCompleteIssue' ng-click='fn.getPageList(0)'>
<span class='slider round'></span>
</label>
+ <label style="position: relative; left: 8rem; bottom: 9px">
+ <select class="form-control form-control-sm" ng-if="vm.listMode === 0" ng-model="vm.hideDownIssue" ng-change="fn.getPageList(0)" ng-init="0" style="width:160px">
+ <option value="0">�쟾泥� �씠�뒋 蹂닿린</option>
+ <option value="1">�긽�쐞 �씠�뒋留� 蹂닿린</option>
+ <option value="2">�븯�쐞 �씠�뒋留� 蹂닿린</option>
+ </select>
+ </label>
<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">
--
Gitblit v1.8.0