From cf0583ef841ccd5a30eb0cd3984c88c4ec427c1c Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 17 Oct 2023 15:36:00 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EA=B0=95=EC=82=AC=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asgnmInfo/web/VEFndtnAsgnmController.java | 633 ++++++++++++++++++ .../asgnmInfo/service/VEAsgnmMIXService.java | 3 + .../asgnmInfo/service/impl/VEAsgnmMIXDAO.java | 5 + .../service/impl/VEAsgnmMIXServiceImpl.java | 6 + .../prcsInfo/service/VEPrcsDetailVO.java | 8 + .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 64 ++ .../jsp/web/ve/aplct/sspnIdtmt/main_2.jsp | 2 +- .../fndtnVisitEdu/asgnmInfo/acmdtPop.jsp | 228 +++++++ .../fndtnVisitEdu/asgnmInfo/acmdtRegPop.jsp | 214 ++++++ .../asgnmInfo/instrAsgnmAddRqstDetail.jsp | 234 +++++++ .../asgnmInfo/instrAsgnmAddRqstList.jsp | 259 +++++++ .../asgnmInfo/instrAsgnmDetail.jsp | 486 ++++++++++++++ .../asgnmInfo/instrAsgnmList.jsp | 194 ++++++ .../asgnmInfo/instrAsgnmRqstDetail.jsp | 295 ++++++++ .../asgnmInfo/instrAsgnmRqstList.jsp | 270 ++++++++ 15 files changed, 2900 insertions(+), 1 deletion(-) create mode 100644 src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/acmdtPop.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/acmdtRegPop.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java new file mode 100644 index 00000000..bfcaaa7e --- /dev/null +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -0,0 +1,633 @@ +package kcc.ve.instr.fndtnVisitEdu.asgnmInfo.web; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; +import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.IpUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; +import kcc.ve.cmm.VeConstants; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAcmdtAplctService; +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.VEEduAplctVO; +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.VEAPrcsAplctPrdInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +import kcc.ve.oprtn.asgnmnoti.service.VEAsgnmNotiService; +import kcc.ve.oprtn.asgnmnoti.service.VEAsgnmNotiVO; + + +@Controller +public class VEFndtnAsgnmController { + + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + //과정 관리 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + + //과정차시 관리 + @Resource(name = "vEAPrcsAplctPrdInstrAsgnmService") + private VEAPrcsAplctPrdInstrAsgnmService vEAPrcsAplctPrdInstrAsgnmService; + + //배정 MIX 정보 + @Resource(name="vEAsgnmMIXService") + private VEAsgnmMIXService vEAsgnmMIXService; + + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + + + // 기반강화 강의목록(확정) + @RequestMapping("/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.do") + public String instrAsgnmList( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("loginVO", loginVO); + //로그인 처리==================================== + + + //3.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + + + //4. pageing step2 + vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + vEPrcsDetailVO.setInstrDiv("20"); + vEPrcsDetailVO.setAprvlCd("20"); + vEPrcsDetailVO.setSearchDiv("ING"); // 강의내역 END 종료내역 + + try { +// System.out.println("session.getAttribute(menuNo).toString()"); +// System.out.println(session.getAttribute("menuNo").toString()); +// vEPrcsDetailVO.setMenuNo(session.getAttribute("menuNo").toString()); + }catch(Exception ex) { + ex.printStackTrace(); + } + +// + + List vEPrcsDetailVOList = vEAsgnmMIXService.selectFndtnVisitAsgnmPagingList(vEPrcsDetailVO); + + + //6.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + model.addAttribute("paginationInfo", paginationInfo); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("vEPrcsDetailVOList", vEPrcsDetailVOList); + + + return "/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList"; + } + + // 기반강화 강의목록(확정) > 상세 + @RequestMapping("/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.do") + public String instrAsgnmDetail( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("loginVO", loginVO); + //로그인 처리==================================== + + + //과정 조회 + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + + //과정 신청자 정보 가져오기 + { + //해당 과정을 제출한 사용자 정보를 가져온다. + VEEduAplctVO paramVO = new VEEduAplctVO(); + paramVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + paramVO.setSbmtYn("Y"); + + // 검색 - 날짜 + paramVO.setSearchSmbtStartDt(vEPrcsDetailVO.getSearchSmbtStartDt()); + paramVO.setSearchSmbtEndDt(vEPrcsDetailVO.getSearchSmbtEndDt()); + // 검색 - 검색어 + paramVO.setSearchStatus(vEPrcsDetailVO.getSearchStatus()); + + List vEPrcsDetailVOList = vEEduMIXService.selectList(paramVO); + vEPrcsDetailVOList = egovCryptoUtil.decryptVeEduAplctList(vEPrcsDetailVOList); + System.out.println("===="); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("listPrcsAplct", vEPrcsDetailVOList); + + // 신청자 수 반려 승인 요청 신청자 모두 포함 + vEPrcsDetailVODetail.setNosCnt1(Integer.toString(vEPrcsDetailVOList.size())); + } + // 과정 조회 set + model.addAttribute("info", vEPrcsDetailVODetail); + + // 강사 배치 정보 + { + + List vEAPrcsAplctPrdInstrAsgnmList = vEAPrcsAplctPrdInstrAsgnmService.findByPrcsAplctPrdOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + List instrAsgnmList = egovCryptoUtil.decryptVEAPrcsAplctPrdInstrAsgnmVOList(vEAPrcsAplctPrdInstrAsgnmList); + + model.addAttribute("instrAsgnmList", instrAsgnmList); + } + + + return "/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail"; + } + + + + + + + //성인강사 강의 요청 상세 + /*@RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.do") + public String instrAsgnmRqstDetail( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("loginVO", loginVO); + //로그인 처리==================================== + + VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmRqstDetail(vEInstrAsgnmVO); + vEInstrAsgnmVOInfo = egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("info", vEInstrAsgnmVOInfo); + + //사용자 교육신청 과정 리스트 + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + List vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO); + model.addAttribute("eduList", vEPrcsDetailVOList); + + //강사료 + VEInstrFeeAcmdtVO instrFee = new VEInstrFeeAcmdtVO(); + instrFee.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); + instrFee.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + + instrFee = vEInstrFeeService.selectDetail(instrFee); + + //강사료 제외 합계 + int instrFeeSum = Integer.parseInt(instrFee.getSpecialWorkAllow()) + + Integer.parseInt(instrFee.getDistanceAllow()) + + Integer.parseInt(instrFee.getTrafficFee()) + + Integer.parseInt(instrFee.getAcmdtFee()); + instrFee.setInstrFeeSum(instrFeeSum); + model.addAttribute("instrFee", instrFee); + + //20220222 우영두 추가 + //강의내역 NOTI 입력 + VEAsgnmNotiVO vEAsgnmNotiVO = new VEAsgnmNotiVO(); + + vEAsgnmNotiVO.setTblUniqOrd(vEInstrAsgnmVO.getEduChasiOrd()); + vEAsgnmNotiVO.setFrstRegisterId(loginVO.getUniqId()); + + try { + System.out.println("session.getAttribute(menuNo).toString()"); + System.out.println(session.getAttribute("menuNo").toString()); + vEAsgnmNotiVO.setMenuNo(session.getAttribute("menuNo").toString()); + }catch(Exception ex) { + ex.printStackTrace(); + } + + vEAsgnmNotiVO.setUrlPath(IpUtil.getRequestURI(request)); + + vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + + return "/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail"; + } + + //성인강사 강의 추가요청 상세 + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.do") + public String instrAsgnmAddRqstDetail( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("loginVO", loginVO); + //로그인 처리==================================== + vEInstrAsgnmVO.setUserId(loginVO.getUniqId()); + + VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmAddRqstDetail(vEInstrAsgnmVO); + vEInstrAsgnmVOInfo = egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("info", vEInstrAsgnmVOInfo); + + //사용자 교육신청 과정 리스트 + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_20); + List vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO); + model.addAttribute("eduList", vEPrcsDetailVOList); + + return "/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail"; + } + + //성인강사 강의확정내역 상세 + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.do") + public String instrAsgnmDetail( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + return checkLoginUtil.getUserLoginPage(model); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + model.addAttribute("ssoLoginVO", ssoLoginVO); + model.addAttribute("loginVO", loginVO); + //로그인 처리==================================== + vEInstrAsgnmVO.setUserId(loginVO.getUniqId()); + + //배정 교육 정보 + VEInstrAsgnmVO vEInstrAsgnmVOInfo = vEAsgnmMIXService.selectAsgnmDetail(vEInstrAsgnmVO); + vEInstrAsgnmVOInfo = egovCryptoUtil.decryptVEInstrAsgnmVO(vEInstrAsgnmVOInfo); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("info", vEInstrAsgnmVOInfo); + + // 강사 상세정보 + VEInstrDetailVO vEInstrDetailVOInfo = new VEInstrDetailVO(); + vEInstrDetailVOInfo.setInstrDiv("20"); + vEInstrDetailVOInfo.setUserId(loginVO.getUniqId()); + vEInstrDetailVOInfo.setUseYn("Y"); + vEInstrDetailVOInfo = vEInstrDetailService.selectDetail(vEInstrDetailVOInfo); + vEInstrDetailVOInfo = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVOInfo); + model.addAttribute("instrInfo", vEInstrDetailVOInfo); + + //강사료 상세정보 + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = new VEInstrFeeAcmdtVO(); + vEInstrFeeAcmdtVO.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); + vEInstrFeeAcmdtVO.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); + vEInstrFeeAcmdtVO = vEInstrFeeService.selectDetail(vEInstrFeeAcmdtVO); + //강사료 제외 합계 + int instrFeeSum = Integer.parseInt(vEInstrFeeAcmdtVO.getInstrFee()) + + Integer.parseInt(vEInstrFeeAcmdtVO.getBsnsTripFee()) + + Integer.parseInt(vEInstrFeeAcmdtVO.getSpareFee()); + + vEInstrFeeAcmdtVO.setInstrFeeSum(instrFeeSum); + model.addAttribute("instrFee", vEInstrFeeAcmdtVO); + + //강의계획서 정보 가져오기 + int fileCnt = 0; + List result = null; + if (vEInstrAsgnmVOInfo != null) { + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(vEInstrAsgnmVOInfo.getLctrPlanAtchFileId()); + result = fileMngService.selectFileInfs(fileVO); + fileCnt = result.size(); + } + else { + fileCnt = 0; + } + model.addAttribute("fileList", result); + model.addAttribute("fileListCnt", fileCnt); + + //20220222 우영두 추가 + //강의내역 NOTI 입력 + VEAsgnmNotiVO vEAsgnmNotiVO = new VEAsgnmNotiVO(); + + vEAsgnmNotiVO.setTblUniqOrd(vEInstrAsgnmVO.getEduChasiOrd()); + vEAsgnmNotiVO.setFrstRegisterId(loginVO.getUniqId()); + + try { + System.out.println("session.getAttribute(menuNo).toString()"); + System.out.println(session.getAttribute("menuNo").toString()); + vEAsgnmNotiVO.setMenuNo(session.getAttribute("menuNo").toString()); + }catch(Exception ex) { + ex.printStackTrace(); + vEAsgnmNotiVO.setMenuNo("9991200"); + } + + vEAsgnmNotiVO.setMenuNo(session.getAttribute("menuNo").toString()); + + vEAsgnmNotiVO.setUrlPath(IpUtil.getRequestURI(request)); + + vEAsgnmNotiService.insertAsgnmNotiInfo(vEAsgnmNotiVO); + + return "/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail"; + } + + *//** + * 강의계획서 제출 Ajax + *//* + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/lctrPlanRegAjax.do") + public ModelAndView filePopupAjax( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + , ModelMap model + , HttpServletRequest request + , final MultipartHttpServletRequest multiRequest + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + + String atchFileId = ""; + final Map files = multiRequest.getFileMap(); + + if (!files.isEmpty()) { + //XXX_로 첨부파일 네이밍 + List result = egovFileMngUtil.parseFileInf(files, "FILE_", 0, "", "", ""); + atchFileId = fileMngService.insertFileInfs(result); + } + + try { + //결과 저장 + vEInstrAsgnmVO.setLctrPlanAtchFileId(atchFileId); + + vEAsgnmMIXService.updateLctrPlan(vEInstrAsgnmVO); + + }catch(Exception ex) { + System.out.println("Exception vEAsgnmMIXService.updateLctrPlan"); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + } + *//** + * 숙박신청 등록 처리 + *//* + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/acmdtRegPopAjax.do") + public ModelAndView acmdtRegPopAjax( + @ModelAttribute("vEInstrFeeAcmdtVO") VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + Boolean isSuccess = true; + String msg = ""; + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + try { + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + vEInstrFeeAcmdtVO.setFrstRegisterId(loginVO.getUniqId()); + vEAcmdtAplctService.insert(vEInstrFeeAcmdtVO); + + } catch (Exception ex) { + ex.printStackTrace(); + isSuccess = false; + msg = ex.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + //성인강사 강의 요청 수락,거절 처리 + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstMdfyAjax.do") + public ModelAndView instrAsgnmRqstMdfyAjax( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + //강사배정테이블 확정 코드 수정 + vEInstrAsgnmVO.setUserId(loginVO.getUniqId()); + vEAsgnmMIXService.updateAsgnmCode(vEInstrAsgnmVO); + //차시 테이블 확정 Y 업데이트 처리 + if("30".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { + vEInstrAsgnmVO.setInstrCnfrmCd("Y"); + vEInstrAsgnmVO.setInstrCnfrmId(loginVO.getUniqId()); + vEAsgnmMIXService.updateChasiCode(vEInstrAsgnmVO); + }else if("40".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025) + vEInstrAsgnmVO.setHstryCd("10"); //거절 + vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO); + }else if("60".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //요청 거절 시 강사배정내역 테이블에 insert. 요청 목록에서 거절한 항목 조회를 위해(VE0025) + vEInstrAsgnmVO.setHstryCd("40"); //변경요청 + vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO); + } + modelAndView.addObject("result", "success"); + + return modelAndView; + } + + //성인강사 강의 추가요청 등록 + @RequestMapping("/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstAjax.do") + public ModelAndView instrAsgnmAddRqstAjax( + @ModelAttribute("vEInstrAsgnmVO") VEInstrAsgnmVO vEInstrAsgnmVO + + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + //로그인 처리==================================== + + //강사배정내역테이블 등록 + vEInstrAsgnmVO.setUserId(loginVO.getUniqId()); + vEAsgnmMIXService.insertAsgnmHstry(vEInstrAsgnmVO); + //차시 테이블 확정 Y 업데이트 처리 + modelAndView.addObject("result", "success"); + + return modelAndView; + } + */ + + + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1( + VEPrcsDetailVO p_vEPrcsDetailVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEPrcsDetailVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEPrcsDetailVO.getPageUnit()); + paginationInfo.setPageSize(p_vEPrcsDetailVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEPrcsDetailVO setPagingStep2( + VEPrcsDetailVO p_vEPrcsDetailVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEPrcsDetailVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEPrcsDetailVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEPrcsDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEPrcsDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEPrcsDetailVO.setSearchSortCnd("prcs_ord"); + p_vEPrcsDetailVO.setSearchSortOrd("desc"); + } + + return p_vEPrcsDetailVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEPrcsDetailVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEPrcsDetailVOList.size() > 0) totCnt = p_vEPrcsDetailVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java index e4f0daae..667051aa 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java @@ -3,6 +3,7 @@ package kcc.ve.instr.tngrVisitEdu.asgnmInfo.service; import java.util.List; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; public interface VEAsgnmMIXService { @@ -120,4 +121,6 @@ public interface VEAsgnmMIXService { //R VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception; + List selectFndtnVisitAsgnmPagingList(VEPrcsDetailVO vEPrcsDetailVO); + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java index 999a680c..e55637f8 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Repository("vEAsgnmMIXDAO") public class VEAsgnmMIXDAO extends EgovAbstractDAO { @@ -214,5 +215,9 @@ public class VEAsgnmMIXDAO extends EgovAbstractDAO { public VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception { return (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.selectTtlMntChasiSumDetail", paramVO); } + + public List selectFndtnVisitAsgnmPagingList(VEPrcsDetailVO paramVO) { + return (List) list("VEAsgnmMIXDAO.selectFndtnVisitAsgnmPagingList", paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java index a326080a..49a0f8e7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @Service("vEAsgnmMIXService") public class VEAsgnmMIXServiceImpl implements VEAsgnmMIXService { @@ -194,5 +195,10 @@ public class VEAsgnmMIXServiceImpl implements VEAsgnmMIXService { public VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception { return vEAsgnmMIXDAO.selectTtlMntChasiSumDetail(paramVO); } + + @Override + public List selectFndtnVisitAsgnmPagingList(VEPrcsDetailVO paramVO) { + return vEAsgnmMIXDAO.selectFndtnVisitAsgnmPagingList(paramVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 47096603..2c3bca5f 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -15,6 +15,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { //ve_prcs + private String searchDiv; //검색구분 private String prcsOrd; //과정순번 private String prcsDiv; //과정구분 private String prcsKind; //과정종류 @@ -132,6 +133,13 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { + + public String getSearchDiv() { + return searchDiv; + } + public void setSearchDiv(String searchDiv) { + this.searchDiv = searchDiv; + } public String getPrcsOrd() { return prcsOrd; } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index 684ad5da..ba30ca84 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -4,6 +4,7 @@ + @@ -4861,6 +4862,69 @@ + + + + " /> + " /> + + +
+
+

숙박신청

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
숙박신청 (th)를 제공하는 표
+

성명

+ 		+

거주지

+
+

성명

+
+

거주지

+
+

학교명

+
+

학교주소

+
+

강의일자

+ 		+

첫 강의시간

+ 		+ + ~ +
+

강의일자

+
+

첫 강의시간

+ 		+ + ~ +
+

전날 강의여부

+ 		+ Y + +

전날 학교명

+ 		+ +
+

전날 강의여부

+ 		+ Y +
+

전날 학교명

+ 		+ +
+

전날 학교주소

+ 		+ +
+

신청사유

+ 		+ +
+

처리결과

+ 		+ +
+

미승인 사유

+ 		+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/acmdtRegPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/acmdtRegPop.jsp new file mode 100644 index 00000000..1b3f4f65 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/acmdtRegPop.jsp @@ -0,0 +1,214 @@ + +<%@ 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"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<% +%> + + + + + 강의배정팝업 + + + + + " /> + " /> + + + +
+
+

숙박신청

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
숙박신청 (th)를 제공하는 표
+

성명

+ 		+

거주지

+
+

성명

+
+

거주지

+
+

학교명

+
+

학교주소

+
+

강의일자

+ 		+

첫 강의시간

+ 		+ + ~ +
+

강의일자

+
+

첫 강의시간

+ 		+ + ~ +
+

전날 강의여부

+ 		+ Y + +

전날 학교명

+ 		+ +
+

전날 강의여부

+ 		+ Y +
+

전날 학교명

+ 		+ +
+

전날 학교주소

+ 		+ +
+

신청사유

+ 		+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp new file mode 100644 index 00000000..d2130d6f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp @@ -0,0 +1,234 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + + + +강사프로필 목록 + + + + + + +
+ + + " /> + " /> + " /> + + + + + +
+

성인 강의 추가요청 상세

+
+ + +
+
+
+ +
+

찾아가는 저작권 교육

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
성인 강의 추가요청 상세 (th 명)을 보여주는 표
+

교육일시

+ 		${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 +

차시

+ 		+ + ~ + (분) +
+

기관명

+ 		${info.scholInsttNm} +

지역

+
+

기관명

+ 		${info.scholInsttNm}
+

지역

+
+

주소

+ 		${info.addr}
+

교육내용

+ 		+ + + - ${eduList.prcsNm}
+ + +
+

교육대상

+ 		${info.trgt} +

인원

+ 		${info.prsnl}
+

교육대상

+ 		${info.trgt}
+

인원

+ 		${info.prsnl}
+

신청자

+ 		${info.chrgNm}
+

연락처

+ 		${info.phone} +

휴대전화

+ 		${info.clphone}
+

연락처

+ 		${info.phone}
+

휴대전화

+ 		${info.clphone}
+

이메일

+ 		${info.email}
+

신청마감일

+ 		*미구현
+
+ +
+
+
+
+ + + +
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp new file mode 100644 index 00000000..26ab3b32 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp @@ -0,0 +1,259 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +강사프로필 목록 + + + + + + +
+ + + " /> + " /> + " /> + + + +
+

성인 강의 추가요청 목록

+
+ + +
+
+ +
+
+
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ +   학교(기관)명 :  + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + ', '');" style="cursor:pointer;"> + + + + + + + + + + + + + + +
번호교육일자요일시간지역학교(기관)명교육대상상태
+

+ + + + + + +

+

${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)}

+ + ~ + (분) +

+

+ + + + + + +

선정대기

+ + + + +

선정완료

+ + +

선정제외

+ + + +
+
+ +
+ + +
    ', '');"> +
  • + 번호 + +
    • +
  • + 교육일자 + ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} +
    • +
  • + 요일 + +
    • +
  • + 시간 + + + ~ + (분) + +
    • +
  • + 지역 + +
    • +
  • + 기관명 + +
    • +
  • + 교육대상 + +
    • +
  • + 신청상태 + + + + + + +

    강의신청

    +     +     + + +

    선정완료

    +     + +

    선정제외

    +     +     +     +
    • +
+ + +
+ +
+ +
+ + +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp new file mode 100644 index 00000000..b6ba5968 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -0,0 +1,486 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +강사프로필 목록 + + + + + + +
+ + + " /> + " /> + " /> + + + + + + + +
+

성인 강의내역 상세

+
+ + +
+
+
+ +
+

찾아가는 저작권 교육

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
+
+ +
+
+

교육내역

+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
성인 교육내역 상세 (th 명)을 보여주는 표
+

교육일시

+ 		+ 2023년 .1월 0.일 + +

시간

+ 		+ + 15:05 + ~ + + 17:05 + (120분) +
+

교육일시

+ 		2023년 .1월 0.일
+

시간

+ 		+ 15:05 + ~17:05 + (120분) +
+

기관(단체)명

+ 		정기관 +

지역

+ 		(온)
+

기관(단체)명

+ 		정기관
+

지역

+ 		(온)
+

교육장소

+
+

강의주제

+ 		희망 의 주제
+

교육대상

+ 		대상감 +

인원

+ 		18
+

교육대상

+ 		대상감
+

인원

+ 		18
+

담당자

+ 		성인담당자
+

연락처

+ 		010-2322-1941 +

휴대전화

+ 		010-2322-1941
+

연락처

+ 		010-2322-1941
+

휴대전화

+ 		010-2322-1941
+

이메일

+ 		yongjoon.cho@gmail.com
+
+ + + + +
+
+

강사정보

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

성명

+ 		+ 성인강사2 + +

구분

+ 		+ 성인 강사 +
+

성명

+ 		+ 성인강사2 +
+

구분

+ 		+ 성인 강사 +
+

거주지

+ 		+ 광주광역시(동구 계림동) +
+

강사료(a)

+ 		+ 0 + +

출장비(b)

+ 		+ 0 +
+

강사료(a)

+ 		0
+

출장비(b)

+ 		0
+

여비(c)

+ 		+ 0 + +

총액(a)+(b)+(c)

+ 		+ 0 +
+

여비(c)

+ 		0
+

총액(a)+(b)+(c)

+ 		0
+
+ + + + + + +
+ +

필수입력 항목*

강의계획서
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + +
첨부파일 파일 명, 종류, 크기 정보 제공
파일 명종류크기
+

첨부하실 파일을 마우스끌어서 넣어주세요.

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 파일 명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
+ ${fileList.orignlFileNm} + + "> + + "> + + +
+
+
+
+

최대 1개

+

500MB제한

+
+
+ +
+
+
+ + + + + + + + +
+ +
+
+
+
+
+
+ +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp new file mode 100644 index 00000000..80f600ba --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -0,0 +1,194 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +
+ + + + " /> + " /> + " /> + + +
+

기반 강의내역 목록

+
+ + +
+
+ +
+
+
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육과정교육기간정원신청자수
+ ${list.prcsNm } (${list.prcsAplctPrdOrd }) + + ${list.eduStrtPnttm } ~ ${list.eduDdlnPnttm } + + ${list.nos } + + ${list.nosCnt1 } +
+
+ +
+ +
    ', '');"> +
  • + 교육과정 + ${list.prcsNm } (${list.prcsAplctPrdOrd }) +
    • +
  • + 교육기간 + ${list.eduStrtPnttm } ~ ${list.eduDdlnPnttm } +
    • +
  • + 정원 + ${list.nos } +
    • +
  • + 신청자수 + ${list.nosCnt1 } +
    • + + <%--
  • + 교육일자 + ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} +
    • +
  • + 요일 + +
    • +
  • + 시간 + + + ~ + (분) + +
    • +
  • + 지역 + (온) +
    • +
  • + 기관(단체)명 + +
    • +
  • + 총 금액 + + + + + + + + + + + + + +

    +     +
    • --%> +
+ + +
+ +
+ +
+ +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp new file mode 100644 index 00000000..069cd39d --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp @@ -0,0 +1,295 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +강사프로필 목록 + + + + + + +
+ + + " /> + " /> + " /> + " /> + + + + + +
+

성인 강의 요청 상세

+
+ + +
+
+
+ +
+

찾아가는 저작권 교육

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
성인 강의 요청 상세 (th 명)을 보여주는 표
+

교육일시

+ 		${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 +

시간

+ 		+ + ~ + (분) +
+

교육일시

+ 		${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일
+

시간

+ 		+ + ~ + (분) +
+

기관(단체)명

+ 		${info.insttNm} +

지역

+ 		(온)
+

기관(단체)명

+ 		${info.insttNm}
+

지역

+ 		(온)
+

교육장소

+ 		${info.addr}
+

강의주제

+ 		${info.hopeSbjct}
+

교육대상

+ 		${info.trgt} +

인원

+ 		${info.prsnl}
+

교육대상

+ 		${info.trgt}
+

인원

+ 		${info.prsnl}
+

강의료

+ 		+

교통비 등

+
+

강의료

+
+

교통비 등

+
+

담당자

+ 		${info.chrgNm}
+

연락처

+ 		${info.phone} +

휴대전화

+ 		${info.clphone}
+

연락처

+ 		${info.phone}
+

휴대전화

+ 		${info.clphone}
+

이메일

+ 		${info.email}
+

변경 요청 여부

+ 		O
+
+ +
+
+
+
+ + + +
+
+ + + + + + + +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp new file mode 100644 index 00000000..c45d3ef2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -0,0 +1,270 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +
+ + + " /> + " /> + " /> + + +
+

성인 강의 요청 목록

+
+ + +
+
+ +
+
+ + +
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + ', '');" style="cursor:pointer;"> + + + ', '');" style="cursor:pointer;"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호교육일자요일시간지역기관(단체)명총 금액신청상태
+

+ + + + + + +

+

${list.eduHopeDt}

+ + ~ + (분) +

(온)

${statCd}
+
+ +
+ + +
    ', '');"> +
  • + 번호 + + + + + + + + +
    • +
  • + 교육일자 + ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} +
    • +
  • + 요일 + +
    • +
  • + 시간 + + + ~ + (분) + +
    • +
  • + 지역 + (온) +
    • +
  • + 기관(단체)명 + +
    • +
  • + 총 금액 + + + + + + + + + + + + + +
    • +
  • + 신청상태 + + + + + + + + + + + + + + + + + + +
    • +
+ + +
+ +
+ +
+ +
+ +
From dc54e3861d54b64809d3a75468975e9aad4e5dec Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 17 Oct 2023 18:15:55 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=ED=83=80=EC=9D=B4=ED=8B=80=EB=AA=85=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EB=AA=85=EA=B3=BC=20=EA=B0=99=EC=9D=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fndthEduPrcsAplctCfnMngDetail.jsp | 2 +- .../adultVisitEdu/eduAplct/eduAplctMdfy.jsp | 2 +- .../adultVisitEdu/eduAplct/eduAplctReg.jsp | 2 +- .../exprnClsrmEnd/exprnClsrmEndDetail.jsp | 2 +- .../exprnClsrmEnd/exprnClsrmEndList.jsp | 2 +- .../exprnClsrmAplctDashboard.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctDetail.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctGuide.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctList.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctMdfy.jsp | 2 +- .../tngrVisitEdu/eduAplct/eduAplctMdfy.jsp | 2 +- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmList.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstList.jsp | 2 +- .../endInfo/instrEduEndDetail.jsp | 2 +- .../adultVisitEdu/endInfo/instrEduEndList.jsp | 2 +- .../instrInfo/instrDashboard.jsp | 2 +- .../instrInfo/instrPrflDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmDetail.jsp | 184 ++++++++---------- .../asgnmInfo/instrAsgnmList.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstList.jsp | 2 +- .../asgnmInfo/instrAsgnmDetail.jsp | 2 +- .../tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstDetail.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstList.jsp | 2 +- .../endInfo/instrEduEndDetail.jsp | 2 +- .../tngrVisitEdu/endInfo/instrEduEndList.jsp | 2 +- .../tngrVisitEdu/instrInfo/instrDashboard.jsp | 2 +- .../instrInfo/instrPrflDetail.jsp | 2 +- 34 files changed, 113 insertions(+), 137 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index 1cefec18..ecf60441 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -247,7 +247,7 @@ - 교육부분 + 교육부문 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp index cadfb569..5513cf1a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -386,7 +386,7 @@
-

운영신청서 작성

+

교육신청수정

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 8c0de2ef..47104aa3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -466,7 +466,7 @@
-

교육신청 등록

+

교육신청등록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp index 8f5f1b91..0387edb4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp @@ -242,7 +242,7 @@
-

운영내역 상세

+

운영내역상세

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 0e1c8b0c..5e52e262 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -46,7 +46,7 @@ " />
-

운영내역 목록

+

운영내역목록

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp index 5bf8d691..c0efa0db 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -63,7 +63,7 @@
-

체험교실 대시보드

+

대시보드

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp index 77dee52c..0cfd04ad 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp @@ -113,7 +113,7 @@
    -

    운영신청 상세

    +

    운영신청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index 9f4a3729..a3d04cca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -79,7 +79,7 @@
    -

    운영신청 등록안내

    +

    운영신청등록 안내

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index 2f3ccb50..e7adcca8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -85,7 +85,7 @@ " />
    -

    운영신청 목록

    +

    운영신청목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctMdfy.jsp index 590f57f5..78ba5aee 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctMdfy.jsp @@ -388,7 +388,7 @@
    -

    운영신청서 작성

    +

    운영신청수정

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp index be8b2482..eb67de9f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -671,7 +671,7 @@
    -

    교육신청

    +

    교육신청수정

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index bde395b2..caf008d7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -774,7 +774,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
    -

    교육신청

    +

    교육신청등록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp index d2130d6f..bfe3a7ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp @@ -72,7 +72,7 @@
    -

    성인 강의 추가요청 상세

    +

    강의추가요청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index de85f54d..1ee629f0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -109,7 +109,7 @@
    -

    성인 강의내역 상세

    +

    강의내역상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp index d6465678..6a3fa915 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -52,7 +52,7 @@
    -

    성인 강의내역 목록

    +

    강의내역목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp index 069cd39d..20d7455f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp @@ -87,7 +87,7 @@
    -

    성인 강의 요청 상세

    +

    강의요청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index c45d3ef2..2bf52cf4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -52,7 +52,7 @@
    -

    성인 강의 요청 목록

    +

    강의요청목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp index dd1d15d3..b93b810c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp @@ -142,7 +142,7 @@ $( document ).ready(function() {
    -

    성인 강의 종료교육 상세

    +

    종료교육상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp index 4523f2d5..c5a4782a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp @@ -58,7 +58,7 @@
    -

    성인 강의 종료교육 목록

    +

    종료교육목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrDashboard.jsp index fbab99c4..216a1696 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrDashboard.jsp @@ -37,7 +37,7 @@
    -

    성인저작권강사 대시보드

    +

    강사대시보드

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp index c8714d81..081aa3a8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp @@ -158,7 +158,7 @@
    -

    성인 강사신청 상세

    +

    성인 강사 신청 상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp index d2130d6f..bfe3a7ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp @@ -72,7 +72,7 @@
    -

    성인 강의 추가요청 상세

    +

    강의추가요청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index b6ba5968..1b455f5b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -99,32 +99,22 @@ - -
    -

    성인 강의내역 상세

    +
    +

    강의내역상세

    -
    - -
    -

    찾아가는 저작권 교육

    - ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -
    -
    -
    -

    교육내역

    +

    교육과정 정보

    -
    - + @@ -134,128 +124,114 @@ - - - - - - - + - - - + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    성인 교육내역 상세 (th 명)을 보여주는 표교육과정 정보(th 명)을 보여주는 표
    -

    교육일시

    +

    교육부문

    		 - 2023년 .1월 0.일 - -

    시간

    -     		- - 15:05 - ~ - - 17:05 - (120분) +
    -

    교육일시

    +

    교육부문

    		2023년 .1월 0.일
    -

    시간

    -     		- 15:05 - ~17:05 - (120분) -
    -

    기관(단체)명

    +

    과정

    		정기관 -

    지역

    -     		(온) + +
    -

    기관(단체)명

    +

    과정

    		정기관
    +

    기간

    +     		+ ~ +
    -

    지역

    +

    기간

    		(온)~

    교육장소

    		 + +
    +

    교육장소

    +
    +

    상세교육과정

    +     		+ +
    +

    상세교육과정

    +
    +

    정원

    +     		+ +
    +

    정원

    +
    +

    신청자수

    +     		+
    +

    신청자수

    +
    -

    강의주제

    -     		희망 의 주제
    -

    교육대상

    +

    상태

    		대상감 -

    인원

    -     		18 + +
    -

    교육대상

    +

    상태

    		대상감
    -

    인원

    -     		18
    -

    담당자

    -     		성인담당자
    -

    연락처

    -     		010-2322-1941 -

    휴대전화

    -     		010-2322-1941
    -

    연락처

    -     		010-2322-1941
    -

    휴대전화

    -     		010-2322-1941
    -

    이메일

    -     		yongjoon.cho@gmail.com
    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp index 80f600ba..e7f3bc15 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -52,7 +52,7 @@
    -

    기반 강의내역 목록

    +

    강의내역목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp index f885cfbf..7f1eb5f4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstDetail.jsp @@ -103,7 +103,7 @@
    -

    청소년 강의 추가요청 상세

    +

    강의추가요청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp index 9cd05952..0c9b0a75 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp @@ -193,7 +193,7 @@
    -

    청소년 강의 추가요청 목록

    +

    강의추가요청목록

    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 1aaca1f4..fa66b6e5 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 @@ -310,7 +310,7 @@
    -

    강의내역 상세

    +

    강의내역상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp index 084549c3..b77168a0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -49,7 +49,7 @@
    -

    청소년 강의내역 목록

    +

    강의내역목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp index cfb883ec..91f694a1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstDetail.jsp @@ -89,7 +89,7 @@
    -

    청소년 강의 요청 상세

    +

    강의요청상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index c1a62fc1..7744e8e1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -52,7 +52,7 @@
    -

    청소년 강의 요청 목록

    +

    강의요청목록

    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 dc2368e6..6c62eee7 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 @@ -83,7 +83,7 @@ $( document ).ready(function() {
    -

    청소년 강의 종료교육 상세

    +

    종료교육상세

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp index f019a57d..b3da02e1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp @@ -52,7 +52,7 @@
    -

    청소년 강의 종료교육 목록

    +

    종료교육목록

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp index 29cfa823..edb74082 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp @@ -47,7 +47,7 @@
    -

    청소년저작권강사 대시보드

    +

    강사대시보드

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp index e6c727d8..88dce906 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp @@ -289,7 +289,7 @@
    -

    청소년저작권강사정보 상세

    +

    청소년 강사 신청 상세

    From 2e2fde0d4bc21c1dd25df50ac2641eb2146d565c Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 17 Oct 2023 18:18:32 +0900 Subject: [PATCH 3/9] =?UTF-8?q?2023/10/17=20header=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitEdu/usr/publish/css/common.css | 15 +++--- .../visitEdu/usr/publish/script/common.js | 50 ++++++++++++------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/main/webapp/visitEdu/usr/publish/css/common.css b/src/main/webapp/visitEdu/usr/publish/css/common.css index 331f2dca..64482865 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/common.css +++ b/src/main/webapp/visitEdu/usr/publish/css/common.css @@ -10,8 +10,8 @@ body {color: #222;} .logo img {width: 200px;} /* header */ -header{width: 100%; height: 130px; position: fixed; top: 0; left: 0; transition: height .4s ease-in-out, background-color .4s ease-in-out, margin .4s ease-in-out; overflow: hidden; box-sizing: border-box;z-index: 20; background-color: #fff; border-bottom: 1px solid #e2e4e6;max-height: 350px;} -header.on{background-color: #fff; box-shadow: 0 3px 10px rgba(0,0,0,0.1); max-height: 350px;} +header{width: 100%; height: 130px; position: fixed; top: 0; left: 0; transition: height .4s ease-in-out, background-color .4s ease-in-out, margin .4s ease-in-out; overflow: hidden; box-sizing: border-box;z-index: 20; background-color: #fff; border-bottom: 1px solid #e2e4e6;/* max-height: 350px; */} +header.on{background-color: #fff; box-shadow: 0 3px 10px rgba(0,0,0,0.1);/* max-height: 350px; */} header::before{position: absolute; content: " "; display: block; top: 130px; left: 0; height: 1px; background-color: #ddd; opacity: 0; transition: opacity .4s ease-in-out;} header::after{position: absolute; content: " "; display: block; width: 100%; height: 1px; background-color: #d5d5d5; top: 130px; left: 0; opacity: 0; transition: opacity .4s ease-in-out;} header.on::after{top: 130px; opacity: 1;} @@ -52,8 +52,8 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);} .header_inner .nav_wrap{box-sizing: border-box; height: 100%; width: 100%; margin: 0 50px;} .header_inner #menu{width: 100%; margin: 0 auto; height: 100%;} .header_inner .depth01 {display: flex; height: 100%;} -.header_inner .dep_li_01,.header_inner .dep_li_02,.header_inner .dep_li_03 {justify-content:flex-start;} -.header_inner .dep_li_04,.header_inner .dep_li_05,.header_inner .dep_li_06,.header_inner .dep_li_07 {justify-content:space-between;} +/* .header_inner .dep_li_01,.header_inner .dep_li_02,.header_inner .dep_li_03 {justify-content:flex-start;} +.header_inner .dep_li_04,.header_inner .dep_li_05,.header_inner .dep_li_06,.header_inner .dep_li_07 {justify-content:space-between;} */ .header_inner .depth01_li{position: relative; height:100%; padding: 0; box-sizing: border-box;} .header_inner .dep_li_04 .depth01_li{width: calc((100% - 40px)/4);} .header_inner .dep_li_01 .depth01_li{width: 100%;} @@ -69,7 +69,7 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);} .header_inner .menu_link .menu_link_br {color: #E95504;font-family: 'nanumsquare', 'Noto Sans KR', sans-serif; } .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;} +.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; */} .header_inner .depth01_li:first-child .depth02{border-left: 1px solid #d5d5d5;} .header_inner .depth01_li:hover .depth02::after{position:absolute;content:"";width:calc(100% + 4px);height:100%;background-color:#fff8f4;left:-2px;top:0;} .header_inner .depth01_li:hover .depth02 li{position:relative;z-index:1;} @@ -100,10 +100,11 @@ header.scroll{box-shadow: 0 5px 8px rgba(0,0,0,0.15);} .full_menu .depth01_li{display: flex; border-bottom: 1px solid #d5d5d5; padding: 20px 0;} .full_menu .depth01_li:first-child{padding: 0 0 20px 0;} .full_menu .depth01_li:last-child{border-bottom: 0;} -.full_menu .depth01_li .menu_link{width:350px;font-size: 22px; font-weight: 500; color: #222;} +.full_menu .depth01_li .menu_link{width:350px;font-size: 20px; font-weight: 500; color: #222;} .full_menu .depth01_li:hover .menu_link,.full_menu .depth01_li .depth02 li:hover{color: #e95504;} .full_menu .depth01_li .depth02 li:hover{font-weight: 500;} -.full_menu .depth01_li .depth02{display: flex; width: calc(100% - 350px); font-size: 18px; font-weight: 300; color: #666; justify-content: space-between;} +.full_menu .depth01_li .depth02{display: flex; width: calc(100% - 138px); font-size: 18px; font-weight: 300; color: #666; justify-content:flex-start; flex-wrap: wrap;} +.full_menu .depth01_li .depth02 li{width:calc(100% / 4); height:40px;} /* .full_menu .depth01 .menu_link{font-size: 20px; font-weight: 500; color: #ea5404; position: relative; padding-bottom: 25px; letter-spacing: -1px; text-align: center; height: 40px;} .full_menu .depth01 .menu_link>span {display: block; padding-top: 5px;} diff --git a/src/main/webapp/visitEdu/usr/publish/script/common.js b/src/main/webapp/visitEdu/usr/publish/script/common.js index 80d0a3ce..c5f50dea 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/common.js +++ b/src/main/webapp/visitEdu/usr/publish/script/common.js @@ -6,6 +6,13 @@ $(document).ready(function () { gnbOpen(); }, 100); + if($(".full_menu .depth01_li a:contains('ZOOM 신청 게시판(청소년)')").length == "1"){ + $(".full_menu .depth01_li>a").css("width","24%"); + $(".full_menu .depth01_li .depth02").css("width","calc(100% - 50px)"); + $(".full_menu .depth01_li a:contains('ZOOM 신청 게시판(청소년)')").html("ZOOM 신청 게시판"+"
    "+"(청소년)") + }else{} + + //ie 버그로 인하여 강제로 탭키 가도록 설정 if (ie_check()) { $("#main").prop("tabindex", "0"); @@ -155,29 +162,19 @@ function header() { var gnb = $("#menu"); var header = $("header") - + var height_array = gnb.find('.depth02').map(function(){ + return $(this).outerHeight(); + }); + h=Math.max.apply(Math, height_array)+130; function open_gnb(item) { var depth01 = item; var depth01_li = depth01.closest(".depth01_li"); - var depth02 = depth01_li.find(".depth02"); - var height_array = gnb.find('.depth02').map(function(){ - return $(this).outerHeight(); - }); - - var h = Math.max.apply(Math, height_array)+150; - //console.log(height_array,Math.max.apply(Math, height_array)+150); - if(h+1>=Math.max.apply(Math, height_array)){ - h; - header.addClass("on").css('height',h + 'px'); - $("header .depth02").css('height',h+'px'); - //console.log("1"); - }else{ - header.addClass("on").css('height',h + 'px'); - $("header .depth02").css('height',h+'px'); - //console.log("2"); - } + header.addClass("on").css('height',h + 'px'); depth01_li.addClass("on"); + $('header .depth02').css('height',h + 'px'); } + + gnb.find(".menu_link").on("mouseover", function () { open_gnb($(this)); @@ -187,6 +184,12 @@ function header() { var depth01 = $(this); depth01.addClass("on").siblings().removeClass("on"); }); + gnb.find(".depth02").on("mouseover", function () { + if(header.is(".on") !== true){ + $('header .depth02').attr('style',''); + }else{$('header .depth02').css('height',h + 'px');} + }); + gnb.find(".menu_link").on("focusin", function () { open_gnb($(this)); @@ -203,9 +206,20 @@ function header() { header.on("mouseleave", function () { header.removeClass("on").attr('style',''); + $('header .depth02').attr('style',''); + $(".depth01_li").removeClass("on"); + $("header .depth02").animate({height:'auto'},0); + }); + + gnb.on("mouseleave", function () { + header.removeClass("on").attr('style',''); + $('header .depth02').attr('style',''); $(".depth01_li").removeClass("on"); $("header .depth02").animate({height:'auto'},1000); }); + $(".depth01_li").on('mouseleave',function(){ + $('header .depth02').attr('style',''); + }) $("#menu .depth01_li:last-child .depth02 li:last-child").on("focusout", function () { header.removeClass("on").attr('style',''); From b0cd96a063600846736b4928cc4064a5b6c9fd86 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 17 Oct 2023 18:25:07 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=ED=99=94=EB=A9=B4=20=EB=AC=B8=EA=B5=AC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 68fefe03..ed8c514f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -185,7 +185,7 @@ function instrChk(){
    -

    대국민 저작권 교육 서비스1

    +

    대국민 저작권 교육 서비스

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해 올바른 저작권 문화 구축에 앞장서겠습니다.

    교육신청 등록 @@ -195,7 +195,7 @@ function instrChk(){
    -

    대국민 저작권 교육 서비스2

    +

    대국민 저작권 교육 서비스

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해 올바른 저작권 문화 구축에 앞장서겠습니다.

    교육신청 등록 @@ -205,7 +205,7 @@ function instrChk(){
    -

    대국민 저작권 교육 서비스3

    +

    대국민 저작권 교육 서비스

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해 올바른 저작권 문화 구축에 앞장서겠습니다.

    교육신청 등록 @@ -215,7 +215,7 @@ function instrChk(){
    -

    대국민 저작권 교육 서비스4

    +

    대국민 저작권 교육 서비스

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해 올바른 저작권 문화 구축에 앞장서겠습니다.

    교육신청 등록 @@ -225,7 +225,7 @@ function instrChk(){
    -

    대국민 저작권 교육 서비스5

    +

    대국민 저작권 교육 서비스

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해 올바른 저작권 문화 구축에 앞장서겠습니다.

    교육신청 등록 @@ -258,19 +258,19 @@ function instrChk(){
From 5cb78771a4ebc39669ec55acfd097a6868d4c31d Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 18 Oct 2023 10:43:55 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90]=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20=EA=B0=95=EC=9D=98=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?-=20=EA=B0=95=EC=9D=98=20=EC=83=81=EC=84=B8=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 39 ++ .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 18 +- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 406 ++++++++++++------ .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 16 +- .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 2 +- 5 files changed, 337 insertions(+), 144 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index c904249a..e674527a 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -457,6 +457,45 @@ public class FndtnEnhanceTrnController { } + /** + * 교육 list select + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/eduSelectAjax.do") + public ModelAndView eduSelectAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + // 페이징 없이 select를 하기 위한 + vEPrcsDetailVO.setRecordCountPerPage(10000); + vEPrcsDetailVO.setFirstIndex(0); + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO); + + modelAndView.addObject("data", vEPrcsDetailVOList); + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + private String dateChk(VEPrcsDetailVO vEPrcsDetailVO , LocalDate currentDate) { diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 0375c42c..5e1b44a8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -33,6 +33,9 @@ function ddlnCdSttsChk(){ var $ddlnCdStts = $("#ddlnCdStts"); + + // 상태에따라 싱천버튼 활성화 비활성화 + var regStatus = true; // 텍스트가 비어있는지 확인 if ($ddlnCdStts.text().trim() === "") { @@ -41,15 +44,18 @@ var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); var endPnttm = new Date(dateText.split("~")[1].trim().replace(/\./g, '-')); var currentDate = new Date(); - if (currentDate < strtPnttm) { $ddlnCdStts.text("접수전"); } else if (currentDate >= strtPnttm && currentDate <= endPnttm) { $ddlnCdStts.text("접수중"); + regStatus = false; } else if (currentDate > endPnttm) { $ddlnCdStts.text("접수종료"); } + + console.log('regStatus :: ', regStatus); } + $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } function fncGoList(){ @@ -223,5 +229,15 @@
+
+
+
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 8bbe3b9e..69f925bd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -17,6 +17,67 @@ $(document).ready(function(){ + + $('.tab_button').click(function(){ + var type = $(this).data('info'); + // list 타입이면 return; + if(type === 'list') + return false; + + var data = fncEduSelect(); + console.log('data : ', data); + + // 월 하이라이트 체크 + fn_MonthHL(); + + // 현재 날짜를 가져옵니다. + var today = new Date(); + var currentMonth = today.getMonth() + 1; + + // 데이터 추가 전 촐기화 + $(".edu_program tbody").empty(); + // 반복시작 + $.each(data, function(index, item) { + var prcsNm = item.prcsNm; + var startDt = item.eduStrtPnttm; + // 교육 일수 구하기 + var dayDiff = fn_dayDiff(item); + var newRow = $(""); + + // prcsNm 값을 추가합니다. + newRow.append('' + prcsNm + ''); + + // dayDiff 값을 추가합니다. + newRow.append('' + dayDiff + ''); + + // 교육일정 칼럼을 초기화합니다. + for (var i = 1; i <= 12; i++) { + // 다음 월 class + var cellClass = "edup_pass"; // 기본값 + + // 전 월 class + if (i < currentMonth) { + cellClass = "edup_pre"; + // 현재 월 + } else if (i === currentMonth) { + cellClass = "edup_this"; + } + if (i === parseInt(startDt.split('.')[1])) { + newRow.append('' + parseInt(startDt.split('.')[2]) + ''); + } else { + newRow.append(''); + } + } + // 테이블에 새로운 행을 추가합니다. + $(".edu_program tbody").append(newRow); + + }); + //-- /반복끝 + }); + + + + // 상태값 확인 $(".ddlnCdStts").each(function() { var $thisCell = $(this); @@ -38,9 +99,6 @@ $(document).ready(function(){ var ddlnCdText = ''; - console.log('currentDate : ', currentDate); - console.log('strtPnttm : ', strtPnttm); - console.log('endPnttm : ', endPnttm); console.log(''); if (currentDate < strtPnttm) { ddlnCdText = "접수전"; @@ -63,6 +121,69 @@ $(document).ready(function(){ }); + + function fn_dayDiff(item){ + + var startDt = item.eduStrtPnttm; + var endDt = item.eduDdlnPnttm; + + // 날짜 문자열을 Date 객체로 변환합니다. + var startDate = new Date(startDt.split('.').join('-')); + var endDate = new Date(endDt.split('.').join('-')); + + // 두 날짜 사이의 밀리초 차이를 구합니다. + var differenceInMilliseconds = endDate - startDate; + + // 밀리초를 일수로 변환합니다. (1일 = 24시간 = 24 * 60분 = 24 * 60 * 60초 = 24 * 60 * 60 * 1000 밀리초) + var differenceInDays = differenceInMilliseconds / (24 * 60 * 60 * 1000); + + // 시작 날짜와 종료 날짜를 모두 포함하여 계산 + differenceInDays += 1; + + return differenceInDays; + + } + + + + function fn_MonthHL(){ + var today = new Date(); + // 현재 달을 가져옵니다. (0부터 시작하므로 1을 더해줍니다.) + var currentMonth = today.getMonth() + 1; + + // 해당하는 달의 요소에 'edup_this' 클래스를 추가합니다. + $("#monthTemp th:nth-child(" + currentMonth + ")").addClass("edup_this"); + } + function fncEduSelect(){ + var returnVal = ''; + var data = new FormData(document.getElementById("selectForm")); + var url = "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduSelectAjax.do"; + console.log(data); + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + console.log('returnData : ', returnData); + returnVal = returnData.data; + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + return returnVal; + + + } + function fncEduReg(prcsAplctPrdOrd){ var regForm = document.regForm; regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd; @@ -100,14 +221,12 @@ $(document).ready(function(){ listForm.submit(); } - function fncGoDetail(prcsAplctPrdOrd){ var viewForm = document.viewForm ; viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; - viewForm.action = ""; + viewForm.action = ""; viewForm.submit(); } - function fncGoList(){ linkPage(1); @@ -140,6 +259,9 @@ $(document).ready(function(){
+
+ +
@@ -151,7 +273,7 @@ $(document).ready(function(){
-

교육신청목록

+

강의목록

@@ -204,143 +326,14 @@ $(document).ready(function(){
    -
    • -
    • +
    • +
-
-
-
- - -
-
-
- -
- ~ -
- -
- - -
-
- -
-
총 6개의 검색결과가 있습니다.
-
    -
  • 지난교육일정
    • -
  • 당월교육일정
    • -
  • 교육예정일정
    • -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수시간교육일정(교육 시작일)
123456789101112
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
-
-
-
+ +
+
@@ -453,5 +446,136 @@ $(document).ready(function(){
+ + +
+ +
+
총 6개의 검색결과가 있습니다.
+
    +
  • 지난교육일정
    • +
  • 당월교육일정
    • +
  • 교육예정일정
    • +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수교육일정(교육 시작일)
123456789101112
+
+
+
\ No newline at end of file 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 0375c42c..535d5ce3 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 @@ -33,7 +33,10 @@ function ddlnCdSttsChk(){ var $ddlnCdStts = $("#ddlnCdStts"); - + + // 상태에따라 싱천버튼 활성화 비활성화 + var regStatus = true; + // 텍스트가 비어있는지 확인 if ($ddlnCdStts.text().trim() === "") { var dateText = $ddlnCdStts.closest('table').find("td:eq(2)").text().trim(); @@ -46,10 +49,12 @@ $ddlnCdStts.text("접수전"); } else if (currentDate >= strtPnttm && currentDate <= endPnttm) { $ddlnCdStts.text("접수중"); + regStatus = false; } else if (currentDate > endPnttm) { $ddlnCdStts.text("접수종료"); } } + $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } function fncGoList(){ @@ -223,5 +228,14 @@
+
+
+
+
+
+
+ +
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index 9f9b3d2d..841c2a1e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -216,7 +216,7 @@ $(document).ready(function(){
-

교육신청목록1

+

강의목록

From c2fa56c3cc99ec555ae6beaa236b2022058c8c73 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 18 Oct 2023 12:27:28 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=9D=BC?= =?UTF-8?q?=EB=B0=98=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EA=B5=90=EC=9C=A1=20=EC=83=81=EC=84=B8=EC=97=90=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=EC=96=91=EC=8B=9D=20=EC=B6=94=EA=B0=80,=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0=EB=B0=98=EA=B0=95?= =?UTF-8?q?=ED=99=94=20=EC=83=81=EC=84=B8=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmm/innorix/service/AdrInnorixFileVO.java | 9 + .../innorix/service/InnorixFileService.java | 3 + .../service/impl/InnorixFileServiceImpl.java | 35 ++ .../innorix/web/InnorixFileController.java | 23 ++ .../asgnmInfo/web/VEFndtnAsgnmController.java | 1 + .../asgnmInfo/service/VEInstrAsgnmVO.java | 8 + .../VEAPrcsAplctPrdInstrAsgnmService.java | 4 +- .../impl/VEAPrcsAplctPrdInstrAsgnmDAO.java | 5 + .../VEAPrcsAplctPrdInstrAsgnmServiceImpl.java | 6 + .../ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml | 4 +- .../VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml | 11 +- .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp | 71 +++- .../asgnmInfo/instrAsgnmDetail.jsp | 372 +++++++----------- .../asgnmInfo/instrAsgnmList.jsp | 4 +- 14 files changed, 314 insertions(+), 242 deletions(-) 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 9bcb9e18..ea6341cc 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -37,6 +37,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { // 파일 등록 후 리턴 메세지 jsp에서 넘겨줌 public String successMsg = ""; public String eduAplctOrd = ""; + public String prcsAplctPrdOrd = ""; //기반강화 강의계획서용 // 컨트롤 엘리먼트 ID - 멀티 업로드 시 jsp에서 사용하는 el 값 public String controlId = ""; @@ -131,6 +132,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.trgtPrsnlReal = trgtPrsnlReal; } + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } + 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 777a765c..0c384109 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -31,4 +31,7 @@ public interface InnorixFileService { RestResponse updateRprtInnorixFile(AdrInnorixFileVO adrInnorixFileVO); + //기반강화 강의계획서 저장 + RestResponse insertInnorixLctrPlanFile(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 c9669212..65d096d8 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 @@ -30,6 +30,8 @@ import kcc.let.utl.fcc.service.EgovStringUtil; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; /** * @Class Name : EgovCmmUseServiceImpl.java @@ -72,6 +74,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I //교육과정신청 @Resource(name = "vEEduMIXService") private VEEduMIXService vEEduMIXService; + + //과정차시 관리 + @Resource(name = "vEAPrcsAplctPrdInstrAsgnmService") + private VEAPrcsAplctPrdInstrAsgnmService vEAPrcsAplctPrdInstrAsgnmService; /** * @methodName : fileDataUpload * @author : 이호영 @@ -366,4 +372,33 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); } + + @Override + public RestResponse insertInnorixLctrPlanFile(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + + VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO = new VEAPrcsAplctPrdInstrAsgnmVO(); + vEAPrcsAplctPrdInstrAsgnmVO.setLctrPlanAtchFileId(atchFileId); + + vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); + vEAPrcsAplctPrdInstrAsgnmVO.setPrcsAplctPrdOrd(adrInnorixFileVO.getPrcsAplctPrdOrd()); + + //저장 + vEAPrcsAplctPrdInstrAsgnmService.updatLctrPlanAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), 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 5c6ee42f..906b82f2 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -136,4 +136,27 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.updateRprtInnorixFile(adrInnorixFileVO)); } + /** + * @methodName : insertInnorixFile + * @author : 이호영 + * @date : 2023.07.20 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/web/common/insertInnorixLctrPlanFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixLctrPlanFile(@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.insertInnorixLctrPlanFile(adrInnorixFileVO)); + } } \ No newline at end of file diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java index bfcaaa7e..3bc7fe63 100644 --- a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -113,6 +113,7 @@ public class VEFndtnAsgnmController { vEPrcsDetailVO.setUserId(loginVO.getUniqId()); vEPrcsDetailVO.setInstrDiv("20"); vEPrcsDetailVO.setAprvlCd("20"); + vEPrcsDetailVO.setLctrDivCd("50"); //기반강화50. 기소유예 60 vEPrcsDetailVO.setSearchDiv("ING"); // 강의내역 END 종료내역 try { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index a0dbbfe2..d90532c2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -148,6 +148,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String eduPlace; //교육장소 + private String prcsAplctPrdOrd; //과정신청기간순번 + public String getMemoCn() { return memoCn; @@ -734,6 +736,12 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public String getPnltyOrd() { return pnltyOrd; } + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } public void setPnltyOrd(String pnltyOrd) { this.pnltyOrd = pnltyOrd; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java index d9708200..2151f404 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java @@ -2,8 +2,6 @@ package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; import java.util.List; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - public interface VEAPrcsAplctPrdInstrAsgnmService { void instrInsert(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); @@ -19,4 +17,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService { void updateAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO); void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO); + + void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java index e800dde6..3e3a76d4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -41,6 +41,11 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { public void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO) { update("VEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax", vEPrcsDetailVO); + } + + public void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + update("VEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java index e244db0e..4b4f7cbb 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -64,4 +64,10 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst vEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax(vEPrcsDetailVO); } + + @Override + public void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + vEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index ba30ca84..0d667e5e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -4904,12 +4904,12 @@ vpap.prcs_aplct_prd_ord = a.prcs_aplct_prd_ord LEFT JOIN ve_prcs vp ON vp.prcs_ord = vpap.prcs_ord - WHERE + WHERE 1 = 1 AND vid.aprvl_cd = #aprvlCd# /* 강의 승인 20 */ AND vid.instr_div = #instrDiv# /* 성인 20 */ AND vid.use_yn = 'Y' - + AND vpap.lctr_div_cd = #lctrDivCd# /*진행 중 : 진행 예정*/ AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') REPLACE(vpap.edu_ddln_pnttm, '.' , '') diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index ae7f8e87..2cb400b0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -158,7 +158,16 @@ AND vid.use_yn ='Y' - + + + /* VEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId */ + + UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM + SET lctr_plan_atch_file_id = #lctrPlanAtchFileId# + , last_updusr_id = #lastUpdusrId# + , last_updt_pnttm = sysdate + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + 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 0d7fd711..c8dfaca5 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 @@ -13,6 +13,9 @@ <% pageContext.setAttribute("replaceChar", "\n"); %> + + + @@ -99,6 +131,8 @@ + /> + " />

강의내역상세

@@ -155,7 +189,7 @@

기간

- ~ + ~ @@ -211,13 +245,14 @@

신청자수

+

신청자수

- + @@ -233,6 +268,28 @@ + +

강의계획서

+ +
+ + + <%-- + + --%> +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+ +
@@ -242,118 +299,51 @@
-

강사정보

+

강사 배치 정보

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

성명

- 		- 성인강사2 - -

구분

- 		- 성인 강사 -
-

성명

- 		- 성인강사2 -
-

구분

- 		- 성인 강사 -
-

거주지

- 		- 광주광역시(동구 계림동) -
-

강사료(a)

- 		- 0 - -

출장비(b)

- 		- 0 -
-

강사료(a)

- 		0
-

출장비(b)

- 		0
-

여비(c)

- 		- 0 - -

총액(a)+(b)+(c)

- 		- 0 -
-

여비(c)

- 		0
-

총액(a)+(b)+(c)

- 		0
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명연락처확정여부
+ + + + + +
강사 배치 정보가 없습니다.
+
@@ -361,92 +351,6 @@ -
- -

필수입력 항목*

강의계획서
-
-
- - -
-
- - - - - - - - - - - - - - - - - -
첨부파일 파일 명, 종류, 크기 정보 제공
파일 명종류크기
-

첨부하실 파일을 마우스끌어서 넣어주세요.

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
첨부파일 파일 명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
- ${fileList.orignlFileNm} - - "> - - "> - - -
-
-
-
-

최대 1개

-

500MB제한

-
-
- -
-
-
- - - - - - - - -
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp index e7f3bc15..baea3ae6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -112,7 +112,7 @@ - + @@ -183,7 +183,7 @@ -
+
From 544c1f3c1a5a3b6504d35289530ea84e3363f2f2 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 18 Oct 2023 12:44:05 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90]=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20=EA=B0=95=EC=9D=98=EC=83=81=EC=84=B8?= =?UTF-8?q?=20=EC=8B=A0=EC=B2=AD=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FndtnEnhanceTrnController.java | 11 + .../sspnIdtmt/web/SspnIdtmtController.java | 12 + .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 7 +- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 49 -- .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 184 ++++++- .../web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 459 ++++++++++-------- 6 files changed, 461 insertions(+), 261 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index e674527a..1d5acbbf 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -396,6 +396,17 @@ public class FndtnEnhanceTrnController { //1.pageing step1 //과정 조회 VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); + vEEduAplctReqVO.setUserId(loginVO.getUniqId()); + vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd()); + vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); + vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); + VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); + // VO를 먼저 null 체크 후 진행해야 에러안남 + // vEEduAplctVO != null && + if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { + vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd()); + } model.addAttribute("info", vEPrcsDetailVODetail); diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index c170f5b2..2c51c130 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -392,6 +392,18 @@ public class SspnIdtmtController { //1.pageing step1 //과정 조회 VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); + vEEduAplctReqVO.setUserId(loginVO.getUniqId()); + vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd()); + vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); + vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_60); + VEEduAplctVO vEEduAplctVO = sspnIdtmtService.findByAprvlCd(vEEduAplctReqVO); + // VO를 먼저 null 체크 후 진행해야 에러안남 + // vEEduAplctVO != null && + if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { + vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd()); + } + model.addAttribute("info", vEPrcsDetailVODetail); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 5e1b44a8..8ba41da2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -33,10 +33,10 @@ function ddlnCdSttsChk(){ var $ddlnCdStts = $("#ddlnCdStts"); - + // 상태에따라 싱천버튼 활성화 비활성화 var regStatus = true; - + // 텍스트가 비어있는지 확인 if ($ddlnCdStts.text().trim() === "") { var dateText = $ddlnCdStts.closest('table').find("td:eq(2)").text().trim(); @@ -44,6 +44,7 @@ var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); var endPnttm = new Date(dateText.split("~")[1].trim().replace(/\./g, '-')); var currentDate = new Date(); + if (currentDate < strtPnttm) { $ddlnCdStts.text("접수전"); } else if (currentDate >= strtPnttm && currentDate <= endPnttm) { @@ -52,8 +53,6 @@ } else if (currentDate > endPnttm) { $ddlnCdStts.text("접수종료"); } - - console.log('regStatus :: ', regStatus); } $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 69f925bd..80b00759 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -516,7 +516,6 @@ $(document).ready(function(){ 6 7 8 - 9 10 11 @@ -524,54 +523,6 @@ $(document).ready(function(){ -
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 535d5ce3..517e4633 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 @@ -27,12 +27,16 @@ // 상태값 확인 ddlnCdSttsChk(); - + + $("#regBtn").click(function(){ + var regForm = document.regForm; + regForm.prcsAplctPrdOrd.value = $(this).data('info'); + }); }); function ddlnCdSttsChk(){ - var $ddlnCdStts = $("#ddlnCdStts"); + var $ddlnCdStts = $(".ddlnCdStts"); // 상태에따라 싱천버튼 활성화 비활성화 var regStatus = true; @@ -54,20 +58,16 @@ $ddlnCdStts.text("접수종료"); } } + console.log('regStatus : ', regStatus); $('#regBtn').prop('disabled', regStatus); // 버튼 비활성화 } function fncGoList(){ var listForm = document.listForm ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } - function fncGoEdit(){ - var linkForm = document.linkForm ; - linkForm.action = ""; - linkForm.submit(); - } function fncSendSubmit(){ if(confirm("제출 하시겠습니까?")){ @@ -116,6 +116,42 @@ } } + + // 대상자 이름, 생년월일, 대상자TB ID + function fncEduReg(trgtNm, dBirth, sspnIdtmtTrgtOrd){ + var form = document.regForm; + form.trgtNm.value = trgtNm; + form.dBirth.value = dBirth; + form.sspnIdtmtTrgtOrd.value = sspnIdtmtTrgtOrd; + + var data = new FormData(document.getElementById("regForm")); + if(confirm("신청하시겠습니까?")){ + var url = "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/eduRegAjax.do"; + console.log(data); + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("저장되었습니다."); + fncGoList(); + }else{ + alert("교육 신청에 실패하였습니다.\n담당자에게 문의해 주세요."); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + function fncGoDetail(){ var linkForm = document.linkForm ; linkForm.action = ""; @@ -132,9 +168,74 @@ , "chrgInfoUpdatePop" ); } + + + function fn_confirm(){ + + var form = document.confirmForm; + var dBirth = $('#dBirth').val().replace(/\./g, ''); + var trgtNm = $('#trgtNm').val(); + + + form.trgtNm.value = trgtNm; + form.dBirth.value = dBirth; + + var data = new FormData(document.getElementById("confirmForm")); + + var url = "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/userConfirmAjax.do"; + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + console.log('returnData : ', returnData); + if(returnData.result == "success"){ + // 대상자 테이블 pk 값 + var sspnIdtmtTrgtOrd = returnData.id; + if(sspnIdtmtTrgtOrd != ''){ + alert("확인되었습니다."); + + // 교육 신청 ajax + // 대상자 이름, 생년월일, 대상자TB ID + fncEduReg(trgtNm, dBirth, sspnIdtmtTrgtOrd); + } else { + alert("대상자에 없습니다."); + } + }else{ + alert("대상자에 없습니다."); + } + fn_target_confirm_clean(); + + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + + + + $('#target_confirm_popup-close').click(); + } + +
+ + + + +
+
+ + +

교육신청 상세

@@ -221,8 +322,15 @@ 상태 - - + + + + + + + + + @@ -233,9 +341,59 @@
-
- +
+
-
\ No newline at end of file +
+ + + +
+
+
+

교육대상자 확인

+ +
+
+
+
+ + + + + + + + + + + + + +
성명 + +
주민번호앞자리 +
+ +
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index 841c2a1e..fb569ac0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -17,52 +17,108 @@ $(document).ready(function(){ + + $('.tab_button').click(function(){ + var type = $(this).data('info'); + // list 타입이면 return; + if(type === 'list') + return false; + + var data = fncEduSelect(); + console.log('data : ', data); + + // 월 하이라이트 체크 + fn_MonthHL(); + + // 현재 날짜를 가져옵니다. + var today = new Date(); + var currentMonth = today.getMonth() + 1; + + // 데이터 추가 전 촐기화 + $(".edu_program tbody").empty(); + // 반복시작 + $.each(data, function(index, item) { + var prcsNm = item.prcsNm; + var startDt = item.eduStrtPnttm; + // 교육 일수 구하기 + var dayDiff = fn_dayDiff(item); + var newRow = $(""); + + // prcsNm 값을 추가합니다. + newRow.append('' + prcsNm + ''); + + // dayDiff 값을 추가합니다. + newRow.append('' + dayDiff + ''); + + // 교육일정 칼럼을 초기화합니다. + for (var i = 1; i <= 12; i++) { + // 다음 월 class + var cellClass = "edup_pass"; // 기본값 + + // 전 월 class + if (i < currentMonth) { + cellClass = "edup_pre"; + // 현재 월 + } else if (i === currentMonth) { + cellClass = "edup_this"; + } + if (i === parseInt(startDt.split('.')[1])) { + newRow.append('' + parseInt(startDt.split('.')[2]) + ''); + } else { + newRow.append(''); + } + } + // 테이블에 새로운 행을 추가합니다. + $(".edu_program tbody").append(newRow); + + }); + //-- /반복끝 + }); + + $(".aplctBtn button").click(function(){ var regForm = document.regForm; regForm.prcsAplctPrdOrd.value = $(this).data('info'); }); // 상태값 확인 - $(".ddlnCdStts").each(function() { - var $thisCell = $(this); - var $applyButton = $thisCell.closest('tr').find(".aplctBtn button"); + $(".ddlnCdStts").each(function() { + var $thisCell = $(this); + var $applyButton = $thisCell.closest('tr').find(".aplctBtn button"); // var $aprvlCd = $thisCell.closest('tr').find(".aplctBtn input"); - - // 텍스트가 비어있는지 확인 - if ($thisCell.text().trim() === "") { - var $currentRow = $thisCell.closest('tr'); + + // 텍스트가 비어있는지 확인 + if ($thisCell.text().trim() === "") { + var $currentRow = $thisCell.closest('tr'); - var strtPnttm = new Date($currentRow.find("td:eq(2)").text().split("~")[0].trim()); - var endPnttm = new Date($currentRow.find("td:eq(2)").text().split("~")[1].trim()); - var currentDate = new Date(); + var strtPnttm = new Date($currentRow.find("td:eq(2)").text().split("~")[0].trim()); + var endPnttm = new Date($currentRow.find("td:eq(2)").text().split("~")[1].trim()); + var currentDate = new Date(); - // 시간, 분, 초 초기화 - strtPnttm.setHours(0, 0, 0, 0); - endPnttm.setHours(0, 0, 0, 0); - currentDate.setHours(0, 0, 0, 0); - - var ddlnCdText = ''; - - console.log('currentDate : ', currentDate); - console.log('strtPnttm : ', strtPnttm); - console.log('endPnttm : ', endPnttm); - console.log(''); - if (currentDate < strtPnttm) { - ddlnCdText = "접수전"; - } else if (currentDate >= strtPnttm && currentDate <= endPnttm) { - ddlnCdText = "접수중"; - } else if (currentDate > endPnttm) { - ddlnCdText = "접수종료"; - } - - $thisCell.text(ddlnCdText); - - } + // 시간, 분, 초 초기화 + strtPnttm.setHours(0, 0, 0, 0); + endPnttm.setHours(0, 0, 0, 0); + currentDate.setHours(0, 0, 0, 0); + + var ddlnCdText = ''; + + console.log(''); + if (currentDate < strtPnttm) { + ddlnCdText = "접수전"; + } else if (currentDate >= strtPnttm && currentDate <= endPnttm) { + ddlnCdText = "접수중"; + } else if (currentDate > endPnttm) { + ddlnCdText = "접수종료"; + } + + $thisCell.text(ddlnCdText); + + } - // 텍스트가 "접수중"인지 확인 - if ($thisCell.text().trim() !== "접수중") { - $applyButton.prop('disabled', true); // 버튼 비활성화 - } - }); + // 텍스트가 "접수중"인지 확인 + if ($thisCell.text().trim() !== "접수중") { + $applyButton.prop('disabled', true); // 버튼 비활성화 + } + }); }); @@ -101,6 +157,67 @@ $(document).ready(function(){ }); } } + + function fn_dayDiff(item){ + + var startDt = item.eduStrtPnttm; + var endDt = item.eduDdlnPnttm; + + // 날짜 문자열을 Date 객체로 변환합니다. + var startDate = new Date(startDt.split('.').join('-')); + var endDate = new Date(endDt.split('.').join('-')); + + // 두 날짜 사이의 밀리초 차이를 구합니다. + var differenceInMilliseconds = endDate - startDate; + + // 밀리초를 일수로 변환합니다. (1일 = 24시간 = 24 * 60분 = 24 * 60 * 60초 = 24 * 60 * 60 * 1000 밀리초) + var differenceInDays = differenceInMilliseconds / (24 * 60 * 60 * 1000); + + // 시작 날짜와 종료 날짜를 모두 포함하여 계산 + differenceInDays += 1; + + return differenceInDays; + + } + + function fn_MonthHL(){ + var today = new Date(); + // 현재 달을 가져옵니다. (0부터 시작하므로 1을 더해줍니다.) + var currentMonth = today.getMonth() + 1; + + // 해당하는 달의 요소에 'edup_this' 클래스를 추가합니다. + $("#monthTemp th:nth-child(" + currentMonth + ")").addClass("edup_this"); + } + + function fncEduSelect(){ + var returnVal = ''; + var data = new FormData(document.getElementById("selectForm")); + var url = "${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduSelectAjax.do"; + console.log(data); + $.ajax({ + type:"POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + console.log('returnData : ', returnData); + returnVal = returnData.data; + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + + return returnVal; + + + } function linkPage(pageNo){ var listForm = document.listForm ; @@ -132,8 +249,6 @@ $(document).ready(function(){ function fn_confirm(){ - console.log('??'); - var form = document.confirmForm; var dBirth = $('#dBirth').val().replace(/\./g, ''); var trgtNm = $('#trgtNm').val(); @@ -141,7 +256,7 @@ $(document).ready(function(){ form.trgtNm.value = trgtNm; form.dBirth.value = dBirth; - + var data = new FormData(document.getElementById("confirmForm")); var url = "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/userConfirmAjax.do"; @@ -195,6 +310,9 @@ $(document).ready(function(){
+
+ +
@@ -224,144 +342,13 @@ $(document).ready(function(){
-
    -
    • -
    • -
+
    +
    • +
    • +
-
-
- - -
-
-
- -
- ~ -
- -
- -
-
- -
-
총 6개의 검색결과가 있습니다.
-
    -
  • 지난교육일정
    • -
  • 당월교육일정
    • -
  • 교육예정일정
    • -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수시간교육일정(교육 시작일)
123456789101112
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
-
-
- -
-
+
- - - - 주민번호앞자리 - -
+ + + + + + + + + + + + - -
성명 + +
주민번호앞자리 +
-
+ + +
-
+
From 39a33e17a51a51b3fc11b69d97e8fb3a384d1b94 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 18 Oct 2023 12:49:13 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?= =?UTF-8?q?=ED=95=98=EC=9D=B4=EB=9D=BC=EC=9D=B4=ED=8A=B8=20js=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index fb569ac0..6c614b59 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -520,7 +520,7 @@ $(document).ready(function(){ 일수 교육일정(교육 시작일) - + 1 2 3 From 0282d6479bb3a90e42510c1fcff0908e26c07edb Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 18 Oct 2023 12:53:46 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A0=80?= =?UTF-8?q?=EC=9E=91=EA=B6=8C=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=EB=B2=84=ED=8A=BC=20=EC=9D=B4=EC=A0=84/=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C=20=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/exprnAplctDashboard.jsp | 9 +++++++-- .../exprnClsrmInfo/exprnDocumentDashboard.jsp | 11 +++++++++-- .../exprnClsrmInfo/exprnPlanDashboard.jsp | 11 +++++++++-- .../exprnClsrmInfo/exprnRprtDashboard.jsp | 11 +++++++++-- .../exprnClsrmInfo/exprnRsltDashboard.jsp | 7 ++++++- 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp index a6aa7542..70daf69d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp @@ -40,6 +40,11 @@

운영신청 상세

+
+
+ +
+
@@ -264,7 +269,6 @@
-
@@ -276,7 +280,8 @@
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp index 89517439..c10b627f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -76,6 +76,12 @@

거래선 및 서약서 정보

+
+
+ + +
+
@@ -119,12 +125,13 @@
- +
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp index d260d1fb..34630e4b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp @@ -53,6 +53,12 @@

운영계획

+
+
+ + +
+
@@ -167,7 +173,7 @@
- +
@@ -179,7 +185,8 @@
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp index 0cde9626..1c806919 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRprtDashboard.jsp @@ -431,6 +431,12 @@

결과보고

+
+
+ + +
+
@@ -597,7 +603,7 @@
- +
@@ -609,7 +615,8 @@ - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp index 9abf8149..a74bbf7e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -245,6 +245,11 @@

운영내역 상세

+
+
+ +
+
@@ -700,7 +705,6 @@
-
@@ -709,6 +713,7 @@
+