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' 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 @@ ,EXPRN_CLSRN_CD = #exprnClsrnCd# - + ,EXPRN_CLSRN_YEAR = #exprnClsrnYear# - + ,EXPRN_CLSRN_APLCT = #exprnClsrnAplct# 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 = ''+info.instrNm+' 사진?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 @@ - +    (기타 내용 : ${info.exprnClsrnAplctCn}) 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 @@ - +    (기타 내용 : ${info.exprnClsrnAplctCn}) 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 @@

학교구분

- checked
> - checked
> - checked> - checked> - checked> + checked> + checked> + checked> + checked> + checked> @@ -680,10 +684,10 @@

학교지역특성

- checked> - checked> - checked> - checked> + checked> + checked> + checked> + checked> @@ -843,7 +847,7 @@ - + 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 = ''+info.instrNm+' 사진?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);