diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java index 61d304ff..7ba566bb 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -62,6 +62,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { //서류요청 기능 public String docReqNm = ""; //요청 서류명 public String sbmtId = ""; //제출 강사 ID + public String eduDocReqOrd = "";//서류요청 순번 public String getFileType() { @@ -160,6 +161,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.sbmtId = sbmtId; } + public String getEduDocReqOrd() { + return eduDocReqOrd; + } + + public void setEduDocReqOrd(String eduDocReqOrd) { + this.eduDocReqOrd = eduDocReqOrd; + } + diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java index 51e380d8..fa3ea7bf 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -36,4 +36,6 @@ public interface InnorixFileService { RestResponse insertInnorixReqFile(AdrInnorixFileVO adrInnorixFileVO); + RestResponse insertInnorixDocFile(AdrInnorixFileVO adrInnorixFileVO); + } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index 20e8c983..28ef9abc 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -432,6 +432,32 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I } + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); + } + + @Override + public RestResponse insertInnorixDocFile(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + //VE_EDU_DOC_REQ 서류요청테이블 insert + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setEduDocReqOrd(adrInnorixFileVO.getEduDocReqOrd()); + vEEduAplctVO.setSbmtAtchFileId(atchFileId); + vEEduAplctService.updateSbmtAtchFileId(vEEduAplctVO); + + } catch (Exception e) { e.printStackTrace(); return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java index 4a2d3fd8..b47e3727 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -184,4 +184,29 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.insertInnorixReqFile(adrInnorixFileVO)); } + + /** + * @methodName : insertReqDocInnorixFile + * @author : 이지우 + * @date : 2023.11.06 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + * 청소년 교육 강사 요청 서류 업로드 + */ + @RequestMapping(value = {"/web/common/insertInnorixDocFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertReqDocInnorixFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + adrInnorixFileVO.setUniqId(userId); + + return ResponseEntity.ok(innorixService.insertInnorixDocFile(adrInnorixFileVO)); + } } \ No newline at end of file diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index d59bb6e4..40fbed82 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -901,6 +901,29 @@ public class CommonWebController { return modelAndView; } + // 강사 요청 서류 업르도 팝업 + @RequestMapping("/popup/docFileUploadPop.do") + public String reqFileUploadPop(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model, HttpServletRequest request) throws Exception{ + try { + + + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + vEEduAplctVO.setUserId(loginVO.getUniqId()); + System.out.println("===================== loginVO.getUniqId() :: " + loginVO.getUniqId()); + + String fileType = request.getParameter("fileType"); + System.out.println("=====================" + fileType); + model.addAttribute("fileType", fileType); + + String eduDocReqOrd = request.getParameter("eduDocReqOrd"); + model.addAttribute("eduDocReqOrd", eduDocReqOrd); + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + return "/web/ve/comm/docFileUploadPop"; + } //////////////////////////////////////////////////////////////////////// // // 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 36cc948e..a1fe02a0 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 @@ -484,6 +484,13 @@ public class EduEndTngrController { egovQustnrRespondManageService.selectQustnrRespondManageListCnt(searchVO); model.addAttribute("cryptoUtil", egovCryptoUtil); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); return "/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail"; } 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 d5903fc4..c74b31dd 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 @@ -29,6 +29,8 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; @@ -86,6 +88,9 @@ public class VEAsgnmController { @Resource(name = "vEEduMIXService") private VEEduMIXService vEEduMIXService; + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + //청소년강사 강의 요청 목록 @RequestMapping("/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.do") public String instrAsgnmRqstList( @@ -573,6 +578,14 @@ public class VEAsgnmController { model.addAttribute("vEEduChasiCompanionVOList", vEEduChasiCompanionVOList); + //요청서류 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEInstrAsgnmVOInfo.getEduAplctOrd()); + veEduDocReqVO.setSbmtId(loginVO.getUniqId()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java index e13a0a21..c0edb85f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java @@ -54,4 +54,7 @@ public interface VEEduAplctService { //서류요청 목록 조회 List selectDocReqList(VEEduAplctVO paramVO) throws Exception; + + //요청서류 제출 + void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java index ab17483c..2958bd2d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctDAO.java @@ -147,4 +147,8 @@ public class VEEduAplctDAO extends EgovAbstractDAO { public List selectDocReqList(VEEduAplctVO paramVO) throws Exception { return (List) list("VEEduAplctDAO.selectDocReqList", paramVO); } + + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { + insert("VEEduAplctDAO.updateSbmtAtchFileId", paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index 89059355..5c7917b7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -171,4 +171,8 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { public List selectDocReqList(VEEduAplctVO paramVO) throws Exception{ return vEEduAplctDAO.selectDocReqList(paramVO); } + + public void updateSbmtAtchFileId(VEEduAplctVO paramVO) throws Exception { + vEEduAplctDAO.updateSbmtAtchFileId(paramVO); + } } 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 e0c2594d..474b5fb0 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 @@ -46,6 +46,7 @@ import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; @@ -112,6 +113,9 @@ public class VEEduEndController { @Resource(name="vEAsgnmNotiService") private VEAsgnmNotiService vEAsgnmNotiService; + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + private static final Logger LOGGER = LoggerFactory.getLogger(EgovFileDownloadController.class); /** @@ -324,6 +328,15 @@ public class VEEduEndController { vEAsgnmNotiVO.setTblUniqOrd(vEInstrAsgnmVO.getEduChasiOrd()); vEAsgnmNotiVO.setFrstRegisterId(loginVO.getUniqId()); + //요청서류 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEInstrAsgnmVOInfo.getEduAplctOrd()); + veEduDocReqVO.setSbmtId(loginVO.getUniqId()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); + try { System.out.println("session.getAttribute(menuNo).toString()"); System.out.println(session.getId()); 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 a73775df..097b77b0 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 @@ -463,6 +463,13 @@ public class EduAplctMngTngrController { System.out.println(session.toString()); System.out.println(session.getAttribute("menuNo").toString()); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); return "oprtn/tngrVisitEdu/eduAplctMngDetail"; } @@ -964,6 +971,13 @@ public class EduAplctMngTngrController { } + /** + * 교육신청관리 상세 화면 + */ + @RequestMapping("popup/eduDocReqAlertPopup.do") + public String eduDocReqAlertPopup( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + return "oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup"; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // 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 a0c435fa..77fc08a3 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 @@ -697,6 +697,14 @@ public class EduRsltMngTngrController { vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + //서류 요청 목록 + VEEduAplctVO veEduDocReqVO = new VEEduAplctVO(); + veEduDocReqVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + List vEEduDocReqList = vEEduAplctService.selectDocReqList(veEduDocReqVO); + //복호화 + vEEduDocReqList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduDocReqList); + model.addAttribute("docReqList", vEEduDocReqList); + }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 6eb678ef..18fdaa43 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -1247,10 +1247,10 @@ A.EDU_DOC_REQ_ORD AS eduDocReqOrd, A.DOC_REQ_NM AS docReqNm, A.DOC_FORM_ATCH_FILE_ID AS docFormAtchFileId, - A.FRST_REGIST_PNTTM AS frstRegistPnttm, + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm, A.FRST_REGISTER_ID AS frstRegisterId, A.SBMT_ATCH_FILE_ID AS sbmtAtchFileId, - A.SBMT_PNTTM AS sbmtPnttm, + TO_CHAR(A.SBMT_PNTTM,'YYYY-MM-DD') AS sbmtPnttm, A.SBMT_ID AS sbmtId, B.INSTR_NM AS instrNm FROM @@ -1263,7 +1263,20 @@ AND EDU_APLCT_ORD = #eduAplctOrd# + + AND SBMT_ID = #sbmtId# + + + + /* VEEduAplctDAO.updateSbmtAtchFileId */ + UPDATE VE_EDU_DOC_REQ + SET + SBMT_ATCH_FILE_ID = #sbmtAtchFileId#, + SBMT_PNTTM = SYSDATE + WHERE + EDU_DOC_REQ_ORD = #eduDocReqOrd# + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp index 76153620..174cd7e4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngCreate.jsp @@ -333,7 +333,9 @@ - + + + @@ -341,7 +343,7 @@

필수입력 항목*

교사 아이디

- @@ -359,7 +361,7 @@ <%-- 수정요청사항에 따라 온라인 -> 온라인 실시간으로 변경을 위해 ve:code 미사용_220218 --%> - @@ -467,7 +469,7 @@

필수입력 항목*

신청내용

-
+ + @@ -510,17 +512,19 @@ - - + + + + - - - - - - + + + + + + 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 0626a2b4..41f37633 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -289,6 +289,13 @@ }); } + // 서류요청 SMS, EMAIL 알림 팝업 + function alertPopup(userId,type) { //메뉴생성 화면 호출 + document.popForm.action = ""; + window.open("#", "_eduDocReqAlertPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.popForm.target = "_eduDocReqAlertPopup"; + document.popForm.submit(); + } @@ -570,6 +577,76 @@

필수입력 항목*

교육희망일

필수입력 항목*

시간

필수입력 항목*

대상

필수입력 항목*

인원

필수입력 항목*

교육희망일

필수입력 항목*

시간

필수입력 항목*

대상

필수입력 항목*

인원
+ + +
+

요청서류 목록

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명서류명요청일양식제출일제출서류 및 알림
+ + + + + + + + + + + + + + + - + + + + + + + + + + + <%-- + --%> + +
+
+
+

알림정보

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 39a9d1b9..cff989b1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -271,7 +271,13 @@ function replyCalculation(){ - + // 서류요청 SMS, EMAIL 알림 팝업 + function alertPopup(userId,type) { //메뉴생성 화면 호출 + document.popForm.action = ""; + window.open("#", "_eduDocReqAlertPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + document.popForm.target = "_eduDocReqAlertPopup"; + document.popForm.submit(); + } @@ -521,6 +527,76 @@ function replyCalculation(){
+ + +
+

요청서류 목록

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명서류명요청일양식제출일제출서류 및 알림
+ + + + + + + + + + + + + + + - + + + + + + + + + + + <%-- + --%> + +
+
+
+

결과보고

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp new file mode 100644 index 00000000..1d5c26fc --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp @@ -0,0 +1,112 @@ + +<%@ 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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% + /** + * @Class Name : eduAplctMngDetailPopup.jsp + * @Description : 신청 상세 보기 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.16 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + */ +%> + + +교육신청 상세 + + + + + + + + + + " /> + +
+ " /> + +
+ +
+
+ +

SMS|EMIAL 발송 - 개발전

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

수신자

+
청소년강사1(010-1111-2222)
+

내용

+
+ + +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+
+ + + 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 854c4c60..1f4f24cf 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 @@ -232,7 +232,7 @@ return false; } //첨부파일 체크 및 요청 - if(confirm("서류 요청을 등록하시겠습니까?")){ + if(confirm("양식을 업로드 하시겠습니까?")){ if(control.getUploadFiles().length > 0){ var postObj = new Object(); postObj.innoDirPath = $('#innoDirPath').val(); @@ -402,7 +402,7 @@
+ + +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명강사명양식제출여부제출일
+ + + + + + + + + + + + + + + 미제출 + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp new file mode 100644 index 00000000..39019f6d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/docFileUploadPop.jsp @@ -0,0 +1,186 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ 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="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%-- --%> + + + + + + + +
+ + + " /> +
+ + + 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 b9af714a..df6f50ce 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 @@ -11,6 +11,9 @@ 강사프로필 목록 + + + @@ -774,6 +787,71 @@
+ +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명요청일양식제출여부제출일
+ + + + + + + + + + + + + + + + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+
+
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 c615dd44..24ab2b54 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 @@ -518,6 +518,133 @@ $( document ).ready(function() {
+
+
+

동반강사리스트

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육일자강사명차시학교(기관)명교육장소교육대상
+ + + ${list.eduHopeDt} + + ${list.instrNm} + + + ~ + (분) + + + + + + +
+
+ + +
+
+

요청서류 목록

+
+
+
+ + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육차시 정보 교육희망일, 시간, 구분, 대상, 배정강사, 인원 을/를 제공하는 표
서류명요청일양식제출여부제출일
+ + + + + + + + + + + + + + + - + + + + + + + - + +
+

* 확정된 교육에 대한 변경은 위원회를 통해 진행 부탁드립니다.

+
+
+
diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index 5bb39ef7..7a38940d 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -91,7 +91,7 @@ input[type="text"]::placeholder {color: #999;} input[type="text"]:read-only {background-color: #f5f5f5; border: 1px solid #d5d5d5;} input[type="text"]:valid {color: #555;} textarea {width: 100%; border: 1px solid #d5d5d5; border-radius: 5px; font-size: 16px; color: #222; padding: 15px; box-sizing: border-box; font-family: 'Noto Sans KR', sans-serif;} -select.sel_type1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 50px 0 15px; font-size: 16px; color: #222; background-image: url(../image/content/select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; color: #666;} +select.sel_type1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 50px 0 15px; font-size: 16px; color: #222; background-image: url(/offedu/visitEdu/adm/publish/image/content/select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; color: #666;} table select+button{vertical-align: middle;} /*.btn_edit {width: 24px !important; height: 24px !important; padding: initial !important; border: 1px solid #d5d5d5; border-radius: 5px; vertical-align: middle;}*/ .btn_edit {padding: 0 5px;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/common.css b/src/main/webapp/visitEdu/usr/publish/css/common.css index 7c06495e..6c3d4fcc 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/common.css +++ b/src/main/webapp/visitEdu/usr/publish/css/common.css @@ -64,9 +64,9 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);} .header_inner .dep_li_07 .depth01_li:nth-child(n+2):nth-child(-n+4){width: 16%;} .header_inner .dep_li_07 .depth01_li:nth-child(n+5){width: 12%; min-width: 85px;} .header_inner .dep_li_07 .depth01_li:nth-child(1),.header_inner .dep_li_07 .depth01_li:nth-child(2){width:170px;} -.header_inner .menu_link{font-size: 18px; font-weight: 600; letter-spacing: -0.5px; display: flex; align-items: center; justify-content: center; flex-flow: column; height: 100%; position: relative;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; line-height: 1.25;} +.header_inner .menu_link{font-size: 18px; letter-spacing: -0.5px; display: flex; align-items: center; justify-content: center; flex-flow: column; height: 100%; position: relative;line-height: 1.25;font-family: 'GmarketSansMedium';} .header_inner .menu_link::before{position: absolute; content: " "; display: block; width: 0; height: 4px; background-color: #E95504; left: 50%; transform: translateX(-50%); transition: width .4s ease-in-out; top: 87px; z-index: 1;} -.header_inner .menu_link .menu_link_br {color: #E95504;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; } +.header_inner .menu_link .menu_link_br {color: #E95504;font-family: 'GmarketSansMedium';} .header_inner .on .menu_link{color: #E95504;} .on .nav_wrap .on .menu_link::before{width: 100%;} .header_inner .depth02{position: absolute; text-align: center; padding: 15px 0; width: 100%; left: 50%; transform: translateX(-50%);border-right: 1px solid #d5d5d5;/* max-height: 350px; */} @@ -283,6 +283,17 @@ footer .wa_mark .wa {width: 110px;margin: 0 40px 0 0;} footer .area_top .site_go select {overflow:hidden;text-overflow:ellipsis;white-space:nowrap;float:left;width:calc(100% - 45px);height:35px;padding:0 35px 0 15px;font-size:14px;background-size:10px;} footer .area_top .site_go .btn_go {float:right;width:40px;height:35px;font-size:14px;} } + +@media screen and (max-width: 767px){ + header .header .header_inner h1 a img{width:150px;height:auto;} +} + +@media screen and (max-width: 400px){ + footer .area_top address{margin:15px 0;} + footer .wa_mark,footer .area_top .site_go{position:unset;} + footer .wa_mark{margin:0 0 30px 0;} + footer .area_top .site_go{width:100%;} +} @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none){ .header_inner .area_right{/* width: 80px; */justify-content: space-between;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/font.css b/src/main/webapp/visitEdu/usr/publish/css/font.css index f7622028..a32de38d 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/font.css +++ b/src/main/webapp/visitEdu/usr/publish/css/font.css @@ -25,4 +25,11 @@ font-style: normal; font-weight: 400; src: url('//cdn.jsdelivr.net/korean-webfonts/1/corps/lottemart/LotteMartHappy/LotteMartHappyMedium.woff2') format('woff2'), url('//cdn.jsdelivr.net/korean-webfonts/1/corps/lottemart/LotteMartHappy/LotteMartHappyMedium.woff') format('woff'); - } \ No newline at end of file + } + +@font-face { + font-family: 'yg-jalnan'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_four@1.2/JalnanOTF00.woff') format('woff'); + font-weight: normal; + font-style: normal; +} \ No newline at end of file diff --git a/src/main/webapp/visitEdu/usr/publish/css/main.css b/src/main/webapp/visitEdu/usr/publish/css/main.css index 2306cbfc..48acb3de 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/main.css +++ b/src/main/webapp/visitEdu/usr/publish/css/main.css @@ -7,10 +7,10 @@ .visual_slide .swiper-slide .inner .text_area{height:auto;padding:63px 0 0 40px;margin:0 auto;box-sizing:border-box;text-align:center;} .visual_slide .swiper-slide .inner .text_area *{line-height: 1.4;color:#182448;} .visual_slide .swiper-slide .inner .text_area .sub_title{font-size:20px;font-family:'GmarketSansMedium';} -.visual_slide .swiper-slide .inner .text_area .title{font-size:52px;font-family:'GmarketSansBold';} +.visual_slide .swiper-slide .inner .text_area .title{font-size:52px;font-family:'yg-jalnan';} .visual_slide .swiper-slide .inner .text_area .summary{font-size:18px;} .visual_slide .swiper-slide .inner .text_area a{display:flex;width:145px;height:38px;font-size: 18px;color:#182448;background-color:#fff;padding:0 20px;margin:33px auto 0 auto;border-radius:26px;align-items:center;justify-content:space-between;box-sizing:border-box;} -.visual_slide .slide_control{position:relative;width:100%;bottom:20px;} +.visual_slide .slide_control{position:relative;width:100%;bottom:32px;} .visual_slide .slide_control .inner{position:relative;justify-content:center;align-items:center;} .visual_slide .slide_control .swiper-pagination{position: relative;} .visual_slide .slide_control .swiper-pagination-bullet{background-color:#19222d;opacity:0.5;margin:0 4px;} @@ -22,14 +22,14 @@ .visual_slide .btn_prev_slide{background:url(/offedu/visitEdu/usr/publish/images/main/btn_main_visual_arrow_right.png) no-repeat;left:77px;} .visual_slide .btn_next_slide{background:url(/offedu/visitEdu/usr/publish/images/main/btn_main_visual_arrow_left.png) no-repeat;left:calc(100% - 97px);} -.visual_slide .swiper-slide[aria-label="1 / 5"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_01.jpg) no-repeat;} -.visual_slide .swiper-slide[aria-label="2 / 5"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_02.jpg) no-repeat;} -.visual_slide .swiper-slide[aria-label="3 / 5"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_03.jpg) no-repeat;} -.visual_slide .swiper-slide[aria-label="4 / 5"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_04.jpg) no-repeat;} -.visual_slide .swiper-slide[aria-label="5 / 5"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_05.jpg) no-repeat;} +.visual_slide .swiper-slide[data-swiper-slide-index="0"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_01.jpg) no-repeat center top;} +.visual_slide .swiper-slide[data-swiper-slide-index="1"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_02.jpg) no-repeat center top;} +.visual_slide .swiper-slide[data-swiper-slide-index="2"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_03.jpg) no-repeat center top;} +.visual_slide .swiper-slide[data-swiper-slide-index="3"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_04.jpg) no-repeat center top;} +.visual_slide .swiper-slide[data-swiper-slide-index="4"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_05.jpg) no-repeat center top;} /* main_banner_link */ -.container .main_banner_link{position:relative;height:130px;margin:60px auto 70px auto;} +.container .main_banner_link{position:relative;height:130px;margin:20px auto 70px auto;} .container .main_banner_link li{position:relative;display:flex;width:calc((100%/5) - 12px);height:100%;background-color:#fff;border-radius:5px;box-shadow:0 0 5px rgba(45,55,90,0.2);align-items:center;transition:all 0.3s ease-in-out;} .container .main_banner_link li::after{position:absolute;content:" ";width: calc(100% + 10px);height:calc(100% + 10px);border:3px solid transparent;left:-8px;border-radius:10px;} .container .main_banner_link li:hover{z-index: 15;} @@ -86,5 +86,46 @@ .wrap .notify .notify_control .slide_pause,.wrap .notify .notify_control .slide_play{height: 30px;margin: 0 0 0 -0.5px;} .wrap .notify .notify_control .slide_pause{background:url(/offedu/visitEdu/usr/publish/images/main/btn_pause.png) no-repeat center center;} .wrap .notify .notify_control .slide_play{background:url(/offedu/visitEdu/usr/publish/images/main/btn_play.png) no-repeat center center;} -.wrap .notify .content{width:100%;height:332px;overflow: hidden;border-radius:5px;} +.wrap .notify .content{width:100%;height:332px;overflow:hidden;border-radius:5px;} + +@media all and (max-width: 1440px){ + .main .inner{width:calc(100% - 40px);} + .wrap .notice .content,.wrap .data_notice .notice_list li{padding:15px 25px;} + +} + +@media all and (max-width: 1024px){ + .main{margin-top:130px;} + .wrap .content_wrap{width:100%;margin:0 0 30px 0;} + + .visual_slide .swiper-slide{background-size:auto 100% !important;} + .visual_slide .swiper-slide .inner .text_area{width:calc(100% - 40px);margin:0 auto;padding:63px 0 0 0;} + .visual_slide .swiper-slide .inner .text_area .sub_title{font-size:1.2rem;} + .visual_slide .swiper-slide .inner .text_area .title{font-size:2.5rem;} + .visual_slide .swiper-slide .inner .text_area .summary{font-size:1.1rem;} + .visual_slide .slide_control{bottom:-20px;} + + .container .main_banner_link{height:auto;} + .container .main_banner_link li{width:calc((100% - 20px)/2);margin:0 0 10px 0;padding:15px 0;} +} + +@media all and (max-width: 767px){ + .main{margin:70px 0 0 0;} + + .visual_slide .btn_next_slide{left:calc(100% - 60px);} + .visual_slide .btn_prev_slide{left:10px;} +} + +@media all and (max-width: 640px){ + .visual_slide .swiper-slide{background-size:cover !important;} + .visual_slide .swiper-slide[data-swiper-slide-index="0"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg) no-repeat center bottom;} + .visual_slide .swiper-slide[data-swiper-slide-index="1"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_02_mob.jpg) no-repeat center bottom;} + .visual_slide .swiper-slide[data-swiper-slide-index="2"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_03_mob.jpg) no-repeat center bottom;} + .visual_slide .swiper-slide[data-swiper-slide-index="3"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_04_mob.jpg) no-repeat center bottom;} + .visual_slide .swiper-slide[data-swiper-slide-index="4"]{background:url(/offedu/visitEdu/usr/publish/images/main/main_visual_05_mob.jpg) no-repeat center bottom;} + + .visual_slide .swiper-slide .inner .text_area .title{font-size:2rem;} + .visual_slide .swiper-slide .inner .text_area .summary{font-size:1rem;letter-spacing:-0.5px;} + +} diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg index 774f33ce..821327f9 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg new file mode 100644 index 00000000..85bf5a91 Binary files /dev/null and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_02_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_02_mob.jpg new file mode 100644 index 00000000..596390fc Binary files /dev/null and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_02_mob.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_03_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_03_mob.jpg new file mode 100644 index 00000000..d66a213e Binary files /dev/null and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_03_mob.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04.jpg index dc2bd3d7..41db9bad 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04.jpg and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04_mob.jpg new file mode 100644 index 00000000..69b48309 Binary files /dev/null and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_04_mob.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_05_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_05_mob.jpg new file mode 100644 index 00000000..cfe55c22 Binary files /dev/null and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_05_mob.jpg differ