From 0a06a7d0ca485fbf16e3cb9ac15a4925eba73871 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Mon, 19 Feb 2024 16:12:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84=20=EA=B0=95?=
 =?UTF-8?q?=EC=82=AC=EC=8B=A0=EC=B2=AD=EA=B4=80=EB=A6=AC,=20=EA=B0=95?=
 =?UTF-8?q?=EC=82=AC=EA=B4=80=EB=A6=AC=20=EC=83=9D=EB=85=84=EC=9B=94?=
 =?UTF-8?q?=EC=9D=BC=20=EB=85=B8=EC=B6=9C=20=EB=B0=8F=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtn/adultVisitEdu/instrMngDetail.jsp    | 45 +++++++------
 .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp | 64 ++++++++++++++-----
 2 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
index 5fbcbbf0..05bc3f38 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
@@ -52,24 +52,33 @@ $( document ).ready(function(){
 
 	//생년월일 selected 처리
 	var dBirth = "${info.dBirth}"
-	var dBirth1 = dBirth.substring(0,4);
-	var dBirth2 = dBirth.substring(4,6);
-	var dBirth3 = dBirth.substring(6,8);
-	/*
-	생년월일은 8자리(20120812)로 들어가므로 하단은 주석처리함(2023.10-11.)
-	if(dBirth1.substring(0,1) == "0"){
-		dBirth1 = "20"+dBirth1
-	}else{
-		dBirth1 = "19"+dBirth1
-	}
-	*/
-	if(dBirth2.substring(0,1) == "0"){
-		dBirth2 = dBirth2.substring(1,2);
-	}
-	if(dBirth3.substring(0,1) == "0"){
-		dBirth3 = dBirth3.substring(1,2);
-	}
-	
+		if(dBirth.length == '6'){
+			var dBirth1 = dBirth.substring(0,2);    	
+			var dBirth2 = dBirth.substring(2,4);
+			var dBirth3 = dBirth.substring(4,6);
+			if(dBirth1.substring(0,1) == "0"){
+				dBirth1 = "20"+dBirth1
+			}else{
+				dBirth1 = "19"+dBirth1
+			}
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+			
+		}else{
+			var dBirth1 = dBirth.substring(0,4);    	
+			var dBirth2 = dBirth.substring(4,6);
+			var dBirth3 = dBirth.substring(6,8);
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+		}	
 	$('#dBirth1 option').each(function(){
 		 if (this.value == dBirth1) {
 			 $(this).attr("selected","selected");
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
index a0710584..23cb3405 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp
@@ -67,21 +67,33 @@
 		
 		//생년월일 selected 처리
 		var dBirth = "${info.dBirth}"
-		var dBirth1 = dBirth.substring(0,2);
-		var dBirth2 = dBirth.substring(2,4);
-		var dBirth3 = dBirth.substring(4,6);
-		if(dBirth1.substring(0,1) == "0"){
-			dBirth1 = "20"+dBirth1
-		}else{
-			dBirth1 = "19"+dBirth1
-		}
-		if(dBirth2.substring(0,1) == "0"){
-			dBirth2 = dBirth2.substring(1,2);
-		}
-		if(dBirth3.substring(0,1) == "0"){
-			dBirth3 = dBirth3.substring(1,2);
-		}
-		
+			if(dBirth.length == '6'){
+				var dBirth1 = dBirth.substring(0,2);    	
+				var dBirth2 = dBirth.substring(2,4);
+				var dBirth3 = dBirth.substring(4,6);
+				if(dBirth1.substring(0,1) == "0"){
+					dBirth1 = "20"+dBirth1
+				}else{
+					dBirth1 = "19"+dBirth1
+				}
+				if(dBirth2.substring(0,1) == "0"){
+					dBirth2 = dBirth2.substring(1,2);
+				}
+				if(dBirth3.substring(0,1) == "0"){
+					dBirth3 = dBirth3.substring(1,2);
+				}
+				
+			}else{
+				var dBirth1 = dBirth.substring(0,4);    	
+				var dBirth2 = dBirth.substring(4,6);
+				var dBirth3 = dBirth.substring(6,8);
+				if(dBirth2.substring(0,1) == "0"){
+					dBirth2 = dBirth2.substring(1,2);
+				}
+				if(dBirth3.substring(0,1) == "0"){
+					dBirth3 = dBirth3.substring(1,2);
+				}
+			}	
 		$('#dBirth1 option').each(function(){
 			 if (this.value == dBirth1) {
 				 $(this).attr("selected","selected");
@@ -182,6 +194,25 @@
 	}
 	
 	function fncUpdate(){
+		//핸드폰번호 하이푼 추가
+		 var phoneAll = document.getElementById("phone1").value + "-"+ document.getElementById("phone2").value + "-"+ document.getElementById("phone3").value; 
+		 $("#phone").val(phoneAll)
+		//이메일 합치기
+		var emailAll = document.getElementById("email1").value + "@"+ document.getElementById("email2").value ;
+		$("#email").val(emailAll)
+		//생년월일합치기, 8자리 맞추기
+		var dBirth1 = $("#dBirth1 option:selected").val()
+		var dBirth2 = $("#dBirth2 option:selected").val()
+		var dBirth3 = $("#dBirth3 option:selected").val()
+		if(dBirth2.length == 1){
+			dBirth2 = "0"+dBirth2;
+		}
+		if(dBirth3.length == 1){
+			dBirth3 = "0"+dBirth3;
+		}
+		var dBirthAll = dBirth1 + dBirth2 + dBirth3
+		$("#dBirth").val(dBirthAll)		
+			
 		var data = new FormData(document.getElementById("detailForm"));
         if(confirm("수정 하시겠습니까?")){
             $.ajax({
@@ -454,6 +485,9 @@
 	<input type="hidden" name="aprvlCn" id="aprvlCn" value=""/> <!-- 승인내용(반려사유) -->
 	<input type="hidden" name="qlfctEndYn" id="qlfctEndYn" value=""/> <!-- 자격종료여부 -->
 	<input type="hidden" name="stngYrMnt" id="stngYrMnt" value="202202"/><!-- 강사구분 -->
+	<input type="hidden" name="phone" id="phone" value=""/> <!-- 연락처 -->
+	<input type="hidden" name="email" id="email" value=""/> <!-- 이메일 -->
+	<input type="hidden" name="dBirth" id="dBirth" value=""/> <!-- 생년월일 -->
 <!-- cont -->
 
 	<!-- 팝업을 위한 mask -->