diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 51c3c28a..f6baf362 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -38,6 +38,8 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; @@ -133,7 +135,11 @@ public class EduEndTngrController { @Resource(name = "egovQustnrRespondManageService") private EgovQustnrRespondManageService egovQustnrRespondManageService; + //강사상세 정보 + @Resource(name="vEInstrDetailService") + private VEInstrDetailService vEInstrDetailService; + /* // 교육신청 서비스단 @@ -505,6 +511,31 @@ public class EduEndTngrController { return modelAndView; } + /** + * 배정강사 정보 조회 + */ + @RequestMapping(value="/selectInstrInfo.do") + public ModelAndView selectInstrInfo( HttpServletRequest request + , ModelMap model + , @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("vEInstrDetailVO.getUserId() :: "+ vEInstrDetailVO.getUserId()); + + vEInstrDetailVO.setUserId(vEInstrDetailVO.getUserId()); + vEInstrDetailVO.setInstrDiv("10"); + vEInstrDetailVO.setUseYn("Y"); + VEInstrDetailVO info = vEInstrDetailService.selectDetail(vEInstrDetailVO); + + // 강사 정보 select + info = egovCryptoUtil.decryptVEInstrDetailVO(info); + + modelAndView.addObject("info", info); + modelAndView.addObject("result", "success"); + return modelAndView; + } + /** * 교육 설문 결과 정보 조회 */ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index 5dbfdbe9..04fb27c9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -138,6 +138,47 @@ ); } + + function selectInstrInfo(instrId){ + $.ajax({ + type:"POST" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/selectInstrInfo.do" + ,data: { + "userId" : instrId + } + ,dataType:'json' + ,success:function(returnData){ + console.log(returnData); + var info = returnData.info; + + $('#info_instrNm').text(info.instrNm); + + var appendHtml = ""; + if(info.phtAtchFileId == null) + appendHtml = '이미지를 넣어주세요' + else + appendHtml = ''+info.instrNm+' 사진?atchFileId='+info.phtAtchFileId+'" />' + + $('#info_instrPhoto').append(appendHtml); + + $('#info_phone').text(info.phone); + $('#info_email').text(info.email); + $('#info_post').text(info.post); + $('#info_addr').text(info.addr); + $('#info_rsdne').text(info.rsdne); + $('#info_dBirth').text(info.dBirth); + $('#info_finalSchol').text(info.finalSchol); + $('#info_mjr').text(info.mjr); + $('#info_apptYr').text(info.apptYr); + $('#info_actvtCarer').text(info.actvtCarer); + $('#info_mnLctrCn').text(info.mnLctrCn); + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + @@ -226,6 +267,189 @@ + + + + +
+ +
+ + +

교육신청 상세

@@ -494,7 +718,17 @@ ${list.trgt} - ${empty list.instrNm ? '-' : list.instrNm} +<%-- ${empty list.instrNm ? '-' : list.instrNm} --%> + + + + - + + + + + + ${list.prsnl} 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 ec5f0b68..a9928395 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 @@ -131,37 +131,36 @@ function selectInstrInfo(instrId){ $.ajax({ type:"POST" - ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/selectEduChasiStatusAjax.do" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/selectInstrInfo.do" ,data: { - "eduAplctOrd" : id - ,"eduChasiOrd" : chId + "userId" : instrId } ,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); - $("#popupTm").text(tm); - $("#popupDivCd").text(info.divCd); - $("#popupTrgt").text(info.trgt); - $("#popupInstrNm").text(info.instrNm); - $("#popupPrsnl").text(info.prsnl); + var info = returnData.info; - $("#eduAplctOrd").val(info.eduAplctOrd); - $("#eduChasiOrd").val(info.eduChasiOrd); + $('#info_instrNm').text(info.instrNm); - $(".popupInput").removeAttr("readonly"); - $(".popupInput").val("0"); + var appendHtml = ""; + if(info.phtAtchFileId == null) + appendHtml = '이미지를 넣어주세요' + else + appendHtml = ''+info.instrNm+' 사진?atchFileId='+info.phtAtchFileId+'" />' - if(action == "select"){ - $("#popupSubmin").hide(); - $("#popupSrvyStatus").text("설문완료"); - selectChasiSrvyInfo(id, chId); - }else{ - $("#popupSubmin").show(); - $("#popupSrvyStatus").text("설문진행중"); - } + $('#info_instrPhoto').append(appendHtml); + + $('#info_phone').text(info.phone); + $('#info_email').text(info.email); + $('#info_post').text(info.post); + $('#info_addr').text(info.addr); + $('#info_rsdne').text(info.rsdne); + $('#info_dBirth').text(info.dBirth); + $('#info_finalSchol').text(info.finalSchol); + $('#info_mjr').text(info.mjr); + $('#info_apptYr').text(info.apptYr); + $('#info_actvtCarer').text(info.actvtCarer); + $('#info_mnLctrCn').text(info.mnLctrCn); } ,error:function(request , status, error){ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); @@ -606,19 +605,14 @@ -

필수입력 항목*

강사명

- + -

원영현

+

원영현

-
- - - 원영현 사진 - +
@@ -626,145 +620,127 @@ -

필수입력 항목*

연락처(핸드폰)

-

010-9341-4986

+

-

필수입력 항목*

e-mail

-

rosehips@naver.com

+

-

필수입력 항목*

주소

-

50445


-

경상남도 밀양시 가곡동 449-4 1층 대강장

+


+

-

필수입력 항목*

거주지

-

경기도(남양주시 화도읍)

+

-

필수입력 항목*

생년월일

-

1980.12.01

+

-

필수입력 항목*

최종학교

-

카이스트

+

-

필수입력 항목*

전공

-

+

+ + + -

필수입력 항목*

위촉년도

-

2022

+

-

필수입력 항목*

구분

-

입문

+

- + -

필수입력 항목*

활동경력

- - +

-

필수입력 항목*

주요강의내용

- - +

@@ -776,10 +752,7 @@
- - - - +
@@ -1031,7 +1004,7 @@ ${list.trgt} -<%-- ${empty list.instrNm ? '-' : cryptoUtil.decrypt(list.instrNm)} --%> +<%-- ${empty list.instrNm ? '-' : cryptoUtil.decrypt(list.instrNm)} --%> - diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css index f4a295ee..42a27c4a 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/popup.css +++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css @@ -97,8 +97,8 @@ .application_wrap .list ol li span {display:block;white-space:normal;word-break:break-all;} .application_wrap .list ol li a {display:inline;color:#555;} -.pop_tb_type01 table tbody tr td .put_photo{position: absolute; right: 0; top: 0; border-left: 1px solid #e5e5e5} -.pop_tb_type01 table tbody tr td .put_photo .put_photo_in {background-color: #f5f5f5; width: 128px; height: 165px; border: 1px solid #d5d5d5; border-radius: 5px; margin: 7px; box-sizing: border-box; position: relative; overflow: hidden;} +.pop_tb_type01 table tbody tr td .put_photo{position: absolute; right: 0; top: 0; border-left: 1px solid #e5e5e5; background-color: #fff;} +.pop_tb_type01 table tbody tr td .put_photo .put_photo_in {background-color: #f5f5f5; width: 116px; height: 150px; border: 1px solid #d5d5d5; border-radius: 5px; margin: 7px; box-sizing: border-box; position: relative; overflow: hidden;}