Compare commits

...

2 Commits

Author SHA1 Message Date
Hyung Geun fe79f99402 줄정리, 회원가입 라벨, js 링크 정리 2022-03-03 15:46:10 +09:00
Hyung Geun 597644c790 페이지 수정 2022-03-03 14:41:50 +09:00
34 changed files with 1838 additions and 1683 deletions

View File

@ -51,17 +51,17 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements
* @see
*/
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;";
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 class=\"page-item\">\n" +
"\t\t\t\t\t <a class=\"page-link\" href=\"#\" aria-label=\"Previous\">\n" +
"\t\t\t\t\t <a class=\"page-link\" onclick=\"{0}({1}); return false;\" href=\"#\" aria-label=\"Previous\">\n" +
"\t\t\t\t\t\t<span aria-hidden=\"true\">&laquo;</span>\n" +
"\t\t\t\t\t </a>\n" +
"\t\t\t\t\t</li>";
currentPageLabel = "<li class = \"page-item active\"><a class=\"page-link\" href=\"#\">{0}</a></li>";
otherPageLabel = "<li class=\"page-item\"><a class=\"page-link\" href=\"#\" onclick=\"{0}({1}); return false;\">{2}</a></li>";
nextPageLabel = "<li class=\"page-item\">\n" +
"\t\t\t\t\t <a class=\"page-link\" href=\"#\" aria-label=\"Next\">\n" +
"\t\t\t\t\t <a class=\"page-link\" onclick=\"{0}({1}); return false;\" 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>";

View File

@ -37,7 +37,8 @@
<img src="/images/icon/icon_003.png" width="60" height="60" alt="">
</div>
<div class="col-auto">
<a href="/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=0" class="mb-0 text-black-50">확인 요청 데이터</a>
<a href="/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=0"
class="mb-0 text-black-50">확인 요청 데이터</a>
<h3><c:out value="${standFieldData}"/></h3>
</div>

View File

@ -4,7 +4,7 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="/js/admin/fieldData.js"></script>
<script src="<c:url value="/js/admin/fieldData.js"/>"></script>
<style>
@ -20,31 +20,36 @@
<ul class="nav">
<li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status0" id="status0" value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
<input type="checkbox" class="statusChkBox d-none" name="status0" id="status0"
value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
<label for="status0">수집</label>
</a>
</li>
<li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status1" id="status1" value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
<input type="checkbox" class="statusChkBox d-none" name="status1" id="status1"
value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
<label for="status1">검증실패</label>
</a>
</li>
<li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status2" id="status2" value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
<input type="checkbox" class="statusChkBox d-none" name="status2" id="status2"
value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
<label for="status2">검증</label>
</a>
</li>
<li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}">
<input type="checkbox" class="statusChkBox d-none" name="status3" id="status3" value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
<input type="checkbox" class="statusChkBox d-none" name="status3" id="status3"
value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
<label for="status3">반영실패</label>
</a>
</li>
<li class="nav-item">
<a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#">
<input type="checkbox" class="statusChkBox d-none" name="status4" id="status4" value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
<input type="checkbox" class="statusChkBox d-none" name="status4" id="status4"
value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
<label for="status4">반영</label>
</a>
</li>
@ -54,15 +59,24 @@
<div class="col-auto 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>
<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}"/>
<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="검색"/>
@ -94,9 +108,11 @@
<td>
<c:choose>
<c:when test="${item.status eq '0'}"><span class="card-warning">수집</span> </c:when>
<c:when test="${item.status eq '1'}"><span class="card-default">검증실패</span> </c:when>
<c:when test="${item.status eq '1'}"><span
class="card-default">검증실패</span> </c:when>
<c:when test="${item.status eq '2'}"><span class="card-warning">검증</span> </c:when>
<c:when test="${item.status eq '3'}"><span class="card-default">반영실패</span> </c:when>
<c:when test="${item.status eq '3'}"><span
class="card-default">반영실패</span> </c:when>
<c:when test="${item.status eq '4'}"><span class="card-success">반영</span> </c:when>
</c:choose>
</td>
@ -104,7 +120,9 @@
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr><td colspan="4">요청한 목록이 없습니다.</td></tr>
<tr>
<td colspan="4">요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>

View File

@ -15,6 +15,7 @@
<script src="<c:out value="/js/admin/fieldView.js" />"></script>
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
</div>

View File

@ -4,7 +4,8 @@
<%@ 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" %>
<script src="../../../js/admin/history.js"></script>
<script src="<c:url value="/js/admin/history.js"/>"></script>
<div class="section_title">
<!-- <p>지도사용 이력</p> -->
@ -19,15 +20,24 @@
<div class="col-auto 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>
<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>
</div>
<div class="col-auto">
<input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}" />
<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="검색"/>
@ -58,7 +68,9 @@
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr><td colspan="5">요청한 목록이 없습니다.</td></tr>
<tr>
<td colspan="5">요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>

View File

@ -3,7 +3,8 @@
<%@ 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" %>
<script src="../../../js/admin/request.js"></script>
<script src="<c:url value="/js/admin/request.js"/>"></script>
<div class="section_content">
@ -15,20 +16,37 @@
<div class="col-auto">
<ul class="nav nav-pills" role="tablist">
<li role="presentation" class="nav-item" style="margin-left: 16px"><a class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a></li>
<li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a></li>
<li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a></li>
<li role="presentation" class="nav-item"><a class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}" href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a></li>
<li role="presentation" class="nav-item" style="margin-left: 16px"><a
class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
</li>
<li role="presentation" class="nav-item"><a
class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a>
</li>
<li role="presentation" class="nav-item"><a
class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}"
href="/admin/request?status=-1">반려</a></li>
<li role="presentation" class="nav-item"><a
class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}"
href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}"/></span></a>
</li>
</ul>
</div>
<div class="col-auto 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>
<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>
@ -43,7 +61,6 @@
</div>
<div class="row m-3 p-2 bg-white">
<table class="table table-hover text-center">
<thead>
@ -61,22 +78,28 @@
<c:forEach var="item" items="${useRequestList}" varStatus="idx">
<tr>
<td><c:out value="${item.idx}"/></td>
<td><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}" /></a></td>
<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="card-warning"><c:out value='승인대기' /></span></c:when>
<c:when test="${item.status eq '0'}"><span class="card-success"><c:out value='승인' /></span></c:when>
<c:when test="${item.status eq '-1'}"><span class="card-default"><c:out value='반려' /></span></c:when>
<c:when test="${item.status eq '99'}"><span class="card-warning"><c:out
value='승인대기'/></span></c:when>
<c:when test="${item.status eq '0'}"><span class="card-success"><c:out
value='승인'/></span></c:when>
<c:when test="${item.status eq '-1'}"><span class="card-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>
<tr>
<td colspan="6">요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>

View File

@ -5,7 +5,7 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<script src="../../../js/admin/requestView.js"></script>
<script src="<c:url value="/js/admin/requestView.js"/>"></script>
<form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm">
@ -35,9 +35,12 @@
<th>상태</th>
<td class="text-center">
<c:choose>
<c:when test="${useRequestVO.status eq '99'}"><span class="label label-warning"><c:out value='승인대기' /></span></c:when>
<c:when test="${useRequestVO.status eq '0'}"><span class="label label-success"><c:out value='승인' /></span></c:when>
<c:when test="${useRequestVO.status eq '-1'}"><span class="label label-default"><c:out value='반려' /></span></c:when>
<c:when test="${useRequestVO.status eq '99'}"><span class="label label-warning"><c:out
value='승인대기'/></span></c:when>
<c:when test="${useRequestVO.status eq '0'}"><span class="label label-success"><c:out
value='승인'/></span></c:when>
<c:when test="${useRequestVO.status eq '-1'}"><span class="label label-default"><c:out
value='반려'/></span></c:when>
</c:choose>
</td>
</tr>
@ -79,7 +82,8 @@
<c:if test="${item.code eq 'facility'}">
<c:set var="faciltySize" value="${faciltySize+1}"/>
<label class="layer-label">
<input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}"
<input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled"
value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}">
<c:out value='checked'/>
@ -98,7 +102,8 @@
<div class="structure">
<c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'structure'}">
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}"
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}"
disabled="disabled" value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}">
<c:out value='checked'/>
@ -117,7 +122,8 @@
<div class="ground">
<c:forEach var="item" items="${layersVO}" varStatus="status">
<c:if test="${item.code eq 'ground'}">
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}"
<label class="layer-label"><input type="checkbox" name="${item.code}" id="${item.code}"
disabled="disabled" value="${item.layer}"
<c:forEach var="item2" items="${layers}" varStatus="status2">
<c:if test="${item.layer eq item2}">
checked
@ -158,15 +164,17 @@
</div>
<div class="row justify-content-between bg-white mx-3 py-2">
<div class="section_btn">
<p class="search_p1">
<input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'" />
<input class="btn btn-primary" type="button" value="목록"
onclick="location.href='/admin/request'"/>
</p>
<p class="search_p2">
<input class="btn btn-danger" type="button" value="거절" onclick="confirmReqBtn('-1'); return false;" />
<input class="btn btn-success" type="button" value="승인" onclick="confirmReqBtn('0'); return false;" />
<input class="btn btn-danger" type="button" value="거절"
onclick="confirmReqBtn('-1'); return false;"/>
<input class="btn btn-success" type="button" value="승인"
onclick="confirmReqBtn('0'); return false;"/>
</p>
</div>
</div>

View File

@ -5,7 +5,8 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script src="/js/admin/userinfo.js"></script>
<script src="<c:url value="/js/admin/userinfo.js"/>"></script>
<div class="section_title">
<!-- <p>현장 지원 시스템</p> -->
@ -17,8 +18,11 @@
<div class="row justify-content-between bg-white mx-3 py-2">
<div class="col-auto">
<ul class="nav nav-pills" role="tablist" style="margin-left: 16px">
<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>
<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>
@ -26,11 +30,24 @@
<div class="col-auto 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>
<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>
@ -73,8 +90,10 @@
<c:when test="${user.auth eq '1'}">관리자</c:when>
<c:when test="${user.auth eq '2'}">사용자</c:when>
<c:when test="${user.auth eq '99'}">
<input type="button" class="btn btn-outline-success" value="승인" onclick="confirmBtn('${user.userid}','2'); return false;" />
<input type="button" class="btn btn-outline-danger" value="삭제" onclick="confirmBtn('${user.userid}','-1'); return false;" />
<input type="button" class="btn btn-outline-success" value="승인"
onclick="confirmBtn('${user.userid}','2'); return false;"/>
<input type="button" class="btn btn-outline-danger" value="삭제"
onclick="confirmBtn('${user.userid}','-1'); return false;"/>
</c:when>
</c:choose>
</td>
@ -82,7 +101,9 @@
</c:forEach>
</c:if>
<c:if test="${count == 0}">
<tr><td colspan="7">요청한 목록이 없습니다.</td></tr>
<tr>
<td colspan="7">요청한 목록이 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>
@ -103,7 +124,8 @@
</form:form>
</div>
<div class="modal fade" id="userInfoModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userInfoModalLabel" aria-hidden="true">
<div class="modal fade" id="userInfoModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
aria-labelledby="userInfoModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">

View File

@ -20,12 +20,14 @@
<th><label for="password">비밀번호</label></th>
<td>
<p><label for="changePw"><input type="checkbox" id="changePw"/> 비밀번호 변경</label></p>
<input type="password" class="form-control" id="password" name="password" value="" disabled="true" />
<input type="password" class="form-control" id="password" name="password" value=""
disabled="true"/>
</td>
</tr>
<tr>
<th><label for="passwordCheck">비밀번호 확인</label></th>
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value="" disabled="true" />
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value=""
disabled="true"/>
</td>
</tr>
<tr>
@ -34,11 +36,13 @@
</tr>
<tr>
<th><label for="company">소속기관</label></th>
<td><input type="text" class="form-control" name="company" id="company" value="${userVO.company}" /></td>
<td><input type="text" class="form-control" name="company" id="company" value="${userVO.company}"/>
</td>
</tr>
<tr>
<th><label for="phonenum">연락처</label></th>
<td><input type="text" class="form-control" name="phonenum" id="phonenum" value="${userVO.phonenum}"/></td>
<td><input type="text" class="form-control" name="phonenum" id="phonenum"
value="${userVO.phonenum}"/></td>
</tr>
<tr>
<th><label for="email">이메일</label></th>
@ -53,9 +57,11 @@
<tr>
<th>권한</th>
<td>
<input type="radio" name="auth" id="auth2" value="2" <c:if test="${userVO.auth eq '2'}">checked</c:if>/>
<input type="radio" name="auth" id="auth2" value="2"
<c:if test="${userVO.auth eq '2'}">checked</c:if>/>
<label for="auth2" class="auth-label">사용자</label>
<input type="radio" name="auth" id="auth1" value="1" <c:if test="${userVO.auth eq '1'}">checked</c:if>/>
<input type="radio" name="auth" id="auth1" value="1"
<c:if test="${userVO.auth eq '1'}">checked</c:if>/>
<label for="auth1" class="auth-label">관리자</label>
</td>
</tr>
@ -66,8 +72,10 @@
<p class="search_p2">
<c:choose>
<c:when test="${userVO.auth eq '99'}">
<input type="button" class="btn btn-success" value="승인" onclick="confirmBtn('${userVO.userid}','2'); return false;" />
<input type="button" class="btn btn-danger" value="삭제" onclick="confirmBtn('${userVO.userid}','-1'); return false;" />
<input type="button" class="btn btn-success" value="승인"
onclick="confirmBtn('${userVO.userid}','2'); return false;"/>
<input type="button" class="btn btn-danger" value="삭제"
onclick="confirmBtn('${userVO.userid}','-1'); return false;"/>
</c:when>
<c:otherwise>
<input class="btn btn-success" type="button" value="수정" onclick="update();"/>

View File

@ -30,13 +30,16 @@
transform: translate(-50%, -50%);
}
.errorTable {
margin: 0 auto;
margin-bottom: 20px;
}
.errorTable > tbody > tr > td {
padding: 10px;
}
.errorBtn {
width: 200px;
margin: 0 auto;

View File

@ -30,13 +30,16 @@
transform: translate(-50%, -50%);
}
.errorTable {
margin: 0 auto;
margin-bottom: 20px;
}
.errorTable > tbody > tr > td {
padding: 10px;
}
.errorBtn {
width: 200px;
margin: 0 auto;

View File

@ -30,13 +30,16 @@
transform: translate(-50%, -50%);
}
.errorTable {
margin: 0 auto;
margin-bottom: 20px;
}
.errorTable > tbody > tr > td {
padding: 10px;
}
.errorBtn {
width: 200px;
margin: 0 auto;

View File

@ -24,8 +24,14 @@
<div class="header_menu">
<ul>
<li <c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if> onclick="location.href='/map/request'">지도사용 요청</li>
<li <c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if> onclick="location.href='/map/userInfo'">회원정보수정</li>
<li
<c:if test="${thisURL eq '/map/request'}">class="thisOn"</c:if>
onclick="location.href='/map/request'">지도사용 요청
</li>
<li
<c:if test="${thisURL eq '/map/userInfo'}">class="thisOn"</c:if>
onclick="location.href='/map/userInfo'">회원정보수정
</li>
</ul>
</div>
</nav>
@ -45,16 +51,31 @@
<nav class="common_nav">
<div class="header_menu">
<ul>
<li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'">
<img src="/images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
<li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'">
<img src="/images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
<li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
<li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
<img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
<li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
<li
<c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if>
onclick="location.href='/admin/dashBoard'">
<img src="/images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드
</li>
<li
<c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if>
onclick="location.href='/admin/request'">
<img src="/images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청
</li>
<li
<c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if>
onclick="location.href='/admin/history'">
<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력
</li>
<li
<c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if>
onclick="location.href='/admin/fieldData'">
<img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터
</li>
<li
<c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if>
onclick="location.href='/admin/userInfo?auth=99'">
<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리
</li>
</ul>
</div>
</nav>

View File

@ -30,41 +30,57 @@
<span class="glyphicon glyphicon-edit"></span> 회원 정보 입력
</h2>
</div>
<form:form commandName="userVO" name="insertFrm" action="/insertUser" id="insertFrm" autocomplete="off" method="post">
<form:form commandName="userVO" name="insertFrm" action="/insertUser" id="insertFrm" autocomplete="off"
method="post">
<table class="join_table">
<tbody>
<tr>
<th>아이디</th>
<th>
<label for="id">아이디</label>
</th>
<td>
<input type="text" class="form-control" name="userid" id="id"/>
<span id="idMsg"></span>
</td>
</tr>
<tr>
<th>비밀번호</th>
<th>
<label for="password">비밀번호</label>
</th>
<td><input type="password" class="form-control" id="password" name="password" value=""/></td>
</tr>
<tr>
<th>비밀번호 확인</th>
<th>
<label for="passwordCheck">비밀번호 확인</label>
</th>
<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value=""/></td>
</tr>
<tr>
<th>이름</th>
<th>
<label for="name">이름</label>
</th>
<td><input type="text" class="form-control" name="name" id="name"/></td>
</tr>
<tr>
<th>소속기관</th>
<th>
<label for="company">소속기관</label>
</th>
<td><input type="text" class="form-control" name="company" id="company"/></td>
</tr>
<tr>
<th>연락처</th>
<td><input type="text" class="form-control" name="phonenum" id="phonenum" /></td>
<th>
<label for="phonenum">연락처</label>
</th>
<td><input type="tel" class="form-control" name="phonenum" id="phonenum"/></td>
</tr>
<tr>
<th>이메일</th>
<th>
<label for="email">이메일</label>
</th>
<td>
<div>
<input type="text" class="form-control" name="email" id="email" />
<input type="email" class="form-control" name="email" id="email"/>
</div>
</td>
</tr>
@ -72,7 +88,8 @@
</table>
<div class="join_bottom" style="padding-top: 10px">
<p>※ 회원 가입을 요청한 후에 승인을 기다려주세요.</p>
<p class="join_bottom_p"><input class="btn_join big on" type="submit" value="가입신청" onclick="join(); return false;" /></p>
<p class="join_bottom_p"><input class="btn_join big on" type="submit" value="가입신청"
onclick="join(); return false;"/></p>
</div>
</form:form>

View File

@ -27,7 +27,9 @@
</div>
<sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_USER')">
<div class="header_info">
<a id="logoutLink" href="#"><i class="bi bi-box-arrow-right"></i> 로그아웃</a>
<a id="logoutLink" href="#">
<i class="bi bi-box-arrow-right"></i> 로그아웃
</a>
</div>
</sec:authorize>
</header>

View File

@ -1,6 +1,7 @@
<%@ 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="sec" uri="http://www.springframework.org/security/tags" %><!--시큐리티 태그 라이브러리 선언-->
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<!--시큐리티 태그 라이브러리 선언-->
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
@ -11,10 +12,14 @@
<nav class="common_nav">
<div class="header_menu">
<ul>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}" onclick="location.href='/map/request'">
<i class="bi bi-map fs-5" ></i> &nbsp;지도사용 요청</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}" onclick="location.href='/map/userInfo'">
<i class="bi bi-person-circle"></i> &nbsp;회원정보 수정</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/request')?"thisOn":""}"
onclick="location.href='/map/request'">
<i class="bi bi-map fs-5"></i> &nbsp;지도사용 요청
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/map/userInfo')?"thisOn":""}"
onclick="location.href='/map/userInfo'">
<i class="bi bi-person-circle"></i> &nbsp;회원정보 수정
</li>
</ul>
</div>
</nav>
@ -23,16 +28,26 @@
<nav class="common_nav">
<div class="header_menu">
<ul>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}" onclick="location.href='/admin/dashBoard'">
<i class="bi bi-grid fs-5"></i> &nbsp;대시보드</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}" onclick="location.href='/admin/request'">
<i class="bi bi-map fs-5" ></i>&nbsp; 지도사용 요청</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}" onclick="location.href='/admin/history'">
<i class="bi bi-signpost-2 fs-5"></i></i>&nbsp; 지도사용 이력</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}" onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">
<i class="bi bi-flag fs-5"></i>&nbsp; 현장수집 데이터</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}" onclick="location.href='/admin/userInfo?auth=99'">
<i class="bi bi-person-circle"></i>&nbsp;&nbsp; 회원 관리</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/dashBoard')?"thisOn":""}"
onclick="location.href='/admin/dashBoard'">
<i class="bi bi-grid fs-5"></i> &nbsp;대시보드
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/request')?"thisOn":""}"
onclick="location.href='/admin/request'">
<i class="bi bi-map fs-5"></i>&nbsp; 지도사용 요청
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/history')?"thisOn":""}"
onclick="location.href='/admin/history'">
<i class="bi bi-signpost-2 fs-5"></i></i>&nbsp; 지도사용 이력
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/fieldData')?"thisOn":""}"
onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">
<i class="bi bi-flag fs-5"></i>&nbsp; 현장수집 데이터
</li>
<li class="fs-6 ps-3 ${fn:contains(tilesURI, '/admin/userInfo')?"thisOn":""}"
onclick="location.href='/admin/userInfo?auth=99'">
<i class="bi bi-person-circle"></i>&nbsp;&nbsp; 회원 관리
</li>
</ul>
</div>
</nav>

View File

@ -10,7 +10,8 @@
<body>
<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="100%" height="100%" align="center" valign="middle" style="padding-top: 150px;"><table border="0" cellspacing="0" cellpadding="0">
<td width="100%" height="100%" align="center" valign="middle" style="padding-top: 150px;">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="<spring:message code='image.errorBg' />">
<span style="font-family: Tahoma; font-weight: bold; color: #000000; line-height: 150%; width: 440px; height: 70px;"></span>

View File

@ -1,4 +1,3 @@
$(document).on("click", ".nav-item", function () {
const chkBox = $(this).find(".statusChkBox")[0]
chkBox.checked = !chkBox.checked;
@ -10,6 +9,7 @@ function fn_link_page(pageNo) {
document.searchForm.action = "<c:url value='/admin/fieldData' />";
document.searchForm.submit();
}
function getCheckoxValue() {
const query = 'input[name="check1"]:checked';
const selectedEls = document.querySelectorAll(query);

View File

@ -1,4 +1,3 @@
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = '/admin/history';

View File

@ -1,4 +1,3 @@
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = '/admin/request';

View File

@ -1,4 +1,3 @@
function confirmReqBtn(val) {
$("#status").val(val);