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

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2024-01-25 16:00:57 +09:00
commit 49a6a68ca0
6 changed files with 10 additions and 8 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(); VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO();
vEInstrDetailVOInfo.setInstrDiv("10"); vEInstrDetailVOInfo.setInstrDiv("10");
vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId()); //영상 촬영을 위하여 임시로 로그인 ID 값 사용
/*vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId());*/
vEInstrDetailVOInfo.setUserId(loginVO.getUniqId());
vEInstrDetailVOInfo.setUseYn("Y"); vEInstrDetailVOInfo.setUseYn("Y");
vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo);
if (vEInstrDetailVOInfo != null) { if (vEInstrDetailVOInfo != null) {
@ -708,7 +710,9 @@ public class VEEduEndController {
// 강사 상세정보 // 강사 상세정보
VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO();
vEInstrDetailVOInfo.setInstrDiv("10"); vEInstrDetailVOInfo.setInstrDiv("10");
vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId()); //영상 촬영을 위하여 임시로 로그인 ID 값 사용
/*vEInstrDetailVOInfo.setUserId(vEInstrFeeAcmdtVO.getUserId());*/
vEInstrDetailVOInfo.setUserId(loginVO.getUniqId());
vEInstrDetailVOInfo.setUseYn("Y"); vEInstrDetailVOInfo.setUseYn("Y");
vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo);
if (vEInstrDetailVOInfo != null) { 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.setFrstRegisterId(loginVO.getUniqId()); //esntl_id
vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
vEPrcsDetailVO.setUseYn("Y");
vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdGnrService.getNextStringId()); // 고유ID 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> <th scope="row">의뢰상태</th>
<td> <td>
<ve:select codeId="VEA005" name="reqStateCd" id="reqStateCd" css="class='sel_type1'" <ve:select codeId="VEA005" name="reqStateCd" id="reqStateCd" css="class='sel_type1'"
selectedText="교육대기" defaultValue="10"
defaultText='선택'
/> />
</td> </td>
<th scope="row">검사명</th> <th scope="row">검사명</th>

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

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

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

@ -331,7 +331,7 @@
<td> <td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}"> <c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap"> <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> <button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div> </div>
<div id="docAtch"></div><br/> <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> <td>
<c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}"> <c:if test="${instrInfo.docAtchFileId == null || instrInfo.docAtchFileId == ''}">
<div class="btn_wrap"> <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> <button type="button" onclick="fileSave();" class="btnType01 docAtch_btn_add_file">제출</button>
</div> </div>
<div id="docAtch"></div><br/> <div id="docAtch"></div><br/>