diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index 5ab4edcb..da3d7cbe 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -475,6 +475,24 @@ public class EduRsltMngAdultController { vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + + //사용자 교육신청 차시 리스트 - 4 qr=============================================== + VEEduChasiVO vEEduChasiQR = new VEEduChasiVO(); + vEEduChasiQR.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiQR.setEduChasiOrd(vEEduAplctVO.getEduChasiOrd()); + vEEduChasiQR.setInstrDiv(VeConstants.LCTR_DIV_CD_20); + vEEduChasiQR.setPageIndex(0); + + vEEduChasiQR.setSiteId("20"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + //List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + List vEEduChasiQRList = vEEduMIXService.selectChasiList202312(vEEduChasiQR); + + //복호화 + vEEduChasiQRList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiQRList); + + model.addAttribute("chasiQr", vEEduChasiQRList); + return "oprtn/adultVisitEdu/eduRsltMngDetail"; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 8aab6e66..ac5e2fe3 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -511,7 +511,64 @@ public class EduRsltMngTngrController { return "oprtn/tngrVisitEdu/popup/chasiStatusPopup"; } + /** + * 교육결과관리 상세 화면 + */ + @RequestMapping("popup/chasiQRPopup.do") + public String chasiQRPopup( + //@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + @ModelAttribute("vEEduChasiVO") VEEduChasiVO vEEduChasiVO + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //설문 정보(설문지정보, 문항정보) + try { + //qustnrCommonUtil._qustnrQesItm(model, p_siteId, p_siteIdCd, p_qestnrTmplatId, p_vEALettnQestnrMIXService, p_egovQustnrRespondInfoService) + + /* + model = qustnrCommonUtil._qustnrQesItm( + model + , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012 + , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012 + , "QTMPLA_0000000000001" + , vEALettnQestnrMIXService + , egovQustnrRespondInfoService + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() + ); + */ + + }catch(Exception ex) { + ex.printStackTrace(); + } + + System.out.println("================================= Comtnqustnrqesitm ================================="); + + + //답변정보 + try{ + /* + model = qustnrCommonUtil._chasiSrvyList( + model + , VeConstants.LCTR_DIV_CD_10 //청소년 -10, 성인-20, ...VE0012 + , "10" //10-기본설문, 20-신청자설문, 30-강사설문 VEA012 + , vEEduAplctVO.getEduAplctOrd() + , vEEduAplctVO.getEduChasiOrd() + , vEALettnQestnrMIXService + ); + */ + + }catch(Exception ex) { + ex.printStackTrace(); + } + + System.out.println("=============================================chasiSrvyList============================================="); + return "oprtn/tngrVisitEdu/popup/chasiQRPopup"; + } + /** * 교육설문 수정 - 청소년/성인 공통 */ @@ -860,6 +917,26 @@ public class EduRsltMngTngrController { }catch(Exception ex) { ex.printStackTrace(); } + + + //사용자 교육신청 차시 리스트 - 4 qr=============================================== + VEEduChasiVO vEEduChasiQR = new VEEduChasiVO(); + vEEduChasiQR.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiQR.setEduChasiOrd(vEEduAplctVO.getEduChasiOrd()); + vEEduChasiQR.setInstrDiv(VeConstants.LCTR_DIV_CD_20); + vEEduChasiQR.setPageIndex(0); + + vEEduChasiQR.setSiteId("10"); //설문정보를 위해서 설문지의 대상값을 넣는다. VE0011 10-청소년, 20-성인,30-체험, 40-외부, 50-기반, 60-기소 + + //List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + List vEEduChasiQRList = vEEduMIXService.selectChasiList202312(vEEduChasiQR); + + //복호화 + vEEduChasiQRList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiQRList); + + model.addAttribute("chasiQr", vEEduChasiQRList); + + return "oprtn/tngrVisitEdu/eduRsltMngDetail"; } 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 9e7ae80c..eb8b80b9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -360,6 +360,34 @@ ); } + + // 만족도 평가 등록/수정 팝업(청소년, 성인 별도임) + function fn_chasiQRPop( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + var form = document.chasiStatusPopForm; + + form.eduAplctOrd.value=id; + form.eduChasiOrd.value=chId; + form.siteIdCd.value=p_site_id_cd; + form.qustnrTmplatId.value=p_qustnrTmplatId; + form.qestnrId.value=p_qestnrId; + form.qustnrRespondId.value=p_qustnrRespondId; + + //form.action = "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrQRPrintPopList.do"; + form.action = ""; + + + window.open("#", "_chasiQRPop", "scrollbars = no, top=100px, left=100px, height=750px, width=830px"); + form.target = "_chasiQRPop"; + form.submit(); + } @@ -367,6 +395,12 @@ " /> " /> + + + + + + @@ -930,6 +964,26 @@
+ + + + + + + + + + + + + + + + +
@@ -939,6 +993,26 @@
+ + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp index 2d27e2cf..d6bd1230 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp @@ -229,7 +229,7 @@ - + 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 06f18553..35467a6f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -322,7 +322,33 @@ function replyCalculation(){ form.submit(); } - + // 만족도 평가 등록/수정 팝업(청소년, 성인 별도임) + function fn_chasiQRPop( + id //aplctOrd + , chId //chasiOrd + , p_site_id_cd //10,20,30 + , p_action //select, insert + , p_qustnrTmplatId //select, insert + , p_qestnrId //select, insert + , p_qustnrRespondId //select, insert + ) { + var form = document.chasiStatusPopForm; + + form.eduAplctOrd.value=id; + form.eduChasiOrd.value=chId; + form.siteIdCd.value=p_site_id_cd; + form.qustnrTmplatId.value=p_qustnrTmplatId; + form.qestnrId.value=p_qestnrId; + form.qustnrRespondId.value=p_qustnrRespondId; + + //form.action = "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/qustnrQRPrintPopList.do"; + form.action = ""; + + + window.open("#", "_chasiQRPop", "scrollbars = no, top=100px, left=100px, height=750px, width=830px"); + form.target = "_chasiQRPop"; + form.submit(); + } // 서류요청 SMS, EMAIL 알림 팝업 @@ -394,6 +420,12 @@ function replyCalculation(){ " /> " /> + + + + + + @@ -973,8 +1005,27 @@ function replyCalculation(){ <%-- --%> -
+
+ + + + + + + + + + + + + + + +
@@ -982,8 +1033,28 @@ function replyCalculation(){ -
+
+ + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiQRPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiQRPopup.jsp new file mode 100644 index 00000000..0a54e2a8 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiQRPopup.jsp @@ -0,0 +1,307 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : chasiQRPopup.jsp + * @Description : 관리자에서 QR보기 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + + +
+ + + + + + + + +
+ +
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp index 2eaa9660..a2714801 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp @@ -609,7 +609,7 @@ - +<%-- --%>
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 0dc0a206..2848225f 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 @@ -229,7 +229,7 @@ - +<%-- --%> @@ -348,7 +348,7 @@ - +<%-- --%>