From 0927ea47376528ac4b16b4d06fa9a8407c91e21c Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 1 Feb 2024 18:03:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84/=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=20=EA=B2=B0=EA=B3=BC=EB=B3=B4=EA=B3=A0=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../endInfo/web/VEEduEndController.java | 6 +- .../web/OprtnStateMngController.java | 51 ++++ src/main/webapp/WEB-INF/decorators.xml | 4 +- .../oprtn/adultVisitEdu/eduRsltMngDetail.jsp | 8 +- .../popup/auldtRsltRprtfileInsertPopup.jsp | 278 ++++++++++++++++++ .../popup/rsltRprtfileInsertNewPopup.jsp | 218 ++++++++++++++ .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 14 +- 7 files changed, 570 insertions(+), 9 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.jsp diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java index c44ef6cd..b7e8e41c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java @@ -576,9 +576,11 @@ public class VEEduEndController { // 강사 상세정보 VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); vEInstrDetailVOInfo.setInstrDiv("10"); + //영상 촬영을 위하여 임시로 로그인 ID 값 사용 - /*vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId());*/ - vEInstrDetailVOInfo.setUserId(loginVO.getUniqId()); + /*vEInstrDetailVOInfo.setUserId(loginVO.getUniqId());*/ + vEInstrDetailVOInfo.setUserId(vEEduRprtVO.getUserId()); + vEInstrDetailVOInfo.setUseYn("Y"); vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); if (vEInstrDetailVOInfo != null) { diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index fefea73e..1f0130ff 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -584,6 +584,57 @@ public class OprtnStateMngController { return modelAndView; } + /* 관리자 결과보고 등록 팝업(청소년) + * + * + * */ + @RequestMapping(value = "popup/rsltRprtfileInsertNewPopup.do") + public String rsltRprtfileInsertNewPopup( + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + ) throws Exception { + + + return "oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup"; + } + + /* 관리자 결과보고 등록 팝업(성인) + * + * + * */ + @RequestMapping(value = "popup/auldtRsltRprtfileInsertPopup.do") + public String auldtRsltRprtfileInsertPopup( + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO, ModelMap model + ) throws Exception { + + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduAplctOrd(vEEduRprtVO.getEduAplctOrd()); + //기본데이터 불러오기 + vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + + //데이터 복호화 - VO 단위로 만들어서 사용 + vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); + + model.addAttribute("info", vEEduAplctVO); + + //사용자 교육신청 차시 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); + vEEduChasiVO.setPageIndex(0); + + vEEduChasiVO.setSiteId("20"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + //List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + List vEEduChasiVOList = vEEduMIXService.selectChasiList202312(vEEduChasiVO); + + //복호화 + vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList); + + model.addAttribute("chasiList", vEEduChasiVOList); + + return "oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup"; + } /** * 교육실적통계 화면 */ diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 2a89c285..500bcd69 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -50,7 +50,9 @@ */ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do */ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.do - */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.do diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 7bdffd6c..9536c02f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -190,7 +190,11 @@ function fncAttachFileCreate(){ - alert("구현해야 합니다."); + document.chasiStatusPopForm.action = ""; + window.open("#", "_attachFileCreatePop", "scrollbars = no, top=100px, left=100px, height=900px, width=950px"); + document.chasiStatusPopForm.target = "_attachFileCreatePop"; + document.chasiStatusPopForm.submit(); + } // 결과보고서 삭제 @@ -509,7 +513,7 @@ function fncAttachFileDelete( - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.jsp new file mode 100644 index 00000000..cd191a51 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/auldtRsltRprtfileInsertPopup.jsp @@ -0,0 +1,278 @@ +<%@ 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 : filePopup.jsp + * @Description : 교육확정안 등록 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + " /> + " /> + + + + + + +
+
+ +
+

+ 결과보고 등록 +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

강의주제

+
+ + "> + +
+

강의날짜

+
+ +
+

강의시간

+
+ + + ~ + + + (${list.lrnTm}분) +
+

교육매체

+
+ + + + + + +
+

장 소

+
+ +
+

교육대상

+
+ +
+

인 원

+
+ +
+

강사명(소속)

+
+ + + + - + + + + + + +
+

첨부파일

+
+ +
+ +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.jsp new file mode 100644 index 00000000..7cfb7e29 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/rsltRprtfileInsertNewPopup.jsp @@ -0,0 +1,218 @@ +<%@ 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 : filePopup.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/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index 7627a1ba..7c18ab17 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -147,8 +147,13 @@ function replyCalculation(){ } function fncAttachFileCreate(){ - - alert("구현해야 합니다."); + + document.chasiStatusPopForm.userId.value = document.getElementById("chasiUserId").value; + document.chasiStatusPopForm.action = ""; + window.open("#", "_attachFileCreatePop", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.chasiStatusPopForm.target = "_attachFileCreatePop"; + document.chasiStatusPopForm.submit(); + } // 결과보고서 삭제 @@ -388,6 +393,7 @@ function replyCalculation(){ " /> " /> + @@ -606,7 +612,7 @@ function replyCalculation(){ - + @@ -726,7 +732,7 @@ function replyCalculation(){ - +