DBNT
/
GGWEB
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: DBNT:4d3c039ba66bc91ea6317325442897fc97f7b526
Branches Tags
DBNT:master
..
compare: DBNT:0b669bddfe1596bc3e89de74e4e6d3d81a1051a2
Branches Tags
DBNT:master

No commits in common. "4d3c039ba66bc91ea6317325442897fc97f7b526" and "0b669bddfe1596bc3e89de74e4e6d3d81a1051a2" have entirely different histories.
4d3c039ba6 ... 0b669bddfe

7 changed files with 105 additions and 146 deletions
Show Stats Expand all files Collapse all files

20
src/main/java/com/mca/util/ImgPaginationRenderer.java
View File

@ -52,20 +52,12 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
*/ */
public void initVariables() { public void initVariables() {
firstPageLabel = "";//""<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;"; firstPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre10.gif' border=0/></a>&#160;";
previousPageLabel = "<li>\n" + previousPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_pre1.gif' border=0/></a>&#160;";
"\t\t\t\t\t <a href=\"#\" aria-label=\"Previous\">\n" + currentPageLabel = "<strong>{0}</strong>&#160;";
"\t\t\t\t\t\t<span aria-hidden=\"true\">&laquo;</span>\n" + otherPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a>&#160;";
"\t\t\t\t\t </a>\n" + nextPageLabel = "<a href=\"#\" onclick=\"{0}({1}); return false;\">" + "<image src='" + servletContext.getContextPath() + "/images/egovframework/cmmn/btn_page_next1.gif' border=0/></a>&#160;";
"\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>&#160;";
currentPageLabel = "<li class = \"active\"><a href=\"#\">{0}</a></li>";
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\">&raquo;</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>&#160;";
} }
@Override @Override

15
src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml
View File

@ -35,21 +35,6 @@
FROM FROM
map_field_data a LEFT JOIN t_user b ON a.userid=b.userid map_field_data a LEFT JOIN t_user b ON a.userid=b.userid
WHERE 1=1 WHERE 1=1
<if test='searchKeyword != null and searchKeyword != ""'>
<choose>
<when test='searchCondition eq "all"'>
AND (a.region LIKE CONCAT('%',#{searchKeyword},'%')
OR b.name LIKE CONCAT('%',#{searchKeyword},'%')
OR b.company LIKE CONCAT('%',#{searchKeyword},'%'))
</when>
<otherwise>
AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
</otherwise>
</choose>
</if>
ORDER BY id DESC ORDER BY id DESC
LIMIT #{recordCountPerPage} OFFSET #{firstIndex} LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
</select> </select>

16
src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml
View File

@ -7,19 +7,20 @@
SELECT SELECT
log_date AS logDate, log_date AS logDate,
req_area AS reqArea, req_area AS reqArea,
-- content,
a.userid, a.userid,
b.name, b.name,
b.company b.company
FROM FROM
map_use_history a JOIN t_user b ON a.userid=b.userid map_use_history a JOIN t_user b ON a.userid=b.userid
WHERE 1 = '1' WHERE 1 = 1
<if test='searchKeyword != null and searchKeyword != ""'> <if test='searchKeyword != null and searchKeyword != ""'>
<choose> <choose>
<when test='searchCondition eq "all"'> <when test='searchCondition eq "all"'>
AND (content LIKE CONCAT('%',#{searchKeyword},'%')
AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') OR b.name LIKE CONCAT('%',#{searchKeyword},'%')
OR b.company LIKE CONCAT('%',#{searchKeyword},'%') OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) OR a.area LIKE CONCAT('%',#{searchKeyword},'%'))
</when> </when>
<otherwise> <otherwise>
AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
@ -39,9 +40,10 @@
<if test='searchKeyword != null and searchKeyword != ""'> <if test='searchKeyword != null and searchKeyword != ""'>
<choose> <choose>
<when test='searchCondition eq "all"'> <when test='searchCondition eq "all"'>
AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') AND (content LIKE CONCAT('%',#{searchKeyword},'%')
OR b.company LIKE CONCAT('%',#{searchKeyword},'%') OR b.name LIKE CONCAT('%',#{searchKeyword},'%')
OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) OR b.company LIKE CONCAT('%',#{searchKeyword},'%'))
OR a.area LIKE CONCAT('%',#{searchKeyword},'%'))
</when> </when>
<otherwise> <otherwise>
AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')

15
src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
View File

@ -42,9 +42,10 @@
<div class="search_keyword"> <div class="search_keyword">
<select class="form-control search_selectbox" name="searchCondition"> <select class="form-control search_selectbox" 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 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
<option <c:if test="${fieldDataSearchVO.searchCondition eq 'content'}"><c:out value="selected" /></c:if> value="content">작업내용</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 '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 '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> <option <c:if test="${fieldDataSearchVO.searchCondition eq 'area'}"><c:out value="selected" /></c:if> value="area">위치</option>
</select> </select>
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value="${fieldDataSearchVO.searchKeyword}" />" /> <input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value="${fieldDataSearchVO.searchKeyword}" />" />
<input class="btn btn-default" type="submit" value="검색" /> <input class="btn btn-default" type="submit" value="검색" />
@ -90,15 +91,11 @@
</tbody> </tbody>
</table> </table>
<div class="text-center"> <div id="paging" style="width: 100%;">
<nav aria-label="Page navigation"> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<ul class="pagination"> <form:hidden path="pageIndex" />
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<form:hidden path="pageIndex" />
</form:form>
</ul>
</nav>
</div> </div>
</form:form>
</div> </div>
</section> </section>
</body> </body>

22
src/main/webapp/WEB-INF/jsp/admin/history.jsp
View File

@ -20,13 +20,6 @@
<link href="<c:out value="/css/style.css" />" rel="stylesheet"> <link href="<c:out value="/css/style.css" />" rel="stylesheet">
</head> </head>
<script>
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = "<c:url value='/admin/history' />";
document.searchForm.submit();
}
</script>
<body> <body>
<%@ include file="../include/header.jsp"%> <%@ include file="../include/header.jsp"%>
@ -41,9 +34,10 @@
<div class="search_keyword"> <div class="search_keyword">
<select class="form-control search_selectbox" name="searchCondition"> <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 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
<option <c:if test="${UseHistorySearchVO.searchCondition eq 'content'}"><c:out value="selected" /></c:if> value="content">작업내용</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 '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 '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> <option <c:if test="${UseHistorySearchVO.searchCondition eq 'area'}"><c:out value="selected" /></c:if> value="area">위치</option>
</select> </select>
<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value='${UseHistorySearchVO.searchKeyword}' />" /> <input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value='${UseHistorySearchVO.searchKeyword}' />" />
<input class="btn btn-default" type="submit" value="검색" /> <input class="btn btn-default" type="submit" value="검색" />
@ -56,6 +50,7 @@
<tr><th colspan="5">지도사용 이력</th></tr> <tr><th colspan="5">지도사용 이력</th></tr>
<tr> <tr>
<th>위치</th> <th>위치</th>
<th>작업내용</th>
<th>소속</th> <th>소속</th>
<th>담당자</th> <th>담당자</th>
<th>날짜</th> <th>날짜</th>
@ -66,6 +61,7 @@
<c:forEach var="item" items="${useHistoryList}"> <c:forEach var="item" items="${useHistoryList}">
<tr> <tr>
<td><c:out value="${item.reqArea}" /></td> <td><c:out value="${item.reqArea}" /></td>
<td><%--<c:out value="${item.content}" />--%></td>
<td><c:out value="${item.company}" /></td> <td><c:out value="${item.company}" /></td>
<td><c:out value="${item.name}" /></td> <td><c:out value="${item.name}" /></td>
<td class="td_date"><c:out value="${item.logDate}" /></td> <td class="td_date"><c:out value="${item.logDate}" /></td>
@ -78,15 +74,11 @@
</tbody> </tbody>
</table> </table>
<div class="text-center"> <div id="paging" style="width: 100%;">
<nav aria-label="Page navigation">
<ul class="pagination">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<form:hidden path="pageIndex" /> <form:hidden path="pageIndex" />
</form:form> </div>
</ul> </form:form>
</nav>
</div>
</div> </div>
</section> </section>
</body> </body>

123
src/main/webapp/WEB-INF/jsp/admin/request.jsp
View File

@ -28,84 +28,79 @@
<body> <body>
<%@ include file="../include/header.jsp"%> <%@ include file="../include/header.jsp"%>
<section class="section"> <section class="section">
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
<div class="section_content"> <div class="section_content">
<form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get"> <form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
<input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" /> <input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" />
<div class="search_div"> <div class="search_div">
<div class="search_menu"> <div class="search_menu">
<ul class="nav nav-pills" role="tablist"> <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="${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 '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 '-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> <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> </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> </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"> <table class="list-table">
<thead> <thead>
<tr><th colspan="6">지도사용 요청</th></tr> <tr><th colspan="6">지도사용 요청</th></tr>
<tr> <tr>
<th>번호</th> <th>번호</th>
<th>작업명</th> <th>작업명</th>
<th>소속</th> <th>소속</th>
<th>담당자</th> <th>담당자</th>
<th>날짜</th> <th>날짜</th>
<th>상태</th> <th>상태</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:if test="${count >= 1}"> <c:if test="${count >= 1}">
<c:forEach var="item" items="${useRequestList}" varStatus="idx"> <c:forEach var="item" items="${useRequestList}" varStatus="idx">
<tr> <tr>
<td><c:out value="${item.idx}" /></td> <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 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.company}" /></td>
<td><c:out value="${item.name}" /></td> <td><c:out value="${item.name}" /></td>
<td class="td_date"><c:out value="${item.r_date}" /></td> <td class="td_date"><c:out value="${item.r_date}" /></td>
<td> <td>
<c:choose> <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 '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 '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:when test="${item.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when>
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
</c:forEach> </c:forEach>
</c:if> </c:if>
<c:if test="${count == 0}"> <c:if test="${count == 0}">
<tr><td colspan="6">요청한 목록이 없습니다.</td></tr> <tr><td colspan="6">요청한 목록이 없습니다.</td></tr>
</c:if> </c:if>
</tbody> </tbody>
</table> </table>
<div class="text-center"> <div id="paging" style="width: 100%;">
<nav aria-label="Page navigation"> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<ul class="pagination"> <form:hidden path="pageIndex" />
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<form:hidden path="pageIndex" />
</form:form>
</ul>
</nav>
</div> </div>
</div> </form:form>
</div>
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>
</section> </section>
</body> </body>
</html> </html>

12
src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
View File

@ -111,15 +111,11 @@
</tbody> </tbody>
</table> </table>
<div class="text-center"> <div id="paging" style="width: 100%;">
<nav aria-label="Page navigation"> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<ul class="pagination"> <form:hidden path="pageIndex" />
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
<form:hidden path="pageIndex" />
</form:form>
</ul>
</nav>
</div> </div>
</form:form>
<form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign"> <form:form commandName="userVO" id="updateFrm" method="post" action="/admin/userSign">
<input type="hidden" id="userid" name="userid" /> <input type="hidden" id="userid" name="userid" />