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

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2023-12-12 15:17:36 +09:00
commit 1d14862168
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java
View File

@ -555,7 +555,7 @@ public class ExprnClsrmAplctController {
int cnt = vEEduAplctService.selectCntAplctPrd(vEEduAplctVO);
model.addAttribute("cnt", cnt);
return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard";
}else if("40".equals(Type)) { //type4 - 결과보고
}else if("40".equals(Type)) { //서류제출
//거래선 파일 정보 가져오기
FileVO fileVO = new FileVO();
@ -591,7 +591,7 @@ public class ExprnClsrmAplctController {
return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard";
}else if("50".equals(Type) || "60".equals(Type)){ //type5 - 최종결과
}else if("50".equals(Type) || "60".equals(Type)){ //운영진행중, 결과보고 완료
FileVO fileVO = new FileVO();
if(vEEduAplctVO.getOrgnlRsltAtchFileId() != null){
@ -615,7 +615,7 @@ public class ExprnClsrmAplctController {
vEEduAplctVO.setRmtTrnAtchFileDetail(fileService.selectFileInf(fileVO));
}
return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard";
}else {
}else { //검토중, 운영종료
FileVO fileVO = new FileVO();
if(vEEduAplctVO.getOrgnlRsltAtchFileId() != null){

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

@ -29,6 +29,9 @@
margin-bottom: 0;
}
input::placeholder {
font-style: italic;
}
</style>
<script type="text/javaScript" language="javascript">
$( document ).ready(function(){
@ -727,11 +730,11 @@
<div class="tb_type02 tb_type02_write">
<table class="addClassRow" rowLimit="1" >
<colgroup>
<col style="width: 20%;">
<col style="width: 13%;">
<col style="width: 25%;">
<col style="width: auto;">
<col style="width: 15%;">
<col style="width: 12%;">
<col style="width: 9%;">
<col style="width: 10%;">
<col style="width: 6%;">
</colgroup>
<thead>
@ -876,7 +879,7 @@
<td>
<label for="lrnSbjct" class="label">학습주제</label>
<input type="text" id="lrnSbjct" name="lrnSbjct" maxlength="50">
<input type="text" id="lrnSbjct" name="lrnSbjct" maxlength="50" placeholder="(예시) 교육 전 저작권 의식조사">
</td>
<td>
<label for="lrnCn" class="label">지도내용</label>

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

@ -28,7 +28,9 @@
margin-bottom: 0;
}
input::placeholder {
font-style: italic;
}
</style>
<script type="text/javaScript" language="javascript">
$( document ).ready(function(){
@ -373,6 +375,12 @@
return true;
}
function fncGoLctrAplctReg(){
var linkForm = document.linkForm ;
linkForm.action = "<c:url value='/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.do'/>"
linkForm.submit();
}
</script>
<div class="mask2" onclick="timeLayerUtil()"></div>
<form:form id="listForm" name="listForm" commandName="vEEduAplctVO" onsubmit="return false;" method="post">
@ -548,11 +556,11 @@
<div class="tb_type02 tb_type02_write">
<table class="addClassRow" rowLimit="1" >
<colgroup>
<col style="width: 20%;">
<col style="width: 13%;">
<col style="width: 25%;">
<col style="width: auto;">
<col style="width: 15%;">
<col style="width: 12%;">
<col style="width: 9%;">
<col style="width: 10%;">
<col style="width: 6%;">
</colgroup>
<thead>
@ -697,7 +705,7 @@
<td>
<label for="lrnSbjct" class="label">학습주제</label>
<input type="text" id="lrnSbjct" name="lrnSbjct" maxlength="50">
<input type="text" id="lrnSbjct" name="lrnSbjct" maxlength="50" placeholder="(예시) 교육 전 저작권 의식조사">
</td>
<td>
<label for="lrnCn" class="label">지도내용</label>
@ -839,6 +847,7 @@
</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>
<c:if test="${info.aprvlCd eq VeConstants.EXPRN_APRVL_CD_40}">
<button type="button" class="btnType05" onclick="fncSave('50');">계획서 제출</button>
</c:if>