diff --git a/src/main/java/kcc/com/uss/ion/fms/web/FmsFileController.java b/src/main/java/kcc/com/uss/ion/fms/web/FmsFileController.java index 88ef20ba..2a37b361 100644 --- a/src/main/java/kcc/com/uss/ion/fms/web/FmsFileController.java +++ b/src/main/java/kcc/com/uss/ion/fms/web/FmsFileController.java @@ -366,6 +366,32 @@ public class FmsFileController { } return modelAndView; } + + /* 첨부파일 삭제 사용자 url*/ + @RequestMapping(value = "/web/fms/fmsfileDeleteAjax.do") + public ModelAndView webFmsfileDeleteAjax(@RequestParam Map commandMap, + FmsFileVO fmsFileVO, + @ModelAttribute("fileVO") FileVO fileVO + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + /*Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (!isAuthenticated) { + modelAndView.addObject("result", "auth_fail"); //권한없음 팝업창 닫고, 오프너 창 리로드 + return modelAndView; + }*/ + + try { + fileMngService.deleteFmsFileInf(fileVO); + modelAndView.addObject("result", "success"); + }catch (Exception e) { + modelAndView.addObject("result", "fail"); + System.out.println("Exception Occured!!!"); + return modelAndView; + } + return modelAndView; + } @RequestMapping(value = "/uss/ion/fms/fmsfileMultipleDeleteAjax.do", method = RequestMethod.POST) public ModelAndView fmsfileMultipleDeleteAjax(@RequestBody FileVO fileVo) throws Exception { diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index 78e7aabc..a333cfef 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -175,6 +175,7 @@ public class ExprnClsrmAplctController { //신청서 양식다운로드 정보 가져오기(신청일자 기준 가장 최신 데이터, 1개 로우) VEPrcsDetailVO detailVO = new VEPrcsDetailVO(); + detailVO.setLctrDivCd("30"); //저작권 체험교실 구분 값 detailVO = vEPrcsAplctPrdService.selectDetailNewOne(detailVO); model.addAttribute("detailVO", detailVO); @@ -184,35 +185,48 @@ public class ExprnClsrmAplctController { @RequestMapping("popup/cautionGuide.do") public String cautionGuide( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { - // 청소년 + // 저작권 체험교실 vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //신청서 양식다운로드 정보 가져오기(신청일자 기준 가장 최신 데이터, 1개 로우) VEPrcsDetailVO detailVO = new VEPrcsDetailVO(); + detailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); //저작권 체험교실 구분 값 detailVO = vEPrcsAplctPrdService.selectDetailNewOne(detailVO); + //신청 기간 체크 + ModelAndView modelAndView = new ModelAndView(); //eduAplctChkProcess 공통으로 사용하기 위한 선언 + boolean flag = exprnClsrmAplctService.eduAplctChkProcess(detailVO, request, modelAndView); + detailVO.setCheckYn(flag ? "Y" : "N"); + //날짜 표시형식 변환 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); + SimpleDateFormat simpleStrFormat = new SimpleDateFormat("yyyy년 MM월 dd일"); SimpleDateFormat simpleStrFormatEnd = new SimpleDateFormat("MM월 dd일"); //시작일자 날짜 형식 변환 - Date stDate = simpleDateFormat.parse(detailVO.getFrstRegistPnttm()); + Date stDate = simpleDateFormat.parse(detailVO.getStrtPnttm()); String stDay = simpleStrFormat.format(stDate); //종료일자 날짜 형식 변환 - Date edDate = simpleDateFormat.parse(detailVO.getLastUpdtPnttm()); + Date edDate = simpleDateFormat.parse(detailVO.getEndPnttm()); String edDay = simpleStrFormatEnd.format(edDate); //요일 텍스트 받아오기 String strWeekStart = DateUtil.getWeekText(stDate); String strWeekEnd = DateUtil.getWeekText(edDate); - detailVO.setFrstRegistPnttm(stDay + "(" + strWeekStart + ")"); - detailVO.setLastUpdtPnttm(edDay + "(" + strWeekEnd + ")"); + detailVO.setStrtPnttm(stDay + "(" + strWeekStart + ")"); + detailVO.setEndPnttm(edDay + "(" + strWeekEnd + ")"); model.addAttribute("detailVO", detailVO); + //현재년도 + Date year = new Date(); + SimpleDateFormat nowYearFormat = new SimpleDateFormat("yyyy"); + String nowYear = nowYearFormat.format(year); + model.addAttribute("nowYear", nowYear); + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide"; } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java index 13154ffe..440a4ae6 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java @@ -433,7 +433,7 @@ public class ExprnClsrmEndController { model.addAttribute("info", vEEduAplctVO); // return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt"; //대량 업로드 솔루션 테스트 - return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRsltTest"; + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt"; } /** diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 3ac74444..77ab96d2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -51,6 +51,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String eduPlace; //교육장소 private String sbmtYn; //제출여부 private String sbmtPnttm; //제출일시 + private String sbmtPnttmDetail; //제출일시 시분초 추가 private String aprvlCd; //승인코드 private String aprvlPnttm; //승인일시 private String aprvlCn; //승인내용 @@ -260,6 +261,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String endPnttm; //접수 종료일 + private String prcsEndPnttm; //접수 종료일 저작권체험교실. + //강사료확정처리 private String instrFeeOrd; private String feeSbmtYn; @@ -293,6 +296,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String prcsAplctPrdOrd; + private String unfthYn; //불성실여부 + public String getPrcsAplctPrdOrd() { return prcsAplctPrdOrd; @@ -1464,6 +1469,24 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setRmtTrnAtchFileDetail(FileVO rmtTrnAtchFileDetail) { this.rmtTrnAtchFileDetail = rmtTrnAtchFileDetail; } + public String getSbmtPnttmDetail() { + return sbmtPnttmDetail; + } + public void setSbmtPnttmDetail(String sbmtPnttmDetail) { + this.sbmtPnttmDetail = sbmtPnttmDetail; + } + public String getPrcsEndPnttm() { + return prcsEndPnttm; + } + public void setPrcsEndPnttm(String prcsEndPnttm) { + this.prcsEndPnttm = prcsEndPnttm; + } + public String getUnfthYn() { + return unfthYn; + } + public void setUnfthYn(String unfthYn) { + this.unfthYn = unfthYn; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 3ea98814..e7723144 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -50,4 +50,6 @@ public interface VEEduMIXService { void updateRsltRprtFileIdNull(VEEduAplctVO vEEduAplctVO) throws Exception; void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception; + //저작권 체험교실 목록 + List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 6eb4d909..29e64cd1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -137,4 +137,10 @@ public class VEEduMIXDAO extends EgovAbstractDAO { public void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception { insert("VEEduMIXDAO.updateRsltRprtFileId", vEEduAplctVO); } + + public List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectExprnPagingList", paramVO); + return tlist; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index 330c026d..add8b050 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -125,4 +125,8 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception { vEEduMIXDAO.updateRsltRprtFileId(vEEduAplctVO); } + + public List selectExprnPagingList(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectExprnPagingList(paramVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java index a89de15d..08f53614 100644 --- a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java +++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java @@ -115,7 +115,7 @@ public class CommonManageWebController { //권한에 따른 로그인 정보 가져오기 LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); - + vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); int rs = vEEduAplctService.statusUpdate(vEEduAplctVO); //교육콘텐츠 교육승인 상태로 변경 시 메일발송 diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java index a7d4e0be..6c1933a7 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java @@ -1,5 +1,7 @@ package kcc.ve.oprtn.cpyrgExprnClsrm.oprtnAplctMng.web; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -19,6 +21,7 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.DateUtil; import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; @@ -132,7 +135,7 @@ public class OprtnAplctAnncmMngController { */ @RequestMapping("oprtnAplctAnncmMngList.do") public String OprtnAplctAnncmMngList( - VEPrcsDetailVO vEPrcsDetailVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model ) throws Exception { @@ -212,6 +215,43 @@ public class OprtnAplctAnncmMngController { return "oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngDetail"; } + /** + * 교육과정관리 미리보기 팝업 + */ + @RequestMapping("cautionGuidePreView.do") + public String cautionGuidePreView(@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO, ModelMap model)throws Exception{ + + //날짜 표시형식 변환 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); + + SimpleDateFormat simpleStrFormat = new SimpleDateFormat("yyyy년 MM월 dd일"); + SimpleDateFormat simpleStrFormatEnd = new SimpleDateFormat("MM월 dd일"); + + //시작일자 날짜 형식 변환 + Date stDate = simpleDateFormat.parse(vEPrcsDetailVO.getStrtPnttm()); + String stDay = simpleStrFormat.format(stDate); + + //종료일자 날짜 형식 변환 + Date edDate = simpleDateFormat.parse(vEPrcsDetailVO.getEndPnttm()); + String edDay = simpleStrFormatEnd.format(edDate); + + //요일 텍스트 받아오기 + String strWeekStart = DateUtil.getWeekText(stDate); + String strWeekEnd = DateUtil.getWeekText(edDate); + + vEPrcsDetailVO.setStrtPnttm(stDay + "(" + strWeekStart + ")"); + vEPrcsDetailVO.setEndPnttm(edDay + "(" + strWeekEnd + ")"); + + + //현재년도 + Date year = new Date(); + SimpleDateFormat nowYearFormat = new SimpleDateFormat("yyyy"); + String nowYear = nowYearFormat.format(year); + model.addAttribute("nowYear", nowYear); + + return "oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView"; + } + /** * 교육과정관리 수정 화면 */ @@ -411,7 +451,6 @@ public class OprtnAplctAnncmMngController { } LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 -// SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 //로그인 처리==================================== @@ -436,19 +475,6 @@ public class OprtnAplctAnncmMngController { //step2.파일 처리==================================== - - /* if (loginVO!=null) { - System.out.println(loginVO.getMembId()); - System.out.println(loginVO.getMembSeq()); - System.out.println(loginVO.getId()); - System.out.println(loginVO.getUniqId()); - } - if (ssoLoginVO!=null) { - System.out.println(ssoLoginVO.getMembId()); - System.out.println(ssoLoginVO.getMembSeq()); - //System.out.println(ssoLoginVO.getId()); - }*/ - //번호 생성 및 디비 생성해주기 String prcsAplctPrdOrd = prcsGnrService.getNextStringId(); // 고유ID vEPrcsDetailVO.setAtchFileId(s_scholSealAtchFileId); //학교장직인 첨부파일 @@ -475,7 +501,6 @@ public class OprtnAplctAnncmMngController { System.out.println(vEPrcsDetailVO.getEndPnttm()); vEPrcsDetailVO.setLctrDivCd("30"); -// vEPrcsDetailVO.setUseYn("Y"); vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vEPrcsAplctPrdService.insert(vEPrcsDetailVO); diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java index e49b9072..ce80adbe 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java @@ -137,7 +137,9 @@ public class OprtnAplctMngController { //vEEduAplctVO.setLctrDivCd("30"); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); - List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + //List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); + vEEduAplctVO.setLctrDivCd("30"); + List vEEduAplctVOList = vEEduMIXService.selectExprnPagingList(vEEduAplctVO); //List복호화 vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); //3.pageing step3 @@ -408,13 +410,13 @@ String[] header = { ,"보고서제출일" ,"운영시기(월)" -,"선정결과" +,"처리상태" ,"성별" ,"참고사항" }; String[] order = { -"TotCnt" +"EduAplctOrd" ,"EduSlctAreaCd" ,"ScholDivCd" ,"ScholInsttNm" @@ -438,7 +440,7 @@ String[] order = { ,"RprtSbmtDt" ,"OprtnStrtDt" -,"MdfyRqstYn" +,"AprvlCd" ,"ChrgSexCd" ,"" }; diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_NOTI_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_NOTI_SQL_Tibero.xml index 230c83e2..6f5703e5 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_NOTI_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_NOTI_SQL_Tibero.xml @@ -33,7 +33,7 @@ - MERGE INTO T1 USING DB_ROOT + + + MERGE INTO T1 + USING (SELECT + #tblUniqOrd# AS tbl_uniq_ord, + #frstRegisterId# AS frst_register_id, + #menuNo# AS menu_no, + #urlPath# AS url_path FROM DUAL) T2 + ON (T1.tbl_uniq_ord = T2.tbl_uniq_ord + AND T1.frst_register_id = T2.frst_register_id + AND T1.menu_no = T2.menu_no) + WHEN MATCHED THEN + UPDATE SET + frst_regist_pnttm = SYSDATE, + url_path = T2.url_path + WHEN NOT MATCHED THEN + INSERT( + + )VALUES ( + T2.TBL_UNIQ_ORD, + SYSDATE, + T2.FRST_REGISTER_ID, + T2.MENU_NO, + T2.URL_PATH ) + + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 3c097563..341f10f0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -181,10 +181,10 @@ #email#, #eduPlace#, #sbmtYn#, - IF(#sbmtYn# = 'Y', SYSDATE, NULL), + CASE WHEN #sbmtYn# = 'Y' THEN SYSDATE ELSE NULL END, #aprvlCd#, - IF(#aprvlCd# IS NOT NULL, SYSDATE, NULL), + CASE WHEN #aprvlCd# IS NOT NULL THEN SYSDATE ELSE NULL END, #aprvlCn#, #insttNm#, #insttDivCd#, @@ -275,6 +275,7 @@ REMOTE_YN AS remoteYn, CLS_CMBT_YN clsCmbtYn, PPUL_DCLN_YN AS ppulDclnYn + , TO_CHAR(A.SBMT_PNTTM, 'YYYY-MM-DD HH24:MI:ss') AS sbmtPnttmDetail ,C.aprvl_cd AS exprnAprvlCd , C.orgnl_rslt_atch_file_id AS orgnlRsltAtchFileId , C.cpy_rslt_atch_file_id AS cpyRsltAtchFileId @@ -579,7 +580,7 @@ , SBMT_YN = #sbmtYn# - , SBMT_PNTTM = IF(SBMT_PNTTM is null, SYSDATE, SBMT_PNTTM) + , SBMT_PNTTM = CASE WHEN SBMT_PNTTM IS NULL THEN SYSDATE ELSE SBMT_PNTTM END , APRVL_CD = #aprvlCd# diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml index dc93c88d..f12c7e77 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Tibero.xml @@ -57,8 +57,7 @@ A.EDU_APLCT_ORD AS eduAplctOrd, A.EDU_CHASI_ORD AS eduChasiOrd, - - IF(A.EDU_HOPE_DT is not null and A.EDU_HOPE_DT != '', DATE_FORMAT(A.EDU_HOPE_DT,'%Y.%m.%d'), '') AS eduHopeDt, + CASE WHEN A.EDU_HOPE_DT IS NOT NULL AND A.EDU_HOPE_DT != '' THEN TO_CHAR(TO_DATE(a.EDU_HOPE_DT, 'YYYYMMDD'), 'YYYY.MM.dd') ELSE '' END AS eduHopeDt, A.STRT_TM AS strtTm, A.END_TM AS endTm, A.LRN_TM AS lrnTm, @@ -66,10 +65,10 @@ A.TRGT AS trgt, A.PRSNL AS prsnl, A.MEMO_CN AS memoCn, - - DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') AS frstRegistPnttm, + + TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-dd') AS frstRegistPnttm, A.FRST_REGISTER_ID AS frstRegisterId, - DATE_FORMAT(A.LAST_UPDT_PNTTM,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-dd') AS frstRegistPnttm, A.LAST_UPDUSR_ID AS lastUpdusrId, A.LRN_SBJCT AS lrnSbjct, @@ -244,6 +243,7 @@ - /* VEEduMIXDAO.selectPagingList */ + /* 임시.*NOT_SQL_LOG.* VEEduMIXDAO.selectPagingList */ SELECT COUNT(1) OVER() AS totCnt , ROWNUM AS rowNo @@ -264,6 +264,12 @@ WHERE S3.use_YN = 'Y' AND S3.frst_regist_pnttm = (SELECT MAX(frst_regist_pnttm) FROM ve_prcs_aplct_prd) ) AS endPnttm , ( + SELECT + S4.end_pnttm + FROM ve_prcs_aplct_prd S4 + WHERE S4.prcs_aplct_prd_ord = A.prcs_ord + ) AS prcsEndPnttm + , ( SELECT COUNT(1) FROM ve_edu_chasi_instr_asgnm X @@ -2580,9 +2586,10 @@ @@ -2693,9 +2701,9 @@ VALUES , #evdncPhtAtchFileId# , #rmtTrnAtchFileId# -, NOW() +, SYSDATE , #frstRegisterId# -, NOW() +, SYSDATE , #lastUpdusrId# ) @@ -3384,7 +3392,7 @@ VALUES SET $fileType$ = null, last_updusr_id = #lastUpdusrId#, - last_updt_pnttm = now() + last_updt_pnttm = SYSDATE WHERE edu_aplct_ord = #eduAplctOrd# @@ -3407,8 +3415,100 @@ VALUES rmt_trn_atch_file_id = #rmtTrnAtchFileId#, last_updusr_id = #lastUpdusrId#, - last_updt_pnttm = now() + last_updt_pnttm = SYSDATE WHERE edu_aplct_ord = #eduAplctOrd# + + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index bbfd0d5d..be8773dd 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -349,7 +349,7 @@ - + + + @@ -331,7 +339,7 @@ - + <%--

안내내용

@@ -347,7 +355,7 @@ - + --%>

사용여부

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp index 3c11e708..2a6cd11c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp @@ -289,7 +289,10 @@ - ${list.strtPnttm}~${list.endPnttm} + + + ~ + @@ -313,7 +316,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp index 8b5260a7..651b7a14 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -153,14 +153,14 @@ alert("종료일을 입력해주세요."); return false; } - if($("#anncmCn").val() == ""){ + /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; } if($("#popupCn").val() == ""){ alert("팝업내용을 입력해주세요."); return false; - } + } */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -465,24 +465,6 @@ --> - - -

필수입력 항목*

-

안내내용

- - - - - - - -

필수입력 항목*

-

팝업내용

- - - - -

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp index eb772d0c..db9d4cd3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp @@ -126,14 +126,14 @@ alert("종료일을 입력해주세요."); return false; } - if($("#anncmCn").val() == ""){ + /* if($("#anncmCn").val() == ""){ alert("안내내용을 입력해주세요."); return false; } if($("#popupCn").val() == ""){ alert("팝업내용을 입력해주세요."); return false; - } + } */ //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 @@ -426,7 +426,7 @@
- + <%--

필수입력 항목*

안내내용

@@ -444,7 +444,7 @@ - + --%>

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index fa301387..8d120e80 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -162,6 +162,7 @@ +<%-- --%> - @@ -174,8 +175,9 @@ - - + <%-- + --%> + - @@ -413,15 +415,17 @@ - + <%-- - + --%>
- - + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp index 63410a07..a6d46df3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp @@ -1,128 +1,207 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ 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 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="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" + uri="http://www.springmodules.org/tags/commons-validator"%> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="un" + uri="http://jakarta.apache.org/taglibs/unstandard-1.0"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - +c 신청관리 - - - " /> - " /> - - -
-
- -
-

운영신청 목록

-
    -
  • -
  • -

    저작권 체험교실

    -
  • -
  • -

    운영신청 관리

    -
  • -
  • 운영신청 관리
  • -
-
- + + + " /> + " /> + + +
+
+ +
+

운영신청 목록

+
    +
  • +
  • +

    저작권 체험교실

    +
  • +
  • +

    운영신청 관리

    +
  • +
  • 운영신청 관리
  • +
+
+ -
-
-

저작권 체험교실 운영 신청서 접수 목록

-
- +
+
+

저작권 체험교실 운영 신청서 접수 목록

+
+

구분

- - - - - - + + + + +
@@ -131,16 +210,20 @@
- - 초등학교 - - 중학교 - - 고등학교 - + + 초등학교 중학교 고등학교
@@ -151,140 +234,185 @@
-

선정여부

+ <%--

선정여부

-
+
--%>
- -
-

건의 접수가 검색되었습니다.

-
- - + +
+

+ 건의 + 접수가 검색되었습니다. +

+
+ + + +
-
- + - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + <%-- --%> + + + + + + + + + + +
번호담당교과학교명담당자신청일자선정여부처리상태
- - - - <%----%> - - - - - - - - - - - - - - 선정 - 미선정 - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + - - 운영신청 - - - 수정요청 - - - 수정요청완료 - - - 교육확정 - - - 교육미확정 + + - - + - - - - - - - -
번호담당교과학교명담당자신청일자처리상태비고
+
+ " type="checkbox" value=""/> + + <%----%> + + + - 선정 미선정 + + 운영신청 + + + 수정요청 + + + 수정완료 + + + 운영확정 + + + 운영미확정 + + + - + + + + 불성실 + + + 성실 + +
+
+ +
+
+
+
+
+
+ + +
+
+ +
+ +
+
- - - -
- -
-
-
- - + + -
+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp new file mode 100644 index 00000000..ebcfef4b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp @@ -0,0 +1,71 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + 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 dbf0088f..6c7a5462 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 @@ -106,7 +106,8 @@ document.body.innerHTML = initBody; } - function beforeSrvyPopupAjax(){ + //설문조사 주석 임시로 + function beforeSrvyPopupAjax(){ var sendData= $(document.listForm).serializeArray(); $("#beforeSrvyPopupLoad").load("${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/Popup/beforeSrvyPopup.do", sendData ,function(response, status, xhr){ }); @@ -283,9 +284,9 @@ - - - + + + - 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 452da54a..6a65739b 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 @@ -113,8 +113,8 @@ - - + + @@ -185,8 +185,8 @@
  • 접수종료일 - - + +
  • diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index 114cb54c..96131cd1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -10,6 +10,15 @@ <% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + - - - " /> - " /> - " /> - - + + " /> -
    - -
    @@ -626,10 +433,8 @@

    결과보고 정보

    - ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. -
        용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다. -
    + ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. +
        용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다.
    @@ -637,72 +442,15 @@

    필수입력 항목*

    원본 결과보고서
    - - -
    -
    - - - - - - - - - - - - - - - - - -
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    -

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

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    파일 명종류크기삭제
    - ${fileList.orignlFileNm} - - "> - - "> - - -
    + + + +
    +

    - -

    최대 1

    -

    100MB제한

    등록된 파일 0

    @@ -716,73 +464,15 @@

    필수입력 항목*

    평가용 결과보고서
    - - -
    -
    - - - - - - - - - - - - - - - - - -
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    -

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

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

    - -

    최대 1

    -

    100MB제한

    등록된 파일 0

    @@ -795,73 +485,15 @@

    필수입력 항목*

    증빙사진
    - - -
    -
    - - - - - - - - - - - - - - - - - -
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    -

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

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

    - -

    최대 1

    -

    100MB제한

    등록된 파일 0

    @@ -874,73 +506,15 @@
    원격연수 이수증
    - - -
    -
    - - - - - - - - - - - - - - - - - -
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    -

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

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

    - -

    최대 1

    -

    100MB제한

    등록된 파일 0

    @@ -952,12 +526,13 @@
    -
    -
    +
    +
    +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRsltTest.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRsltTest.jsp deleted file mode 100644 index 96131cd1..00000000 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRsltTest.jsp +++ /dev/null @@ -1,540 +0,0 @@ -<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> - -<% pageContext.setAttribute("replaceChar", "\n"); %> - - - - - - - - - - - - - - " /> - - - -
    -
    -

    결과보고

    -
    - - -
    -
    -
    -
    -

    결과보고 정보

    - ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. -
        용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다.
    -
    -
    -
    -
    -

    필수입력 항목*

    원본 결과보고서
    -
    -
    - - - - -
    -

    -
    -
    -

    최대 1

    -
    -
    -

    등록된 파일 0

    - 0MB -
    -
    -
    -
    - -
    -

    필수입력 항목*

    평가용 결과보고서
    -
    -
    - - - - -
    -

    -
    -
    -

    최대 1

    -
    -
    -

    등록된 파일 0

    - 0MB -
    -
    -
    -
    -
    -

    필수입력 항목*

    증빙사진
    -
    -
    - - - - -
    -

    -
    -
    -

    최대 1

    -
    -
    -

    등록된 파일 0

    - 0MB -
    -
    -
    -
    -
    -
    원격연수 이수증
    -
    -
    - - - - -
    -

    -
    -
    -

    최대 1

    -
    -
    -

    등록된 파일 0

    - 0MB -
    -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    - - -
    -
    -
    - diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt_back.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt_back.jsp new file mode 100644 index 00000000..114cb54c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt_back.jsp @@ -0,0 +1,965 @@ +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + +<% pageContext.setAttribute("replaceChar", "\n"); %> + + + + + + + + " /> + " /> + " /> + + + + + + +
    + +
    + +
    +
    +

    결과보고

    +
    + + +
    +
    +
    +
    +

    결과보고 정보

    + ※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다. +
        용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다. +
    +
    +
    +
    +
    +

    필수입력 항목*

    원본 결과보고서
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    +

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

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    파일 명종류크기삭제
    + ${fileList.orignlFileNm} + + "> + + "> + + +
    +
    +
    + + +
    +

    최대 1

    +

    100MB제한

    +
    +
    +

    등록된 파일 0

    + 0MB +
    +
    +
    +
    + +
    +

    필수입력 항목*

    평가용 결과보고서
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    +

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

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

    최대 1

    +

    100MB제한

    +
    +
    +

    등록된 파일 0

    + 0MB +
    +
    +
    +
    +
    +

    필수입력 항목*

    증빙사진
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    +

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

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

    최대 1

    +

    100MB제한

    +
    +
    +

    등록된 파일 0

    + 0MB +
    +
    +
    +
    +
    +
    원격연수 이수증
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    첨부파일 파일명, 종류, 크기 정보 제공
    파일 명종류크기
    +

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

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

    최대 1

    +

    100MB제한

    +
    +
    +

    등록된 파일 0

    + 0MB +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + 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 52866c3c..c2de6f81 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 @@ -148,9 +148,9 @@ - - - + + + - @@ -164,7 +164,7 @@ - + @@ -196,7 +196,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 ed9a79ce..65932f40 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 @@ -18,7 +18,7 @@ } function openPop(){ - if(!checkAplctPsbl()) return; + //if(!checkAplctPsbl()) return; commonPopLayeropen( "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.do" 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 76e52969..422efc3a 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 @@ -24,7 +24,7 @@ } function goWrite(){ - if(!checkAplctPsbl()) return; + /* if(!checkAplctPsbl()) return; */ $("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.do").submit(); } @@ -98,9 +98,9 @@ - - - + + +
    @@ -154,8 +154,8 @@ - - + + <%-- @@ -187,13 +187,13 @@ 수정요청 - 수정요청완료 + 수정완료 - 교육확정 + 운영확정 - 교육미확정 + 운영미확정 - @@ -227,8 +227,8 @@
  • 접수종료일 - - + +
  • diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index c9615530..4a76cf5b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -107,7 +107,7 @@ $(".tb_write").find("input[type=radio]:first-child").attr('checked',true); $(".addClassRowClsrm > tbody").find(">tr:gt(5)").remove(); $("#agree").prop('checked',false); - $("#agree1").prop('checked',false); + /* $("#agree1").prop('checked',false); */ $("input[name=onlnPrcsOrd]").prop('checked',false); var fileVo = new Array(); @@ -234,8 +234,19 @@ $('#exprnClsrnYear').val(arr); } - $('#oprtnStrtDt').val($('#oprtnStrtDt').val().replace(/[.]/gi, '')); - $('#oprtnEndDt').val($('#oprtnEndDt').val().replace(/[.]/gi, '')); + if($('#oprtnStrtDt').val() != null){ + $('#oprtnStrtDt').val($('#oprtnStrtDt').val().replace(/[.]/gi, '')); + } + if($('#oprtnEndDt').val() != null){ + $('#oprtnEndDt').val($('#oprtnEndDt').val().replace(/[.]/gi, '')); + } + //임시저장 데이터 불러왔을 시 duet-date-picker에서 날짜 input에 id를 넣어주지 않음 + if($('duet-date-picker[name=oprtnStrtDt]').val() != null){ + $('duet-date-picker[name=oprtnStrtDt]').val($('duet-date-picker[name=oprtnStrtDt]').val().replace(/[.]/gi, '')) + } + if($('duet-date-picker[name=oprtnEndDt]').val() != null){ + $('duet-date-picker[name=oprtnEndDt]').val($('duet-date-picker[name=oprtnEndDt]').val().replace(/[.]/gi, '')) + } } function validCheck(){ @@ -382,8 +393,10 @@ return false; } - var oprtnStrtDt = $('#oprtnStrtDt').val(); - var oprtnEndDt = $('#oprtnEndDt').val(); + /* var oprtnStrtDt = $('#oprtnStrtDt').val(); + var oprtnEndDt = $('#oprtnEndDt').val(); */ + var oprtnStrtDt = $('duet-date-picker[name=oprtnStrtDt]').val(); + var oprtnEndDt = $('duet-date-picker[name=oprtnEndDt]').val(); oprtnStrtDt = oprtnStrtDt.replace(/[.]/gi, ''); oprtnEndDt = oprtnEndDt.replace(/[.]/gi, ''); @@ -394,7 +407,8 @@ return false; } - var oprtnStrtDtDate = $('#oprtnStrtDt').val(); + /* var oprtnStrtDtDate = $('#oprtnStrtDt').val(); */ + var oprtnStrtDtDate = $('duet-date-picker[name=oprtnStrtDt]').val(); var yyyy = oprtnStrtDtDate.substr(0,4); var mm = oprtnStrtDtDate.substr(5,2); var dd = oprtnStrtDtDate.substr(8,2); @@ -417,10 +431,10 @@ return false; } - if($("#agree1").length > 0 && $('#agree1').val() != 'Y'){ + /* if($("#agree1").length > 0 && !$('#agree1').prop('checked')){ alert('개인정보 이용 약관에 동의해주세요.'); return false; - } + } */ return true; } @@ -501,7 +515,10 @@ // cmpltNoFormat(document.getElementById('cmpltNum')); // } - $("#exprnClsrnCd").val(info.exprnClsrnCd); + $('input[name=exprnClsrnCd][value='+info.exprnClsrnCd+']').prop('checked', true); + if(info.exprnClsrnCd == '02'){ + $('input[name="eClsrnYear"]').attr('disabled',true); + } $('input[name=eClsrnYear]').prop('checked',false); if(isNotEmpty(info.exprnClsrnYear)){ var yearList = info.exprnClsrnYear.split(','); @@ -510,7 +527,7 @@ }); } - $("#exprnClsrnAplct").val(info.exprnClsrnAplct); + $('input[name=exprnClsrnAplct][value='+info.exprnClsrnAplct+']').prop('checked', true); if(info.exprnClsrnAplct == '04'){ $("#exprnClsrnAplctCn").prop('disabled' , false); $("#exprnClsrnAplctCn").val(info.exprnClsrnAplctCn); @@ -524,11 +541,15 @@ $("#trgtPrsnl").val(info.trgtPrsnl); if(isNotEmpty(info.oprtnStrtDt)){ - $("#oprtnStrtDt").val(dateFormat(info.oprtnStrtDt.replace(/[.]/gi,''), 'date')); + /* $("#oprtnStrtDt").val(dateFormat(info.oprtnStrtDt.replace(/[.]/gi,''), 'date')); */ + $('duet-date-picker[name=oprtnStrtDt]').val(dateFormat(info.oprtnStrtDt.replace(/[.]/gi,''), 'date')) + $('#oprtnStrtDt').val(dateFormat(info.oprtnStrtDt.replace(/[.]/gi,''), 'date')); } if(isNotEmpty(info.oprtnEndDt)){ - $("#oprtnEndDt").val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')); + /* $("#oprtnEndDt").val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')); */ + $('duet-date-picker[name=oprtnEndDt]').val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')) + $('#oprtnEndDt').val(dateFormat(info.oprtnEndDt.replace(/[.]/gi,''), 'date')); } $("#oprtnFileId").val(info.oprtnFileId); @@ -536,6 +557,7 @@ var fileTbody = $("#tbody_fiielist"); $.each(fileList, function(idx, obj){ var tr = $("").addClass('item_'+obj.atchFileId+'_'+obj.fileSn).addClass('uploaded_obj'); + var hiddenInput = $('').attr('type', 'hidden').attr('name', 'fileSize').addClass('item_file_size').val(obj.fileSize); var td1 = $('').addClass('td_filename'); var td2 = $('').addClass('td_filesort'); var td3 = $('').addClass('td_filesize'); @@ -551,7 +573,7 @@ td2.append(span2); td3.append(span3); td4.append(button); - tr.append(td1).append(td2).append(td3).append(td4); + tr.append(hiddenInput).append(td1).append(td2).append(td3).append(td4); fileTbody.append(tr); }); if(fileList.length > 0){ @@ -593,6 +615,8 @@ + +

    운영신청서 작성

    @@ -1069,7 +1093,7 @@
  • -
    + + IE에서 체크박스가 마지막에 있을 시 이상한 오류 발생. 오류 방지를 위해히든 하나 넣어둠
    -
    +
  • -->
    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp index 55f792cb..4507c3fd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp @@ -31,11 +31,16 @@ } function goWrite(){ - location.href= "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.do"; + var frm = document.getElementById("prcsOrdForm"); + frm.action = ""; + frm.submit(); } +
    + +