From f757b2718331f003238785f1d14abc5702de845a Mon Sep 17 00:00:00 2001
From: kmg <kmg@DESKTOP-VIC6KQU>
Date: Mon, 22 Jan 2024 15:32:34 +0900
Subject: [PATCH 1/3] =?UTF-8?q?2024/01/22=20=ED=94=84=EB=A1=9C=EC=84=B8?=
 =?UTF-8?q?=EC=8A=A4=20=EB=AA=85=EB=8F=84=EB=8C=80=EB=B9=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/visitEdu/usr/publish/css/content.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css
index 8fb458f7..b5dab6fa 100644
--- a/src/main/webapp/visitEdu/usr/publish/css/content.css
+++ b/src/main/webapp/visitEdu/usr/publish/css/content.css
@@ -382,7 +382,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
 /* 체험교실대시보드 7단계 */
 .ex_process {display:flex; justify-content:space-between;}
 .ex_process li {border-radius: 10px; width:13.5%; text-align: center; color:#fff; padding:15px 0 18px 0; font-size:22px;}
-.ex_process li.p {background-color: #a7acb6;}
+.ex_process li.p {/*background-color: #a7acb6;*/ background-color:#8b919e;}
 .ex_process li.p_on {/*background-color:#f37632;*/ background-color:#f05f0f;}
 
 

From 25182cd94471a8511738693e30887c6d3d24fd95 Mon Sep 17 00:00:00 2001
From: kmg <kmg@DESKTOP-VIC6KQU>
Date: Mon, 22 Jan 2024 16:42:59 +0900
Subject: [PATCH 2/3] =?UTF-8?q?2024/01/22=20alt=20=ED=83=9C=EA=B7=B8=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index a5267ac0..6fe5b5d4 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -254,7 +254,7 @@ function usrJoin(){
 							<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/kcc_ci.png" alt="한국저작권위원회">
 							<span>GO</span>
 						</button>
-						<p><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/edu_mark_1.png" alt="" /> 교육기부 우수기관</p>
+						<p><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/edu_mark_1.png" alt="교육기부 우수기관" /> 교육기부 우수기관</p>
 					</div>-->
 					<%-- <button class="site" onclick="window.open('https://www.copyright.or.kr/main.do')" title="새창열림">
 						<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/kcc_ci.png" alt="한국저작권위원회">

From bdabf72d6c97f0b25af95d38155665755f78ea67 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Mon, 22 Jan 2024 17:05:15 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=9B=B9?=
 =?UTF-8?q?=EC=A0=91=EA=B7=BC=EC=84=B1=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml   |  1 +
 .../sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml   |  4 +-
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   |  6 ++-
 .../adultVisitEdu/eduEnd/eduEndDetail.jsp     |  3 +-
 .../exprnClsrmInfo/exprnAplctDashboard.jsp    |  2 +-
 .../exprnClsrmInfo/exprnClsrmAplctDetail.jsp  |  2 +-
 .../exprnClsrmInfo/exprnClsrmAplctReg.jsp     | 40 ++++++++++---------
 .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp  |  5 +++
 .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp |  5 +++
 .../tngrVisitEdu/eduEnd/eduEndDetail.jsp      |  3 +-
 10 files changed, 45 insertions(+), 26 deletions(-)

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 a013908e..c9c20b23 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
@@ -1404,6 +1404,7 @@
 			VE_EDU_APLCT a
 		WHERE USER_ID = #userId#
 		AND LCTR_DIV_CD = '30'
+		AND SBMT_YN = 'Y'
 		<!-- AND APRVL_CD >= '20' -->
 	</select>
 	
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml
index 3dd9aa48..8961cfac 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml
@@ -86,9 +86,9 @@
 				<isNotEmpty property="exprnClsrnCd">
 					,EXPRN_CLSRN_CD = #exprnClsrnCd#
 				</isNotEmpty>
-				<isNotEmpty property="exprnClsrnYear">
+				<!-- <isNotEmpty property="exprnClsrnYear"> -->
 					,EXPRN_CLSRN_YEAR = #exprnClsrnYear#
-				</isNotEmpty>
+				<!-- </isNotEmpty> -->
 				<isNotEmpty property="exprnClsrnAplct">
 					,EXPRN_CLSRN_APLCT = #exprnClsrnAplct#
 				</isNotEmpty>
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index a5267ac0..fae605e0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -197,7 +197,8 @@ function usrJoin(){
 			cache: false,
 			success: function (returnData, status) {
 				if(returnData.status == 'loginY'){
-					window.location.href = url+"?user_id="+returnData.user_id+"&key="+returnData.key;
+					/* window.location.href = url+"?user_id="+returnData.user_id+"&key="+returnData.key; */
+					window.open(url+"?user_id="+returnData.user_id+"&key="+returnData.key);
 				} else if(returnData.status == 'fail') {
 					alert("key 갱신 오류");
 				} else if(returnData.status == 'loginN'){
@@ -211,7 +212,8 @@ function usrJoin(){
 		});
 		
 	 }else{									//비로그인 상태일시
-		 window.location.href = url;
+		 /* window.location.href = url; */
+		 window.open(url);
 	 }
 	 
 	 
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
index 7b384c39..a820015e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@@ -505,7 +505,8 @@
 				else
 					appendHtml = '<img id="instrPhoto" alt="'+info.instrNm+' 사진" src="<c:url value="/uss/ion/pwm/getImage.do"/>?atchFileId='+info.phtAtchFileId+'" />'
 				
-				$('#info_instrPhoto').append(appendHtml);
+				/* $('#info_instrPhoto').append(appendHtml); */
+				$('#info_instrPhoto').html(appendHtml);
 
 				$('#info_phone').text(info.phone);
 				$('#info_email').text(info.email);
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp
index e1eb866b..482a4f28 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp
@@ -238,7 +238,7 @@
 				</th>
 				<td>
 					<kc:code codeId="VE0030" code="${info.exprnClsrnAplct}"/>
-					<c:if test="${not empty info.exprnClsrnAplctCn}">
+					<c:if test="${info.exprnClsrnAplct eq '04'}">
 						&nbsp;&nbsp;&nbsp;(기타 내용 : ${info.exprnClsrnAplctCn})
 					</c:if>
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp
index 34f7bc76..b63982a3 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp
@@ -304,7 +304,7 @@
 				</th>
 				<td>
 					<kc:code codeId="VE0030" code="${info.exprnClsrnAplct}"/>
-					<c:if test="${not empty info.exprnClsrnAplctCn}">
+					<c:if test="${info.exprnClsrnAplct eq '04'}">
 						&nbsp;&nbsp;&nbsp;(기타 내용 : ${info.exprnClsrnAplctCn})
 					</c:if>
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp
index 626f827c..4003b2a1 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp
@@ -38,7 +38,8 @@
 // 		cmpltNoFormat(document.getElementById('cmpltNum'));
 
 		if('${info.exprnClsrnCd}' == '02'){
-			$('input[name="eClsrnYear"]').attr('disabled',true);
+			/* $('input[name="eClsrnYear"]').attr('disabled',true); */
+			$('input[name="eClsrnYear"]').attr("onclick", "return false;")
 			$('input[name="eClsrnYear"]').prop('checked',false);
 		}
 	});
@@ -46,9 +47,11 @@
 	function oprtnYn(){
 	var radioVal = $('input[name="exprnClsrnCd"]:checked').val();
 		if(radioVal == "01"){
-			 $('input[name="eClsrnYear"]').attr('disabled',false);
+			 /* $('input[name="eClsrnYear"]').attr('disabled',false); */
+			 $('input[name="eClsrnYear"]').removeAttr("onclick")
 		}else{
-			 $('input[name="eClsrnYear"]').attr('disabled',true);
+			 /* $('input[name="eClsrnYear"]').attr('disabled',true); */
+			 $('input[name="eClsrnYear"]').attr("onclick", "return false;")
 			 $('input[name="eClsrnYear"]').prop('checked',false);
 		}
 	}
@@ -548,7 +551,8 @@
 
 		$('input[name=exprnClsrnCd][value='+info.exprnClsrnCd+']').prop('checked', true);
 		if(info.exprnClsrnCd == '02'){
-			$('input[name="eClsrnYear"]').attr('disabled',true);
+			/* $('input[name="eClsrnYear"]').attr('disabled',true); */
+			$('input[name="eClsrnYear"]').attr("onclick", "return false;")
 		}
 		$('input[name=eClsrnYear]').prop('checked',false);
 		if(isNotEmpty(info.exprnClsrnYear)){
@@ -560,10 +564,10 @@
 
 		$('input[name=exprnClsrnAplct][value='+info.exprnClsrnAplct+']').prop('checked', true);
 		if(info.exprnClsrnAplct == '04'){
-			$("#exprnClsrnAplctCn").prop('disabled' , false);
+			$("#exprnClsrnAplctCn").prop('readonly' , false);
 			$("#exprnClsrnAplctCn").val(info.exprnClsrnAplctCn);
 		}else{
-			$("#exprnClsrnAplctCn").prop('disabled' , true);
+			$("#exprnClsrnAplctCn").prop('readonly' , true);
 			$("#exprnClsrnAplctCn").val('');
 		}
 
@@ -587,9 +591,9 @@
 	function fncEtcInputEnable(thisObj){
 		$("#exprnClsrnAplctCn").val('');
 		if($(thisObj).val() == '04'){
-			$("#exprnClsrnAplctCn").prop('disabled' , false);
+			$("#exprnClsrnAplctCn").prop('readonly' , false);
 		}else{
-			$("#exprnClsrnAplctCn").prop('disabled' , true);
+			$("#exprnClsrnAplctCn").prop('readonly' , true);
 		}
 	}
 	
@@ -668,11 +672,11 @@
 					<p>학교구분</p>
 				</th>
 				<td colspan="3">
-					<input type="radio" id="scholDivCd01" name="scholDivCd" value="10" disabled="disabled" <c:if test="${info.scholDivCd eq '10' }">checked</c:if>> <label class="" for="scholDivCd01">초등</label>
-					<input type="radio" id="scholDivCd012" name="scholDivCd" value="20" disabled="disabled" <c:if test="${info.scholDivCd eq '20' }">checked</c:if>> <label class="" for="scholDivCd012">중등</label>
-					<input type="radio" id="scholDivCd0123" name="scholDivCd" value="30" disabled="disabled" <c:if test="${info.scholDivCd eq '30' }">checked</c:if>> <label class="" for="scholDivCd0123">고등</label>
-					<input type="radio" id="scholDivCd01234" name="scholDivCd" value="40" disabled="disabled" <c:if test="${info.scholDivCd eq '40' }">checked</c:if>> <label class="" for="scholDivCd01234">특수</label>
-					<input type="radio" id="scholDivCd012345" name="scholDivCd" value="50" disabled="disabled" <c:if test="${info.scholDivCd eq '50' }">checked</c:if>> <label class="" for="scholDivCd012345">기타</label>
+					<input type="radio" id="scholDivCd01" name="scholDivCd" value="10" onclick="return false;" <c:if test="${info.scholDivCd eq '10' }">checked</c:if>> <label class="" for="scholDivCd01">초등</label>
+					<input type="radio" id="scholDivCd012" name="scholDivCd" value="20" onclick="return false;" <c:if test="${info.scholDivCd eq '20' }">checked</c:if>> <label class="" for="scholDivCd012">중등</label>
+					<input type="radio" id="scholDivCd0123" name="scholDivCd" value="30" onclick="return false;" <c:if test="${info.scholDivCd eq '30' }">checked</c:if>> <label class="" for="scholDivCd0123">고등</label>
+					<input type="radio" id="scholDivCd01234" name="scholDivCd" value="40" onclick="return false;" <c:if test="${info.scholDivCd eq '40' }">checked</c:if>> <label class="" for="scholDivCd01234">특수</label>
+					<input type="radio" id="scholDivCd012345" name="scholDivCd" value="50" onclick="return false;" <c:if test="${info.scholDivCd eq '50' }">checked</c:if>> <label class="" for="scholDivCd012345">기타</label>
 				</td>
 			</tr>
 			<tr>
@@ -680,10 +684,10 @@
 					<p>학교지역특성</p>
 				</th>
 				<td colspan="3">
-					<input type="checkbox" id="islandsYn"  name="islandsYn"  value="Y" disabled="disabled" <c:if test="${info.islandsYn eq 'Y' }">checked</c:if>><label for="islandsYn"> 도서지역</label>
-					<input type="checkbox" id="remoteYn"   name="remoteYn"   value="Y" disabled="disabled" <c:if test="${info.remoteYn eq 'Y' }">checked</c:if>><label for="remoteYn"> 벽지지역</label>
-					<input type="checkbox" id="clsCmbtYn"  name="clsCmbtYn"  value="Y" disabled="disabled" <c:if test="${info.clsCmbtYn eq 'Y' }">checked</c:if>><label for="clsCmbtYn"> 접적지역</label>
-					<input type="checkbox" id="ppulDclnYn" name="ppulDclnYn" value="Y" disabled="disabled" <c:if test="${info.ppulDclnYn eq 'Y' }">checked</c:if>><label for="ppulDclnYn"> 인구감소지역</label>
+					<input type="checkbox" id="islandsYn"  name="islandsYn"  value="Y" onclick="return false;" <c:if test="${info.islandsYn eq 'Y' }">checked</c:if>><label for="islandsYn"> 도서지역</label>
+					<input type="checkbox" id="remoteYn"   name="remoteYn"   value="Y" onclick="return false;" <c:if test="${info.remoteYn eq 'Y' }">checked</c:if>><label for="remoteYn"> 벽지지역</label>
+					<input type="checkbox" id="clsCmbtYn"  name="clsCmbtYn"  value="Y" onclick="return false;" <c:if test="${info.clsCmbtYn eq 'Y' }">checked</c:if>><label for="clsCmbtYn"> 접적지역</label>
+					<input type="checkbox" id="ppulDclnYn" name="ppulDclnYn" value="Y" onclick="return false;" <c:if test="${info.ppulDclnYn eq 'Y' }">checked</c:if>><label for="ppulDclnYn"> 인구감소지역</label>
 				</td>
 			</tr>
 			<tr>
@@ -843,7 +847,7 @@
 				<td colspan="3">
 					<ve:radio codeId="VE0030" name="exprnClsrnAplct" id="exprnClsrnAplct" selectedValue="${empty info.exprnClsrnAplct ? '01' : info.exprnClsrnAplct}" onChange="fncEtcInputEnable(this)"/>
 					<label for="exprnClsrnAplctCn" class="label">신청경로 기타설명</label>
-					<input type="text" value="${info.exprnClsrnAplctCn}" size="25"  id="exprnClsrnAplctCn" name="exprnClsrnAplctCn" ${info.exprnClsrnAplct eq '04' ? '' : 'disabled'}>
+					<input type="text" value="${info.exprnClsrnAplctCn}" size="25"  id="exprnClsrnAplctCn" name="exprnClsrnAplctCn" ${info.exprnClsrnAplct eq '04' ? '' : 'readonly'}>
 				</td>
 			</tr>
 			</tbody>
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 c13b6187..144d8b49 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
@@ -81,6 +81,11 @@
     	    regStatus = false;
 	    }
         $('#regBtn').prop('disabled', regStatus);  // 버튼 비활성화
+        /* 240122 웹접근성으로 인하여 disabled 사용 불가능 - disabled대신 onclick과 데이터툴팁 제거하기 */
+        if ($('#regBtn').prop('disabled')) {
+        	$('#regBtn').removeAttr('onclick').removeAttr('data-tooltip');
+        	$('#regBtn').prop('disabled', false);
+        }
 	}
 
 	function fncGoList(){
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 6d32c8ce..fed21d31 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
@@ -66,6 +66,11 @@
 	    }
 	    console.log('regStatus : ', regStatus);
         $('#regBtn').prop('disabled', regStatus);  // 버튼 비활성화
+        /* 240122 웹접근성으로 인하여 disabled 사용 불가능 - disabled대신 onclick과 데이터툴팁 제거하기 */
+        if ($('#regBtn').prop('disabled')) {
+        	$('#regBtn').removeAttr('onclick').removeAttr('data-tooltip');
+        	$('#regBtn').prop('disabled', false);
+        }
 	}
 
 	function fncGoList(){
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 1cce41cb..feddfd97 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
@@ -255,7 +255,8 @@
 				else
 					appendHtml = '<img id="instrPhoto" alt="'+info.instrNm+' 사진" src="<c:url value="/uss/ion/pwm/getImage.do"/>?atchFileId='+info.phtAtchFileId+'" />'
 				
-				$('#info_instrPhoto').append(appendHtml);
+				//$('#info_instrPhoto').append(appendHtml);
+				$('#info_instrPhoto').html(appendHtml);
 
 				$('#info_phone').text(info.phone);
 				$('#info_email').text(info.email);