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

Merge branch 'advc' into hylee

Browse Source
This commit is contained in:
hylee 2023-12-18 16:56:32 +09:00
commit 263696e59c
7 changed files with 690 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/web/MainController.java
View File

@ -457,7 +457,7 @@ public class MainController {
BoardVO boardVO_2 = new BoardVO();
boardVO_2.setRecordCountPerPage(5); //게시글 수
boardVO_2.setFirstIndex(0); //
boardVO_2.setBbsId("BBSMSTR_000000000681");
boardVO_2.setBbsId("BBSMSTR_000000000000");
List<BoardVO> vo_2 = bbsMngService.selectMainBoardRecent(boardVO_2);
//게시글 내용 html 태그 삭제
for(int i=0; i<vo_2.size(); i++) {

3
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovDataNoticeInqire.jsp
View File

@ -29,7 +29,8 @@ $(document).ready(function(){
var listPage = $(location).attr('href').split($(location).attr('host'))[1].split('Detail.do')[0]+'List.do'+"?bbsId=<c:out value='${brdMstrVO.bbsId}' />" ;
var detailPage = $(location).attr('href').split($(location).attr('host'))[1].split('?')[0] ;
function fn_egov_select_noticeList(pageNo) {
window.history.back();
//window.history.back();
location.href="<c:url value='/web/cop/bbs/selectDataBoardList.do'/>";
}
</script>

28
src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
View File

@ -78,6 +78,15 @@ function fn_egov_inqire_notice(bbsId, nttId) {
document.frm.action = "<c:url value='/web/cop/bbsWeb/selectBoardDetail.do'/>?pubDetail=Y";
document.frm.submit();
}
function fn_egov_inqire_data(bbsId, nttId) {
document.frm.nttId.value = nttId;
document.frm.bbsId.value = bbsId;
document.frm.method = "get";
document.frm.action = "<c:url value='/web/cop/bbs/selectDataBoardDetail.do'/>";
document.frm.submit();
}
//저작권체험교실 등록화면 이동 시 운영신청 기간인지 체크
function goCpyrgWrite(){
if(!checkAplctPsbl()) return;
@ -287,8 +296,8 @@ function instrChk(){
<c:forEach var="bbsData" items="${bbsList}" varStatus="status" end="4">
<li>
<a href="#none">
<p class="date"><i></i>2023-09-25</p>
<a href="#none" onclick="javascript:fn_egov_inqire_notice('<c:out value="${bbsData.bbsId}"/>', '<c:out value="${bbsData.nttId}"/>');">
<p class="date"><i></i><c:out value="${bbsData.frstRegisterPnttm}" /></p>
<p class="title"><span class="emphasis">공지</span><c:out value='${bbsData.nttSj}' /></p>
</a>
</li>
@ -341,10 +350,21 @@ function instrChk(){
<div class="data_notice content_wrap">
<div class="title">
<h3>자료실</h3>
<a href="#none" class="btn_plus">더보기</a>
<!-- <a href="#none" class="btn_plus">더보기</a> -->
<a href="<c:url value='/web/cop/bbs/selectDataBoardList.do'/>" class="btn_plus">더보기</a>
</div>
<div class="content">
<ul class="notice_list">
<c:forEach var="bbsData" items="${bbsList_2}" varStatus="status" end="3">
<li>
<a href="#none" onclick="javascript:fn_egov_inqire_data('<c:out value="${bbsData.bbsId}"/>', '<c:out value="${bbsData.nttId}"/>');">
<p class="title"><i></i><c:out value='${bbsData.nttSj}' /></p>
<p class="date"><c:out value="${bbsData.frstRegisterPnttm}" /></p>
</a>
</li>
</c:forEach>
<!--
<li>
<a href="#none">
<p class="title"><i></i>제 13기 청소년 전담 강사 양성</p>
@ -369,6 +389,7 @@ function instrChk(){
<p class="date">2023-09-25</p>
</a>
</li>
-->
</ul>
</div>
</div>
@ -404,5 +425,6 @@ function instrChk(){
<form name="frm" action="<c:url value='/web/cop/bbsWeb/selectBoardList.do'/>" method="post">
<input type="hidden" name="bbsId" value="" />
<input type="hidden" name="nttId" value="" />
<input type="hidden" name="pageIndex" value="1" />
</form>
</html>

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

@ -83,4 +83,15 @@
</tbody>
</table>
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left">
</div>
<div class="btn_center">
<button type="button" class="btnType08" onclick="location.href='<c:url value="/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.do" />'">교육신청</button>
</div>
<div class="btn_right">
</div>
</div>
</div>

23
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
View File

@ -185,10 +185,10 @@
<div class="tit_box">
<i class="tit_box_icon1"></i>
<div>
<p>찾아가는 저작권 교육</p>
<p>실무역량강화</p>
<span>
‘찾아가는 저작권 교육’은 저작권 교육이 필요한 <span>공공기관, 대학, 문화예술단체 등을 </span>대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다.
<p style="font-weight:400;color:red;font-size:17px;padding-top:10px;">담당자 연락처) 02-2669-0083</p>
<p style="font-weight:400;color:red;font-size:17px;padding-top:10px;">담당자 연락처) 02-2669-0082</p>
</span>
</div>
</div>
@ -238,14 +238,16 @@
<tr>
<th scope="row">상세교육내용</th>
<td>
<c:out value="${info.prcsCn }" />
<td colspan="3">
<div style="white-space:pre;"><c:out value='${info.prcsCn}'/></div>
</td>
</tr>
<tr>
<th scope="row">정원</th>
<td class="addPro_wrap">
<td class="addPro_wrap" colspan="3">
<c:out value="${info.nos}"/>
</td>
</tr
</tr>
<tr>
<th scope="row">목적</th>
<td>
@ -286,9 +288,14 @@
</c:if> --%>
<tr>
<th scope="row">운영계획서</th>
<th scope="row">교육안내문</th>
<td>
<a href="/cmm/fms/FileDown.do?atchFileId=FILE_000000000001170&fileSn=0">실무역량강화 운영 계획서.pptx 다운로드</a>
<%-- <a href="<c:url value='/cmm/fms/FileDown.do?atchFileId=FILE_000000000001170&fileSn=0'/>">교육안내문.pptx 다운로드</a> --%>
<c:import url="/cmm/fms/selectSimpleDownInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="FILE_000000000001170" />
</c:import>
</td>
</tr>

11
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduInfo.jsp
View File

@ -83,4 +83,15 @@
</tbody>
</table>
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left">
</div>
<div class="btn_center">
<button type="button" class="btnType08" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'">교육신청</button>
</div>
<div class="btn_right">
</div>
</div>
</div>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
View File

@ -121,10 +121,10 @@
<h2>나의강의실</h2>
</div>
<ul class="edu_process">
<li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(5)"><i></i>
<li class="edu_apply" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i>
<div class="text_area">신청중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div>
</li>
<li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(10)"><i></i>
<li class="edu_register" style="cursor: pointer;" onclick="fn_goListForm(5)"><i></i>
<div class="text_area">수강중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p></div>
</li>
<li class="edu_close" style="cursor: pointer;" onclick="fn_goListForm(20)"><i></i>