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..0d1fbd19 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,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디 - + private String qustnrTmplatId; public String getSearchDiv() { @@ -810,6 +810,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/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/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/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(){
-
-
-
이달의 과정
-
-
- -
-
- -
- - -
- - -
    -
    • -
  • ~
    • -
    • -
-
- -
-
    • @@ -607,4 +583,29 @@ $(document).ready(function(){ + +
    +
    +
    이달의 과정
    +
    +
    + +
    +
    + +
    + + +
    + + +
      +
      • +
    • ~
      • +
      • +
    +
    +     +
    + 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/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); }