From 9572284a4e343515bc845b3fd4b670c970adc091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 <ITN_디자인팀@ITN>
Date: Fri, 26 Jan 2024 11:05:16 +0900
Subject: [PATCH 1/2] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?=
 =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exprnClsrmInfo/popup/qustnrPopList.jsp    |  5 ++--
 .../tngrVisitEdu/eduEnd/eduEndDetail.jsp      | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
index 6a7e6f86..fbd699a8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp
@@ -223,7 +223,8 @@ $(document).ready(function(){
 	$(".tooltip-close").click(function(){
 		var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
 		activeTarget.hide();
-		$('[data-tooltip="sub37_pop20"]:first-child').focus();
+		//$('[data-tooltip="sub37_pop20"]:first-child').focus();
+		$('[data-info="${chasiInfo.eduChasiOrd}"]').focus();
 	});
 
 })
@@ -236,7 +237,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="sub37_pop20" data-focus="sub37_pop20" data-focus-prev="sub37_pop20_close">
+<div class="popup_wrap popType01" tabindex="0" data-info="${chasiInfo.eduChasiOrd}" data-tooltip-con="sub37_pop20" data-focus="sub37_pop20" data-focus-prev="sub37_pop20_close">
 	<div class="popup_tit">
 		<p>강의만족도 결과 등록</p> <button class="btn_popup_close tooltip-close" data-focus="sub37_pop20_close" title="팝업 닫기"><i></i></button>
 	</div>
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 feddfd97..8a264691 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
@@ -433,6 +433,19 @@
 		popupWindow.close()
 		}, 5000)
 	};
+	
+	
+	$(document).ready(function(){
+		// 레이어팝업 포커싱 이동 수정
+		$(".tooltip-close").click(function(){
+			var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
+			activeTarget.hide();
+			//$('[data-tooltip="sub37_pop20"]:first-child').focus();
+			$('[data-info="${chasiInfo.eduChasiOrd}"]').focus();
+		});
+
+	})
+	
 </script>
 
 <!-- 팝업을 위한 mask -->
@@ -723,7 +736,7 @@
 <div class="tooltip-wrap">
 	<div class="popup_wrap popType05" tabindex="0" data-tooltip-con="instrInfo_pop01" data-focus="instrInfo_pop01" data-focus-prev="instrInfo_pop01_close" style="width:800px;">
 		<div class="popup_tit">
-			<p>강사 정보</p>
+			<p>강사 정보22</p>
 			<button class="btn_popup_close tooltip-close" data-focus="instrInfo_pop01_close" title="팝업 닫기"><i></i></button>
 		</div>
 		<div class="popup_cont">
@@ -1183,23 +1196,23 @@
 						<td><!-- 학생 -->
 							<c:choose>
 								<c:when test="${not empty list.qustnrRespondId10 and list.qestnrParticipantCnt gt 0 and list.qustnrQesitmId10Cnt gt 0}">
-									<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType02" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
 									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
 									)" title="팝업 열림">설문완료</button>
 								</c:when>
 								<c:when test="${not empty list.qestnrId10}">
-									<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType01" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
 									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
 									)" title="팝업 열림">설문등록</button>
 									
-									<button type="button" class="btnType04" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType04" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrPrintList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','print'
 									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
 									)" title="팝업 열림">설문출력</button>
 									
-									<button type="button" class="btnType04" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType04" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrQRPrintList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','print'
 									,'${list.qustnrTmplatId}','${list.qestnrId10}','${list.qustnrRespondId10}'
 									)" title="팝업 열림">설문QR</button>											
@@ -1213,13 +1226,13 @@
 						<td><!-- 신청인 -->
 							<c:choose>
 								<c:when test="${not empty list.qustnrRespondId20 and list.qestnrParticipantCnt gt 0 and list.qustnrQesitmId20Cnt gt 0}">
-									<button type="button" class="btnType02" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType02" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','20','select'
 									,'${list.qustnrTmplatId}','${list.qestnrId20}','${list.qustnrRespondId20}'
 									)" title="팝업 열림">설문완료</button>
 								</c:when>
 								<c:when test="${not empty list.qestnrId20}">
-									<button type="button" class="btnType01" data-tooltip="sub37_pop20" 
+									<button type="button" class="btnType01" data-info="${list.eduChasiOrd}" data-tooltip="sub37_pop20" 
 									onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','20','insert'
 									,'${list.qustnrTmplatId}','${list.qestnrId20}','${list.qustnrRespondId20}'
 									)" title="팝업 열림">설문등록</button>

From 26850d4809188bd55b5f15c5d62cef73b5a3e3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 <ITN_디자인팀@ITN>
Date: Fri, 26 Jan 2024 11:07:45 +0900
Subject: [PATCH 2/2] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?=
 =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

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 8a264691..d653cd6b 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
@@ -433,19 +433,6 @@
 		popupWindow.close()
 		}, 5000)
 	};
-	
-	
-	$(document).ready(function(){
-		// 레이어팝업 포커싱 이동 수정
-		$(".tooltip-close").click(function(){
-			var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
-			activeTarget.hide();
-			//$('[data-tooltip="sub37_pop20"]:first-child').focus();
-			$('[data-info="${chasiInfo.eduChasiOrd}"]').focus();
-		});
-
-	})
-	
 </script>
 
 <!-- 팝업을 위한 mask -->
@@ -736,7 +723,7 @@
 <div class="tooltip-wrap">
 	<div class="popup_wrap popType05" tabindex="0" data-tooltip-con="instrInfo_pop01" data-focus="instrInfo_pop01" data-focus-prev="instrInfo_pop01_close" style="width:800px;">
 		<div class="popup_tit">
-			<p>강사 정보22</p>
+			<p>강사 정보</p>
 			<button class="btn_popup_close tooltip-close" data-focus="instrInfo_pop01_close" title="팝업 닫기"><i></i></button>
 		</div>
 		<div class="popup_cont">