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-02-22 18:02:33 +09:00
commit 6c35226bfc
4 changed files with 14 additions and 9 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/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp
View File

@ -1338,8 +1338,8 @@
<div class="btn_left">
</div>
<div class="btn_center">
<!-- 231101 요청사항으로 교육콘텐츠 관련 메뉴 삭제 -->
<button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button>
<!-- 240222 요청으로 교육콘텐츠 버튼 삭제 -->
<!-- <button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button> -->
<c:if test="${info.aprvlCd eq VeConstants.EXPRN_APRVL_CD_50 or (rsltAllYn eq 'N' and info.aprvlCd > VeConstants.EXPRN_APRVL_CD_50)}">
<button type="button" class="btnType05" onclick="fncGoRslt();">결과보고제출</button>
</c:if>

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

@ -94,10 +94,11 @@
<div class="list_view">
<div class="view_top">
<p class="view_title"><c:out value="${detailVO.title}" /></p>
<div class="view_info">
<!-- 20240222 요청으로 인하여 주석 -->
<%-- <div class="view_info">
<p>담당부서 <span><c:out value="${detailVO.dprtmNm}"/></span></p>
<p>등록일<span><c:out value="${detailVO.frstRegistPnttm}" /></span></p>
</div>
</div> --%>
<div class="view_info info_con">
<dl>
<dd>

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

@ -23,16 +23,19 @@
<div class="cont_wrap" id="sub" style="margin-top:20px;">
<div class="cont_tit">
<h2>운영신청 안내</h2>
<h2>운영지침 안내</h2>
</div>
<div class="list_view">
<div class="view_top">
<p class="view_title"><c:out value="${fn:substring(detailVO.frstRegistPnttm, 2, 4)}" />년 체험교실 운영 지침 안내</p>
<div class="view_info">
<c:set var="now" value="<%=new java.util.Date()%>" />
<c:set var="sysYear"><fmt:formatDate value="${now}" pattern="yyyy" /></c:set>
<p class="view_title"><c:out value="${fn:substring(sysYear, 2, 4)}" />년 체험교실 운영 지침 안내</p>
<!-- 20240222 요청으로 인하여 주석 -->
<%-- <div class="view_info">
<p>담당부서 <span><c:out value="${detailVO.dprtmNm}"/></span></p>
<p>등록일<span><c:out value="${detailVO.frstRegistPnttm}" /></span></p>
</div>
</div> --%>
<div class="view_info info_con">
<dl>
<dd>

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

@ -1063,7 +1063,8 @@
</div>
<div class="btn_right">
<%-- <button type="button" class="btnType05" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.do"/>'">운영 목록으로 이동</button> --%>
<button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button>
<!-- 240222 요청으로 교육콘텐츠 버튼 삭제 -->
<!-- <button type="button" class="btnType04" onclick="fncGoLctrAplctReg();">교육콘텐츠 신청</button> -->
<c:if test="${info.aprvlCd eq VeConstants.EXPRN_APRVL_CD_40}">
<button type="button" class="btnType05" onclick="fncSave('50');">계획서 제출</button>
</c:if>