Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB
commit
f3a782f24d
|
|
@ -50,7 +50,47 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
|
|||
*
|
||||
* @see 개발프레임웍크 실행환경 개발팀
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination">
|
||||
<li>
|
||||
<a href="#" aria-label="Previous">
|
||||
<span aria-hidden="true">«</span>
|
||||
</a>
|
||||
</li>
|
||||
<li><a href="#">1</a></li>
|
||||
<li><a href="#">2</a></li>
|
||||
<li><a href="#">3</a></li>
|
||||
<li><a href="#">4</a></li>
|
||||
<li><a href="#">5</a></li>
|
||||
<li>
|
||||
<a href="#" aria-label="Next">
|
||||
<span aria-hidden="true">»</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
*/
|
||||
public void initVariables() {
|
||||
<<<<<<< HEAD
|
||||
|
||||
firstPageLabel = "";//"<li><a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a> ";
|
||||
previousPageLabel = "<li>\n" +
|
||||
"\t\t\t\t\t <a href=\"#\" aria-label=\"Previous\">\n" +
|
||||
"\t\t\t\t\t\t<span aria-hidden=\"true\">«</span>\n" +
|
||||
"\t\t\t\t\t </a>\n" +
|
||||
"\t\t\t\t\t</li>";
|
||||
currentPageLabel = "<strong>{0}</strong> ";
|
||||
otherPageLabel = "<li><a href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a></li>";
|
||||
nextPageLabel = "<li>\n" +
|
||||
"\t\t\t\t\t <a href=\"#\" aria-label=\"Next\">\n" +
|
||||
"\t\t\t\t\t\t<span aria-hidden=\"true\">»</span>\n" +
|
||||
"\t\t\t\t\t </a>\n" +
|
||||
"\t\t\t\t\t</li>";
|
||||
lastPageLabel = "";//"<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_next10.gif' border=0/></a> ";
|
||||
=======
|
||||
// firstPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a> ";
|
||||
firstPageLabel = "";//"<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a> ";
|
||||
previousPageLabel = "<li class=\"page-item\">\n" +
|
||||
|
|
@ -66,6 +106,7 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
|
|||
"\t\t\t\t\t </a>\n" +
|
||||
"\t\t\t\t\t</li>";
|
||||
lastPageLabel = "";//""<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_next10.gif' border=0/></a> ";
|
||||
>>>>>>> fe79f99402336104ee1532a6190dfbcb6ec1d1e3
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -6,6 +6,126 @@
|
|||
|
||||
<script src="<c:url value="/js/admin/request.js"/>"></script>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>모바일센터 관리시스템</title>
|
||||
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
|
||||
<script src="<c:out value="/js/bootstrap.min.js" />"></script>
|
||||
<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
|
||||
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
|
||||
<link href="<c:out value="/css/style.css" />" rel="stylesheet">
|
||||
</head>
|
||||
<script>
|
||||
function fn_link_page(pageNo) {
|
||||
document.searchForm.pageIndex.value = pageNo;
|
||||
document.searchForm.action = "<c:url value='/admin/request' />";
|
||||
document.searchForm.submit();
|
||||
}
|
||||
</script>
|
||||
<body>
|
||||
<%@ include file="../include/header.jsp"%>
|
||||
<section class="section">
|
||||
<div class="section_title">
|
||||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
<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_menu">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" <c:if test="${empty useRequestSearchVO.status}">class="active"</c:if>><a href="/admin/request">전체</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '0'}">class="active"</c:if>><a href="/admin/request?status=0">승인</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '-1'}">class="active"</c:if>><a href="/admin/request?status=-1">반려</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '99'}">class="active"</c:if>><a href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a></li>
|
||||
</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-default" type="submit" value="검색" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
<tr><th colspan="6">지도사용 요청</th></tr>
|
||||
<tr>
|
||||
<th>번호</th>
|
||||
<th>작업명</th>
|
||||
<th>소속</th>
|
||||
<th>담당자</th>
|
||||
<th>날짜</th>
|
||||
<th>상태</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:if test="${count >= 1}">
|
||||
<c:forEach var="item" items="${useRequestList}" varStatus="idx">
|
||||
<tr>
|
||||
<td><c:out value="${item.idx}" /></td>
|
||||
<td class="title-td"><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}" /></a></td>
|
||||
<td><c:out value="${item.company}" /></td>
|
||||
<td><c:out value="${item.name}" /></td>
|
||||
<td class="td_date"><c:out value="${item.r_date}" /></td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${item.status eq '99'}"><span class="label label-warning"><c:out value='승인대기' /></span></c:when>
|
||||
<c:when test="${item.status eq '0'}"><span class="label label-success"><c:out value='승인' /></span></c:when>
|
||||
<c:when test="${item.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${count == 0}">
|
||||
<tr><td colspan="6">요청한 목록이 없습니다.</td></tr>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="text-center">
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination" >
|
||||
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
|
||||
<form:hidden path="pageIndex" />
|
||||
</form:form>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<%--
|
||||
|
||||
<li>
|
||||
<a href="${firstIndex-1}" aria-label="Previous">
|
||||
<span aria-hidden="true">«</span>
|
||||
</a>
|
||||
</li>
|
||||
<li><a href="paginationInfo="${pageindex}">1</a></li>
|
||||
<li><a href="#">2</a></li>
|
||||
<li><a href="#">3</a></li>
|
||||
<li><a href="#">4</a></li>
|
||||
<li><a href="#">5</a></li>
|
||||
<li>
|
||||
<a href="#" aria-label="Next">
|
||||
<span aria-hidden="true">»</span>
|
||||
</a>
|
||||
</li>
|
||||
--%>
|
||||
</div>
|
||||
</section>
|
||||
</body>
|
||||
</html>
|
||||
=======
|
||||
|
||||
<div class="section_content">
|
||||
<h1 class="h4 m-3">지도사용 요청</h1>
|
||||
|
|
@ -117,3 +237,4 @@
|
|||
<div class="section_title">
|
||||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
>>>>>>> fe79f99402336104ee1532a6190dfbcb6ec1d1e3
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,127 @@
|
|||
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
|
||||
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
|
||||
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
|
||||
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="ko">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>모바일센터 관리시스템</title>
|
||||
<script src="<c:out value="/js/jquery-3.5.1.min.js" />"></script>
|
||||
<script src="<c:out value="/js/bootstrap.min.js" />"></script>
|
||||
<link href="<c:out value="/css/normalize.css" />" rel="stylesheet">
|
||||
<link href="<c:out value="/css/bootstrap.min.css" />" rel="stylesheet">
|
||||
<link href="<c:out value="/css/style.css" />" rel="stylesheet">
|
||||
</head>
|
||||
<script>
|
||||
function fn_link_page(pageNo) {
|
||||
document.searchForm.pageIndex.value = pageNo;
|
||||
document.searchForm.action = "<c:url value='/admin/request' />";
|
||||
document.searchForm.submit();
|
||||
}
|
||||
</script>
|
||||
<body>
|
||||
<%@ include file="../include/header.jsp"%>
|
||||
<section class="section">
|
||||
<div class="section_title">
|
||||
<!-- <p>현장 지원 시스템</p> -->
|
||||
</div>
|
||||
<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_menu">
|
||||
<ul class="nav nav-pills" role="tablist">
|
||||
<li role="presentation" <c:if test="${empty useRequestSearchVO.status}">class="active"</c:if>><a href="/admin/request">전체</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '0'}">class="active"</c:if>><a href="/admin/request?status=0">승인</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '-1'}">class="active"</c:if>><a href="/admin/request?status=-1">반려</a></li>
|
||||
<li role="presentation" <c:if test="${useRequestSearchVO.status eq '99'}">class="active"</c:if>><a href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a></li>
|
||||
</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-default" type="submit" value="검색" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="list-table">
|
||||
<thead>
|
||||
<tr><th colspan="6">지도사용 요청</th></tr>
|
||||
<tr>
|
||||
<th>번호</th>
|
||||
<th>작업명</th>
|
||||
<th>소속</th>
|
||||
<th>담당자</th>
|
||||
<th>날짜</th>
|
||||
<th>상태</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:if test="${count >= 1}">
|
||||
<c:forEach var="item" items="${useRequestList}" varStatus="idx">
|
||||
<tr>
|
||||
<td><c:out value="${item.idx}" /></td>
|
||||
<td class="title-td"><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}" /></a></td>
|
||||
<td><c:out value="${item.company}" /></td>
|
||||
<td><c:out value="${item.name}" /></td>
|
||||
<td class="td_date"><c:out value="${item.r_date}" /></td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${item.status eq '99'}"><span class="label label-warning"><c:out value='승인대기' /></span></c:when>
|
||||
<c:when test="${item.status eq '0'}"><span class="label label-success"><c:out value='승인' /></span></c:when>
|
||||
<c:when test="${item.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${count == 0}">
|
||||
<tr><td colspan="6">요청한 목록이 없습니다.</td></tr>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="text-center">
|
||||
<nav aria-label="Page navigation">
|
||||
<ul class="pagination" >
|
||||
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
|
||||
<form:hidden path="pageIndex" />
|
||||
</form:form>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<%--
|
||||
|
||||
<li>
|
||||
<a href="${firstIndex-1}" aria-label="Previous">
|
||||
<span aria-hidden="true">«</span>
|
||||
</a>
|
||||
</li>
|
||||
<li><a href="paginationInfo="${pageindex}">1</a></li>
|
||||
<li><a href="#">2</a></li>
|
||||
<li><a href="#">3</a></li>
|
||||
<li><a href="#">4</a></li>
|
||||
<li><a href="#">5</a></li>
|
||||
<li>
|
||||
<a href="#" aria-label="Next">
|
||||
<span aria-hidden="true">»</span>
|
||||
</a>
|
||||
</li>
|
||||
--%>
|
||||
</div>
|
||||
</section>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
Loading…
Reference in New Issue