From 6fc9b2f645093efefe7dbf7c201e9168331059d2 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 13 Nov 2023 12:19:57 +0900
Subject: [PATCH] =?UTF-8?q?2023-11-13=2012:19=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EC=B0=BE=EA=B5=90=20=EC=8B=A0=EC=B2=AD=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eduInfo/service/VEEduAplctVO.java         |  9 ++++-
 .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml   | 10 +++++
 .../jsp/oprtn/cmm/SchduleManagerPopDetail.jsp |  9 ++++-
 .../oprtn/tngrVisitEdu/eduAplctMngDetail.jsp  | 15 ++++----
 .../tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp   | 13 +++----
 .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp   | 13 +++----
 .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp  | 11 +++++-
 .../tngrVisitEdu/eduAplct/eduAplctReg.jsp     | 37 ++++++++++++++++---
 .../tngrVisitEdu/eduEnd/eduEndDetail.jsp      |  9 ++++-
 .../asgnmInfo/instrAsgnmDetail.jsp            |  3 +-
 10 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
index 438006eb..a7c74dc0 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
@@ -48,7 +48,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	private String	email1;			//이메일
 	private String	email2;			//이메일
 	
-	private String	eduPlace;		//교육장소
+	private String	eduPlace;		//교육장소(eduPlaceCd-99인 경우만 들어가도록)
+	private String	eduPlaceCd;		//교육장소코드(VEA010)
 	private String	sbmtYn;			//제출여부
 	private String	sbmtPnttm;		//제출일시
 	private String	sbmtPnttmDetail;		//제출일시 시분초 추가
@@ -604,6 +605,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
 	public void setEduPlace(String eduPlace) {
 		this.eduPlace = eduPlace;
 	}
+	public String getEduPlaceCd() {
+		return eduPlaceCd;
+	}
+	public void setEduPlaceCd(String eduPlaceCd) {
+		this.eduPlaceCd = eduPlaceCd;
+	}
 	public String getSbmtYn() {
 		return sbmtYn;
 	}
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
index 7c56c839..cc7fdd4d 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@@ -34,6 +34,7 @@
 		
 		EMAIL,
 		EDU_PLACE,
+		EDU_PLACE_CD,
 		SBMT_YN,
 		SBMT_PNTTM,
 		APRVL_CD,
@@ -110,6 +111,7 @@
 		A.PHONE								AS	phone,
 		A.EMAIL								AS	email,
 		A.EDU_PLACE							AS	eduPlace,
+		A.EDU_PLACE_CD						AS	eduPlaceCd,
 		A.SBMT_YN							AS	sbmtYn,
 		TO_CHAR(A.SBMT_PNTTM, 'YY-MM-DD')	AS	sbmtPnttm,
 		A.APRVL_CD							AS	aprvlCd,
@@ -186,6 +188,7 @@
 			
 			#email#,
 			#eduPlace#,
+			#eduPlaceCd#,
 			#sbmtYn#,
 			CASE WHEN #sbmtYn# = 'Y' THEN SYSDATE ELSE NULL END,
 			#aprvlCd#,
@@ -313,6 +316,7 @@
 			A.PHONE ,
 			A.EMAIL ,
 			A.EDU_PLACE ,
+			A.EDU_PLACE_CD ,
 			A.SBMT_YN ,
 			TO_CHAR(A.SBMT_PNTTM, 'YY-MM-DD') ,
 			A.APRVL_CD ,
@@ -524,6 +528,9 @@
 		<isNotEmpty property="eduPlace">
 			, EDU_PLACE	= #eduPlace#
 		</isNotEmpty>
+		<isNotEmpty property="eduPlaceCd">
+			, EDU_PLACE_CD	= #eduPlaceCd#
+		</isNotEmpty>
 		<isNotEmpty property="sbmtYn">
 			, SBMT_YN	= #sbmtYn#			
 			/*
@@ -716,6 +723,9 @@
 		<isNotEmpty property="eduPlace">
 			, EDU_PLACE	= #eduPlace#
 		</isNotEmpty>
+		<isNotEmpty property="eduPlaceCd">
+			, EDU_PLACE_CD	= #eduPlaceCd#
+		</isNotEmpty>
 		<isNotEmpty property="sbmtYn">
 			, SBMT_YN	= #sbmtYn#			
 			, SBMT_PNTTM	= CASE WHEN SBMT_PNTTM IS NULL THEN SYSDATE ELSE SBMT_PNTTM END
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp
index 78f5655a..05edd1b5 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp
@@ -206,7 +206,14 @@
 							<th scope="row">
 								<p>교육장소</p>
 							</th>
-							<td><c:out value="${info.eduPlace}" /></td>
+							<td>
+								<c:if test="${info.eduPlaceCd eq '99'}">
+									${info.eduPlace}
+								</c:if>
+								<c:if test="${info.eduPlaceCd ne '99'}">
+									<kc:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+								</c:if>									
+							</td>
 						</tr>
 						<tr>
 							<th scope="row">
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp
index 70e6affc..dfa395f6 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp
@@ -443,14 +443,13 @@
 							<th scope="row">
 								<p>교육장소</p>
 							</th>
-							<td colspan="3">
-								<c:out value="${info.eduPlace}" />
-								<p style="padding-left:10%;">
-									<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
-								</p>
-								<p style="padding-left:20px;">
-									<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
-								</p>
+							<td colspan="3">							
+								<c:if test="${info.eduPlaceCd eq '99'}">
+									${info.eduPlace}
+								</c:if>
+								<c:if test="${info.eduPlaceCd ne '99'}">									
+									<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+								</c:if>										
 							</td>
 						</tr>
 						<tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp
index aa002828..2f2016bd 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp
@@ -352,13 +352,12 @@
 								<p>교육장소</p>
 							</th>
 							<td colspan="3">
-								<c:out value="${info.eduPlace}" />
-								<p style="padding-left:10%;">
-									<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
-								</p>
-								<p style="padding-left:20px;">
-									<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
-								</p>
+								<c:if test="${info.eduPlaceCd eq '99'}">
+									${info.eduPlace}
+								</c:if>
+								<c:if test="${info.eduPlaceCd ne '99'}">
+									<kc:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+								</c:if>										
 							</td>
 						</tr>
 					</tbody>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp
index d16abe35..f43604f1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp
@@ -427,13 +427,12 @@ function replyCalculation(){
 						<tr>
 							<th scope="row"><p>교육장소</p></th>
 							<td colspan="3">
-								<c:out value='${info.eduPlace}'/>
-								<p style="padding-left:10%;">
-									<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
-								</p>
-								<p style="padding-left:20px;">
-									<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
-								</p>
+								<c:if test="${info.eduPlaceCd eq '99'}">
+									${info.eduPlace}
+								</c:if>
+								<c:if test="${info.eduPlaceCd ne '99'}">
+									<ve:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+								</c:if>										
 							</td>
 						</tr>
 					</tbody>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
index 4bc3b60b..067b9e6b 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
@@ -855,8 +855,15 @@
 			<tr>
 				<th scope="row">
 					<p>교육장소</p>
-				</th>
-				<td colspan="3">${info.eduPlace}</td>
+				</th>				
+				<td colspan="3">					
+					<c:if test="${info.eduPlaceCd eq '99'}">
+						${info.eduPlace}
+					</c:if>
+					<c:if test="${info.eduPlaceCd ne '99'}">
+						<kc:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+					</c:if>
+				</td>
 			</tr>
 			<tr>
 				<th scope="row">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
index be6e3485..1834edf0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
@@ -365,11 +365,15 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 			return false;
 		};
 
-		if($("#eduPlace").val() == ''){
-			alert('교육장소를 입력해주세요.');
-			$("#eduPlace").focus();
-			return false;
-		};
+		var v_eduPlaceCd	=	$("input[name='eduPlaceCd']:checked").val();
+
+		if (v_eduPlaceCd=='99'){
+			if($("#eduPlace").val() == ''){
+				alert('교육장소를 입력해주세요.');
+				$("#eduPlace").focus();
+				return false;
+			};			
+		}
 
 		var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
 		if(trObj.length  == 0){
@@ -809,6 +813,23 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 				, "calendarPop"
 		);
 	}
+
+	//교육 장소에 따른 내용 변경
+	function eduPlaceChg(){
+
+		var v_eduPlaceCd	=	$("input[name='eduPlaceCd']:checked").val();
+		var v_eduPlace	=	$('#eduPlace');
+		
+		
+		if (v_eduPlaceCd=='99'){
+			v_eduPlace.removeAttr('disabled');	
+		}else{
+			v_eduPlace.val('');
+			v_eduPlace.attr('disabled', 'disabled');	
+		}
+		
+	}	
+	
 </script>
 <div class="mask2" onclick="timeLayerUtil()"></div>
 <div class="cont_wrap" id="sub">
@@ -1043,9 +1064,13 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 				</th>
 				<td>
 					<label for="eduPlace" class="label">교육장소 입력</label>
-					<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25">
+					<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" disabled>
 					<input type="checkbox" name="corpsEdu" id="corpsEdu" value="Y" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if>> <label for="corpsEdu">집체교육</label>
 					<input type="checkbox" name="broadroomEdu" id="broadroomEdu" value="Y" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if>> <label for="broadroomEdu">방송실교육</label>
+					<ve:radio codeId="VEA010"  id="eduPlaceCd" name="eduPlaceCd" 
+					selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}"
+					onChange="eduPlaceChg();" 
+					/>
 				</td>
 			</tr>
 			<!-- 
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
index 417f5ad5..bc9ab73c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
@@ -908,7 +908,14 @@
 				<th scope="row">
 					<p>교육장소</p>
 				</th>
-				<td colspan="3">${info.eduPlace}</td>
+				<td colspan="3">					
+					<c:if test="${info.eduPlaceCd eq '99'}">
+						${info.eduPlace}
+					</c:if>
+					<c:if test="${info.eduPlaceCd ne '99'}">
+						<kc:code codeId="VEA010" code="${info.eduPlaceCd}"/>
+					</c:if>
+				</td>
 			</tr>
 			<tr>
 				<th scope="row">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
index df6f50ce..49c8d27a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
@@ -166,8 +166,7 @@
 									<p>강의일자</p>
 								</th>
 								<td>
-									${info.eduHopeDt}
-									${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일
+									${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,5,7)}월 ${fn:substring(info.eduHopeDt,8,10)}일
 								</td>
 								<th scope="row">
 									<p>첫 강의시간</p>