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-26 10:31:03 +09:00
commit dae1f95471
8 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -624,12 +624,14 @@
<p>교육매체</p> <p>교육매체</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<label for="eduMd" class="label">교육매체 입력</label>
<ve:radio codeId="VEA015" id="eduMdCd" name="eduMdCd" <ve:radio codeId="VEA015" id="eduMdCd" name="eduMdCd"
selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}" selectedValue="${empty info.eduMdCd ? '01' : info.eduMdCd}"
onChange="eduMdChg();" onChange="eduMdChg();"
/> />
<label for="eduMd" class="label">교육매체 입력</label>
<input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25"> <input type="text" name="eduMd" id="eduMd" value="${info.eduMd}" size="25">
</td> </td>
</tr> </tr>
<tr class="input_adress" id="juso"> <tr class="input_adress" id="juso">

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

@ -1136,7 +1136,7 @@
<span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 운영지원금 지원을 위한 계획서(계획은 운영에 따라 변경 가능)<br/>※ 담당교사의 재량으로 자율 편성하되, 1일 최대 2차시까지만 운영 가능</span> <span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 운영지원금 지원을 위한 계획서(계획은 운영에 따라 변경 가능)<br/>※ 담당교사의 재량으로 자율 편성하되, 1일 최대 2차시까지만 운영 가능</span>
</div> </div>
</div> </div>
<div class="tb_type02 tb_type02_write"> <div class="tb_type02">
<table class="addClassRow" rowLimit="1" > <table class="addClassRow" rowLimit="1" >
<colgroup> <colgroup>
<col style="width: 10%;"> <col style="width: 10%;">

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

@ -219,7 +219,12 @@ $(document).ready(function(){
btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus-next','sub36_pop02');
btnLast.attr('data-focus','sub36_pop02_close'); btnLast.attr('data-focus','sub36_pop02_close');
*/ */
// 레이어팝업 포커싱 이동 수정
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
activeTarget.hide();
$('[data-tooltip="sub37_pop20"]:nth-child(2)').focus();
});
}) })
function onclickPrint() { function onclickPrint() {
@ -264,9 +269,9 @@ $(document).ready(function(){
<input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}"> <input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}">
<div class="tooltip-wrap srvyPopupPrintDiv" id="srvyPopupPrintDiv"> <div class="tooltip-wrap srvyPopupPrintDiv" id="srvyPopupPrintDiv">
<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-tooltip-con="sub37_pop20" data-focus="sub37_pop20" data-focus-prev="sub37_pop20_close">
<div class="popup_tit"> <div class="popup_tit">
<p>강의만족도 설문지 출력</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button> <p>강의만족도 설문지 출력</p> <button class="btn_popup_close tooltip-close" data-focus="sub37_pop20_close" title="팝업 닫기"><i></i></button>
</div> </div>
<div class="popup_cont"> <div class="popup_cont">
@ -447,7 +452,11 @@ $(document).ready(function(){
<!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> --> <!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> -->
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button> <button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button> <<<<<<< HEAD
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
=======
<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="sub36_pop02">취소</button>
>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>
@ -466,7 +475,11 @@ $(document).ready(function(){
</div> </div>
<div class="btn_center"> <div class="btn_center">
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button> <button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button> <<<<<<< HEAD
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">닫기</button>
=======
<button type="button" class="btnType02 tooltip-close" data-focus="sub36_pop02_close" data-focus-next="ssub36_pop02">닫기</button>
>>>>>>> branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>

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

@ -219,6 +219,12 @@ $(document).ready(function(){
btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus-next','sub36_pop02');
btnLast.attr('data-focus','sub36_pop02_close'); btnLast.attr('data-focus','sub36_pop02_close');
*/ */
// 레이어팝업 포커싱 이동 수정
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
activeTarget.hide();
$('[data-tooltip="sub37_pop20"]:first-child').focus();
});
}) })
</script> </script>
@ -230,9 +236,9 @@ $(document).ready(function(){
<input type="hidden" name="qestnrId" id="qestnrId" value="${chasiSrvyList[0].qestnrId}"> <input type="hidden" name="qestnrId" id="qestnrId" value="${chasiSrvyList[0].qestnrId}">
<input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}"> <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-tooltip-con="sub37_pop20" data-focus="sub37_pop20" data-focus-prev="sub37_pop20_close">
<div class="popup_tit"> <div class="popup_tit">
<p>강의만족도 결과 등록</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button> <p>강의만족도 결과 등록</p> <button class="btn_popup_close tooltip-close" data-focus="sub37_pop20_close" title="팝업 닫기"><i></i></button>
</div> </div>
<div class="popup_cont"> <div class="popup_cont">
@ -423,8 +429,7 @@ $(document).ready(function(){
<div class="btn_center"> <div class="btn_center">
<button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>
@ -442,8 +447,7 @@ $(document).ready(function(){
<div class="btn_left"> <div class="btn_left">
</div> </div>
<div class="btn_center"> <div class="btn_center">
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">닫기</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button>
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>

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

@ -219,7 +219,12 @@ $(document).ready(function(){
btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus-next','sub36_pop02');
btnLast.attr('data-focus','sub36_pop02_close'); btnLast.attr('data-focus','sub36_pop02_close');
*/ */
// 레이어팝업 포커싱 이동 수정
$(".tooltip-close").click(function(){
var activeTarget = $('[data-tooltip-con="sub37_pop20"]');
activeTarget.hide();
$('[data-tooltip="sub37_pop20"]:last-child').focus();
});
}) })
function onclickPrint() { function onclickPrint() {
@ -264,9 +269,9 @@ $(document).ready(function(){
<input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}"> <input type="hidden" name="qestmInfoSize" id="qestmInfoSize" value="${fn:length(chasiSrvyList)}">
<div class="tooltip-wrap srvyPopupPrintDiv" id="srvyPopupPrintDiv"> <div class="tooltip-wrap srvyPopupPrintDiv" id="srvyPopupPrintDiv">
<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-tooltip-con="sub37_pop20" data-focus="sub37_pop20" data-focus-prev="sub37_pop20_close">
<div class="popup_tit"> <div class="popup_tit">
<p>강의만족도 설문지 QR</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button> <p>강의만족도 설문지 QR</p> <button class="btn_popup_close tooltip-close" data-focus="sub37_pop20_close" title="팝업 닫기"><i></i></button>
</div> </div>
<div class="popup_cont"> <div class="popup_cont">
@ -489,8 +494,7 @@ $(document).ready(function(){
<!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> --> <!-- <button type="button" class="btnType05" id="popupSubmin" onclick="popupSrvySendSubmit();">제출</button> -->
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button> <button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">취소</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>
@ -509,7 +513,7 @@ $(document).ready(function(){
</div> </div>
<div class="btn_center"> <div class="btn_center">
<button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button> <button type="button" class="btnType05" id="popupSubmin" onclick="onclickPrint();" title="새창 열림">출력</button>
<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button> <button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop20_close" data-focus-next="sub37_pop20">닫기</button>
</div> </div>
<div class="btn_right"> <div class="btn_right">
</div> </div>

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

@ -402,7 +402,7 @@
<div class="tooltip-wrap"> <div class="tooltip-wrap">
<div class="popup_wrap popType05" tabindex="0" data-tooltip-con="sub37_pop02" data-focus="sub37_pop02" data-focus-prev="sub37_pop02_close"> <div class="popup_wrap popType05" tabindex="0" data-tooltip-con="sub37_pop02" data-focus="sub37_pop02" data-focus-prev="sub37_pop02_close">
<div class="popup_tit"> <div class="popup_tit">
<p>양식 업로드</p> <p>양1식 업로드</p>
<button class="btn_popup_close tooltip-close" data-focus="sub37_pop02_close" title="팝업 닫기"><i></i></button> <button class="btn_popup_close tooltip-close" data-focus="sub37_pop02_close" title="팝업 닫기"><i></i></button>
</div> </div>
<div class="popup_cont"> <div class="popup_cont">
@ -427,7 +427,7 @@
<tr> <tr>
<td> <td>
<c:if test="${not empty list.instrNm}"> <c:if test="${not empty list.instrNm}">
<input name="chk" id="<c:out value="${list.userId}"/>" type="checkbox" value="<c:out value="${list.userId}"/>"/> <label for="<c:out value="${list.userId}"/>"></label> <input name="chk" id="<c:out value="${list.userId}"/>" type="checkbox" title="${empty list.instrNm ? '-' : list.instrNm}선택" value="<c:out value="${list.userId}"/>"/> <label for="<c:out value="${list.userId}"/>"></label>
</c:if> </c:if>
${empty list.instrNm ? '-' : list.instrNm} ${empty list.instrNm ? '-' : list.instrNm}
</td> </td>

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

@ -1266,11 +1266,13 @@ function _chkChasiTime(p_this){
if (v_eduPlaceCd=='99'){ if (v_eduPlaceCd=='99'){
/* v_eduPlace.removeAttr('disabled'); */ /* v_eduPlace.removeAttr('disabled'); */
v_eduPlace.removeAttr('readonly'); v_eduPlace.removeAttr('readonly');
v_eduPlace.attr("style","background-color:#fff !important");
}else{ }else{
v_eduPlace.val(''); v_eduPlace.val('');
/* v_eduPlace.attr('disabled', 'disabled'); */ /* v_eduPlace.attr('disabled', 'disabled'); */
v_eduPlace.attr('readonly', 'readonly'); v_eduPlace.attr('readonly', 'readonly');
v_eduPlace.removeAttr("style");
} }
} }
@ -1551,6 +1553,7 @@ function _chkChasiTime(p_this){
selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}" selectedValue="${empty info.eduPlaceCd ? '01' : info.eduPlaceCd}"
onChange="eduPlaceChg();" onChange="eduPlaceChg();"
/> />
<label for="eduPlace" class="label">교육장소 입력</label>
<input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" readonly> <input type="text" value="${info.eduPlace}" name="eduPlace" id="eduPlace" size="25" readonly>
</td> </td>
</tr> </tr>
@ -1586,7 +1589,7 @@ function _chkChasiTime(p_this){
<span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)</span> <span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)</span>
</div> </div>
<div class="btn_wrap"> <div class="btn_wrap">
<button type="button" class="btnType01" data-tooltip="sub01_pop03" onclick="fncCalView();" title="팝업 열림">교육일정달력보기</button> <!-- 2024.01.25 <button type="button" class="btnType01" data-tooltip="sub01_pop03" onclick="fncCalView();" title="팝업 열림">교육일정달력보기</button> -->
<button type="button" class="btnType05" title="교육차시 입력테이블 추가생성" onclick="addEduClassCopyTngr('addClassRow')">교육추가</button> <button type="button" class="btnType05" title="교육차시 입력테이블 추가생성" onclick="addEduClassCopyTngr('addClassRow')">교육추가</button>
</div> </div>
</div> </div>

8
src/main/webapp/WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp
View File

@ -12,7 +12,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
boardCaptionDetailToggle3(); //boardCaptionDetailToggle3();
// 레이어팝업 포커싱 이동 수정 // 레이어팝업 포커싱 이동 수정
$(".tooltip-close").click(function(){ $(".tooltip-close").click(function(){
@ -92,12 +92,12 @@
return true; return true;
} }
</script> </script>
<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="sub01_pop01" data-focus="sub01_pop01" data-focus-prev="list_popup_close"> <div class="popup_wrap popType01" tabindex="0" data-tooltip-con="sub01_pop01" data-focus="sub01_pop01" data-focus-prev="sub01_pop01_close">
<form:form id="createForm" name="createForm" commandName="vEEduAplctVO"> <form:form id="createForm" name="createForm" commandName="vEEduAplctVO">
<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${info.eduAplctOrd}" /> <input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${info.eduAplctOrd}" />
<div class="popup_tit"> <div class="popup_tit">
<p>담당자 정보 수정</p> <p>담당자 정보 수정</p>
<button class="btn_popup_close tooltip-close" data-focus="list_popup_close" title="팝업 닫기"><i></i></button> <button class="btn_popup_close tooltip-close" data-focus="sub01_pop01_close" title="팝업 닫기"><i></i></button>
</div> </div>
<div class="popup_cont"> <div class="popup_cont">
<div class="cont_body"> <div class="cont_body">
@ -185,7 +185,7 @@
</div> </div>
<div class="btn_center"> <div class="btn_center">
<button type="button" class="btnType06" onclick="fncUpdateSubmit();">수정</button> <button type="button" class="btnType06" onclick="fncUpdateSubmit();">수정</button>
<button type="button" class="btnType02 tooltip-close" data-focus="list_popup_close" data-focus-next="sub01_pop01">취소</button> <button type="button" class="btnType02 tooltip-close" data-focus="sub01_pop01_close" data-focus-next="sub01_pop01">취소</button>
</div> </div>
<div class="btn_right"> <div class="btn_right">