From 6565e26508224b5d1de1ff7cf0f263fe196790e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:54:06 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueListNormal.html | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 102 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 847261d..2f018a6 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -5,7 +5,7 @@
<div class="element-box">
<div class="row" >
<div class="col-sm-12">
- <div class="searchdiv">
+ <div class="searchdiv" ng-if="!$root.isMainSearch">
<form name="issueSearchForm" role="form" ng-enter="fn.getPageList(0)">
<div class="row">
<div class="col-sm-6">
@@ -47,6 +47,12 @@
<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.search.issueNumber)">
+ {{vm.search.issueNumber}}
+ <span ng-click="vm.search.issueNumber = ''">횞</span>
+ </p>
+
<!-- �씠�뒋 �궡�슜 -->
<p ng-if="$root.isDefined(vm.search.description)">
{{vm.search.description}}
@@ -86,6 +92,10 @@
{{vm.search.registerDateRange}}
<span ng-click="vm.search.registerDateRange = ''">횞</span>
</p>
+
+ <!-- �떞�떦遺��꽌 -->
+ <issue-search-array-view-element lists="vm.departments"
+ type="'department'"></issue-search-array-view-element>
<!-- �뀓�뒪�듃 �엯�젰 �븘�뱶 -->
<issue-search-custom-field-view-element
@@ -154,12 +164,12 @@
<div class="form-group">
<label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
<input type="text"
- name="name"
+ name="issueNumber"
class="form-control input-sm"
autocomplete="off"
kr-input
maxlength="20"
- ng-model="vm.search.combinationIssueNumber">
+ ng-model="vm.search.issueNumber">
</div>
</div>
@@ -272,9 +282,93 @@
<div ng-switch on="customField.customFieldType">
<div ng-switch-when="INPUT">
- <input type="text" class="form-control input-sm"
+ <input type="text"
+ class="form-control input-sm"
ng-model="customField.useValues"
maxlength="100">
+ </div>
+ <div ng-switch-when="NUMBER">
+ <input type="text"
+ class="form-control input-sm"
+ name="numberType"
+ ng-model="customField.useValues"
+ kr-input
+ placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
+ ng-pattern="/^[0-9]*$/"
+ autocomplete="off">
+ <div ng-show="issueSearchForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
+ </div>
+
+ <!-- todo : �궇吏� 寃��깋 臾몄젣 -->
+ <div ng-switch-when="DATETIME">
+ <input type="text" class="form-control input-sm"
+ name="dateTime"
+ ng-model="customField.useValues"
+ maxlength="100"
+ range-type="singleDate"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget" class="bootstrap-datepicker "></div>
+ </div>
+ </div>
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <input type="text"
+ class="form-control input-sm"
+ name="ipAdress"
+ ng-model="customField.useValues"
+ kr-input
+ ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
+ placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off">
+ <div ng-show="issueSearchForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="email"
+ class="form-control input-sm"
+ name="email"
+ ng-model="customField.useValues"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+ placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off">
+ <div ng-show="issueSearchForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+
+ <div ng-switch-when="SITE">
+ <input type="text"
+ class="form-control input-sm"
+ name="site"
+ ng-model="customField.useValues"
+ kr-input
+ ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
+ placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off">
+ <div ng-show="issueSearchForm.site.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
+ </div>
+ <div ng-switch-when="TEL">
+ <input type="text"
+ class="form-control input-sm"
+ name="tel"
+ ng-model="customField.useValues"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off">
+ <div ng-show="issueSearchForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<div ng-switch-default>
@@ -336,8 +430,8 @@
<!-- �슦痢� -->
<div class="col-5" >
- <span class="issue-detail-label" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
- <label class='switch' style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
+ <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>
@@ -355,12 +449,12 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start" >
- <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.importExcel()"> <span translate="common.importExcel">Excel Import</span></a>
<a class="dropdown-item cursor" ng-click="fn.modifyMultiIssueStatus()"> <span translate="common.updateIssueStatus">�씠�뒋 �긽�깭 蹂�寃�</span></a>
<a class="dropdown-item cursor" ng-click="fn.addIssueTableConfig()"> <span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.selectDelete">�궘�젣</span></a>
</div>
</div>
</form>
--
Gitblit v1.8.0