diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
index 7eca7c1e..e16f3180 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
@@ -466,10 +466,13 @@ public class CndtnTrgtMngController {
//성인 미성년 구분
String adultWhether = getIsAdultInKorea(cndtnTrgtInfoMngVO.getdBirth());
- String reqNmbrTemp = adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+LocalDate.now().getYear()+"-";
+ String reqNmbrTemp = adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+DateUtil.getStringToLocalDateYear();
int cnt = cndtnTrgtInfoMngService.findCntreqNmber("%" + reqNmbrTemp + "%");
- return adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+DateUtil.getStringToLocalDateYear()+"-"+(cnt+1);
+ System.out.println(cnt);
+ System.out.println(cnt+1);
+ return reqNmbrTemp+"-"+(cnt+1);
+
}
/**
@@ -493,6 +496,7 @@ public class CndtnTrgtMngController {
// 생년월일과 현재 날짜 사이의 기간 계산
Period period = Period.between(birthDate, now);
+ System.out.println("period.getYears() : "+ period.getYears());
if(period.getYears() >= 19) {
returnData="A";
}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
index 41505953..29c264b4 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
@@ -72,7 +72,7 @@
console.log('returnData :: ', returnData);
if(returnData.result == "success"){
alert("저장되었습니다.");
-// fncGoList();
+ fncGoList();
}else if(returnData.result == "fail"){
alert(returnData.message);
$('#cmptntAthrt').prop('disabled', true);
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp
index 66049b67..1166a07c 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp
@@ -336,7 +336,7 @@
-
+
~
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
index 583dae52..b8be457b 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
@@ -1,600 +1,601 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
-<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-
- 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
-
-
-
-
-
-
-
-
-
-
-
-
-
- " />
- " />
-
-
-
- 강의목록
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <%-- --%>
-
-
- ~
-
- <%-- --%>
-
-
-
-
-
-
-
-
-
-
-
-
- <%-- --%>
-
-
-
-
-
-
-
-
-
-
-
- | 교육구분 |
- 과정명 |
- 신청기간 |
- 교육기간 |
- 신청자/정원 |
- 상태 |
- 교육신청 |
-
-
-
-
-
- <%-- | ');" style="cursor:pointer;"> --%>
- <%-- --%>
-
-
-
- |
- | ');" style="cursor:pointer;">
- ()
-
-
- ~
- |
-
- ~
- |
-
- /
- |
-
-
-
-
-
-
-
-
-
- |
-
- <%-- ');">신청 --%>
- " data-tooltip="target_confirm_popup" >신청
- |
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 총 6개의 검색결과가 있습니다.
-
- - 지난교육일정
- - 당월교육일정
- - 교육예정일정
-
-
-
-
-
- 교육일정표
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 교육과정명 (상세 내용을 보시려면 과정을 클릭하세요) |
- 일수 |
- 교육일정(교육 시작일) |
-
-
- | 1 |
- 2 |
- 3 |
- 4 |
- 5 |
- 6 |
- 7 |
- 8 |
- 9 |
- 10 |
- 11 |
- 12 |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+
+ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " />
+ " />
+
+
+
+ 강의목록
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+
+
+ ~
+
+ <%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+ | 교육구분 |
+ 과정명 |
+ 신청기간 |
+ 교육일자 |
+ 신청자/정원 |
+ 상태 |
+ 교육신청 |
+
+
+
+
+
+ <%-- | ');" style="cursor:pointer;"> --%>
+ <%-- --%>
+
+
+
+ |
+ | ');" style="cursor:pointer;">
+ ()
+
+
+ ~
+ |
+
+<%-- ~ --%>
+
+ |
+
+ /
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+ <%-- ');">신청 --%>
+ " data-tooltip="target_confirm_popup" >신청
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 총 6개의 검색결과가 있습니다.
+
+ - 지난교육일정
+ - 당월교육일정
+ - 교육예정일정
+
+
+
+
+
+ 교육일정표
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 교육과정명 (상세 내용을 보시려면 과정을 클릭하세요) |
+ 일수 |
+ 교육일정(교육 시작일) |
+
+
+ | 1 |
+ 2 |
+ 3 |
+ 4 |
+ 5 |
+ 6 |
+ 7 |
+ 8 |
+ 9 |
+ 10 |
+ 11 |
+ 12 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
index 71e22692..85fc9e80 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
@@ -1,137 +1,138 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
-<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-
- 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
-
-
-
-
-
-
-
-
- " />
- " />
-
-
-
- 대시보드
-
-
-
-
-
-
-
- 최근 교육 목록표
-
-
-
-
-
-
-
-
-
- | 교육과정 |
- 교육기간 |
- 신청결과 |
- 설문조사 |
- 이수증 |
-
-
-
-
-
-<%-- | ');" style="cursor:pointer;"> --%>
-
- ()
- |
-
- ~
- |
- |
-
-
-
-
-
-
-
- 설문완료
-
-
- -
-
-
- |
-
-
-
-
-
-
- 교육완료
-
-
- -
-
-
- |
-
-
-
- |
-
-
-
-
-
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+
+ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
+
+
+
+
+
+
+
+
+ " />
+ " />
+
+
+
+ 대시보드
+
+
+
+
+
+
+
+ 최근 교육 목록표
+
+
+
+
+
+
+
+
+
+ | 교육과정 |
+ 교육일자 |
+ 신청결과 |
+ 설문조사 |
+ 이수증 |
+
+
+
+
+
+<%-- | ');" style="cursor:pointer;"> --%>
+
+ ()
+ |
+
+<%-- ~ --%>
+
+ |
+ |
+
+
+
+
+
+
+
+ 설문완료
+
+
+ -
+
+
+ |
+
+
+
+
+
+
+ 교육완료
+
+
+ -
+
+
+ |
+
+
+
+ |
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
index 4d2fa8ac..6fa51cef 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp
@@ -1,266 +1,368 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %>
-<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
-
- 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템
-
-
-
-
-
-
-
-
-
-
-
-
- " />
- " />
-
-
-
- 신청목록
-
-
-
-
-
-
-
-
-
-
-
-
- <%-- --%>
-
-
- ~
-
- <%-- --%>
-
-
-
-
-
-
-
-
-
-
-
-
- 교육 목록표
-
-
-
-
-
-
-
-
-
- | 교육과정 |
- 교육기간 |
- 신청결과 |
- 설문조사 |
- 이수증 |
-
-
-
-
-
- | ');" style="cursor:pointer;">
- ()
-
-
- ~
- |
- |
-
-
-
-
-
-
-
- 설문완료
-
-
- -
-
-
- |
-
-
-
-
-
-
- 교육완료
-
-
- -
-
-
-
- ', '');">이수증테스트
-
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ " />
+ " />
+
+
+
+ 신청목록
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+
+
+ ~
+
+ <%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+ 교육 목록표
+
+
+
+
+
+
+
+
+
+ | 교육과정 |
+ 교육일자 |
+ 신청결과 |
+ 설문조사 |
+ 이수증 |
+
+
+
+
+
+ | ');" style="cursor:pointer;">
+ ()
+
+
+<%-- ~ --%>
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ 설문완료
+
+
+ -
+
+
+ |
+
+
+
+
+
+
+ 교육완료
+
+
+ -
+
+
+
+ ', '');">이수증테스트
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css
index 9eb43865..3d0f0d31 100644
--- a/src/main/webapp/visitEdu/usr/publish/css/popup.css
+++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css
@@ -35,6 +35,9 @@
.popup_wrap.popType04 {width: 520px;}
.popup_wrap.popType05 {width: 730px;}
+.popup_table_top{margin:0 0 15px 0;text-align:right;}
+.popup_table_top button{height:38px;padding:0 13px;font-size:16px;font-weight:500;border-radius:5px;}
+
/* popup table type01 */
.pop_tb_type01 {margin-bottom: 40px; overflow-y: scroll; max-height: 500px;}
.pop_tb_type01>table{width: 100%; table-layout: fixed;}
diff --git a/src/main/webapp/visitEdu/usr/publish/sub_sus_dashboard.html b/src/main/webapp/visitEdu/usr/publish/sub_sus_dashboard.html
index 8ca3f813..4aae9f2e 100644
--- a/src/main/webapp/visitEdu/usr/publish/sub_sus_dashboard.html
+++ b/src/main/webapp/visitEdu/usr/publish/sub_sus_dashboard.html
@@ -48,6 +48,9 @@
|