Merge branch 'JIWOO' into advc
This commit is contained in:
jiwoo
commit
e5dfe2205e
@ -236,10 +236,11 @@ public class FndtnEnhanceTrnController {
|
||||
LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
|
||||
SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
|
||||
|
||||
if (loginVO == null || ssoLoginVO == null) {
|
||||
// 231031 비로그인으로 강의 목록 조회 가능하게 요청
|
||||
/*if (loginVO == null || ssoLoginVO == null) {
|
||||
//이전 url 처리(beforeSiteUrl)_이준호_220228추가
|
||||
return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다.
|
||||
}
|
||||
} */
|
||||
//1.pageing step1
|
||||
PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO);
|
||||
|
||||
@ -275,8 +276,9 @@ public class FndtnEnhanceTrnController {
|
||||
}
|
||||
List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO);
|
||||
|
||||
|
||||
// 231031 비로그인으로 강의 목록 조회 가능하게 요청
|
||||
// 리스트 row마다 신청 확인하기
|
||||
if(loginVO != null) {
|
||||
vEPrcsDetailVOList.stream().forEach(t->{
|
||||
VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
|
||||
vEEduAplctReqVO.setUserId(loginVO.getUniqId());
|
||||
@ -290,7 +292,7 @@ public class FndtnEnhanceTrnController {
|
||||
t.setAprvlCd(vEEduAplctVO.getAprvlCd());
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
//대상 리스트, 페이징 정보 전달
|
||||
model.addAttribute("list", vEPrcsDetailVOList);
|
||||
|
||||
@ -299,6 +301,7 @@ public class FndtnEnhanceTrnController {
|
||||
|
||||
|
||||
model.addAttribute("paginationInfo", paginationInfo);
|
||||
model.addAttribute("loginVO", loginVO);
|
||||
|
||||
|
||||
|
||||
|
||||
@ -203,6 +203,7 @@ function usrJoin(){
|
||||
</c:if>
|
||||
<!-- dev -->
|
||||
<c:if test="${environment eq 'dev' }">
|
||||
<p class="login_info header_login_wrap"><a href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do" class="header_login"><i></i>개발로그인</a></p>
|
||||
<p class="login_info header_login_wrap"><a href="http://223.255.205.7/user/member/loginForm.do?eduOff=Y" class="header_login"><i></i>로그인</a></p> <!-- e-배움터 개발서버 -->
|
||||
<p class="login_info"><a href="http://223.255.205.7/user/usrservice/selectUserSeView.do?eduOff=Y" class="header_join" title="새창열림"><i></i>회원가입</a></p> <!-- e-배움터 개발서버 -->
|
||||
</c:if>
|
||||
|
||||
@ -258,19 +258,19 @@ function instrChk(){
|
||||
<li class="banner_link_03">
|
||||
<a href="#none">
|
||||
<i></i>
|
||||
<p>저작권 체험교실</p>
|
||||
<p>체험교실</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="banner_link_04">
|
||||
<a href="#none">
|
||||
<i></i>
|
||||
<p>기반강화연수</p>
|
||||
<p>실무역량강화교육</p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="banner_link_05">
|
||||
<a href="#none">
|
||||
<i></i>
|
||||
<p>기소유예</p>
|
||||
<p>기소유예교육</p>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
|
||||
$(document).ready(function(){
|
||||
|
||||
|
||||
$('.tab_button').click(function(){
|
||||
var type = $(this).data('info');
|
||||
// list 타입이면 return;
|
||||
@ -337,6 +336,7 @@ $(document).ready(function(){
|
||||
<div class="list_top">
|
||||
<div class="list_top_left">
|
||||
<label for="searchStatus2" class="label">신청상태 선택</label>
|
||||
<c:if test="${loginVO != null }">
|
||||
<select class="selType1" id="searchStatus2" name="searchStatus2">
|
||||
<option ${vEEduAplctVO.searchStatus2 eq '' ? 'selected' : ''} value="">전체</option>
|
||||
<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
|
||||
@ -345,6 +345,7 @@ $(document).ready(function(){
|
||||
<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
|
||||
<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
|
||||
</select>
|
||||
</c:if>
|
||||
</div>
|
||||
<div class="btn_wrap">
|
||||
<div class="calendar_wrap">
|
||||
@ -373,8 +374,10 @@ $(document).ready(function(){
|
||||
<col style="width: 180px;">
|
||||
<col style="width: 180px;">
|
||||
<col style="width: 10%">
|
||||
<c:if test="${loginVO != null }">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 10%">
|
||||
</c:if>
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -384,8 +387,10 @@ $(document).ready(function(){
|
||||
<th>신청기간</th>
|
||||
<th>교육기간</th>
|
||||
<th>신청자/정원</th>
|
||||
<c:if test="${loginVO != null }">
|
||||
<th>상태</th>
|
||||
<th>교육신청</th>
|
||||
</c:if>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -409,6 +414,7 @@ $(document).ready(function(){
|
||||
<td>
|
||||
<c:out value="${list.nosCnt1}"/>/<c:out value="${list.nos}"/>
|
||||
</td>
|
||||
<c:if test="${loginVO != null }">
|
||||
<td class="ddlnCdStts">
|
||||
<c:choose>
|
||||
<c:when test="${not empty list.aprvlCd}">
|
||||
@ -422,11 +428,17 @@ $(document).ready(function(){
|
||||
<td class="aplctBtn">
|
||||
<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button>
|
||||
</td>
|
||||
</c:if>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
<c:if test="${empty list}">
|
||||
<c:if test="${loginVO != null }">
|
||||
<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
|
||||
</c:if>
|
||||
<c:if test="${loginVO == null }">
|
||||
<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
|
||||
</c:if>
|
||||
</c:if>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user