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 c6603696..178e4609 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -514,8 +514,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(); @@ -539,6 +539,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); @@ -690,7 +694,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/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/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 5a903053..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 @@ -167,7 +167,11 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디 + private String qustnrTmplatId; + private String fld; // 분야 + private String lctrYn; // 저작권 교육 수강 여부 + private String prvsQs; // 교육관련 사전질의 public String getSearchDiv() { @@ -810,6 +814,30 @@ 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; + } + 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/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/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp index 0aaf0cdf..3d222fe8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp @@ -176,6 +176,12 @@
+ +
    +
  • +
  • +
  • +
@@ -193,7 +199,7 @@
-

교육 확정 관리

+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp index 91ef1abb..6ff347de 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngList.jsp @@ -187,6 +187,13 @@
+ +
    +
  • +<%--
  • --%> +
  • +
  • +
@@ -204,7 +211,7 @@
-

교육 과정 관리

+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp index c9d8a13c..5be98216 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngList.jsp @@ -152,10 +152,11 @@
    -
  • -
  • -
  • -
+ +
  • +
  • +
  • +
    @@ -173,7 +174,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/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/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/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/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/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/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 06977265..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(); @@ -61,8 +62,19 @@ // 상태 $ddlnCdStts.text(textVal); + // 버튼 - $('#regBtn').text(textVal); + // 접수중일땐 버튼에 신청으로 노출 + if(textVal != '접수중'){ + $('#regBtn').text(textVal); + } + else{ + $('#regBtn').text('신청'); + } + }else if($ddlnCdStts.text().trim() === "찜하기"){ + + $('#regBtn').text('신청'); + regStatus = false; } $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } @@ -149,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 75530a02..768df024 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 @@ -295,7 +295,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 @@ -366,30 +366,6 @@ $(document).ready(function(){
    -
    -
    -
    이달의 과정
    -
    -
    - -
    -
    - -
    - - -
    - - -
      -
    • -
    • ~
    • -
    • -
    -
    -
    -
    -
    • @@ -610,4 +586,29 @@ $(document).ready(function(){
    + +
    +
    +
    이달의 과정
    +
    +
    + +
    +
    + +
    + + +
    + + +
      +
    • +
    • ~
    • +
    • +
    +
    +
    +
    +
    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 @@ -
    - - - - - -
    -
    + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    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 @@
    + + + " /> 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 003f11f6..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(); @@ -637,7 +651,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); } 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 @@ - + + 마감 + + + + diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 2d405c8f..f05510da 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -177,8 +177,8 @@ input[type="text"] {height: 40px; padding: 0 15px; font-size: 16px; color: #222; input[type="text"]:read-only {background-color: #f5f5f5; border: 1px solid #d5d5d5;} input[type="text"]::placeholder {color: #999;} input[type="text"]:valid {color: #555;} -input[type="checkbox"]+label {color: #555; font-size: 16px; font-weight: 300; line-height: 1; vertical-align: middle;} -input[type="radio"]+label {color: #555; font-size: 16px; font-weight: 300; line-height: 1; vertical-align: middle;} +input[type="checkbox"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;} +input[type="radio"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;} textarea {border: 1px solid #d5d5d5; border-radius: 5px;} textarea::placeholder {color: #000;} select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 50px 0 15px; font-size: 16px; color: #222; background-image: url(../images/content/select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; color: #666;} @@ -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;} @@ -228,7 +230,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tab .tab_li.on .tab_button{position:relative;z-index:20;margin:-5px 0 0 0;font-weight:500;color:#fff;} .tab_content{display:none;} -.tab_content.on{display:block;} +.tab_content.on{display:block; margin:0 0 50px 0; border-bottom:1px solid #f37632;} /* table title */ .tb_tit01 {display: flex; width: 100%; justify-content: space-between; align-items: flex-end; margin-bottom: 15px;} @@ -253,7 +255,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_type01>table>tbody>tr>th,.tb_type01>table>tbody>tr>td{ font-size: 16px; text-align: left;box-sizing: border-box;} .tb_type01>table>tbody>tr>th{background-color: #f5f5f5; font-weight: 400; vertical-align: top; padding-top: 19px; padding-left: 20px; padding-bottom: 16px;} .tb_type01>table>tbody>tr>th p {line-height: 1.3;} -.tb_type01>table>tbody>tr>td{padding: 12px 20px; height: 60px; font-weight: 300; color: #555; vertical-align: middle;} +.tb_type01>table>tbody>tr>td{padding: 12px 20px; height: 60px; font-weight: 400; color: #555; vertical-align: middle;} .tb_type01>table>tbody>tr>td input[type="text"] {height: 40px;padding: 0 15px; border-radius: 5px; font-size: 16px; box-sizing: border-box;} .tb_type01>table>tbody>tr>td input[type="radio"]+label {margin-right: 10px;} .tb_type01>table>tbody>tr>td input[type="checkbox"]+label {margin-right: 10px;} @@ -273,7 +275,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /* 교육기반강화연수 */ -.tb_tit02 {display: flex; width: 100%; justify-content: space-between; align-items: flex-end; margin:-5px 0 15px 0;} +.tb_tit02 {display: flex; width: 100%; justify-content: space-between; align-items: flex-end; margin:0 0 15px 0;} .tb_tit02>p {font-size: 18px;} .tb_tit02 .tb_tit02_left {display: flex; align-items: center;} .tb_tit02 .tb_tit02_left p{font-size: 22px; font-weight: 600; color: #222; } @@ -312,7 +314,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .edup_result ul li.pre {position: relative; padding: 0 0 0 25px;} .edup_result ul li.pre::after{position: absolute; content: " ";width: 20px; height: 20px; border-radius: 5px; background-color: #e40000; left: 0; top: 55%; transform: translateY(-50%);} -.edu_program { } +.edu_program {margin:0 0 50px 0; } .edu_program table {border-top:2px solid #000; width:100%; } .edu_program table.ppre {color:#0c3a97; } .edu_program table th {vertical-align: middle; line-height:20px; background-color: #f5f5f5; border-left:1px solid #d5d5d5; text-align: center; border-bottom: 1px solid #d5d5d5; padding:10px 0;} @@ -353,7 +355,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_list02 {width:100%; } .tb_list02 table {border-top:2px solid #000; width:100%; } .tb_list02 table th {vertical-align: middle; line-height:20px; background-color: #f5f5f5; text-align: center; border-bottom: 1px solid #d5d5d5; padding:15px 0;} -.tb_list02 table td {vertical-align: middle; line-height:20px; text-align: center; border-bottom: 1px solid #d5d5d5; padding:8px 0;} +.tb_list02 table td {vertical-align: middle; line-height:20px; text-align: center; border-bottom: 1px solid #d5d5d5; padding:16px 2px; color:#555;} .tb_list02 table .btnType02 {border-radius:5px; padding:5px 10px; font-size:15px; margin:0 0 0 3px;} .tb_list02 table .btnType03 {border-radius:5px; padding:5px 10px; font-size:15px;} .tb_list02 table .btnType04 {border-radius:5px; padding:5px 10px; font-size:15px;} @@ -433,7 +435,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_type02>table>thead>tr>th:last-child,.tb_type02>table>tbody>tr>td:last-child{border-right: 0;} .tb_type02>table>thead>tr>th{font-weight: 400; background-color: #f5f5f5;} .tb_type02>table>tbody>tr>th {line-height: 1.4;} -.tb_type02>table>tbody>tr>th, .tb_type02>table>tbody>tr>td {color: #555; font-weight: 300; position: relative;} +.tb_type02>table>tbody>tr>th, .tb_type02>table>tbody>tr>td {color: #555; font-weight: 400; position: relative;} .tb_type02 tbody td input[type="text"].input_time {padding: 0 5px; margin: 0 5px; text-align: center;} .tb_type02 tbody td button {width: 90px; height: 36px; text-align: center; font-size: 16px; border-radius: 5px;} .tb_type02 tbody td button.table_del {width: auto; height: auto;} @@ -469,7 +471,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_list01 thead th{height: 55px; padding: 0 5px; box-sizing: border-box; vertical-align: middle;border-bottom: 1px solid #d5d5d5; font-size: 17px; font-weight: 400; color: #222; background-color: #f5f5f5; word-break: keep-all;} .tb_list01 thead th button {font-size: 8px; padding: 0 8px;} .tb_list01 tbody tr:last-child{border-bottom: 0;} -.tb_list01 tbody th, .tb_list01 tbody td {border-bottom: 1px solid #ececec; font-weight: 300; color: #555555; vertical-align: middle; padding: 16px 2px;font-size: 16px; line-height: 1.3;} +.tb_list01 tbody th, .tb_list01 tbody td {border-bottom: 1px solid #ececec; font-weight: 400; color: #555555; vertical-align: middle; padding: 16px 2px;font-size: 16px; line-height: 1.3;} .tb_list01 tbody th:not(.has_notice), .tb_list01 tbody tr.new_cont td {color: #5c6dc3; text-decoration: underline;} .tb_list01 tbody td.t_left {padding: 0 15px;} .tb_list01 tbody td p {width: 100%; margin: 0 auto; padding: 0 5px; box-sizing: border-box; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;} /* 테이블 안에 내용 ..처리 할때 */ @@ -529,7 +531,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .list_view .view_info span{position: relative; padding-left: 20px;} .list_view .view_info span::before{position: absolute; content: " "; width: 1px; height: 15px; background-color: #d5d5d5; left: 7px; top: 6.5px;} .list_view .view_cont{border-bottom: 1px solid #d5d5d5;padding: 40px 30px;} -.list_view .view_cont p{font-size: 18px; font-weight: 300; box-sizing: border-box; line-height: 1.4; word-break: break-word;} +.list_view .view_cont p{font-size: 18px; font-weight: 400; color:#555; box-sizing: border-box; line-height: 1.4; word-break: break-word;} .list_view .file_list{width: 100%; border-bottom: 1px solid #d5d5d5; padding: 20px 30px; box-sizing: border-box;} .list_view .file_list td{display: flex; font-size: 18px; font-weight: 300; margin-bottom: 10px}