From c7192992db160758a133c9c167a2656a256ddc06 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 28 Nov 2023 14:38:05 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20>=20?= =?UTF-8?q?=EA=B8=B0=EC=86=8C=20>=20main=20>=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 2c711ab3..c2abc9bc 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 @@ -23,11 +23,14 @@ $("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit(); } - function fncGoDetail(eduAplctOrd){ - var listForm = document.listForm ; - listForm.eduAplctOrd.value = eduAplctOrd ; - $("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do").submit(); + + function fncGoDetail(prcsAplctPrdOrd){ + var viewForm = document.viewForm ; + viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + viewForm.action = ""; + viewForm.submit(); } + function fncGoList(){ linkPage(1); @@ -102,6 +105,9 @@
+
+ +
" /> From 4d7876b2d00c36b71fc9ae7b286e2fa0e85a1737 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 28 Nov 2023 16:25:21 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=B2=AD=EC=86=8C=EB=85=84=20=EA=B5=90=EC=9C=A1=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../popup/advRndsStngMngPopup.jsp | 1261 +++++++++-------- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 12 + 2 files changed, 655 insertions(+), 618 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp index 23b4d8ed..d1c62962 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp @@ -1,618 +1,643 @@ - -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<% - /** - * @Class Name : advLctrRsrchStngMngPopup.jsp - * @Description : 강의조사관리 팝업 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.08.09 김봉호 최초 생성 - * @author 김봉호 - * @since 2021.08.21 - * @version 1.0 - * @see - * - */ -%> - - - - - - - - - - - - - - 신청반려팝업 - - - - -
- - - -
- - -
-

회차관리

-
- - -
- - -"> -"> -"> -"> - - - - - - - - - - - - - - -
-

필수입력 항목

-

-    년도   - - - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
회차명접수시작일시접수마감일시관리
-
- - 회차 -
-
-
- -
- 시 - -
- 		-
- -
- -
- - 시 -
- 		-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
회차명접수시작일시접수마감일시관리
-
- - 회차 -
-
-
- -
- 시 - -
- 		-
- -
- -
- - 시 -
- 		-
-
- - -
-
-
- - - -
-
-
-
- - -
-
-
-
-
- - -
- - - + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : advLctrRsrchStngMngPopup.jsp + * @Description : 강의조사관리 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + + 신청반려팝업 + + + + +
+ + + +
+ + +
+

회차관리

+
+ + +
+ + +"> +"> +"> +"> + + + + + + + + + + + + + + +
+

필수입력 항목

+

+    년도   + + + +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 +
+
+
+ +
+ 시 + +
+ 		+
+ +
+ +
+ + 시 +
+ 		+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 + + + + +
+
+
+ +
+ 시 + +
+ 		+
+ +
+ +
+ + 시 +
+ 		+
+
+ + +
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index 003f11f6..1597bc4c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -637,7 +637,19 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 alert("신청가능한 기간이 아닙니다.\n\n"+returnData.message+"\n\n(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)"); //location.href="" + + psblFlag = 'N'; + + + //저작권배움터 수정요청사항(r1.2023.11.23.).pptx p.109 요구사항 + $('#createForm select').prop('disabled', true); + $('#createForm input').prop('disabled', true); + $('#createForm button').prop('disabled', true); + + // Disable all radio buttons +// $('input[type="radio"]').prop('disabled', true); + }else{ $("input[name=rndsOrd]").val(returnData.rndsOrd); } From b775023900a15b4003ed14559f60cf5020901fbc Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 28 Nov 2023 18:04:22 +0900 Subject: [PATCH 03/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EB=AA=85=20=EC=88=98=EC=A0=95=20>=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=EC=97=B0=EC=88=98=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20->=20

=EC=8B=A4=EB=AC=B4=EC=9E=90=EC=97=AD=EB=9F=89?= =?UTF-8?q?=EA=B0=95=ED=99=94(=EA=B8=B0=EB=B0=98=EA=B0=95=ED=99=94?= =?UTF-8?q?=EC=97=B0=EC=88=98=EA=B4=80=EB=A6=AC)

?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp | 2 +- .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp | 2 +- .../jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp | 2 +- .../WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp index 63fe5f92..9acd90cb 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp @@ -180,7 +180,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 기반강화연수 과정 신청기간 등록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp index d0e03fa0..87a0dc02 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp @@ -205,7 +205,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 강사별관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index e0c2f140..2091c9e6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -255,7 +255,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 교육확정관리상세
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp index 1d1f8b20..4e7f3cc3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp @@ -184,7 +184,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 교육확정관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index 4219a672..a31a8d11 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -252,7 +252,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 과정신청기간관리 신청기간 상세
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp index 2041fcde..6f31c7f1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp @@ -192,7 +192,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 과정신청기간관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp index 83c1535c..dc772af8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp @@ -183,7 +183,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 과정신청기간관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp index 32308dfc..782395c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp @@ -191,7 +191,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 기반강화연수 과정 신청기간 등록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp index 4fa3b32c..b073f1fe 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp @@ -205,7 +205,7 @@
  • -

    기반강화연수관리

    +

    실무자역량강화(기반강화연수관리)

  • 강사별관리목록
From fb2b41597f02a01bbf5a711b8fd75dcf8d3d9864 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 29 Nov 2023 14:10:28 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=84=A4=EB=AC=B8=EC=A1=B0?= =?UTF-8?q?=EC=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prcsInfo/service/VEPrcsDetailVO.java | 8 +++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 14 +++++- .../cndtnEduPrcsAplctCfnMngDetail.jsp | 47 ++++++++++++++++-- .../fndthEnhanceTrn/popup/lctrEvalPopup.jsp | 13 +++-- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 49 ++++++++++--------- 5 files changed, 98 insertions(+), 33 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 5a903053..bc471fb6 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -167,6 +167,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디 + private String qustnrTmplatId; + @@ -810,6 +812,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setInstrNm(String instrNm) { this.instrNm = instrNm; } + public String getQustnrTmplatId() { + return qustnrTmplatId; + } + public void setQustnrTmplatId(String qustnrTmplatId) { + this.qustnrTmplatId = qustnrTmplatId; + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index c2c12310..a4a4c2dd 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -189,7 +189,18 @@ vsit.trgt_nm AS trgtNm, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, vsit.clphone AS vs_clphone, - vsit.d_birth AS dBirth + vsit.d_birth AS dBirth , + CASE + WHEN EXISTS (/* 설문조사 */ + SELECT + 1 + FROM + LETTNQESTNRRSLTDETAIL lersltD + WHERE + lersltD.respond_id = a.USER_ID + AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 + ELSE 0 + END AS qestRsltExists FROM a JOIN ve_prcs_aplct_prd vpap ON @@ -229,6 +240,7 @@ AND a.use_yn = 'Y' + AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ 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 2d40a1ef..910beb64 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -215,11 +215,27 @@ }); } - + + //설문조사 결과 + function fncInstrCostInfo(eduId, userId) { //메뉴생성 화면 호출 + var form = document.popupForm; + + form.eduAplctOrd.value = eduId; + form.respondId.value = userId; +// form.prcsAplctPrdOrd.value = prcsAplctPrdOrd; + + form.action = ""; + openPopupAndSubmitForm('popupForm', 'popupForm', 900, 1200); + } +
+ + + +
@@ -441,7 +457,9 @@ - + + + @@ -450,7 +468,9 @@ 주민번호 앞자리 연락처 교육이수여부 - 교육이수상태변경 + 교육이수상태변경 + 설문조사 + 이수증 @@ -478,6 +498,27 @@ + + + +<%-- --%> + + + + 미입력 + + + + + + + + + + - + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp index 0dc4e1cf..7288f771 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp @@ -36,7 +36,7 @@ type:"POST" ,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do" ,data: { - "lctrDivCd" : "50" // 기반강화 -> 기소유예(60)도 같이써야함 + "lctrDivCd" : "60" // 기반강화 -> 기소유예(60)도 같이써야함 // ,"eduChasiOrd" : chId } ,dataType:'json' @@ -168,7 +168,7 @@ if(returnData.result == 'success'){ alert("설문결과가 수정 되었습니다."); - self.close(); + location.reload(); }else if(returnData.result == 'fail'){ alert(returnData.msg); location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; @@ -200,7 +200,7 @@ alert("설문결과가 삭제 되었습니다."); window.opener.location.reload(); - self.close(); + fncPopClose(); }else if(returnData.result == 'fail'){ alert(returnData.msg); // location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; @@ -212,13 +212,16 @@ }); } } - + + function fncPopClose(){ + self.close(); + } - + "> "> ">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 24a4cc3a..bea0b9d4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -363,30 +363,6 @@ $(document).ready(function(){
-
-
-
이달의 과정
-
-
- -
-
- -
- - -
- - -
    -
    • -
  • ~
    • -
    • -
-
- -
-
@@ -173,7 +174,7 @@
-

교육 과정 관리

+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp index f44ff13a..4a8916b5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp @@ -1,361 +1,367 @@ - -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> - -<% - /** - * @Class Name : cndtnEduPrcsMngList.jsp - * @Description : 조건부 기소유예 과정관리 목록 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.12.14 조용준 최초 생성 - * @author 조용준 - * @since 2021.12.14 - * @version 1.0 - * @see - * - */ -%> - - - - - - 교육과정관리 - - - - - - - - " /> - " /> - - - -
-
- - -
-

수료자 목록

-
    -
    • -
  • -

    조건부기소유예관리

    -
    • -
  • 수료자 목록
    • -
-
- - -
-
-

수료자 목록

-
- -
-
-
- - -
-
- -
- ~ -
- -
-
- - - -
-
-
- -
-

건의 접수가 검색되었습니다.

-
- - <%----%> -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ');" style="cursor:pointer;"> -<%-- - - - - - - - - - -<%-- --%> - - - - - - - - -
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> -<%-- --%> - - - -<%-- --%> - - - - - - - - - - - - - - - - - - - ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} - - -
-
- - - -
- -
- - -
-
-
- - - - - - - + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +<% + /** + * @Class Name : cndtnEduPrcsMngList.jsp + * @Description : 조건부 기소유예 과정관리 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 교육과정관리 + + +
+ +
+ + + " /> + " /> + + + +
+ +
    +
    • + +
    • +
+
+ + +
+

수료자 목록

+
    +
    • +
  • +

    조건부기소유예관리

    +
    • +
  • 수료자 목록
    • +
+
+ + +
+
+

수료자 목록

+
+ +
+
+
+ + +
+
+ +
+ ~ +
+ +
+
+ + + +
+
+
+ +
+

건의 접수가 검색되었습니다.

+
+ + <%----%> +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ');" style="cursor:pointer;"> +<%-- + + + + + + + + + +<%-- --%> + + + + + + + + +
의뢰일사건번호관할청생년월일성명성별의뢰번호의뢰상태교육상태주소검사명
');" style="cursor:pointer;"> --%> +<%-- --%> + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + ${fn:length(fullAddr)> 5 ? fn:substring(fullAddr, 0, 5).concat('...') : ''} + + +
+
+ + + +
+ +
+ + +
+
+
+ + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index e7a30463..86002f14 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -241,7 +241,8 @@
    • -
    • + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp index f8141fcf..483e02cf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngDetail.jsp @@ -63,7 +63,7 @@

  • 실무자역량강화(기반강화연수관리)

    • -
  • 기반강화연수관리
    • +
  • 과정관리상세
    • diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp index 2a447c22..2b39b2b0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngMdfy.jsp @@ -155,7 +155,7 @@

  • 실무자역량강화(기반강화연수관리)

    • -
  • 기반강화연수관리
    • +
  • 과정관리수정
    • diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 06977265..3af9e48a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -61,8 +61,15 @@ // 상태 $ddlnCdStts.text(textVal); + // 버튼 - $('#regBtn').text(textVal); + // 접수중일땐 버튼에 신청으로 노출 + if(textVal != '접수중'){ + $('#regBtn').text(textVal); + } + else{ + $('#regBtn').text('신청'); + } } $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } From 27117b28a89aa6e32b61e8a25f191d6a226ab6af Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 29 Nov 2023 17:30:03 +0900 Subject: [PATCH 10/13] =?UTF-8?q?2023/11/29=20=EA=B5=90=EC=9C=A1=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp | 9 +++++++++ src/main/webapp/visitEdu/usr/publish/css/content.css | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp index 00ab7496..92a536f2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduInfo.jsp @@ -84,4 +84,13 @@
    +
    +
    +
    +
    + +
    +
    +
    +
    diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 5dacb8d2..f05510da 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -209,6 +209,8 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .btnType06:hover{background-color: #f1f5fb; transition: background-color .1s linear;} .btnType07{border: 1px solid #d04400; background-color: #fefaf7; color: #d04400;} .btnType07:hover{background-color: #fdf3ed; transition: background-color .1s linear;} +.btnType08{background-color: #3a72db; color: #fff; width:200px;} +.btnType08:hover{background-color: #1854c3; transition: background-color .1s linear;} /* calendar */ .calendar_wrap {display: inline-block; position: relative;} From 385f73ed33fdeb3f2836d9eb18eda8deafab263b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 29 Nov 2023 17:56:41 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EC=B2=AD=EC=86=8C=EB=85=84=20?= =?UTF-8?q?=EA=B0=95=EC=82=AC=20=EC=88=99=EB=B0=95=EC=8B=A0=EC=B2=AD=20?= =?UTF-8?q?=EC=8B=9C=20=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=9E=90=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=ED=9B=84=20=EB=A7=88=EA=B0=90=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VEEduAplctServiceImpl.java | 1 - .../asgnmInfo/instrAsgnmDetail.jsp | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index d5054f9c..b4d50ade 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -141,7 +141,6 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { vEEduAplctVO.setMngNmbrOrd(vo.getMngNmbrOrd()); } - if(true) return 0; return vEEduAplctDAO.statusUpdate(vEEduAplctVO); } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 49c8d27a..a4357c01 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -665,9 +665,19 @@

    숙박신청여부

    + + + + + - + + 마감 + + + + @@ -697,7 +707,12 @@ - + + 마감 + + + + From abd3e8fc4a898bdcfd0661ad9af39ee3644143f1 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 30 Nov 2023 10:43:21 +0900 Subject: [PATCH 12/13] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20=EC=88=98=EA=B0=95=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EC=84=9C=20=ED=8C=9D=EC=97=85=20>=20=EB=B6=84?= =?UTF-8?q?=EC=95=BC=20=EC=88=98=EA=B0=95=EC=97=AC=EB=B6=80=20=EC=82=AC?= =?UTF-8?q?=EC=A0=84=EC=A7=88=EC=9D=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 10 +- .../eduInfo/service/VEEduAplctVO.java | 23 +++- .../prcsInfo/service/VEPrcsDetailVO.java | 22 ++++ .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 19 ++- .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 11 +- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 2 +- .../fndtnEnhanceTrn/popup/eduAplctPop.jsp | 113 +++++++++++------- 7 files changed, 148 insertions(+), 52 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index d739a3c3..6722b4e6 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -516,8 +516,8 @@ public class FndtnEnhanceTrnController { SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id - vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 +// vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id +// vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); @@ -541,6 +541,10 @@ public class FndtnEnhanceTrnController { vEEduAplctVO.setInsttNm(vEPrcsDetailVO.getInsttNm()); vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); + vEEduAplctVO.setFld(vEPrcsDetailVO.getFld()); + vEEduAplctVO.setLctrYn(vEPrcsDetailVO.getLctrYn()); + vEEduAplctVO.setPrvsQs(vEPrcsDetailVO.getPrvsQs()); + fndtnEnhanceTrnService.insertVeEduAplct(vEEduAplctVO); @@ -691,7 +695,7 @@ public class FndtnEnhanceTrnController { } - @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduRegPopup.do") + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do") public String eduRegPopup( @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 9d5ab2da..121982e1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -408,7 +408,10 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String sbmtId; //제출자 private Boolean qestRsltExists; //설문여부 - + + private String fld; // 분야 + private String lctrYn; // 저작권 교육 수강 여부 + private String prvsQs; // 교육관련 사전질의 public String getSpecialWorkAllow() { @@ -1786,6 +1789,24 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setQestRsltExists(Boolean qestRsltExists) { this.qestRsltExists = qestRsltExists; } + public String getFld() { + return fld; + } + public void setFld(String fld) { + this.fld = fld; + } + public String getLctrYn() { + return lctrYn; + } + public void setLctrYn(String lctrYn) { + this.lctrYn = lctrYn; + } + public String getPrvsQs() { + return prvsQs; + } + public void setPrvsQs(String prvsQs) { + this.prvsQs = prvsQs; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 0d1fbd19..1b2a544b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -169,6 +169,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String qustnrTmplatId; + private String fld; // 분야 + private String lctrYn; // 저작권 교육 수강 여부 + private String prvsQs; // 교육관련 사전질의 + public String getSearchDiv() { return searchDiv; @@ -816,6 +820,24 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setQustnrTmplatId(String qustnrTmplatId) { this.qustnrTmplatId = qustnrTmplatId; } + public String getFld() { + return fld; + } + public void setFld(String fld) { + this.fld = fld; + } + public String getLctrYn() { + return lctrYn; + } + public void setLctrYn(String lctrYn) { + this.lctrYn = lctrYn; + } + public String getPrvsQs() { + return prvsQs; + } + public void setPrvsQs(String prvsQs) { + this.prvsQs = prvsQs; + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index ea1e2157..abc60e9c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -317,7 +317,10 @@ USE_YN, CHRG_NM, INSTT_NM, - D_BIRTH + D_BIRTH, + FLD, + LCTR_YN, + PRVS_QS ) VALUES( #eduAplctOrd#, @@ -336,7 +339,10 @@ 'Y', #chrgNm#, #insttNm#, - #dBirth# + #dBirth#, + #fld#, + #lctrYn#, + #prvsQs# ) WHEN MATCHED THEN UPDATE @@ -371,6 +377,15 @@ ,D_BIRTH = #dBirth# + + ,FLD = #fld# + + + ,LCTR_YN = #lctrYn# + + + ,PRVS_QS = #prvsQs# + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 3af9e48a..325fc3d2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -38,6 +38,7 @@ var regStatus = true; // 텍스트가 비어있는지 확인 + console.log('$ddlnCdStts.text(): ',$ddlnCdStts.text()); if ($ddlnCdStts.text().trim() === "") { var dateText = $ddlnCdStts.closest('table').find("td:eq(2)").text().trim(); @@ -70,6 +71,10 @@ else{ $('#regBtn').text('신청'); } + }else if($ddlnCdStts.text().trim() === "찜하기"){ + + $('#regBtn').text('신청'); + regStatus = false; } $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } @@ -156,9 +161,9 @@ } commonPopLayeropen( - "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduRegPopup.do" - , 800 - , 800 + "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do" + , 850 + , 900 , data , "N" , "eduRegPopup" diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index bea0b9d4..72643796 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -292,7 +292,7 @@ $(document).ready(function(){ } commonPopLayeropen( - "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduRegPopup.do" + "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do" , 800 , 800 , data diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp index e4cd5561..701687a7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp @@ -17,6 +17,12 @@ -
    - - - - - -
    -
    + + +
    @@ -130,7 +137,9 @@ $(document).ready(function(){ - + + + @@ -139,18 +148,8 @@ $(document).ready(function(){

    성명

    - - - - - - @@ -159,10 +158,40 @@ $(document).ready(function(){ + + + + + + + + + + + + + + -
    신청인정보를 입력하는 표
    - +
    -

    소속기업

    -     		- -

    생년월일
    +

    소속기업

    +     		+ + +

    분야

    +     		+ +
    +

    저작권 교육 수강 여부

    +     		+ +
    +

    교육관련 사전질의

    +     		+ +
    + 
    개인정보 처리 동의서
  한국저작권위원회에서는 귀하의 개인정보를 중요시하며, 개인정보보호법 제15조, 제17조, 제22조, 제23조 및 제24조에 따라 아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.
 										

From 0ef19ac431ce2ba45996f91342026239c3b4e3e6 Mon Sep 17 00:00:00 2001
From: jiwoo 
Date: Thu, 30 Nov 2023 11:46:28 +0900
Subject: [PATCH 13/13] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20SFR-019?=
 =?UTF-8?q?-01(=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84?=
 =?UTF-8?q?=20=EA=B5=90=EC=9C=A1=20=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=8B=9C=EA=B0=84=EC=97=90=20'=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D'=20=EA=B8=88=EC=A7=80),=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=EB=8F=99?=
 =?UTF-8?q?=EC=9D=98=20=EC=B2=B4=ED=81=AC=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tngrVisitEdu/eduAplct/eduAplctMdfy.jsp    | 34 ++++++++++++++++---
 .../tngrVisitEdu/eduAplct/eduAplctReg.jsp     | 14 ++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp
index f45b9442..7e86a30d 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp
@@ -118,14 +118,10 @@
 			  }
 			});
 
-		alert("1");
 		
 		$("select[name=divCd] option[value='10']").remove();
-		alert("12");
 		$("select[name=divCd] option[value='20']").remove();
-		alert("13");
 		$("select[name=divCd] option[value='30']").remove();
-		alert("14");
 	});
 
 	function fncScholList(paramObj) {
@@ -368,12 +364,21 @@
 				$('input[name=strtTm]:eq('+idx+')').focus();
 				return flag = false;
 			}
+			if($(this).find('input[name=strtTm]').val().indexOf('선택') != -1){
+				alert('교육시작 시간을 입력해주세요.');
+				$('input[name=strtTm]:eq('+idx+')').focus();
+				return flag = false;
+			}
 			if($(this).find('input[name=endTm]').val() == ''){
 				alert('교육종료 시간을 입력해주세요.');
 				$('input[name=endTm]:eq('+idx+')').focus();
 				return flag = false;
 			}
-
+			if($(this).find('input[name=endTm]').val().indexOf('선택') != -1){
+				alert('교육종료 시간을 입력해주세요.');
+				$('input[name=endTm]:eq('+idx+')').focus();
+				return flag = false;
+			}
 			if($(this).find('select[name=divCd]').val() == ''){
 				alert('구분을 선택해주세요.');
 				$('select[name=divCd]:eq('+idx+')').focus();
@@ -441,10 +446,29 @@
 		}
 
 
+		/*작동안되어서 하기로 대체
 		if($("#agree").length > 0 && $('#agree').val() != 'Y'){
 			alert('개인정보 수집 및 이용 목적에 동의하셔야합니다.');
 			return false;
 		}
+		*/
+
+		var fnAgree = true;
+		
+		$('input:checkbox[name="agree"]:checked').each(function(idx) {
+			/*
+			if($(this).attr("class") != "60") {
+				alert("선택한 목록 중 교욱확정알림이 불가능한 건이 있습니다.");
+				fnAgree = true;
+			}
+			*/
+			fnAgree = false;
+		});
+
+		if(fnAgree){
+			alert('개인정보 수집 및 이용 목적에 동의하셔야합니다.');
+			return false;
+		}
 
 		return true;
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
index 1597bc4c..451f8d5c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
@@ -416,12 +416,26 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 				$('input[name=strtTm]:eq('+idx+')').focus();
 				return flag = false;
 			}
+			
+			if($(this).find('input[name=strtTm]').val().indexOf('선택') != -1){
+				alert('교육시작 시간을 입력해주세요.');
+				$('input[name=strtTm]:eq('+idx+')').focus();
+				return flag = false;
+			}
+				
+				
 			if($(this).find('input[name=endTm]').val() == ''){
 				alert('교육종료 시간을 입력해주세요.');
 				$('input[name=endTm]:eq('+idx+')').focus();
 				return flag = false;
 			}
 
+			if($(this).find('input[name=endTm]').val().indexOf('선택') != -1){
+				alert('교육종료 시간을 입력해주세요.');
+				$('input[name=endTm]:eq('+idx+')').focus();
+				return flag = false;
+			}
+			
 			if($(this).find('select[name=divCd]').val() == ''){
 				alert('구분을 선택해주세요.');
 				$('select[name=divCd]:eq('+idx+')').focus();