diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 9f3b7b3a..311787d1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -166,6 +166,8 @@ public class EduAplctMngTngrController { vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd()); } + System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery()); + //2. pageing step2 vEEduAplctVO = this.setPagingStep2Sub(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); 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 1cd0d39c..1c33f4df 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 @@ -407,6 +407,42 @@ public class EduRsltMngTngrController { } + + /** + * 교육결과관리 상세 화면 + */ + @RequestMapping("popup/chasiStatusPopup.do") + public String chasiStatusPopup( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + // 설문조사 문항리스트 조회 + + QustnrRespondInfoVO qustnrRespondInfoVO = new QustnrRespondInfoVO(); + qustnrRespondInfoVO.setSiteId(VeConstants.LCTR_DIV_CD_10); + QustnrRespondInfoVO info = egovQustnrRespondInfoService.selectSiteIdQustnrTmplat(qustnrRespondInfoVO); + + Map commandMap =new HashMap(); + commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); + commandMap.put("qestnrId",info.getQestnrId()); //문제 ID + model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); + + // 설문조사 결과 조회 + qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + qustnrRespondInfoVO.setEduChasiOrd(vEEduAplctVO.getEduChasiOrd()); + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList(qustnrRespondInfoVO); + if(chasiSrvyList.size() > 0) { + model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + model.addAttribute("chasiSrvyList",chasiSrvyList); + } + System.out.println("=============================================chasiSrvyList============================================="); + + return "oprtn/tngrVisitEdu/popup/chasiStatusPopup"; + } /** * 교육결과관리 상세 화면 @@ -425,6 +461,7 @@ public class EduRsltMngTngrController { //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + model.addAttribute("vEEduAplctVO", vEEduAplctVO); //로그인 처리==================================== try{ String chasiOrd = vEEduAplctVO.getEduChasiOrd(); @@ -534,6 +571,7 @@ public class EduRsltMngTngrController { commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); commandMap.put("qestnrId",info.getQestnrId()); //문제 ID model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); // 설문조사 결과 조회 qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); @@ -544,6 +582,7 @@ public class EduRsltMngTngrController { model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); model.addAttribute("chasiSrvyList",chasiSrvyList); } + System.out.println("=============================================chasiSrvyList============================================="); /* System.out.println("------------------------"); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml index 96856d1f..a6c2e8b2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml @@ -774,22 +774,9 @@ ORDER BY 1=1 - - , A.EDU_APLCT_ORD DESC - - - , CC.EDU_HOPE_DT desc - - - , CC.EDU_HOPE_DT asc - + , $orderByQuery$ - - - - - LIMIT #recordCountPerPage# OFFSET #firstIndex# 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 e2704e44..bd3fb612 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -221,14 +221,63 @@ function replyCalculation(){ } }); } + + + + + + // 강사 변경 + function fn_chasiStatusPop() { + var form = document.chasiStatusPopForm; + +// form.eduAplctOrd.value = aplctOrd; +// form.eduChasiOrd.value = chasiOrd; +// form.strtTm.value = strtTm; +// form.endTm.value = endTm; +// form.asgnmAprvlCd.value = code; + + //추가 강사 변경 +// form.action = ""; +console.log("form :: ", form); + form.action = ""; + + + window.open("#", "_chasiStatusPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_chasiStatusPop"; + form.submit(); + } + + + + + + + + + + + + " /> + " /> + " /> " /> + + " /> + " /> + " /> + + " /> + " /> + + " /> + " />
@@ -622,6 +671,11 @@ function replyCalculation(){ +
+
+ +
+

비공개 메모

@@ -704,5 +758,10 @@ function replyCalculation(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp new file mode 100644 index 00000000..4b067dae --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp @@ -0,0 +1,424 @@ + +<%@ 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 : instrAsgnmAddPopup.jsp + * @Description : 강사배치 추가강의 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + + + + + + + + + + +
+
+
+

강의만족도 결과 등록

+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
교육일차시구분대상배정강사인원설문완료 여부
2022-03-3014:10~15:35(85분)101-1반원영현55설문진행중
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
+

참석자

+ 		+ + + +

응답율

+ 		-
+

응답자

+ 		+ + + +

무응답

+ 		-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ 1) 본 교육운영에 대하여 전반적으로 만족하십니까? + + + + + + + + + + + + + + + + + + + +
+ 2) 본 교육 내용구성에 대해서는 어느 정도 만족 하십니까? + + + + + + + + + + + + + + + + + + + +
+ 3) 교육 시간은 적절했다고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 4) 본 교육을 받기 전 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 5) 본 교육을 받은 후, 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 6) 본 교육을 통해, 학교 수업 혹은 직무에 얼마나 도움이 될 것이라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 7) 강사가 교육 5분 전까지 도착했나요?(지각여부_교사 only) + + + + + + + + + + + + + + + + + + + +
+ 8) 본 교육과 관련하여 강사가 교육 5분 전까지 도착했습니까?(지각여부확인_교사만) + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 8057de1d..6666ab8c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -96,6 +96,7 @@ } ,dataType:'json' ,success:function(returnData){ + console.log(returnData); var info = returnData.chasiInfo; var tm = info.strtTm.replace(/(.{2})/,"$1:") +"~"+ info.endTm.replace(/(.{2})/,"$1:")+"("+info.lrnTm+"분)" $("#popupEduHopeDt").text(info.eduHopeDt);