Merge branch 'JIWOO' into advc

pom.xml

@@ -69,12 +69,6 @@
 	</repositories>
 
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/com.thetransactioncompany/cors-filter -->
-		<dependency>
-			<groupId>com.thetransactioncompany</groupId>
-			<artifactId>cors-filter</artifactId>
-			<version>2.6</version>
-		</dependency>
 		<dependency>
 			<groupId>egovframework.rte</groupId>
 			<artifactId>egovframework.rte.fdl.security</artifactId>

src/main/java/kcc/let/uat/uia/web/APILoginContoller.java

@@ -46,7 +46,6 @@ import kcc.let.utl.sim.service.EgovClntInfo;
  */
 
 @Controller
-@CrossOrigin(origins = "*", methods = RequestMethod.POST) 
 public class APILoginContoller {
 
 	/** userManageService */
@@ -67,9 +66,9 @@ public class APILoginContoller {
 	 * @throws Exception
 	*/
 	@RequestMapping(value = "/web/chkloginKeyForOffedu.do")
-	public String loginKeyChkForOffedu(@RequestBody Map<String, String> paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception {
+	public String loginKeyChkForOffedu(RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception {
-		String userId = paramRequest.get("user_id");
+		String userId = request.getParameter("user_id");
-		String key = paramRequest.get("key");
+		String key = request.getParameter("key");
 		//String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함
 		String returnUrl = "";
 		

src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java

@@ -0,0 +1,47 @@
+package kcc.let.uat.uia.web;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * e-배움터와 연동하여 로그인을 처리하는 컨트롤러 클래스
+ *
+ * @author 이지우
+ * @since 2023.08.31
+ * @version 1.0
+ * @see
+ */
+
+@Component
+public class SimpleCORSFilter implements Filter {
+
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+	throws IOException, ServletException {
+	
+	HttpServletResponse response = (HttpServletResponse) res;
+	
+	response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+	response.setHeader("Access-Control-Max-Age", "3600");
+	response.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me");
+	
+	response.setHeader("Access-Control-Allow-Origin", "*");
+	//response.setHeader("Access-Control-Allow-Origin", "http://services.arcgisonline.com");
+	chain.doFilter(req, res);
+	}
+	
+	public void init(FilterConfig filterConfig) {
+	}
+	
+	public void destroy() {
+	}
+
+}

src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml

@@ -1168,10 +1168,5 @@
 		WHERE USER_ID = #userId#
 		AND LCTR_DIV_CD = '30'
 		AND APRVL_CD = '60'
-		AND PRCS_ORD = (SELECT
-							MAX(PRCS_APLCT_PRD_ORD)
-						FROM VE_PRCS_APLCT_PRD
-						WHERE LCTR_DIV_CD = '30'
-						AND USE_YN = 'Y')	
 	</select>
 </sqlMap>

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

@@ -60,6 +60,8 @@ $(document).ready(function (){
 		if("${instrDiv}" == 'tngrInstrDiv'){
 			$("#9991000").parent('li').hide();	
 			$("#full_9991000").parent('li').hide();	
+			$("#99912000").parent('li').hide();	
+			$("#full_99912000").parent('li').hide();	
 		}else if("${instrDiv}" == 'adultInstrDiv'){
 			$("#99923000").parent('li').hide();
 			$("#full_99923000").parent('li').hide();

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp

@@ -264,18 +264,20 @@
 
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
-		</div>
-		<div class="btn_right">
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ or info.sbmtYn ne 'Y'}">
-				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
+				<button type="button" class="btnType05" onclick="fncGoEdit();">수정</button>
 			</c:if>
 			<!-- 23.07031 - 신청기간 내 수정 기능 추가 - 요청중일때만 수정 가능 -->
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_SBMT and cnt > 0}">
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
 		</div>
+		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('2');">운영계획으로 이동</button>
+		</div>
 	</div>
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp

@@ -49,6 +49,11 @@
 			});
 		}
 	}
+	
+	function nextTab(tab){
+		window.scrollTo(0,0);
+		$('.p_'+tab).children('a').click();
+	}
 </script>
 
 <form id="loadForm" name="loadForm" method="post">

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp

@@ -119,10 +119,12 @@
 		</div>
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
 		</div>
 		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('4');">결과보고로 이동</button>
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp

@@ -167,10 +167,9 @@
 
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
-		</div>
-		<div class="btn_right">
 			<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ or info.sbmtYn ne 'Y'}">
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
@@ -179,6 +178,9 @@
 				<button type="button" class="btnType06" onclick="fncGoEdit();">수정</button>
 			</c:if>
 		</div>
+		<div class="btn_right">
+			<button type="button" class="btnType05" onclick="nextTab('3');">서류 제출로 이동</button>
+		</div>
 	</div>
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp

@@ -594,17 +594,24 @@
 				</dd>
 			</dl>
 		</div>
-	
+	</c:if>
 		<div class="btn_wrap btn_layout01">
-			<div class="btn_left"></div>
+			<div class="btn_left">
+				<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
+			</div>
 			<div class="btn_center">
-				<button type="button" class="btnType06" onclick="fncSave();">결과제출</button>
+				<c:if test="${info.exprnAprvlCd != '10'}">
-				<button type="button" class="btnType06" onclick="fncTmprrSave();">임시저장</button>
+					<button type="button" class="btnType06" onclick="fncSave();">결과제출</button>
+					<button type="button" class="btnType06" onclick="fncTmprrSave();">임시저장</button>
+				</c:if>
 			</div>
 			<div class="btn_right">
-				<div id="fileControl5" style="display:none"></div>
+				<c:if test="${info.exprnAprvlCd != '10'}">
+					<div id="fileControl5" style="display:none"></div>
+				</c:if>
+				<button type="button" class="btnType05" onclick="nextTab('5');">최종결과로 이동</button>
 			</div>
 		</div>
-	</c:if>
+	
 </div>
 

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp

@@ -700,6 +700,7 @@
 	</c:if>
 	<div class="btn_wrap btn_layout01">
 		<div class="btn_left">
+			<button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button>
 		</div>
 		<div class="btn_center">
 			<button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button>

src/main/webapp/WEB-INF/web.xml

@@ -19,73 +19,6 @@
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
 	
-    <!-- CORS -->
-	   <filter>
-	      <filter-name>CORS</filter-name>
-	      <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>
-	  <init-param>
-	    <param-name>cors.allowed.origins</param-name>
-	    <param-value>*</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.allowed.methods</param-name>
-	    <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.allowed.headers</param-name>
-	    <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.exposed.headers</param-name>
-	    <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.support.credentials</param-name>
-	    <param-value>false</param-value>
-	  </init-param>
-	  <init-param>
-	    <param-name>cors.preflight.maxage</param-name>
-	    <param-value>10</param-value>
-  </init-param>
-   </filter>
-   <filter-mapping>
-      <filter-name>CORS</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-<filter>
-    <filter-name>CorsFilter</filter-name>
-    <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
-    <init-param>
-        <param-name>cors.allowed.origins</param-name>
-        <param-value>*</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.allowed.methods</param-name>
-        <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.allowed.headers</param-name>
-        <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-    </init-param>
-    <init-param>
-        <param-name>cors.exposed.headers</param-name>
-        <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
-    </init-param>
-    <init-param>
-    	<!-- 쿠키 통신을 안하는데 이걸 true로 하면 4XX 서버 에러가 뜬다 -->
-        <param-name>cors.support.credentials</param-name>
-        <param-value>false</param-value> 
-    </init-param>
-    <init-param>
-        <param-name>cors.preflight.maxage</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</filter>
-<filter-mapping>
-    <filter-name>CorsFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-</filter-mapping>
-	
 	<!-- 템플릿 소스에서는 아래의 필터사용 대신 JSP 출력시 <c:out> 태그를 사용하는 것을 기본정책으로 한다  -->
 	<!-- egovframework.rte.ptl.mvc.filter.HTMLTagFilter kcc.com.cmm.filter.HTMLTagFilter-->
     <!--
@@ -98,6 +31,15 @@
         <url-pattern>*.do</url-pattern>
     </filter-mapping>
     -->
+	<filter>
+	<filter-name>cors</filter-name>
+	<filter-class>kcc.let.uat.uia.web.SimpleCORSFilter</filter-class>
+	</filter>
+	<filter-mapping>
+	<filter-name>cors</filter-name>
+	<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 
     <!-- security start -->
     <filter>