페이징, 검색버튼 수정_220223
parent
d84c91496b
commit
1f72128b7d
|
|
@ -1,3 +1,5 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path:
|
||||
Created-By: IntelliJ IDEA
|
||||
Built-By: DBNT
|
||||
Build-Jdk: version 11.0.1
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,28 @@
|
|||
</div>
|
||||
<div class="section_content">
|
||||
<form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
|
||||
<div class="search_div">
|
||||
|
||||
<div class="d-flex justify-content-end">
|
||||
<div class="row">
|
||||
<div class="col-auto">
|
||||
<select class="form-select" name="searchCondition">
|
||||
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
|
||||
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
|
||||
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected" /></c:if> value="region">위치</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-auto">
|
||||
<input type="text" class="form-control" name="searchKeyword" value="${fieldDataSearchVO.searchKeyword}"/>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%--<div class="search_div">
|
||||
<div class="search_menu"> </div>
|
||||
<div class="search_keyword">
|
||||
<select class="form-control search_selectbox" name="searchCondition">
|
||||
|
|
@ -30,7 +51,7 @@
|
|||
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value="${fieldDataSearchVO.searchKeyword}" />" />
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
|
|
|
|||
|
|
@ -6,24 +6,31 @@
|
|||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
<script src="../../../js/admin/history.js"></script>
|
||||
|
||||
<div class="section_title">
|
||||
<div class="section_title">
|
||||
<!-- <p>지도사용 이력</p> -->
|
||||
</div>
|
||||
<div class="section_content">
|
||||
<form:form commandName="UseHistorySearchVO" name="searchForm" action="/admin/history" method="get">
|
||||
<div class="search_div">
|
||||
<div class="search_menu"> </div>
|
||||
<div class="search_keyword">
|
||||
<select class="form-control search_selectbox" name="searchCondition">
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'req_area'}"><c:out value="selected" /></c:if> value="req_area">위치</option>
|
||||
<div class="d-flex justify-content-end">
|
||||
<div class="row">
|
||||
<div class="col-auto">
|
||||
<select class="form-select" name="searchCondition">
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
|
||||
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'req_area'}"><c:out value="selected" /></c:if> value="req_area">위치</option>
|
||||
</select>
|
||||
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value='${UseHistorySearchVO.searchKeyword}' />" />
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
</div>
|
||||
|
||||
<div class="col-auto">
|
||||
<input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}" />
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<table class="list-table">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,9 @@
|
|||
<div class="section_content">
|
||||
<form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
|
||||
<input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" />
|
||||
<div class="search_div">
|
||||
|
||||
|
||||
<div class="search_div">
|
||||
<div class="search_menu">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a></li>
|
||||
|
|
@ -19,20 +21,29 @@
|
|||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="search_keyword">
|
||||
<select class="form-control search_selectbox" name="searchCondition">
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out value="selected" /></c:if> value="title">작업명</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
|
||||
</select>
|
||||
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value='${useRequestSearchVO.searchKeyword}' />" />
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
<div class="d-flex justify-content-end">
|
||||
<div class="row">
|
||||
<div class="col-auto">
|
||||
<select class="form-select" name="searchCondition">
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out value="selected" /></c:if> value="title">작업명</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
|
||||
<option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
<tr><th colspan="6">지도사용 요청</th></tr>
|
||||
|
|
|
|||
|
|
@ -14,97 +14,127 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
<div class="section_title">
|
||||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
<div class="section_content">
|
||||
<form:form commandName="userSearchVO" name="searchForm" action="/admin/userInfo" method="get">
|
||||
<div class="search_div">
|
||||
<div class="search_menu">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span class="badge"><c:out value='${standByCount}' /></span></a></li>
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li>
|
||||
</ul>
|
||||
<input type="hidden" name="auth" value="${userSearchVO.auth}" />
|
||||
</div>
|
||||
|
||||
|
||||
<div class="search_keyword">
|
||||
<select class="form-control search_selectbox" name="searchCondition">
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if> value="company">소속</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">이메일</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</option>
|
||||
</select>
|
||||
|
||||
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
|
||||
<div class="section_title">
|
||||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
<div class="section_content">
|
||||
<form:form commandName="userSearchVO" name="searchForm" action="/admin/userInfo" method="get">
|
||||
<div class="row justify-content-between">
|
||||
<div class="col-auto">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span class="badge"><c:out value='${standByCount}' /></span></a></li>
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li>
|
||||
</ul>
|
||||
<input type="hidden" name="auth" value="${userSearchVO.auth}" />
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<div class="row">
|
||||
<div class="col-auto">
|
||||
<select class="form-select" name="searchCondition">
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if> value="company">소속</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">이메일</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
<tr><th colspan="7">회원 관리</th></tr>
|
||||
<tr>
|
||||
<th>아이디</th>
|
||||
<th>이름</th>
|
||||
<th>소속</th>
|
||||
<th>전화번호</th>
|
||||
<th>이메일</th>
|
||||
<th>가입일</th>
|
||||
<c:choose>
|
||||
<c:when test="${userSearchVO.auth eq '99'}">
|
||||
<th>상태</th>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<th>권한</th>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:if test="${count >= 1}">
|
||||
<c:forEach var="item" items="${userList}" varStatus="idx">
|
||||
<tr>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.userid}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.name}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.company}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.phonenum}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.email}' /></a></td>
|
||||
<td class="td_date"><c:out value='${item.regdate}' /></a></td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${item.auth eq '1'}">관리자</c:when>
|
||||
<c:when test="${item.auth eq '2'}">사용자</c:when>
|
||||
<c:when test="${item.auth eq '99'}">
|
||||
<input type="button" class="btn btn-outline-primary" value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
|
||||
<input type="button" class="btn btn-outline-danger" value="삭제" onclick="confirmBtn('${item.userid}','-1'); return false;" />
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${count == 0}">
|
||||
<tr><td colspan="7">요청한 목록이 없습니다.</td></tr>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<%--<div class="search_div">
|
||||
<div class="search_menu">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span class="badge"><c:out value='${standByCount}' /></span></a></li>
|
||||
<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a></li>
|
||||
</ul>
|
||||
<input type="hidden" name="auth" value="${userSearchVO.auth}" />
|
||||
</div>
|
||||
|
||||
<div class="text-page">
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination justify-content-center">
|
||||
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
|
||||
<form:hidden path="pageIndex" />
|
||||
</form:form>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
<form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign">
|
||||
<input type="hidden" id="userid" name="userid" />
|
||||
<input type="hidden" id="auth" name="auth" />
|
||||
</form:form>
|
||||
</div>
|
||||
|
||||
<div class="search_keyword">
|
||||
<select class="form-control search_selectbox" name="searchCondition">
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if> value="company">소속</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">이메일</option>
|
||||
<option <c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if> value="phonenum">전화번호</option>
|
||||
</select>
|
||||
|
||||
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="${userSearchVO.searchKeyword}" />
|
||||
<input class="btn btn-outline-secondary" type="submit" value="검색" />
|
||||
|
||||
</div>
|
||||
</div>--%>
|
||||
|
||||
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
<tr><th colspan="7">회원 관리</th></tr>
|
||||
<tr>
|
||||
<th>아이디</th>
|
||||
<th>이름</th>
|
||||
<th>소속</th>
|
||||
<th>전화번호</th>
|
||||
<th>이메일</th>
|
||||
<th>가입일</th>
|
||||
<c:choose>
|
||||
<c:when test="${userSearchVO.auth eq '99'}">
|
||||
<th>상태</th>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<th>권한</th>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:if test="${count >= 1}">
|
||||
<c:forEach var="item" items="${userList}" varStatus="idx">
|
||||
<tr>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.userid}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.name}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.company}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.phonenum}' /></a></td>
|
||||
<td><a href="/admin/userInfo/<c:out value='${item.userid}' />"><c:out value='${item.email}' /></a></td>
|
||||
<td class="td_date"><c:out value='${item.regdate}' /></a></td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${item.auth eq '1'}">관리자</c:when>
|
||||
<c:when test="${item.auth eq '2'}">사용자</c:when>
|
||||
<c:when test="${item.auth eq '99'}">
|
||||
<input type="button" class="btn btn-outline-primary" value="승인" onclick="confirmBtn('${item.userid}','2'); return false;" />
|
||||
<input type="button" class="btn btn-outline-danger" value="삭제" onclick="confirmBtn('${item.userid}','-1'); return false;" />
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${count == 0}">
|
||||
<tr><td colspan="7">요청한 목록이 없습니다.</td></tr>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="text-page">
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination justify-content-center">
|
||||
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
|
||||
<form:hidden path="pageIndex" />
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</form:form>
|
||||
|
||||
<form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign">
|
||||
<input type="hidden" id="userid" name="userid" />
|
||||
<input type="hidden" id="auth" name="auth" />
|
||||
</form:form>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue