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-11-21 17:09:11 +09:00
commit 9e1e971c63
13 changed files with 1928 additions and 1862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/kcc/com/cmm/ComDefaultVO.java
View File

@ -115,6 +115,13 @@ public class ComDefaultVO implements Serializable {
private String searchMonth; //검색월선택
private String searchReqStateCd; //의뢰상태
private String searchEduStateCd; //교육상태
private String searchSex; //성별
private String searchYear; //검색월선택
@ -416,6 +423,30 @@ public class ComDefaultVO implements Serializable {
this.searchMonth = searchMonth;
}
public String getSearchReqStateCd() {
return searchReqStateCd;
}
public void setSearchReqStateCd(String searchReqStateCd) {
this.searchReqStateCd = searchReqStateCd;
}
public String getSearchEduStateCd() {
return searchEduStateCd;
}
public void setSearchEduStateCd(String searchEduStateCd) {
this.searchEduStateCd = searchEduStateCd;
}
public String getSearchSex() {
return searchSex;
}
public void setSearchSex(String searchSex) {
this.searchSex = searchSex;
}
public String[] getSearchStatusArr() {
String[]returnArr;
//int returnSize = this.searchStatusArr.length;

19
src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
View File

@ -195,12 +195,27 @@
$searchQuery$
</isNotEmpty>
/* 의뢰상태 검색*/
<isNotEmpty prepend="AND" property="searchEduStateCd">
a.EDU_STATE_CD = #searchEduStateCd#
</isNotEmpty>
/* 교육상태 검색*/
<isNotEmpty prepend="AND" property="searchReqStateCd">
a.REQ_STATE_CD = #searchReqStateCd#
</isNotEmpty>
/* 교육상태 검색*/
<isNotEmpty prepend="AND" property="searchSex">
a.SEX = #searchSex#
</isNotEmpty>
<isNotEmpty property="searchSmbtStartDt">
AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchSmbtStartDt#, '.' , '')
AND TO_CHAR(A.req_pnttm, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchSmbtStartDt#, '.' , '')
</isNotEmpty>
<isNotEmpty property="searchSmbtEndDt">
AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
AND TO_CHAR(A.req_pnttm, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
</isNotEmpty>
/* 관할청 멀티셀렉트 */
<isNotEmpty property="searchSelStatus">
AND a.cmptnt_athrt IN
<iterate property="searchSelStatusList" open="(" close=")" conjunction=",">

2
src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp
View File

@ -118,7 +118,7 @@
<c:forEach var="fileVO" items="${fileList}" varStatus="status">
<tr id="egov_file_view_table_tr_${status.count}" style="border-bottom: 0px;">
<li>
<a href="javascript:fn_egov_downFile('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>')" class="fileName" title="다운로드">
<a href="javascript:fn_egov_downFile('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>')" class="fileName" title="다운로드" style="display:inline;">
<c:out value="${fileVO.orignlFileNm}"/>&nbsp;<%-- [<c:out value="${fileVO.fileMg}"/>&nbsp;byte] --%>
</a>
<c:if test="${not empty fileVO.fileExtsn}"><!-- pdf미리보기 -->

21
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
View File

@ -217,14 +217,17 @@
<div class="tb_tit01">
<p>대상자 목록</p>
</div>
<!-- list_top -->
<div class="list_top search-only">
<div class="list_top">
<div class="list_top_1">
<div class="util_left">
<p>구분1</p>
</div>
<div class="util_right">
<select name="searchStatus" id="searchStatus" class="sel_type1">
<option value="trgt_nm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'trgt_nm' }">selected="selected"</c:if>>이름</option>
<option value="d_birth" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'd_birth' }">selected="selected"</c:if>>생년월일</option>
<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>기간별</option>
<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>의뢰일자</option>
</select>
<div id="calendar">
@ -237,10 +240,20 @@
</div>
</div>
<input type="text" id="searchKeyword" name="searchKeyword" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeyword}'/>">
<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
<!-- <button class="btn_type03" onclick="fncReset(this); return false;">초기화</button> -->
</div>
</div>
<div class="list_top_2">
<div class="util_left">
<p>구분2</p>
</div>
<div class="util_right">
<ve:select codeId="VEA005" name="searchReqStateCd" id="searchReqStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchReqStateCd }" defaultText="의뢰상태 선택" css="class='sel_type1'" />
<ve:select codeId="VEA002" name="searchEduStateCd" id="searchEduStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchEduStateCd }" defaultText="교육상태 선택" css="class='sel_type1'" />
성별 <ve:radio codeId="COM014" name="searchSex" id="searchSex" defaultValue="" defaultText="전체" selectedValue="${cndtnTrgtInfoMngVO.searchSex }" />
</div>
</div>
</div>
<div class="list_util">

35
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
View File

@ -262,7 +262,7 @@
<select name="searchStatus" id="searchStatus" class="sel_type1">
<option value="trgt_nm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'trgt_nm' }">selected="selected"</c:if>>이름</option>
<option value="d_birth" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'd_birth' }">selected="selected"</c:if>>생년월일</option>
<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>기간별</option>
<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>의뢰일자</option>
</select>
<div id="calendar">
@ -282,6 +282,17 @@
<div class="util_left">
<p>구분2</p>
</div>
<div class="util_right">
<ve:select codeId="VEA005" name="searchReqStateCd" id="searchReqStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchReqStateCd }" defaultText="의뢰상태 선택" css="class='sel_type1'" />
<ve:select codeId="VEA002" name="searchEduStateCd" id="searchEduStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchEduStateCd }" defaultText="교육상태 선택" css="class='sel_type1'" />
성별 <ve:radio codeId="COM014" name="searchSex" id="searchSex" defaultValue="" defaultText="전체" selectedValue="${cndtnTrgtInfoMngVO.searchSex }" />
</div>
</div>
<div class="list_top_2">
<div class="util_left">
<p>구분3</p>
</div>
<div class="util_right">
<p>관할청&nbsp;&nbsp;</p>
@ -346,41 +357,41 @@
<%-- <td onclick="fncGoDetail('<c:out value="${list.sspnIdtmtTrgtOrd}"/>');" style="cursor:pointer;"> --%>
<%-- <c:out value='${list.prcsNm}'/> --%>
<!-- </td> -->
<td>
<td><!-- 의뢰일 -->
<c:set var="reqPnttm" value="${fn:substring(list.reqPnttm, 0, 10)}" />
<%-- <fmt:formatDate value="${list.reqPnttm }" pattern="yyyy-MM-dd" /> --%>
<c:out value="${reqPnttm }" />
</td>
<td>
<td><!-- 사건번호 -->
<c:out value="${list.vntYear }" />형제<c:out value="${list.vntNmbr }" />
</td>
<td>
<td><!-- 관할청 -->
<ve:code codeId="VEA008" code="${list.cmptntAthrt }"/>
</td>
<td>
<td><!-- 생년월일 -->
<c:out value="${list.dBirth }" />
</td>
<td>
<td><!-- 성명 -->
<c:out value="${list.trgtNm }" />
</td>
<td>
<td><!-- 성별 -->
<ve:code codeId="COM014" code="${list.sex }"/>
</td>
<td>
<td><!-- 의뢰번호 -->
<c:out value="${list.reqNmbr }" />
</td>
<td>
<td><!-- 의뢰상태 -->
<ve:code codeId="VEA005" code="${list.reqStateCd }"/>
</td>
<td>
<td><!-- 교육상태 -->
<ve:code codeId="VEA002" code="${list.eduStateCd }"/>
</td>
<c:set var="fullAddr" value="${list.addr} ${list.addrDetail}" />
<%-- <c:set var="fullAddr" value="${list.addr}" /> --%>
<td title="${fullAddr}">
<td title="${fullAddr}"><!-- 주소 -->
${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''}
</td>
<td>
<td><!-- 검사명 -->
<c:out value="${list.prsctrNm }" />
</td>
</tr>

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

@ -63,7 +63,7 @@
<div class="cont_wrap" id="sub">
<div class="cont_tit">
<h2>대시보드</h2>
<h2>나의강의실</h2>
</div>
<!-- 체험교실 프로세스 -->
<ul class="ex_process">

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

@ -85,48 +85,14 @@
<h2>운영신청 안내</h2>
</div>
<div class="tb_tit01">
<div class="tb_tit01_left">
<p>제목</p>
<div class="list_view">
<div class="view_top">
<p class="view_title"><c:out value="${info.title}" /></p>
<div class="view_info">
<p>담당부서 <span><c:out value="${info.dprtmNm}"/></span></p>
<p>등록일<span><c:out value="${info.frstRegistPnttm}" /></span></p>
</div>
</div>
<div class="summary_list">
<dl>
<dd>
<c:out value="${info.title}"/>
</dd>
</dl>
</div>
<div class="tb_tit01">
<div class="tb_tit01_left">
<p>부서</p>
</div>
</div>
<div class="summary_list">
<dl>
<dd>
<c:out value="${info.dprtmNm}"/>
</dd>
</dl>
</div>
<div class="tb_tit01">
<div class="tb_tit01_left">
<p>등록일</p>
</div>
</div>
<div class="summary_list">
<dl>
<dd>
<c:out value="${info.frstRegistPnttm}"/>
</dd>
</dl>
</div>
<div class="tb_tit01">
<div class="tb_tit01_left">
<p>첨부파일</p>
</div>
</div>
<div class="summary_list">
<div class="view_info">
<dl>
<dd>
<c:import url="/cmm/fms/selectBBSFileInfsCustom.do" charEncoding="utf-8">
@ -136,6 +102,8 @@
</dd>
</dl>
</div>
</div>
</div>
<c:out value="${fn:replace(fn:replace(fn:replace(info.anncmCn, crlt , '<'), crgt , '>'), crlf , '<br/>')}" escapeXml="false"/>

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

@ -469,6 +469,10 @@
alert('개인정보 이용 약관에 동의해주세요.');
return false;
}
if($("#agree2").length > 0 && !$('#agree2').prop('checked')){
alert('저작권 체험교실 운영 결과보고서 이용 약관에 동의해주세요.');
return false;
}
return true;
}
@ -1152,10 +1156,10 @@
- 제공하신 정보는 한국저작권위원회에서 운영하는 &lt;저작권 체험교실 운영&gt; 일정 안내를 위해 사용됩니다.
2. 수집하려는 개인정보의 항목
- [필수] 신청자의 성명, 주소, 연락처, 휴대폰, 이메일
- [필수] 신청자의 성명, 주소, 연락처, 휴대폰, 이메일, 직장연락처, 직장주소
3. 개인정보의 보유 및 이용 기간
- 1년
- 3년
4. 개인정보 수집 동의 거부의 권리
- 귀하는 이에 대한 동의를 거부할 수 있습니다.
@ -1166,6 +1170,24 @@
<div>
<input type="checkbox" id="agree1" name="agree1" value="Y">
<label for="agree1">위 사항에 동의합니다.</label>
</div>
</div>
</div>
</div>
<div class="agree_wrap">
<div class="tb_tit01">
<p>저작권 체험교실 운영 결과보고서 이용 허락</p>
</div>
<div class="agree_wrap">
<div class="agree_text" tabindex="0" style="height:80px;">
<pre>
한국저작권위원회에서는 저작권 체험교실 운영 결과보고서를 복제(ebook 제작 등 디지털화를 포함) 및 배포, 전송, 2차적 저작물 작성, 그 밖의 사업 목적상 필요한 범위 내에서 이용할 수 있습니다.
</pre>
</div>
<div class="agree_chx">
<div>
<input type="checkbox" id="agree2" name="agree2" value="Y">
<label for="agree2">위 사항에 동의합니다.</label>
<input type="hidden" id="agreeError" name="agreeError"> <!-- IE에서 체크박스가 마지막에 있을 시 이상한 오류 발생. 오류 방지를 위해히든 하나 넣어둠 -->
</div>
</div>

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

@ -198,46 +198,45 @@
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left">
</div>
<div class="btn_center">
</div>
<div class="btn_right">
<button type="button" class="btnType04" data-info="prcsAplctPrd_0000220" data-tooltip="target_confirm_popup">교육문의</button>
</div>
</div>
<!--Q&A 내용 있을때-->
<div class="q_wrap">
<div class="btn_wrap btn_layout01">
<div class="tb_tit02">
<div class="tb_tit02_left">
<div class="t_best">Q&A</div>
<div class="t_best q_title">Q&amp;A</div>
</div>
<div class="btn_wrap1">
<%-- <button type="button" title="최근 교육 목록 더보기" class="con_more" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'">더보기</button> --%>
</div>
<div class="btn_right">
<button type="button" class="btnType04" data-tooltip="target_confirm_popup">교육문의</button>
</div>
</div>
<div class="tb_list02">
<div class="faq_Wrap">
<div class="faq_wrap">
<ul class="faq">
<c:forEach var="list" items="${qnaList}" varStatus="status">
<li>
<li <c:if test="${status.index == 0}"> class='first' </c:if>>
<button type="button" title="답변 열기" class="question" onclick="faqOpen(this);">
<p class="qst_text"><span>질문</span>Q</p>
<div>
<p class="qst_cont">${list.qnaCn }</p>
<p class="date">${list.frstRegistPnttm }</p>
</div>
</button>
<div class="answer">
<div class="answer_in">
<p class="qst_text"><span>답변</span>A</p>
<p class="awr_cont">
<c:choose>
<c:when test="${not empty list.qnaAnswerCn }">
${list.qnaAnswerCn }
<p class="awr_cont">${list.qnaAnswerCn }</p>
<p class="date">${list.lastUpdtPnttm }</p>
</c:when>
<c:otherwise>
내용이 없습니다.
<p class="awr_cont">내용이 없습니다.</p>
</c:otherwise>
</c:choose>
</p>
</div>
</div>
</li>
@ -248,14 +247,14 @@
</ul>
</div>
</div>
</div>
</form:form>
</div>
<form id="qnaForm" name="qnaForm" method="post">
<!-- 교육대상자 확인 -->
<div class="tooltip-wrap">
<div class="tooltip-wrap q_pop">
<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
<div class="popup_tit">
<p>교육문의하기</p>
@ -265,16 +264,18 @@
<div class="cont_body">
<div class="pop_tb_type01" style="overflow:visible;">
<table>
<colgroup>
<col style="width:27%;">
<col style="width:auto;">
</colgroup>
<thead>
<tr>
<th>문의내용</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<textarea type="text" id="qnaCn" name="qnaCn" style="height: 220px;width: 100%;"></textarea>
</td>
</tr>
</tbody>
</table>
</div>

4
src/main/webapp/innorix/innorix_svr.js
View File

@ -13,7 +13,9 @@
// 라이선스 유형 : INNORIX WP 30일 체험 (만료 2023-05-05)
//var INNORIX_LICENSE = "3v0AzGS0JgwSdFHLQQxxtUkUhisBNnaQemUNZDGw/tswnXPMQE446fqMs3uzb/EOWHvJhjRifBmG2cB2twGldoZzpkI=";
// 운영라이선스 적용
var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8=";
//var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8=";
// 운영라이선스 적용 - 교육운영관리 시스템
var INNORIX_LICENSE = "gGlUilAMoSaupA5XLBI6vNne8xLhh8d6uZkkwMPyQT8CZAIyj6DQsFjCyMSc8ynkQwmOVpnaA2OaN+Wbp3pB+UMW8d/lyo+sA+raobcWha1FtQW19Bdve8bHEn4=";
var INNORIX_VERSION = '1.1.3.458';
var INNORIX_WIN_VERSION = '1.1.3.458';

2
src/main/webapp/visitEdu/usr/publish/css/content.css
View File

@ -788,6 +788,8 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
.q_wrap .tb_list02 .faq_wrap .faq li .date{font-size: 14px; color: #666; text-align: left; font-weight: 400;}
.q_wrap .tb_list02 .faq_wrap .faq li .answer{background-color: #fff; z-index: 1;}
.q_wrap .faq li .question,.q_wrap .faq li .answer .answer_i, .q_wrap .faq li .answer .answer_in{padding: 12px 46px;}
.q_pop .popup_cont .cont_body table thead tr th{width: 100%; padding: 12px 16px; border-top: 2px solid #222; background-color: #f5f5f5; text-align: left; font-size: 15px;}
.q_pop .popup_cont table tbody{border-top: 1px solid #e5e5e5;}
/*나의 강의실 > Q&A 내용 없을때 추가*/
.q_wrap .q_text{padding: 25px 35px; border-top: 2px solid #222; border-bottom: 1px solid #d5d5d5; font-size: 18px; color: #666;}

15
src/main/webapp/visitEdu/usr/publish/sub_classroom_dashboard.html
View File

@ -159,18 +159,19 @@
<div class="cont_body">
<div class="pop_tb_type01" style="overflow:visible;">
<table>
<colgroup>
<col style="width:27%;">
<col style="width:auto;">
</colgroup>
<tbody><tr>
<thead>
<tr>
<th>문의내용</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<textarea type="text" id="qnaCn" name="qnaCn" style="height: 220px;width: 100%;"></textarea>
</td>
</tr>
</tbody></table>
</tbody>
</table>
</div>
<div class="pop_btn_wrap btn_layout01">
<div class="btn_left">