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>

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

@ -93,93 +93,96 @@ $(document).ready(function(){
<input type="hidden" name="formId" id="formId" value="<c:out value="${scholInfoVO.formId}" />" />
<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_tit">
<p>학교명 검색</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
<div class="cont_body">
<div class="list_top">
<div class="pop_list_top_left">
<label for="searchCondition" class="label">학교급 선택</label>
<kc:select codeId="VE0009" id="searchCondition" name="searchCondition" styleClass="selType1" defaultText="선택" defaultValue="" selectedValue="${scholInfoVO.searchCondition}"/>
</div>
<div class="btn_wrap">
<label for="searchKeyword" class="label">검색어 입력</label>
<input type="text" name="searchKeyword" id="searchKeyword" value="<c:out value='${scholInfoVO.searchKeyword}' />" placeholder="검색어 입력" size="20"
onKeypress="javascript:if(event.keyCode==13) {fncGoScholList(); return false;}"/>
<button type="button" class="btnType07" onclick="fncGoScholList(); return false;">검색</button>
</div>
</div>
<div class="pop_tb_type02">
<table>
<caption>학교명 검색 학교급, 지역, 행정구, 선택 을/를 제공하는 표</caption>
<colgroup>
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
<th scope="col">학교급</th>
<th scope="col">지역</th>
<th scope="col">행정구</th>
<th scope="col">선택</th>
</tr>
</thead>
<tbody>
<c:forEach var="row" items="${scholList}" varStatus="status">
<tr>
<th scope="row"><c:out value="${row.scholGradeNm}" /></th>
<td><c:out value="${row.locNm}" /></td>
<td><c:out value="${row.newAddrDtl}" /></td>
<td class="c_ce4900">
<a href="#" onclick="fncScholDataSlct(this); return false;"><c:out value="${row.scholNm}" /></a>
<input type="hidden" name="scholId" value="${row.scholId}"/>
<input type="hidden" name="offcCd" value="${row.offcCd}"/>
<input type="hidden" name="offcNm" value="${row.offcNm}"/>
<input type="hidden" name="stndrdScholCd" value="${row.stndrdScholCd}"/>
<input type="hidden" name="scholNm" value="${row.scholNm}"/>
<input type="hidden" name="scholNmEng" value="${row.scholNmEng}"/>
<input type="hidden" name="scholGradeNm" value="${row.scholGradeNm}"/>
<input type="hidden" name="locNm" value="${row.locNm}"/>
<input type="hidden" name="cptntOrgnzNm" value="${row.cptntOrgnzNm}"/>
<input type="hidden" name="estbsNm" value="${row.estbsNm}"/>
<input type="hidden" name="newZipcd" value="${row.newZipcd}"/>
<input type="hidden" name="newAddr" value="${row.newAddr}"/>
<input type="hidden" name="newAddrDtl" value="${row.newAddrDtl}"/>
<input type="hidden" name="telNum" value="${row.telNum}"/>
<input type="hidden" name="homepage" value="${row.homepage}"/>
<input type="hidden" name="coeduDivsnNm" value="${row.coeduDivsnNm}"/>
<input type="hidden" name="faxNum" value="${row.faxNum}"/>
<input type="hidden" name="hsDivsnNm" value="${row.hsDivsnNm}"/>
<input type="hidden" name="indSpclCls" value="${row.indSpclCls}"/>
<input type="hidden" name="hsTypeNm" value="${row.hsTypeNm}"/>
<input type="hidden" name="spclPrpsHsLineNm" value="${row.spclPrpsHsLineNm}"/>
<input type="hidden" name="exmPrdDivsnNm" value="${row.exmPrdDivsnNm}"/>
<input type="hidden" name="dnDvisnNm" value="${row.dnDvisnNm}"/>
<input type="hidden" name="estbsDt" value="${row.estbsDt}"/>
<input type="hidden" name="scholDivCd" value="${row.scholDivCd}"/>
<input type="hidden" name="isltnScholYn" value="${row.isltnScholYn}"/>
<input type="hidden" name="isltnYn" value="${row.isltnYn}"/>
<input type="hidden" name="isltn2Yn" value="${row.isltn2Yn}"/>
<input type="hidden" name="isltn3Yn" value="${row.isltn3Yn}"/>
<input type="hidden" name="ppltnReducAreaYn" value="${row.ppltnReducAreaYn}"/>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
<!-- page -->
<div class="page">
<ui:pagination paginationInfo = "${paginationInfo}" type="image" jsFunction="linkPage" />
<div class="popup_tit">
<p>학교명 검색</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
<div class="cont_body">
<div class="list_top">
<div class="pop_list_top_left">
<label for="searchCondition" class="label">학교급 선택</label>
<kc:select codeId="VE0009" id="searchCondition" name="searchCondition" styleClass="selType1" defaultText="선택" defaultValue="" selectedValue="${scholInfoVO.searchCondition}"/>
</div>
<div class="btn_wrap">
<label for="searchKeyword" class="label">검색어 입력</label>
<input type="text" name="searchKeyword" id="searchKeyword" value="<c:out value='${scholInfoVO.searchKeyword}' />" placeholder="검색어 입력" size="20"
onKeypress="javascript:if(event.keyCode==13) {fncGoScholList(); return false;}"/>
<button type="button" class="btnType07" onclick="fncGoScholList(); return false;">검색</button>
</div>
</div>
<div class="pop_tb_type02">
<table>
<caption>학교명 검색 학교급, 지역, 행정구, 선택 을/를 제공하는 표</caption>
<colgroup>
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: 20%;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
<th scope="col">학교급</th>
<th scope="col">지역</th>
<th scope="col">행정구</th>
<th scope="col">선택</th>
</tr>
</thead>
<tbody>
<c:forEach var="row" items="${scholList}" varStatus="status">
<tr>
<th scope="row"><c:out value="${row.scholGradeNm}" /></th>
<td><c:out value="${row.locNm}" /></td>
<td><c:out value="${row.newAddrDtl}" /></td>
<td class="c_ce4900">
<a href="#" onclick="fncScholDataSlct(this); return false;"><c:out value="${row.scholNm}" /></a>
<input type="hidden" name="scholId" value="${row.scholId}"/>
<input type="hidden" name="offcCd" value="${row.offcCd}"/>
<input type="hidden" name="offcNm" value="${row.offcNm}"/>
<input type="hidden" name="stndrdScholCd" value="${row.stndrdScholCd}"/>
<input type="hidden" name="scholNm" value="${row.scholNm}"/>
<input type="hidden" name="scholNmEng" value="${row.scholNmEng}"/>
<input type="hidden" name="scholGradeNm" value="${row.scholGradeNm}"/>
<input type="hidden" name="locNm" value="${row.locNm}"/>
<input type="hidden" name="cptntOrgnzNm" value="${row.cptntOrgnzNm}"/>
<input type="hidden" name="estbsNm" value="${row.estbsNm}"/>
<input type="hidden" name="newZipcd" value="${row.newZipcd}"/>
<input type="hidden" name="newAddr" value="${row.newAddr}"/>
<input type="hidden" name="newAddrDtl" value="${row.newAddrDtl}"/>
<input type="hidden" name="telNum" value="${row.telNum}"/>
<input type="hidden" name="homepage" value="${row.homepage}"/>
<input type="hidden" name="coeduDivsnNm" value="${row.coeduDivsnNm}"/>
<input type="hidden" name="faxNum" value="${row.faxNum}"/>
<input type="hidden" name="hsDivsnNm" value="${row.hsDivsnNm}"/>
<input type="hidden" name="indSpclCls" value="${row.indSpclCls}"/>
<input type="hidden" name="hsTypeNm" value="${row.hsTypeNm}"/>
<input type="hidden" name="spclPrpsHsLineNm" value="${row.spclPrpsHsLineNm}"/>
<input type="hidden" name="exmPrdDivsnNm" value="${row.exmPrdDivsnNm}"/>
<input type="hidden" name="dnDvisnNm" value="${row.dnDvisnNm}"/>
<input type="hidden" name="estbsDt" value="${row.estbsDt}"/>
<input type="hidden" name="scholDivCd" value="${row.scholDivCd}"/>
<input type="hidden" name="isltnScholYn" value="${row.isltnScholYn}"/>
<input type="hidden" name="isltnYn" value="${row.isltnYn}"/>
<input type="hidden" name="isltn2Yn" value="${row.isltn2Yn}"/>
<input type="hidden" name="isltn3Yn" value="${row.isltn3Yn}"/>
<input type="hidden" name="ppltnReducAreaYn" value="${row.ppltnReducAreaYn}"/>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
<!-- page -->
<div class="page">
<ui:pagination paginationInfo = "${paginationInfo}" type="image" jsFunction="linkPage" />
</div>
<!-- //page -->
</div>
<!-- //page -->
</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/>