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 2023-11-29 17:58:20 +09:00
commit fc6a3fa93e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java
View File

@ -141,7 +141,6 @@ public class VEEduAplctServiceImpl implements VEEduAplctService {
vEEduAplctVO.setMngNmbrOrd(vo.getMngNmbrOrd()); vEEduAplctVO.setMngNmbrOrd(vo.getMngNmbrOrd());
} }
if(true) return 0;
return vEEduAplctDAO.statusUpdate(vEEduAplctVO); return vEEduAplctDAO.statusUpdate(vEEduAplctVO);
} }

15
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp
View File

@ -665,9 +665,19 @@
<th scope="row"> <th scope="row">
<p>숙박신청여부</p> <p>숙박신청여부</p>
</th> </th>
<!-- 교육일자가 지났을 시 숙박신청 막기 -->
<c:set var="now" value="<%=new java.util.Date()%>" />
<c:set var="today"><fmt:formatDate value="${now}" pattern="yyyyMMdd" /></c:set>
<c:set var="eduDt" value="${fn:replace(info.eduHopeDt, '.', '')}" />
<c:if test="${acmdtAplctCheck eq 'N'}"> <c:if test="${acmdtAplctCheck eq 'N'}">
<td colspan="4"> <td colspan="4">
<c:if test="${eduDt <= today}">
마감
</c:if>
<c:if test="${eduDt > today}">
<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button> <button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
</c:if>
</td> </td>
</c:if> </c:if>
<c:if test="${acmdtAplctCheck eq 'Y'}"> <c:if test="${acmdtAplctCheck eq 'Y'}">
@ -697,7 +707,12 @@
</th> </th>
<c:if test="${acmdtAplctCheck eq 'N'}"> <c:if test="${acmdtAplctCheck eq 'N'}">
<td> <td>
<c:if test="${eduDt < today}">
마감
</c:if>
<c:if test="${eduDt >= today}">
<button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button> <button type="button" class="btnType01" data-tooltip="sub51_pop01" title="팝업 열림">숙박 신청</button>
</c:if>
</td> </td>
</c:if> </c:if>
<c:if test="${acmdtAplctCheck eq 'Y'}"> <c:if test="${acmdtAplctCheck eq 'Y'}">