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조에 따라 아래와 같이 개인정보 처리에 관하여 동의를 얻고자 합니다.