feat: 집합교육 좌측 메뉴 보여지도록 수정

list.txt

@@ -2,20 +2,19 @@ src\main\webapp\WEB-INF\views\home\include\top.jsp
 src\main\java\geoinfo\main\main\MainController.java
 src\main\java\geoinfo\main\login\LoginController.java
 src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp
-src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\inquiry\scheduledGroupEducationApplicationInquiry.jsp
+src\main\webapp\WEB-INF\views\visitEducationApplication\input\visitEducationApplicationInput.jsp
+src\main\webapp\com\img\visitEducationApplication\visitEducationApplicationSample.svg
+src\main\webapp\WEB-INF\views\homeEducationApplication\inquiry\homeEducationApplicationInquiry.jsp
+src\main\webapp\WEB-INF\views\homeEducationApplication\input\homeEducationApplicationInput.jsp
 src\main\webapp\WEB-INF\views\home\main.jsp
 src\main\webapp\WEB-INF\views\home\include\left_menu.jsp
-src\main\webapp\com\img\visitEducationApplication\visitEducationApplicationSample.svg
 src\main\webapp\com\css\common.v2.0.css
 src\main\webapp\WEB-INF\views\home\index.jsp
 src\main\webapp\com\img\common\bg\main_info_visual_20240905.png
 src\main\webapp\com\img\common\bg\main_info_visual_20240906.png
-src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\inquiry\scheduledGroupEducationApplicationInquiry.jsp
-src\main\webapp\WEB-INF\views\scheduledGroupEducationApplication\input\scheduledGroupEducationApplicationInput.jsp
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff2
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.woff
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Regular.otf
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff2
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf
-src\main\resources\egovframework\egovProps\globals.properties

src/main/java/geoinfo/com/WebConfirm.java

@@ -1,6 +1,7 @@
 package geoinfo.com;
 
 import comm.framework.dbcp.*;
+import egovframework.com.cmm.service.EgovProperties;
 
 import java.sql.*;
 import java.util.*;
@@ -27,19 +28,35 @@ public class WebConfirm
     WebUtil wUtil = new WebUtil();
 
     String user = "geoinfo";
-    //String pw = "geoinfo";
+    String pw = "geoinfo";
-    String pw = "dbnt060928!rlaxogh";
+    //String pw = "dbnt060928!rlaxogh";
     //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl";
     /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/
     //String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버
-    //String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버
+    String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버
-    String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버
+    //String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버
+    
+    public String thkimTestOracleUrl = EgovProperties.getProperty("Oracle.Url");
+    public String thkimTestOracleId = EgovProperties.getProperty("Oracle.ID");
+    public String thkimTestOraclePassword = EgovProperties.getProperty("Oracle.Password");
+    
 	/*
 	 * public WebConfirm() { this.connection = null; this.connectionPool = null;
 	 * this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0;
 	 * this.resultBool = false; }
 	 */
     public boolean ConfirmProject(HttpServletRequest request, final String PROJECT_CODE) {
+    	
+    	System.out.println(
+	            "\n--------------------------------------------------------------\n" +
+	            request.getRequestURI() + " " + " ConfirmProject" +
+	            "\n--------------------------------------------------------------\n" +
+	            "thkimTestOracleUrl:[" + thkimTestOracleUrl + "]\n" +
+	            "thkimTestOracleId:[" + thkimTestOracleId + "]\n" +
+	            "thkimTestOraclePassword:[" + thkimTestOraclePassword + "]\n" +
+	            "\n--------------------------------------------------------------\n"
+	        );
+    	
         try {
             Class.forName("oracle.jdbc.driver.OracleDriver");
             connection = DriverManager.getConnection(url,user,pw);

src/main/java/geoinfo/main/login/LoginController.java

@@ -2695,4 +2695,40 @@ public class LoginController {
 		return mv;
 	}
 	
+	@RequestMapping(value = "/visitEducationApplicationInput.do", method = RequestMethod.GET)
+	public ModelAndView visitEducationApplicationInput(@RequestParam HashMap<String, Object> params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView("visitEducationApplication/input/visitEducationApplicationInput");
+
+		// 로그인 세션이 없을 때
+		if (request.getSession().getAttribute("USERID") == null) {
+			mv.setViewName("index.do?cntyn=0");
+			return mv;
+		}
+		return mv;
+	}
+	
+	@RequestMapping(value = "/homeEducationApplicationInquiry.do", method = RequestMethod.GET)
+	public ModelAndView homeEducationApplicationInquiry(@RequestParam HashMap<String, Object> params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView("homeEducationApplication/inquiry/homeEducationApplicationInquiry");
+
+		// 로그인 세션이 없을 때
+		if (request.getSession().getAttribute("USERID") == null) {
+			mv.setViewName("index.do?cntyn=0");
+			return mv;
+		}
+		return mv;
+	}
+	
+	@RequestMapping(value = "/homeEducationApplicationInput.do", method = RequestMethod.GET)
+	public ModelAndView homeEducationApplicationInput(@RequestParam HashMap<String, Object> params, HttpServletRequest request,HttpServletResponse response, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView("homeEducationApplication/input/homeEducationApplicationInput");
+
+		// 로그인 세션이 없을 때
+		if (request.getSession().getAttribute("USERID") == null) {
+			mv.setViewName("index.do?cntyn=0");
+			return mv;
+		}
+		return mv;
+	}
+
 }

src/main/java/geoinfo/main/main/MainController.java

@@ -486,18 +486,18 @@ public class MainController
 			userId = request.getSession().getAttribute("USERID").toString();
 			eGovUrl = "jusandoNew.do";
 			mv.setViewName("home/main.jsp?url=/body/mypage/jusandoNew");
-		} else if (url.equals("scheduledGroupEducationApplication")) {
+		} else if (url.equals("homeEducationApplication")) {
 			userId = request.getSession().getAttribute("USERID").toString();
-			eGovUrl = "scheduledGroupEducationApplicationInquiry.do";
+			eGovUrl = "homeEducationApplicationInquiry.do";
-			mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiry");
+			mv.setViewName("home/main.jsp?url=/homeEducationApplication/inquiry/homeEducationApplicationInquiry");
-		} else if (url.equals("scheduledGroupEducationApplicationInput")) {
+		} else if (url.equals("homeEducationApplicationInput")) {
 			userId = request.getSession().getAttribute("USERID").toString();
-			eGovUrl = "scheduledGroupEducationApplicationInput.do";
+			eGovUrl = "homeEducationApplicationInput.do";
-			mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/input/scheduledGroupEducationApplicationInput");
+			mv.setViewName("home/main.jsp?url=/homeEducationApplication/input/homeEducationApplicationInput");
-		} else if (url.equals("scheduledGroupEducationApplicationInquiryHistory")) {
+		} else if (url.equals("homeEducationApplicationInquiryHistory")) {
 			userId = request.getSession().getAttribute("USERID").toString();
-			eGovUrl = "scheduledGroupEducationApplicationInquiryHistory.do";
+			eGovUrl = "homeEducationApplicationInquiryHistory.do";
-			mv.setViewName("home/main.jsp?url=/scheduledGroupEducationApplication/inquiry/scheduledGroupEducationApplicationInquiryHistory");
+			mv.setViewName("home/main.jsp?url=/homeEducationApplication/inquiry/homeEducationApplicationInquiryHistory");
 		} else if (url.equals("visitEducationApplication")) {
 			userId = request.getSession().getAttribute("USERID").toString();
 			eGovUrl = "visitEducationApplicationInquiry.do";
@@ -508,7 +508,7 @@ public class MainController
 			mv.setViewName("home/main.jsp?url=/visitEducationApplication/input/visitEducationApplicationInput");
 		} else if (url.equals("visitEducationApplicationInquiryProject")) {
 			userId = request.getSession().getAttribute("USERID").toString();
-			eGovUrl = "scheduledGroupEducationApplicationInquiryHistory.do";
+			eGovUrl = "visitEducationApplicationInquiryHistory.do";
 			mv.setViewName("home/main.jsp?url=/visitEducationApplication/inquiry/visitEducationApplicationInquiryProject");
 		}
 

src/main/resources/egovframework/egovProps/globals.properties

@@ -9,11 +9,11 @@ Oracle.Driver=oracle.jdbc.driver.OracleDriver
 # Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl is prod
 #Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
 # dbnt devlop server
-#Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
+Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
 # develop local server
 #Oracle.Url=jdbc:oracle:thin:@192.168.86.2:1521:xe
 # thkim local test
-Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV
+#Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV
 ################################################################
 
 #Oracle.Url=jdbc:oracle:thin:@192.168.0.29:1521:xe
@@ -22,8 +22,9 @@ Oracle.Url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV
 #Oracle.Url=jdbc:oracle:thin:@localhost:1521:orcl
 #Oracle.Url=jdbc:oracle:thin:@218.232.234.162:1521:ORAGEO
 Oracle.ID=geoinfo
-#Oracle.Password=geoinfo
+Oracle.Password=geoinfo
-Oracle.Password=dbnt060928!rlaxogh
+# thkim local test
+#Oracle.Password=dbnt060928!rlaxogh
 #Oracle.Password=!!kictgis1234
 
 

src/main/webapp/WEB-INF/clipreport4/DataConnection.properties

@@ -18,16 +18,16 @@ dataconnection1.version=
 # dataconnection1.url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
 #dataconnection1.url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
 # \uc544\ub798\ub294 \ub514\ube44\uc5d4\ud14d \uac1c\ubc1c\uc11c\ubc84
-#dataconnection1.url=jdbc:oracle:thin:@118.219.150.34:1521:orageodev
+dataconnection1.url=jdbc:oracle:thin:@118.219.150.34:1521:orageodev
 # \uc544\ub798\ub294 \ub514\ube44\uc5d4\ud14d \ub85c\uceec\uc11c\ubc84
 #dataconnection1.url=jdbc:oracle:thin:@127.0.0.1:1521:ORAGEODEV
 # thkim local test
-dataconnection1.url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV
+#dataconnection1.url=jdbc:oracle:thin:@grok-10.com:1521:ORAGEODEV
 ################################################################
 
 dataconnection1.user=geoinfo
-#dataconnection1.password=geoinfo
+dataconnection1.password=geoinfo
-dataconnection1.password=dbnt060928!rlaxogh
+#dataconnection1.password=dbnt060928!rlaxogh
 dataconnection1.encoding=
 
 dataconnection2.conntype=jdbc

src/main/webapp/WEB-INF/views/home/include/left_menu.jsp

@@ -108,11 +108,23 @@
 					<span class="title">시추정보 FAQ</span>
 				</a>
 			</li>
-			<li class="nav-item">
+			
-				<a href="#" onClick="gourl('visitEducationApplication')" onFocus="this.blur()" class="nav-link nav-toggle">
+			<c:if test="${isLogin == true}">
-					<span class="title">방문교육 신청</span>
+				<c:if test="${cls == 0}">
-				</a>
+					<li class="nav-item">
-			</li>
+						<a href="#" onClick="gourl('homeEducationApplication')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">집합교육 신청</span>
+						</a>
+					</li>
+				</c:if>
+				<c:if test="${cls == 1}">
+					<li class="nav-item">
+						<a href="#" onClick="gourl('visitEducationApplication')" onFocus="this.blur()" class="nav-link nav-toggle">
+							<span class="title">방문교육 신청</span>
+						</a>
+					</li>
+				</c:if>
+			</c:if>
 		</ul>
 
 		<ul id="mypage_sub_menu" class="page-sidebar-menu" style="display: none;">

src/main/webapp/WEB-INF/views/home/include/top.jsp

@@ -172,7 +172,12 @@
 										<a class="dropdown-toggle" data-toggle="dropdown" href="#" onClick="gourl('faq')" onFocus="this.blur()">시추정보 FAQ</a>
 									</li>
 									<c:if test="${isLogin == true}">
-										<c:if test="${cls == 2}">
+										<c:if test="${cls == 0}">
+											<li class="dropdown">
+												<a class="dropdown-toggle" data-toggle="dropdown" href="#" onClick="gourl('homeEducationApplication')" onFocus="this.blur()">집합교육 신청</a>
+											</li>
+										</c:if>
+										<c:if test="${cls == 1}">
 											<li class="dropdown">
 												<a class="dropdown-toggle" data-toggle="dropdown" href="#" onClick="gourl('visitEducationApplication')" onFocus="this.blur()">방문교육 신청</a>
 											</li>
@@ -302,6 +307,15 @@
 						<li class="menu-all-item"><a href="#" onClick="gourl('pds')" onFocus="this.blur()">자료실</a></li>
 						<li class="menu-all-item"><a href="#" onClick="gourl('psboard')" onFocus="this.blur()">시추정보 Q&A</a></li>
 						<li class="menu-all-item"><a href="#" onClick="gourl('faq')" onFocus="this.blur()">시추정보 FAQ</a></li>
+						<c:if test="${isLogin == true}">
+							<c:set var="cls" value="${cls}" />
+							<c:if test="${cls == 0}">
+								<li class="menu-all-item"><a href="#" onClick="gourl('homeEducationApplication')" onFocus="this.blur()">집합교육 신청</a></li>
+							</c:if>
+							<c:if test="${cls == 1}">
+								<li class="menu-all-item"><a href="#" onClick="gourl('visitEducationApplication')" onFocus="this.blur()">방문교육 신청</a></li>
+							</c:if>
+						</c:if>
 					</ul>
 				</div>
 			</div>

src/main/webapp/WEB-INF/views/home/index.jsp

@@ -334,7 +334,7 @@
 										        <li>
 										            <img src="../com/img/common/bg/main_info_visual_20240906.png?v=20240906" alt="건설 시추정보 DB 사용자 방문교육 신청 안내" usemap="#study">
 										            <map name="study" id="study" />
-										            <area shape="rect" coords="300, 250, 555, 295" onClick="gourl('scheduledGroupEducationApplication')" style="cursor:pointer;"/>
+										            <area shape="rect" coords="300, 250, 555, 295" onClick="gourl('homeEducationApplication')" style="cursor:pointer;"/>
 										        </li>
 										    </c:when>
 										    <c:when test="${cls == 1}">

src/main/webapp/WEB-INF/views/home/main.jsp

@@ -308,7 +308,7 @@
 						<!-- 커뮤니티 > 시추정보 Q&A 시작 -->
 						<h1 class="page-title">
 							<span class="page-title-text">시추정보 FAQ</span>
-<!-- 							<ul class="page-category"> -->
+							<ul class="page-category">
 								<li class="category-item">게시판</li>
 								<li class="category-item">시추정보 FAQ</li>
 							</ul>
@@ -325,6 +325,26 @@
 						<!-- 커뮤니티 > 시추정보 Q&A 끝 -->
 					</c:if>
 					
+					<c:if test="${eGovUrl == 'homeEducationApplicationInquiry.do' || eGovUrl == 'homeEducationApplicationInput.do' }">
+						<!-- 집합교육 신청 시작 -->
+						<h1 class="page-title">
+							<span class="page-title-text">집합교육 신청</span>
+							<ul class="page-category">
+								<li class="category-item">집합교육 신청</li>
+								<li class="category-item">집합교육 신청하기</li>
+							</ul>
+						</h1>
+						<script>
+							$(document).ready(function(){
+								// 상단메뉴 활성화
+								$(".nav > li.dropdown:eq(5)").addClass("on");
+								// 왼쪽메뉴 활성화
+								$("#community_sub_menu").css("display", "block");
+								$("#community_sub_menu > li.nav-item:eq(5)").addClass("active");
+							});
+						</script>
+						<!-- 집합교육 신청 끝 -->
+					</c:if>
 					
 					<c:if test="${eGovUrl == 'visitEducationApplicationInquiry.do'}">
 						<!-- 방문교육 신청 시작 -->

src/main/webapp/WEB-INF/views/homeEducationApplication/common/homeEducationApplicationIncludeTopMenu.jsp

@@ -1,7 +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="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<c:if test="${'2' == cls}">
+<c:if test="${'0' == cls}">
 	<header>
 		<!-- 네비게이션 시작 -->
 		<nav class="navbar navbar-default bootsnav navbar-fixed-top">

src/main/webapp/WEB-INF/views/homeEducationApplication/input/homeEducationApplicationInput.jsp

@@ -76,8 +76,8 @@ function doSave2(){
 		<div class="table-bottom-control">
 			<div class="form-inline f-right">
 				<div class="form-group">
-					<button type="button" class="btn btn-primary" onClick="alert('신청되었습니다.'); gourl('scheduledGroupEducationApplication');">신청</button>
+					<button type="button" class="btn btn-primary" onClick="alert('신청되었습니다.'); gourl('homeEducationApplication');">신청</button>
-					<button type="button" class="btn dark" onClick="gourl('scheduledGroupEducationApplication')">취소</button>
+					<button type="button" class="btn dark" onClick="gourl('homeEducationApplication')">취소</button>
                     
 				</div>
 			</div>

src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiry.jsp

@@ -64,7 +64,7 @@ function doSave2(){
 				        <td>대전광역시청 3층 대강당</td>
 				        <td>
 				        	<div class="form-group">
-								<button type="button" class="btn btn-primary" onClick="gourl('scheduledGroupEducationApplicationInput')">신청 하기</button>
+								<button type="button" class="btn btn-primary" onClick="gourl('homeEducationApplicationInput')">신청 하기</button>
 							</div>
 						</td>
 				    </tr>
@@ -74,7 +74,7 @@ function doSave2(){
 				        <td>일산서구청 4층 대강당</td>
 				        <td>
 				        	<div class="form-group">
-								<button type="button" class="btn btn-primary" onClick="gourl('scheduledGroupEducationApplicationInput')">신청 하기</button>
+								<button type="button" class="btn btn-primary" onClick="gourl('homeEducationApplicationInput')">신청 하기</button>
 							</div>
 						</td>
 				    </tr>

src/main/webapp/WEB-INF/views/visitEducationApplication/common/visitEducationApplicationIncludeTopMenu.jsp

@@ -1,7 +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="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<c:if test="${'2' == cls}">
+<c:if test="${'1' == cls}">
 	<header>
 		<!-- 네비게이션 시작 -->
 		<nav class="navbar navbar-default bootsnav navbar-fixed-top">