Merge branch 'JIWOO' into advc

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -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,22 +276,23 @@ public class FndtnEnhanceTrnController {
 		}
 		List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO);
 		
-		
+		// 231031 비로그인으로 강의 목록 조회 가능하게 요청
 		// 리스트 row마다 신청 확인하기
-		vEPrcsDetailVOList.stream().forEach(t->{
+		if(loginVO != null) {
-			VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
+			vEPrcsDetailVOList.stream().forEach(t->{
-			vEEduAplctReqVO.setUserId(loginVO.getUniqId());
+				VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
-			vEEduAplctReqVO.setLctrDivCd(t.getLctrDivCd());
+				vEEduAplctReqVO.setUserId(loginVO.getUniqId());
-			vEEduAplctReqVO.setPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd());
+				vEEduAplctReqVO.setLctrDivCd(t.getLctrDivCd());
-			vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50);
+				vEEduAplctReqVO.setPrcsAplctPrdOrd(t.getPrcsAplctPrdOrd());
-			VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO);
+				vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50);
-			// VO를 먼저 null 체크 후 진행해야 에러안남
+				VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO);
-			// vEEduAplctVO != null && 
+				// VO를 먼저 null 체크 후 진행해야 에러안남
-			if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) {
+				// vEEduAplctVO != null && 
-				t.setAprvlCd(vEEduAplctVO.getAprvlCd());
+				if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) {
-			}
+					t.setAprvlCd(vEEduAplctVO.getAprvlCd());
-		});
+				}
-		
+			});
+		}
 		//대상 리스트, 페이징 정보 전달
 		model.addAttribute("list", vEPrcsDetailVOList);
 		
@@ -299,6 +301,7 @@ public class FndtnEnhanceTrnController {
 		
 		
 		model.addAttribute("paginationInfo", paginationInfo);
+		model.addAttribute("loginVO", loginVO);
 		
 		
 		

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -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>

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

@@ -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>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp

@@ -17,7 +17,6 @@
 
 $(document).ready(function(){
 	
-	
 	$('.tab_button').click(function(){
 		var type = $(this).data('info');
 		// list 타입이면 return;
@@ -337,14 +336,16 @@ $(document).ready(function(){
 			<div class="list_top">
 				<div class="list_top_left">
 					<label for="searchStatus2" class="label">신청상태 선택</label>
-					<select class="selType1" id="searchStatus2" name="searchStatus2">
+					<c:if test="${loginVO != null }">
-						<option ${vEEduAplctVO.searchStatus2 eq '' ? 'selected' : ''}  value="">전체</option>
+						<select class="selType1" id="searchStatus2" name="searchStatus2">
-						<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
+							<option ${vEEduAplctVO.searchStatus2 eq '' ? 'selected' : ''}  value="">전체</option>
-						<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
+							<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_SBMT ? 'selected' : ''} value="${VeConstants.STATUS_CD_SBMT}">교육신청</option>
-						<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
+							<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDT_REQ ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_REQ}">수정요청</option>
-						<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
+							<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDT_CMPT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDT_CMPT}">수정완료</option>
-						<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_EDU_SELCT ? 'selected' : ''} value="${VeConstants.STATUS_CD_EDU_SELCT}">교육확정</option>
+							<option ${vEEduAplctVO.searchStatus2 eq VeConstants.STATUS_CD_CAN ? 'selected' : ''} value="${VeConstants.STATUS_CD_CAN}">교육취소</option>
-					</select>
+							<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%">
-						<col style="width: 10%">
+						<c:if test="${loginVO != null }">
-						<col style="width: 10%">
+							<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>
-						<th>상태</th>
+						<c:if test="${loginVO != null }">
-						<th>교육신청</th>
+							<th>상태</th>
+							<th>교육신청</th>
+						</c:if>
 					</tr>
 					</thead>
 					<tbody>
@@ -409,23 +414,30 @@ $(document).ready(function(){
 							<td>									
 								<c:out value="${list.nosCnt1}"/>/<c:out value="${list.nos}"/>
 							</td>
-							<td class="ddlnCdStts">
+							<c:if test="${loginVO != null }">
-								<c:choose>
+								<td class="ddlnCdStts">
-									<c:when test="${not empty list.aprvlCd}">
+									<c:choose>
-										<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
+										<c:when test="${not empty list.aprvlCd}">
-									</c:when>
+											<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
-									<c:otherwise>
+										</c:when>
-										<kc:code codeId="VEA004" code="${list.ddlnCd}"/>
+										<c:otherwise>
-									</c:otherwise>
+											<kc:code codeId="VEA004" code="${list.ddlnCd}"/>
-								</c:choose>
+										</c:otherwise>
-							</td>
+									</c:choose>
-							<td class="aplctBtn">
+								</td>
-								<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button>
+								<td class="aplctBtn">
-							</td>
+									<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button>
+								</td>
+							</c:if>
 						</tr>
 					</c:forEach>
 					<c:if test="${empty list}">
-						<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+						<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>