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-25 18:28:12 +09:00
commit 9f3618be04
18 changed files with 149 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
View File

@ -632,6 +632,7 @@ public class CndtnPrcsInfoMngController {
vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id
vEPrcsDetailVO.setLctrDivCd(LCTR_DIV_CD); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
vEPrcsDetailVO.setUseYn("Y");
String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID
vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd);
vEPrcsAplctPrdService.insert(vEPrcsDetailVO);

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

@ -668,7 +668,7 @@
</div>
<c:if test="${modelVO.mode eq VeConstants.MODE_CRT}">
<div class="btn_wrap">
<button type="button" class="btnType05" onclick="searchBeforeData();" title="팝업 열림">임시저장 불러오기</button>
<button type="button" class="btnType05" data-tooltip="sub01_pop01" onclick="searchBeforeData();" title="팝업 열림">임시저장 불러오기</button>
</div>
</c:if>
</div>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrFndtnPopList.jsp
View File

@ -286,7 +286,7 @@ $(document).ready(function(){
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="sub36_pop02"]');
activeTarget.hide();
$('[data-tooltip="sub36_pop02"]').focus();
$('[data-info="${vEEduChasiVO.eduAplctOrd}"]').focus();
});
})
@ -307,7 +307,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" tabindex="0" data-info="${vEEduChasiVO.eduAplctOrd}" 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>

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/scholPopList.jsp
View File

@ -182,4 +182,7 @@ $(document).ready(function(){
<!-- //page -->
</div>
</div>
</div>
</form:form>
<!-- 팝업을 위한 mask -->
<div class="mask" id="scholPop_mask" style="display: block;"></div>

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

@ -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}"/>

7
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
View File

@ -156,6 +156,7 @@ $(document).ready(function(){
$applyButton.css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$applyButton.attr('title','비활성화됨');
$applyButton.removeAttr('data-tooltip');
}
});
@ -355,11 +356,11 @@ $(document).ready(function(){
</div>
</div>
<!-- tab -->
<!-- tab 2024.01.25 보류
<ul class="tab tab_02">
<li class="tab_li on"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
<li class="tab_li"><button type="button" class="tab_button" data-info="cal">캘린더형</button></li>
</ul>
</ul>-->
@ -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>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
View File

@ -431,7 +431,7 @@ $(document).ready(function(){
<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
<!-- 작성된 설문이 있다 -->
<button type="button" class="btnType02" data-tooltip="sub37_pop20"
<button type="button" class="btnType02" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문완료</button>
@ -444,7 +444,7 @@ $(document).ready(function(){
<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
<!-- 작성된 설문이 없다 -->
<button type="button" class="btnType01" data-tooltip="sub37_pop20"
<button type="button" class="btnType01" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>

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

@ -351,7 +351,7 @@
<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
<!-- 작성된 설문이 있다 -->
<button type="button" class="btnType02" data-tooltip="sub37_pop20"
<button type="button" class="btnType02" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문완료</button>
@ -364,7 +364,7 @@
<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
<!-- 작성된 설문이 없다 -->
<button type="button" class="btnType01 sur_bt" data-tooltip="sub37_pop20"
<button type="button" class="btnType01 sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>

14
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp
View File

@ -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">

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp
View File

@ -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' : ''}>

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

@ -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" id="regBtn" data-tooltip=""
<button type="button" class="btnType04" id="regBtn" data-info="<c:out value='${list.prcsAplctPrdOrd}'/>" data-tooltip="sub36_pop02"
onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
,'','',''
)" title="팝업 열림">신청</button>

7
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
View File

@ -88,6 +88,7 @@ $(document).ready(function(){
$applyButton.css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$applyButton.attr('title','비활성화됨');
$applyButton.removeAttr('data-tooltip');
}
});
@ -604,11 +605,11 @@ $(document).ready(function(){
</div>
</div>
<!-- tab -->
<!-- tab 2024.01.25 보류
<ul class="tab tab_02">
<li class="tab_li on"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
<li class="tab_li"><button type="button" class="tab_button" data-info="cal">캘린더형</button></li>
</ul>
</ul>-->
<div class="tab_content on">
<div class="list_top">
@ -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>

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

@ -238,7 +238,7 @@
<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
<!-- 작성된 설문이 있다 -->
<button type="button" class="btnType02" data-tooltip="sub36_pop02"
<button type="button" class="btnType02" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문완료</button>
@ -251,7 +251,7 @@
<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
<!-- 작성된 설문이 없다 -->
<button type="button" class="btnType01 sur_bt" data-tooltip="sub36_pop02"
<button type="button" class="btnType01 sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp
View File

@ -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');

16
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
View File

@ -204,6 +204,16 @@ $(document).ready(function(){
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>

12
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp
View File

@ -134,20 +134,14 @@
</a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<kc:code codeId="VE0007" code="${list.eduSlctCd}"/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><kc:code codeId="VE0007" code="${list.eduSlctCd}"/></a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<c:out value='${list.scholInsttNm}'/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><c:out value='${list.scholInsttNm}'/></a>
</td>
<td>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');">
<c:out value='${list.eduPlace}'/>
</a>
<a href="javascript:fncGoDetail('${list.eduAplctOrd}');"><c:out value='${list.eduPlace}'/></a>
</td>
<td>
<c:choose>

6
src/main/webapp/WEB-INF/jsp/web/ve/comm/selectPrcsDetailList.jsp
View File

@ -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();
});

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

@ -1296,6 +1296,8 @@ $(document).ready(function () {
$(".tb_list01 a").each(function(index,itm){
if($(itm).text()==""){
$(itm).attr("tabindex","-1");
$(itm).text("내용없음");
$(itm).css("text-indent","-99999px");
}else{}
});