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

Merge branch 'advc' of

Browse Source 
http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

Conflicts:
	src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
This commit is contained in:
subsub 2024-01-25 17:28:50 +09:00
commit dff27e8289
10 changed files with 104 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java
View File

@ -576,7 +576,9 @@ public class VEEduEndController {
// 강사 상세정보
VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO();
vEInstrDetailVOInfo.setInstrDiv("10");
vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId());
//영상 촬영을 위하여 임시로 로그인 ID 값 사용
/*vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId());*/
vEInstrDetailVOInfo.setUserId(loginVO.getUniqId());
vEInstrDetailVOInfo.setUseYn("Y");
vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo);
if (vEInstrDetailVOInfo != null) {
@ -708,7 +710,9 @@ public class VEEduEndController {
// 강사 상세정보
VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO();
vEInstrDetailVOInfo.setInstrDiv("10");
vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId());
//영상 촬영을 위하여 임시로 로그인 ID 값 사용
/*vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId());*/
vEInstrDetailVOInfo.setUserId(loginVO.getUniqId());
vEInstrDetailVOInfo.setUseYn("Y");
vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo);
if (vEInstrDetailVOInfo != null) {

2
src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java
View File

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

2
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
View File

@ -453,8 +453,6 @@
<th scope="row">의뢰상태</th>
<td>
<ve:select codeId="VEA005" name="reqStateCd" id="reqStateCd" css="class='sel_type1'"
selectedText="교육대기" defaultValue="10"
defaultText='선택'
/>
</td>
<th scope="row">검사명</th>

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>

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>

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

@ -356,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>-->

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-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-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>

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" data-info="<c:out value='${list.prcsAplctPrdOrd}'/>" data-tooltip="sub36_pop02"
<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>

2
src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp
View File

@ -331,7 +331,7 @@
<td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap">
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">강의계획서 파일찾기</button>
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">결과보고서 파일찾기</button>
<button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div>
<div id="docAtch"></div><br/>

2
src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp
View File

@ -317,7 +317,7 @@
<td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap">
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">강의계획서 파일찾기</button>
<button type="button" onclick="control1.openFileDialogSingle();" class="btnType01 docAtch_btn_add_file">결과보고서 파일찾기</button>
<button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div>
<div id="docAtch"></div><br/>