From 5af6402e238e8b7c23ebb8f9b138daae557a62d6 Mon Sep 17 00:00:00 2001
From: subsub <user@DESKTOP-VNHEGBF>
Date: Thu, 25 Jan 2024 17:26:27 +0900
Subject: [PATCH] =?UTF-8?q?2024/01/25=20=ED=8C=9D=EC=97=85=20=EB=8B=AB?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=ED=8F=AC=EC=BB=A4=EC=8B=B1=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

---
 .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp   |  2 +-
 .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp  |  3 ++-
 .../fndtnEnhanceTrn/popup/eduAplctPop.jsp      | 16 +++++++++++++---
 .../otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp   |  2 +-
 .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp  |  2 +-
 .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp    |  3 ++-
 .../ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp   |  5 ++++-
 .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp  | 18 ++++++++++++++----
 .../jsp/web/ve/comm/selectPrcsDetailList.jsp   |  6 +++---
 9 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
index 661d7e92..92b24e30 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
@@ -328,7 +328,7 @@
 		<div class="btn_center">
 		</div>
 		<div class="btn_right">
-			<button type="button"  id="regBtn" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${info.prcsAplctPrdOrd}"/>');" data-tooltip="target_confirm_popup">
+			<button type="button"  id="regBtn" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${info.prcsAplctPrdOrd}"/>');" data-info="<c:out value='${info.prcsAplctPrdOrd}'/>" data-tooltip="target_confirm_popup">
 				<c:choose>
 					<c:when test="${not empty info.aprvlCd}">
 						<kc:code codeId="VE0003" code="${info.aprvlCd}"/>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
index 5e2889ac..105a894f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
@@ -156,6 +156,7 @@ $(document).ready(function(){
         	$applyButton.css('background-color', '#888');
         	/*24.01.23 웹접근성 검사를 위하여 title 추가*/
         	$applyButton.attr('title','비활성화됨');
+        	$applyButton.removeAttr('data-tooltip');
         	
         }
     });
@@ -461,7 +462,7 @@ $(document).ready(function(){
 								</td>
 								<td class="aplctBtn">
 									<%-- <button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');" disabled>신청</button> --%>
-									<button type="button" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');" title="팝업 열림" disabled>신청</button>
+									<button type="button" class="btnType04" data-tooltip="target_confirm_popup" data-info="<c:out value='${list.prcsAplctPrdOrd}'/>" onclick="fn_eduRegPopup('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');" title="팝업 열림" disabled>신청</button>
 								</td>
 							</c:if>
 						</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp
index 250cf3e9..f01e5138 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp
@@ -45,7 +45,10 @@ $(document).ready(function(){
     		identifier: "searchStartDt",
     		incrementYears:100,
     	}
-	
+	setTimeout(function(){
+		$('.dBirth .duet-date__input').attr("title","생년월일을 선택하세요.");
+		
+	},10)
     $('#fldSelect').change(function(){
     	console.log($(this).val());
     	console.log($(this).val() == '99');
@@ -59,6 +62,13 @@ $(document).ready(function(){
     	}
     })
     
+    
+		$(".tooltip-close").click(function(){
+			var activeTarget = $('[data-tooltip-con="target_confirm_popup"]');
+			activeTarget.hide();
+			$('[data-info="${vEPrcsDetailVO.prcsAplctPrdOrd}"][data-tooltip="target_confirm_popup"]').focus();
+		});
+    
 //     $('#fld').hide();
     
 });
@@ -157,9 +167,9 @@ $(document).ready(function(){
 	<input type="hidden" name="eduAplctOrd" value="${vEPrcsDetailVO.eduAplctOrd}">
 	<!-- 신청인정보 -->
 	<div class="tooltip-wrap q_pop">
-		<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
+		<div class="popup_wrap popType01" tabindex="0" data-info="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}'/>" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
 			<div class="popup_tit">
-				<p id="popNm">신청인정보</p>
+				<p id="popNm">신청인1정보</p>
 				<button class="btn_popup_close tooltip-close" data-focus="target_confirm_popup_close" title="팝업 닫기"><i></i></button>
 			</div>
 			<div class="popup_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp
index 43182f2d..abf84047 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp
@@ -564,7 +564,7 @@
 						${list.prcsNm}
 					</td>
 					<td>${list.chasiCnt}</td>
-					<td><button type="button" class="btnType01" data-tooltip="${list.prcsOrd}" onclick="selectPrcsDetailListPop(this, '${list.prcsOrd}');" title="팝업 열림">보기</button></td>
+					<td><button type="button" class="btnType01" data-tooltip="${list.prcsOrd}" data-info="${list.prcsOrd}" onclick="selectPrcsDetailListPop(this, '${list.prcsOrd}');" title="팝업 열림">보기</button></td>
 					<td>
 						<label for="checkPrcs${status.index}" class="label">교육신청 체크</label>
 						<input type="checkbox" name="onlnPrcsOrd" id="checkPrcs${status.index}" value="<c:out value='${list.prcsOrd}'/>" ${list.checkYn eq 'Y' ? 'checked' : ''}>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
index 221662ec..a63e1646 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
@@ -401,7 +401,7 @@
 		</div>
 		<div class="btn_right" class="aplctBtn">
 <%-- 			<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button> --%>
-			<button type="button" class="btnType04" data-tooltip="" 
+			<button type="button" class="btnType04" data-info="<c:out value='${list.prcsAplctPrdOrd}'/>" data-tooltip="sub36_pop02" 
 						onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
 						,'','',''
 						)" title="팝업 열림">신청</button>			
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
index 8d6ec712..ec3683ba 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
@@ -88,6 +88,7 @@ $(document).ready(function(){
         	$applyButton.css('background-color', '#888');
         	/*24.01.23 웹접근성 검사를 위하여 title 추가*/
         	$applyButton.attr('title','비활성화됨');
+        	$applyButton.removeAttr('data-tooltip');
         }
 	});
 	
@@ -701,7 +702,7 @@ $(document).ready(function(){
 	<%-- 							<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button> --%>
 <%-- 								<button type="button" class="btnType04" data-info="<c:out value="${list.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button> --%>
 								<!--  -->
-								<button type="button" class="btnType04" data-tooltip="" 
+								<button type="button" class="btnType04" data-info="<c:out value='${list.prcsAplctPrdOrd}'/>" data-tooltip="sub36_pop02" 
 											onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
 											,'','',''
 											)" title="팝업 열림">신청</button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
index 1a5b8c7a..4e4c527c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
@@ -45,7 +45,10 @@ $(document).ready(function(){
     		identifier: "searchStartDt",
     		incrementYears:100,
     	}
-	
+    setTimeout(function(){
+		$('.dBirth .duet-date__input').attr("title","생년월일을 선택하세요.");
+		
+	},10)
     $('#fldSelect').change(function(){
     	console.log($(this).val());
     	console.log($(this).val() == '99');
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
index f77e8d37..e1cdaec2 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
@@ -203,7 +203,17 @@ $(document).ready(function(){
 	btnLast.attr('data-focus-next','sub36_pop02');
 	btnLast.attr('data-focus','sub36_pop02_close');
 	*/
-
+	
+	// 레이어팝업 포커싱 이동 수정
+	$(".tooltip-close").click(function(){
+		var activeTarget = $('[data-tooltip-con="sub36_pop02"]');
+		activeTarget.hide();
+		$('[data-info="${vEEduChasiVO.prcsAplctPrdOrd}"][data-tooltip="sub36_pop02"]').focus();
+	});
+	
+	setTimeout(function(){
+		$('#dBirth .duet-date__input').attr("title","생년월일을 선택하세요.");
+	},10)
 })
 </script>
 <!-- 일정 상세 -->
@@ -222,7 +232,7 @@ $(document).ready(function(){
 	<input type="hidden" name="qestnrId" id="qestnrId" value="${chasiSrvyList[0].qestnrId}">
 	<input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}">
 
-<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="sub36_pop02" data-focus="sub36_pop02" data-focus-prev="sub36_pop02_close">
+<div class="popup_wrap popType01" data-info="${vEEduChasiVO.prcsAplctPrdOrd}" tabindex="0" data-tooltip-con="sub36_pop02" data-focus="sub36_pop02" data-focus-prev="sub36_pop02_close">
 	<div class="popup_tit">
 		<p>교육대상자 확인</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
 	</div>
@@ -238,7 +248,7 @@ $(document).ready(function(){
 							</colgroup>
 							<tbody>
 								<tr>
-									<th scope=“row”>성명</th>
+									<th scope="row">성명</th>
 									<td>
 										<label for="trgtNm" class="label">성명 입력</label>
 										<input type="text" id="trgtNm">                               
@@ -369,7 +379,7 @@ $(document).ready(function(){
 						</div>
 						<div class="btn_center">
 							<button type="button" class="btnType05" onclick="fn_new_confirm('${vEEduChasiVO.prcsAplctPrdOrd}')">제출</button>
-							<button type="button" class="btnType02 tooltip-close" id="target_confirm_popup-close" data-focus="target_confirm_popup-close" data-focus-next="target_confirm_popup">취소</button>							
+							<button type="button" class="btnType02 tooltip-close" id="target_confirm_popup-close" data-focus="sub36_pop02_close" data-focus-next="sub36_pop02">취소</button>							
 						</div>
 						<div class="btn_right">
 						</div>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/selectPrcsDetailList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/selectPrcsDetailList.jsp
index 80d68a24..39826628 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/comm/selectPrcsDetailList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/selectPrcsDetailList.jsp
@@ -14,12 +14,12 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 	
-		boardCaptionDetailToggle3();
-		boardCaptionDetailToggle4();
+		/* boardCaptionDetailToggle3();
+		boardCaptionDetailToggle4(); */
 		
 		// 레이어팝업 포커싱 이동 수정
 		$(".tooltip-close").click(function(){
-			$('[data-tooltip="${vEEduAplctVO.prcsOrd}"]').focus();
+			$('[data-info="${vEEduAplctVO.prcsOrd}"]').focus();
 		});