diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
index c5d3ffcb..e6fdf8a8 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -584,6 +584,8 @@
교육과정관리
+ <%@ include file="../cndtnSspnIdtmt/include/tableEduInfo.jsp" %>
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
index 4ab0cdd9..f8d31ca2 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -237,8 +237,22 @@
function fncDdlnCdSave(data){
$('#modyDdlnCd').val(data);
+ var v_pass = false;
+
+ if (data=='10'){
+ if(confirm("해당 교육 신청을 마감합니까?")){
+ v_pass = true;
+ }
+ }else if (data=='20'){
+ if(confirm("해당 교육을 확정합니까?\n현재 승인된 신청자만 교육진행가능합니다.")){
+ v_pass = true;
+ }
+ }
+
var data = new FormData(document.getElementById("modyfiForm"));
- if(confirm("상태를 변경하시겠습니까?")){
+
+ if(v_pass){
+ //if(confirm("상태를 변경하시겠습니까?")){
var url = "";
console.log(data);
$.ajax({
@@ -472,6 +486,8 @@
교육과정관리
+ <%@ include file="../cndtnSspnIdtmt/include/tableEduInfo.jsp" %>
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
index 46a77664..41bb5701 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -634,6 +634,8 @@
교육과정관리
+ <%@ include file="./include/tableEduInfo.jsp" %>
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
index cfa31b6b..90906062 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -237,8 +237,25 @@
function fncDdlnCdSave(data){
$('#modyDdlnCd').val(data);
+ var v_pass = false;
+
+ if (data=='10'){
+ if(confirm("해당 교육 신청을 마감합니까?")){
+ v_pass = true;
+ }
+ }else if (data=='20'){
+ if(confirm("해당 교육을 확정합니까?\n현재 승인된 신청자만 교육진행가능합니다.")){
+ v_pass = true;
+ }
+ }
+
+ //alert(v_pass);
+ //return ;
+
+
var data = new FormData(document.getElementById("modyfiForm"));
- if(confirm("상태를 변경하시겠습니까?")){
+
+ if(v_pass){
var url = "";
console.log(data);
$.ajax({
@@ -460,6 +477,8 @@
교육과정관리
+ <%@ include file="./include/tableEduInfo.jsp" %>
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/include/tableEduInfo.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/include/tableEduInfo.jsp
new file mode 100644
index 00000000..0dfdae69
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/include/tableEduInfo.jsp
@@ -0,0 +1,106 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
+
+
+
+
+
+
+
+
+
+ | 교육부분 |
+
+
+ |
+
+
+ | 과정 |
+
+
+
+ |
+
+
+ | 과정명 |
+
+
+
+ |
+
+
+ | 신청기간 |
+
+ ~
+ |
+
+
+ | 교육장소 |
+
+
+ |
+
+
+ | 교육기간 |
+
+
+ |
+
+
+ | 설문오픈일시 |
+
+ 시
+ |
+
+
+ | 상세교육과정 |
+
+
+ |
+
+
+ | 정원 |
+
+
+ |
+
+
+ | 상태 |
+
+
+ |
+
+
+ <%--
+ |
+ 공개여부(사용여부)
+ |
+
+ ${empty info.useYn or info.useYn eq 'Y' ? '공개' : ''}
+ ${info.useYn eq 'N' ? '비공개' : ''}
+
+ |
+
--%>
+
+ |
+ 첨부파일
+ |
+
+
+
+
+
+ |
+
+ <%--
+ |
+ 공개여부(사용여부)
+ |
+
+ 예
+ 아니오
+ |
+
--%>
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
index a3fde8e8..8f11829d 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -571,6 +571,8 @@
교육과정관리
+ <%@ include file="../cndtnSspnIdtmt/include/tableEduInfo.jsp" %>
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
index 3d2ee8d8..b180dfda 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -237,8 +237,22 @@
function fncDdlnCdSave(data){
$('#modyDdlnCd').val(data);
+ var v_pass = false;
+
+ if (data=='10'){
+ if(confirm("해당 교육 신청을 마감합니까?")){
+ v_pass = true;
+ }
+ }else if (data=='20'){
+ if(confirm("해당 교육을 확정합니까?\n현재 승인된 신청자만 교육진행가능합니다.")){
+ v_pass = true;
+ }
+ }
+
var data = new FormData(document.getElementById("modyfiForm"));
- if(confirm("상태를 변경하시겠습니까?")){
+
+ if(v_pass){
+ //if(confirm("상태를 변경하시겠습니까?")){
var url = "";
console.log(data);
$.ajax({
@@ -460,6 +474,8 @@
교육과정관리
+ <%@ include file="../cndtnSspnIdtmt/include/tableEduInfo.jsp" %>
+