From 73c93f2c55fd920b36442e0e9f9aca424e741340 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 13 Dec 2023 15:03:52 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=9A=B4?=
 =?UTF-8?q?=EC=98=81=EC=84=9C=EB=B2=84=20DB(svr)=20=EC=9A=B4=EC=98=81=20DB?=
 =?UTF-8?q?=EB=A1=9C=20=EC=97=B0=EA=B2=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/egovframework/egovProps/globals_svr.properties  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties
index b2504aa9..66d75529 100644
--- a/src/main/resources/egovframework/egovProps/globals_svr.properties
+++ b/src/main/resources/egovframework/egovProps/globals_svr.properties
@@ -29,9 +29,9 @@ Globals.DriverClassName=com.tmax.tibero.jdbc.TbDriver
 #\ub85c\uceec DB
 #Globals.Url=jdbc:tibero:thin:@192.168.0.30:8633:tibero
 #\uc6b4\uc601 \uac1c\ubc1cDB - \ud14c\uc2a4\ud2b8 \uc644\ub8cc \ud6c4 \uc6b4\uc601 DB\ub85c \ubcc0\uacbd \uc608\uc815
-Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb
+#Globals.Url=jdbc:tibero:thin:@10.255.3.58:8629:copydb
 #\uc6b4\uc601 DB 
-#Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb
+Globals.Url=jdbc:tibero:thin:@172.17.0.10:8629:copydb
 
 
 # \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c)

From d6395a9c5becdf3ce8bc360941d82fe20f8ffcb9 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 13 Dec 2023 16:01:54 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?=
 =?UTF-8?q?=EB=82=98=EC=9D=98=20=EA=B0=95=EC=9D=98=EC=8B=A4=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp | 7 +++++++
 .../exprnClsrmInfo/exprnClsrmAplctDashboard.jsp           | 8 +++++---
 .../exprnClsrmInfo/exprnDocumentDashboard.jsp             | 7 +++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp
index 318841bf..7dcfe1b5 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp
@@ -262,6 +262,13 @@
 	}
 	function validCheck(){
 		
+		var oathAtchFileId = '${info.oathAtchFileId}';
+		
+		if(oathAtchFileId == null || oathAtchFileId == ''){
+			alert("서약서를 제출해주세요.");
+			return false;
+		}
+		
 		if($('#trgtGrade').val() == ''){
 			alert('대상학년/반을 입력해주세요.');
 			$("#trgtGrade").focus();
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp
index 6eb96129..f69034cc 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp
@@ -21,14 +21,16 @@
 </style>
 <script type="text/javaScript" language="javascript">
 	var aprvlCd = ${info.aprvlCd}
-	if(aprvlCd == '11' || aprvlCd == '12' || aprvlCd == '13'){
-		aprvlCd = '10';
-	}
+
 	$( document ).ready(function(){
 		if(${info == null}){
 			alert("진행 중인 체험교실이 없습니다.");
 			location.href = "<c:url value='/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.do'/>";
 		}else{
+			if(aprvlCd == '11' || aprvlCd == '12' || aprvlCd == '13'){
+				aprvlCd = '10';
+			}
+			
 			$("#p_"+aprvlCd).parent().attr('class', 'p_on');
 			$("#p_"+aprvlCd).parent().prevAll().attr('class', 'p_on');
 			$("#p_"+aprvlCd).css("color", "#FFFF00");
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp
index 9a8569d9..c7f4441a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp
@@ -237,6 +237,13 @@
 	
 	function validCheck(){
 		
+		var oathAtchFileId = '${info.oathAtchFileId}';
+		
+		if(oathAtchFileId == null || oathAtchFileId == ''){
+			alert("서약서를 제출해주세요.");
+			return false;
+		}
+		
 		if($('#trgtGrade').val() == ''){
 			alert('대상학년/반을 입력해주세요.');
 			$("#trgtGrade").focus();