From c75c72fa4663d1a6587bfe6d3794b53f7661ea10 Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 22 Feb 2024 14:08:15 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-22=2014:07=20=EC=8B=A4=EB=AC=B4?= =?UTF-8?q?=EC=97=AD=EB=9F=89=EA=B0=95=ED=99=94=20=EC=B0=9C=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=B9=B4=EC=9A=B4=ED=84=B0=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgnmInfo/service/VEInstrAsgnmVO.java | 7 +++ .../asgnmInfo/web/VEAsgnmController.java | 2 +- .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 3 ++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 1 + .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 2 + .../fndthEduPrcsAplctPrdMngDetail.jsp | 2 +- .../oprtn/tngrVisitEdu/eduAplctMngDetail.jsp | 24 +++++----- .../tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 24 +++++----- .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 24 +++++----- .../popup/eduAplctMngDetailPopup.jsp | 41 ++++++++-------- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 16 +++++-- .../asgnmInfo/instrAsgnmDetail.jsp | 31 +++++++----- .../asgnmInfo/instrAsgnmRqstDetail.jsp | 33 +++++++------ .../asgnmInfo/instrAsgnmRqstList.jsp | 48 ++++++++----------- .../endInfo/instrEduEndDetail.jsp | 31 +++++++----- 15 files changed, 159 insertions(+), 130 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index 7ddfb976..619b469f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -149,6 +149,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String yr; //강사 메모 private String eduPlace; //교육장소 + private String eduPlaceCd; //교육장소코드 private String prcsAplctPrdOrd; //과정신청기간순번 @@ -852,5 +853,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public void setFeeInsttCd(String feeInsttCd) { this.feeInsttCd = feeInsttCd; } + public String getEduPlaceCd() { + return eduPlaceCd; + } + public void setEduPlaceCd(String eduPlaceCd) { + this.eduPlaceCd = eduPlaceCd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index 90828841..392595b0 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -711,7 +711,7 @@ public class VEAsgnmController { vEInstrAsgnmVOInfo = egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo); //대상 리스트, 페이징 정보 전달 model.addAttribute("info", vEInstrAsgnmVOInfo); - + //사용자 교육신청 과정 리스트 VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); vEPrcsDetailVO.setUseYn("Y"); diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index 8f8d985d..a09c73a9 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -775,6 +775,7 @@ , b.instt_nm AS insttNm , b.hope_sbjct AS hopeSbjct , b.EDU_PLACE AS eduPlace + , b.edu_place_cd AS eduPlaceCd , a.memo_cn AS memoCn , ((SUBSTR(a.end_tm, 1,2) - SUBSTR(a.strt_tm, 1,2)) * 60) + (SUBSTR(a.end_tm, 3,4) - SUBSTR(a.strt_tm, 3,4)) AS eduTM @@ -815,6 +816,7 @@ , a.lrn_tm AS lrnTm , b.edu_cn AS eduCn , b.edu_place AS eduPlace + , b.edu_place_cd AS eduPlaceCd , a.trgt AS trgt , a.prsnl AS prsnl /* @@ -927,6 +929,7 @@ , b.phone AS phone , b.email AS email , b.edu_place AS eduPlace + , b.edu_place_cd AS eduPlaceCd , b.end_oprtn_dt AS endOprtnDt , b.instt_div_cd AS insttDivCd , b.schol_div_cd AS scholDivCd 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 64a842f8..d203d04c 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 @@ -261,6 +261,7 @@ AND a.use_yn = 'Y' AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ + AND a.aprvl_cd != 100 /*찜 신청자 제거*/ diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index e11448db..aeef1049 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -379,6 +379,8 @@ WHERE x.prcs_ord = a.prcs_aplct_prd_ord AND x.sbmt_yn='Y' AND x.aprvl_cd != 40 /*취소된 신청자 제거*/ + AND x.aprvl_cd != 100 /*찜 신청자 제거*/ + ) AS nosCnt1 /* 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 c2df589b..40d8967c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -629,7 +629,7 @@ - 신청자가 없습니다. + 신청자가 없습니다. diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp index 1640de6e..1818f423 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -508,18 +508,18 @@ - - -

교육내용

- - - - - - ${list.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${list.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

기자재 유무

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp index c26dd8f0..68a01c63 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -502,18 +502,18 @@ - - -

교육내용

- - - - - - ${list.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${list.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

기자재 유무

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index 0b66432b..c92f71a2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -559,18 +559,18 @@ function replyCalculation(){ - - -

교육내용

- - - - - - ${plist.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${plist.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

기자재 유무

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp index 94cfbe95..522df412 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -148,28 +148,27 @@

교육장소

- - -

- checked disabled="disabled"> 집체교육 -

-

- checked disabled="disabled"> 방송실교육 -

- - - - -

교육내용

- - - - - - ${list.prcsNm}
- - - + + + ${info.eduPlace} + + + + + + + + + + +<%-- --%> +<%-- --%> +<%-- - ${list.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

기자재 유무

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 0a74bc28..b74f4310 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 @@ -159,14 +159,16 @@ function _fncEduHopeDtStep1( return ; }else if(returnData.result == "fail"){ //alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다."); - alert(returnData.msg+"는 강의가능시간이 아닙니다."); + //alert(returnData.msg+"는 강의가능시간이 아닙니다."); + alert("강의가능시간은 (관리자가 지정해둔 시간) 입니다."); flag = false; return; } if(!duplChk) { if(returnData.result == "fail2"){ - if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){ + //if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){ + if(confirm("수정 내용을 제출하시겠습니까?")){ //중복신청건이 있어도 등록(최초 질의 후 재질의 방지) duplChk = true; } else { @@ -526,11 +528,15 @@ function _chkChasiTime(p_this){ alert("등록 되었습니다."); if(type != 'I'){ if(type = 'S'){ + /* if(confirm("교육콘텐츠를 추가로 신청하시겠습니까?\n(해당 콘텐츠는 차시당 10분 내외의 동영상 mp4 파일이며, 찾아가는 저작권 교육과 별도로 학교에서 자체적으로 사용 가능합니다.)")){ location.href="" + http://localhost:3080/offedu/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.do }else{ fncGoDetail(); //상세화면 이동 } + */ + fncGoDetail(); //상세화면 이동 }else{ fncGoDetail(); //상세화면 이동 } @@ -922,7 +928,8 @@ function _chkChasiTime(p_this){ return ; }else if(returnData.result == "fail"){ //alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다."); - alert(returnData.msg+"는 강의가능시간이 아닙니다."); + //alert(returnData.msg+"는 강의가능시간이 아닙니다."); + alert("강의가능시간은 (관리자가 지정해둔 시간) 입니다."); flag = false; return ; }else if(returnData.result == "fail6"){ @@ -939,7 +946,8 @@ function _chkChasiTime(p_this){ */ }else if(!duplChk) { if(returnData.result == "fail2"){ - if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){ + //if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){ + if(confirm("수정 내용을 제출하시겠습니까?")){ //중복신청건이 있어도 등록(최초 질의 후 재질의 방지) duplChk = true; } else { 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 1a0711e8..c1f78aaa 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 @@ -440,24 +440,29 @@ ${info.addr} - - -

교육내용

- - - - - - ${eduList.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${eduList.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

교육장소

- ${info.eduPlace} + + ${info.eduPlace} + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp index f6841a15..cdef9fdd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp @@ -171,24 +171,29 @@ ${info.addr} - - -

교육내용

- - - - - - ${eduList.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${eduList.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

교육장소

- - ${info.eduPlace} + + + ${info.eduPlace} + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index 596f48a6..8099a7a0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -204,7 +204,7 @@ - +<%-- --%> @@ -216,7 +216,7 @@ 기관(학교)명 교육대상 신청상태 - 교환상태 + @@ -304,32 +304,26 @@ - + - - - - - - - - - - - - - - - - - - - -<%-- --%> - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp index b57d8a7d..fe08c0d4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndDetail.jsp @@ -192,24 +192,29 @@ $( document ).ready(function() { - - -

교육내용

- - - - - - ${plist.prcsNm}
- - - - + + + + + +<%-- --%> +<%-- --%> +<%-- - ${plist.prcsNm}
--%> +<%-- --%> +<%-- --%> + +

교육장소

- ${info.eduPlace} + + ${info.eduPlace} + + + +