tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2024-01-22 17:23:59 +09:00
commit a64c42cce8
11 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
View File

@ -1404,6 +1404,7 @@
VE_EDU_APLCT a VE_EDU_APLCT a
WHERE USER_ID = #userId# WHERE USER_ID = #userId#
AND LCTR_DIV_CD = '30' AND LCTR_DIV_CD = '30'
AND SBMT_YN = 'Y'
<!-- AND APRVL_CD >= '20' --> <!-- AND APRVL_CD >= '20' -->
</select> </select>

4
src/main/resources/egovframework/sqlmap/ve/edu/VEEduOptrn_SQL_Tibero.xml
View File

@ -86,9 +86,9 @@
<isNotEmpty property="exprnClsrnCd"> <isNotEmpty property="exprnClsrnCd">
,EXPRN_CLSRN_CD = #exprnClsrnCd# ,EXPRN_CLSRN_CD = #exprnClsrnCd#
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="exprnClsrnYear"> <!-- <isNotEmpty property="exprnClsrnYear"> -->
,EXPRN_CLSRN_YEAR = #exprnClsrnYear# ,EXPRN_CLSRN_YEAR = #exprnClsrnYear#
</isNotEmpty> <!-- </isNotEmpty> -->
<isNotEmpty property="exprnClsrnAplct"> <isNotEmpty property="exprnClsrnAplct">
,EXPRN_CLSRN_APLCT = #exprnClsrnAplct# ,EXPRN_CLSRN_APLCT = #exprnClsrnAplct#
</isNotEmpty> </isNotEmpty>

8
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -197,7 +197,8 @@ function usrJoin(){
cache: false, cache: false,
success: function (returnData, status) { success: function (returnData, status) {
if(returnData.status == 'loginY'){ 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') { } else if(returnData.status == 'fail') {
alert("key 갱신 오류"); alert("key 갱신 오류");
} else if(returnData.status == 'loginN'){ } else if(returnData.status == 'loginN'){
@ -211,7 +212,8 @@ function usrJoin(){
}); });
}else{ //비로그인 상태일시 }else{ //비로그인 상태일시
window.location.href = url; /* window.location.href = url; */
window.open(url);
} }
@ -254,7 +256,7 @@ function usrJoin(){
<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/kcc_ci.png" alt="한국저작권위원회"> <img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/kcc_ci.png" alt="한국저작권위원회">
<span>GO</span> <span>GO</span>
</button> </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>--> </div>-->
<%-- <button class="site" onclick="window.open('https://www.copyright.or.kr/main.do')" title="새창열림"> <%-- <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="한국저작권위원회"> <img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/kcc_ci.png" alt="한국저작권위원회">

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
View File

@ -505,7 +505,8 @@
else else
appendHtml = '<img id="instrPhoto" alt="'+info.instrNm+' 사진" src="<c:url value="/uss/ion/pwm/getImage.do"/>?atchFileId='+info.phtAtchFileId+'" />' 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_phone').text(info.phone);
$('#info_email').text(info.email); $('#info_email').text(info.email);

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp
View File

@ -238,7 +238,7 @@
</th> </th>
<td> <td>
<kc:code codeId="VE0030" code="${info.exprnClsrnAplct}"/> <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}) &nbsp;&nbsp;&nbsp;(기타 내용 : ${info.exprnClsrnAplctCn})
</c:if> </c:if>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp
View File

@ -304,7 +304,7 @@
</th> </th>
<td> <td>
<kc:code codeId="VE0030" code="${info.exprnClsrnAplct}"/> <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}) &nbsp;&nbsp;&nbsp;(기타 내용 : ${info.exprnClsrnAplctCn})
</c:if> </c:if>

40
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp
View File

@ -38,7 +38,8 @@
// cmpltNoFormat(document.getElementById('cmpltNum')); // cmpltNoFormat(document.getElementById('cmpltNum'));
if('${info.exprnClsrnCd}' == '02'){ 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); $('input[name="eClsrnYear"]').prop('checked',false);
} }
}); });
@ -46,9 +47,11 @@
function oprtnYn(){ function oprtnYn(){
var radioVal = $('input[name="exprnClsrnCd"]:checked').val(); var radioVal = $('input[name="exprnClsrnCd"]:checked').val();
if(radioVal == "01"){ if(radioVal == "01"){
$('input[name="eClsrnYear"]').attr('disabled',false); /* $('input[name="eClsrnYear"]').attr('disabled',false); */
$('input[name="eClsrnYear"]').removeAttr("onclick")
}else{ }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); $('input[name="eClsrnYear"]').prop('checked',false);
} }
} }
@ -548,7 +551,8 @@
$('input[name=exprnClsrnCd][value='+info.exprnClsrnCd+']').prop('checked', true); $('input[name=exprnClsrnCd][value='+info.exprnClsrnCd+']').prop('checked', true);
if(info.exprnClsrnCd == '02'){ 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); $('input[name=eClsrnYear]').prop('checked',false);
if(isNotEmpty(info.exprnClsrnYear)){ if(isNotEmpty(info.exprnClsrnYear)){
@ -560,10 +564,10 @@
$('input[name=exprnClsrnAplct][value='+info.exprnClsrnAplct+']').prop('checked', true); $('input[name=exprnClsrnAplct][value='+info.exprnClsrnAplct+']').prop('checked', true);
if(info.exprnClsrnAplct == '04'){ if(info.exprnClsrnAplct == '04'){
$("#exprnClsrnAplctCn").prop('disabled' , false); $("#exprnClsrnAplctCn").prop('readonly' , false);
$("#exprnClsrnAplctCn").val(info.exprnClsrnAplctCn); $("#exprnClsrnAplctCn").val(info.exprnClsrnAplctCn);
}else{ }else{
$("#exprnClsrnAplctCn").prop('disabled' , true); $("#exprnClsrnAplctCn").prop('readonly' , true);
$("#exprnClsrnAplctCn").val(''); $("#exprnClsrnAplctCn").val('');
} }
@ -587,9 +591,9 @@
function fncEtcInputEnable(thisObj){ function fncEtcInputEnable(thisObj){
$("#exprnClsrnAplctCn").val(''); $("#exprnClsrnAplctCn").val('');
if($(thisObj).val() == '04'){ if($(thisObj).val() == '04'){
$("#exprnClsrnAplctCn").prop('disabled' , false); $("#exprnClsrnAplctCn").prop('readonly' , false);
}else{ }else{
$("#exprnClsrnAplctCn").prop('disabled' , true); $("#exprnClsrnAplctCn").prop('readonly' , true);
} }
} }
@ -668,11 +672,11 @@
<p>학교구분</p> <p>학교구분</p>
</th> </th>
<td colspan="3"> <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="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" disabled="disabled" <c:if test="${info.scholDivCd eq '20' }">checked</c:if>> <label class="" for="scholDivCd012">중등</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" disabled="disabled" <c:if test="${info.scholDivCd eq '30' }">checked</c:if>> <label class="" for="scholDivCd0123">고등</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" disabled="disabled" <c:if test="${info.scholDivCd eq '40' }">checked</c:if>> <label class="" for="scholDivCd01234">특수</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" disabled="disabled" <c:if test="${info.scholDivCd eq '50' }">checked</c:if>> <label class="" for="scholDivCd012345">기타</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> </td>
</tr> </tr>
<tr> <tr>
@ -680,10 +684,10 @@
<p>학교지역특성</p> <p>학교지역특성</p>
</th> </th>
<td colspan="3"> <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="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" disabled="disabled" <c:if test="${info.remoteYn eq 'Y' }">checked</c:if>><label for="remoteYn"> 벽지지역</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" disabled="disabled" <c:if test="${info.clsCmbtYn eq 'Y' }">checked</c:if>><label for="clsCmbtYn"> 접적지역</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" disabled="disabled" <c:if test="${info.ppulDclnYn eq 'Y' }">checked</c:if>><label for="ppulDclnYn"> 인구감소지역</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> </td>
</tr> </tr>
<tr> <tr>
@ -843,7 +847,7 @@
<td colspan="3"> <td colspan="3">
<ve:radio codeId="VE0030" name="exprnClsrnAplct" id="exprnClsrnAplct" selectedValue="${empty info.exprnClsrnAplct ? '01' : info.exprnClsrnAplct}" onChange="fncEtcInputEnable(this)"/> <ve:radio codeId="VE0030" name="exprnClsrnAplct" id="exprnClsrnAplct" selectedValue="${empty info.exprnClsrnAplct ? '01' : info.exprnClsrnAplct}" onChange="fncEtcInputEnable(this)"/>
<label for="exprnClsrnAplctCn" class="label">신청경로 기타설명</label> <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> </td>
</tr> </tr>
</tbody> </tbody>

5
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
View File

@ -81,6 +81,11 @@
regStatus = false; regStatus = false;
} }
$('#regBtn').prop('disabled', 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(){ function fncGoList(){

5
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
View File

@ -66,6 +66,11 @@
} }
console.log('regStatus : ', regStatus); console.log('regStatus : ', regStatus);
$('#regBtn').prop('disabled', 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(){ function fncGoList(){

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
View File

@ -255,7 +255,8 @@
else else
appendHtml = '<img id="instrPhoto" alt="'+info.instrNm+' 사진" src="<c:url value="/uss/ion/pwm/getImage.do"/>?atchFileId='+info.phtAtchFileId+'" />' 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_phone').text(info.phone);
$('#info_email').text(info.email); $('#info_email').text(info.email);

2
src/main/webapp/visitEdu/usr/publish/css/content.css
View File

@ -382,7 +382,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
/* 체험교실대시보드 7단계 */ /* 체험교실대시보드 7단계 */
.ex_process {display:flex; justify-content:space-between;} .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 {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;} .ex_process li.p_on {/*background-color:#f37632;*/ background-color:#f05f0f;}