From 920c42693145c734a6f61fcd0991afbdc4f24fae Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 13 Oct 2023 11:54:23 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20e?= =?UTF-8?q?=EB=B0=B0=EC=9B=80=ED=84=B0=20=EC=97=B0=EB=8F=99=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20CORS=20=ED=95=84=ED=84=B0=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/APILoginContoller.java | 6 +-- .../kcc/let/uat/uia/web/SimpleCORSFilter.java | 47 +++++++++++++++++++ src/main/webapp/WEB-INF/web.xml | 15 ++++-- 3 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index be7acdb3..d1413b3b 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -67,9 +67,9 @@ public class APILoginContoller { * @throws Exception */ @RequestMapping(value = "/web/chkloginKeyForOffedu.do") - public String loginKeyChkForOffedu(@RequestBody Map paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { - String userId = paramRequest.get("user_id"); - String key = paramRequest.get("key"); + public String loginKeyChkForOffedu(RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception { + String userId = request.getParameter("user_id"); + String key = request.getParameter("key"); //String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함 String returnUrl = ""; diff --git a/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java b/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java new file mode 100644 index 00000000..aa6ded24 --- /dev/null +++ b/src/main/java/kcc/let/uat/uia/web/SimpleCORSFilter.java @@ -0,0 +1,47 @@ +package kcc.let.uat.uia.web; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Component; + +/** + * e-배움터와 연동하여 로그인을 처리하는 컨트롤러 클래스 + * + * @author 이지우 + * @since 2023.08.31 + * @version 1.0 + * @see + */ + +@Component +public class SimpleCORSFilter implements Filter { + + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) + throws IOException, ServletException { + + HttpServletResponse response = (HttpServletResponse) res; + + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me"); + + response.setHeader("Access-Control-Allow-Origin", "*"); + //response.setHeader("Access-Control-Allow-Origin", "http://services.arcgisonline.com"); + chain.doFilter(req, res); + } + + public void init(FilterConfig filterConfig) { + } + + public void destroy() { + } + +} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 42caa0a1..049662a0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -20,7 +20,7 @@ - + + 쿠키 통신을 안하는데 이걸 true로 하면 4XX 서버 에러가 뜬다 cors.support.credentials false @@ -84,7 +84,7 @@ CorsFilter /* - + --> @@ -98,6 +98,15 @@ *.do --> + + cors + kcc.let.uat.uia.web.SimpleCORSFilter + + + cors + /* + + From 6020967c2a5b4eafe0053307a1b400c314c3ec47 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 13 Oct 2023 16:33:28 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20#3387=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20:=20[=EA=B4=80=EB=A6=AC=EC=9E=90]=20?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=ED=99=95=EC=A0=95=EA=B4=80=EB=A6=AC=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=3D>=20=EA=B0=95=EC=82=AC=EB=B0=B0=EC=A0=95=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=83=81=ED=83=9C=EC=9D=B8=EB=8D=B0,=20?= =?UTF-8?q?=EB=B0=B0=EC=A0=95=EC=99=84=EB=A3=8C=EB=A1=9C=20=EB=82=98?= =?UTF-8?q?=EC=98=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp | 7 +++---- .../oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp index 5dbfd6da..14c22895 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngList.jsp @@ -280,13 +280,12 @@ -<%-- ~ --%> - - 배정완료 + + - + 배정완료 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp index 077d3a73..1d1f8b20 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp @@ -282,11 +282,11 @@ <%-- ~ --%> - - 배정완료 + + - + 배정완료 From 93399ba8656f3acc0ab56707e2553331b9924b79 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 13 Oct 2023 16:59:47 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor=20:=20#3401=20=EC=99=84=EB=A3=8C?= =?UTF-8?q?=20:=20[=EA=B4=80=EB=A6=AC=EC=9E=90]=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EA=B3=BC=EC=A0=95=20=EC=83=81=EC=84=B8=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B5=90=EC=9C=A1=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=ED=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VEPrcsAplctPrdService.java | 2 + .../impl/VEPrcsAplctPrdServiceImpl.java | 5 ++ .../web/CndtnPrcsInfoMngController.java | 48 +++++++++++++++++++ .../web/FndthPrcsAplctPrdMngController.java | 46 ++++++++++++++++++ .../cndtnEduPrcsAplctPrdMngDetail.jsp | 37 ++++++++++++++ .../fndthEduPrcsAplctPrdMngDetail.jsp | 37 ++++++++++++++ .../fndthEduPrcsAplctPrdMngList.jsp | 2 + .../fndthEduPrcsAplctPrdMngMdfy.jsp | 26 +++++----- 8 files changed, 190 insertions(+), 13 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java index b29fe11b..78a03e28 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java @@ -43,4 +43,6 @@ public interface VEPrcsAplctPrdService { Map findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO); + void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java index bacdb13e..070b8d39 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java @@ -100,4 +100,9 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService { return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO); } + @Override + public void updateOneColumn(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { + vEPrcsAplctPrdDAO.update(vEPrcsDetailVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index eeb85d8b..2ce8d3f3 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -672,6 +672,54 @@ public class CndtnPrcsInfoMngController { return "/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail"; } + + /** + * ve_prcs_aplct_prd 테이블에 데이터 하나만 변경하는 기능 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateDdlnCdAjax.do") + public ModelAndView updateDdlnCdAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , 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 로그인 정보 가져오기 + + + //String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID + //vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); + vEPrcsDetailVO.setLctrDivCd("60"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + //vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + + vEPrcsAplctPrdService.updateOneColumn(vEPrcsDetailVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + + /** * 조건부기소유예 기간 상세화면 */ diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index 384e35f2..92b82b0c 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -723,6 +723,52 @@ public class FndthPrcsAplctPrdMngController { } + /** + * ve_prcs_aplct_prd 테이블에 데이터 하나만 변경하는 기능 + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/updateDdlnCdAjax.do") + public ModelAndView updateDdlnCdAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + //, RedirectAttributes redirectAttributes + , 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 로그인 정보 가져오기 + + + //String prcsAplctPrdOrd = prcsAplctPrdGnrService.getNextStringId(); // 고유ID + //vEPrcsDetailVO.setPrcsAplctPrdOrd(prcsAplctPrdOrd); + vEPrcsDetailVO.setLctrDivCd("50"); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + //vEPrcsDetailVO.setUseYn("Y"); + vEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + + vEPrcsAplctPrdService.updateOneColumn(vEPrcsDetailVO); + + + modelAndView.addObject("result", "success"); + + return modelAndView; + + } + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index 46d05c6d..73d3d883 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -189,10 +189,45 @@ } + + + function fncDdlnCdSave(data){ + $('#modyDdlnCd').val(data); + + var data = new FormData(document.getElementById("modyfiForm")); + if(confirm("상태를 변경하시겠습니까?")){ + var url = ""; + 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("변경되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + +
+ + +
@@ -485,6 +520,8 @@
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index f27a9a67..95f958c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -187,10 +187,45 @@ } + + + function fncDdlnCdSave(data){ + $('#modyDdlnCd').val(data); + + var data = new FormData(document.getElementById("modyfiForm")); + if(confirm("상태를 변경하시겠습니까?")){ + var url = ""; + 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("변경되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + + + + +
@@ -486,6 +521,8 @@
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp index 3399e0ae..2041fcde 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp @@ -169,6 +169,8 @@ } + + 과정신청기간관리목록 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp index 1c18a02c..d4076f3d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp @@ -177,19 +177,19 @@
- -
-

교육 과정 수정

-
    -
    • -
  • -

    교육콘텐츠

    -
    • -
  • 교육 과정 관리
    • -
  • 교육 과정 수정
    • -
-
- + +
+

과정신청기간관리 수정

+
    +
    • +
  • +

    기반강화연수관리

    +
    • +
  • 과정신청기간관리목록
    • +
+
+ +
From 6da87ee31e3b4be983147ca83a849cc134c888a9 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 16 Oct 2023 12:52:10 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20/=20=EA=B8=B0=EC=86=8C=EC=9C=A0?= =?UTF-8?q?=EC=98=88=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C(=ED=8D=BC?= =?UTF-8?q?=EB=B8=94)=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 | 8 + .../sspnIdtmt/web/SspnIdtmtController.java | 9 + .../web/ve/aplct/fndtnEnhanceTrn/main_2.jsp | 248 ++++++++++++++++++ .../jsp/web/ve/aplct/sspnIdtmt/main_2.jsp | 213 +++++++++++++++ 4 files changed, 478 insertions(+) create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main_2.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main_2.jsp 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 36b39242..c904249a 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -146,6 +146,14 @@ public class FndtnEnhanceTrnController { private FndtnEnhanceTrnService fndtnEnhanceTrnService; + /** + * 대시보드 임시 + */ + @RequestMapping("/web/ve/aplct/fndtnEnhanceTrn/main_2.do") + public String main_2( @ModelAttribute("vEEduAplctVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model , HttpServletRequest request ) throws Exception { + + return "/web/ve/aplct/fndtnEnhanceTrn/main_2"; + } /** * 교육신청 목록 화면 */ 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 99d32a45..c170f5b2 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -153,6 +153,15 @@ public class SspnIdtmtController { private SspnIdtmtService sspnIdtmtService; + /** + * 대시보드 임시 + */ + @RequestMapping("/web/ve/aplct/sspnIdtmt/main_2.do") + public String main_2( @ModelAttribute("vEEduAplctVO") VEPrcsDetailVO vEPrcsDetailVO , ModelMap model , HttpServletRequest request ) throws Exception { + + return "/web/ve/aplct/sspnIdtmt/main_2"; + } + /** * 교육신청 목록 화면 */ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main_2.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main_2.jsp new file mode 100644 index 00000000..0d02aadb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main_2.jsp @@ -0,0 +1,248 @@ +<%@ 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="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 + + + + + +
+
+

교육기반강화연수

+
+ +
+
+ +
+
+
베스트
+
+
+ +
+
+ +
+
+
핵심인재 역량강화
+
    +
  • 핵심인재 역량강화 핵심인재 역량강화
    • +
  • 2023-09-24 ~ 2023-09-30
    • +
    • +
+
+
+
핵심인재 역량강화
+
    +
  • 핵심인재 역량강화
    • +
  • 2023-09-24 ~ 2023-09-30
    • +
    • +
+
+
+
핵심인재 역량강화
+
    +
  • 핵심인재 역량강화
    • +
  • 2023-09-24 ~ 2023-09-30
    • +
    • +
+
+
+
핵심인재 역량강화
+
    +
  • 핵심인재 역량강화
    • +
  • 2023-09-24 ~ 2023-09-30
    • +
    • +
+
+
+ + +
+
+
교육과정
+
+
+ + +
+
+ + +
+
+
+ +
+ ~ +
+ +
+ + +
+
+ +
+
총 6개의 검색결과가 있습니다.
+
    +
  • 지난교육일정
    • +
  • 당월교육일정
    • +
  • 교육예정일정
    • +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수시간교육일정(교육 시작일)
123456789101112
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main_2.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main_2.jsp new file mode 100644 index 00000000..81363341 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main_2.jsp @@ -0,0 +1,213 @@ +<%@ 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="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 + + + + + +
+
+

교육기반강화연수

+
+ +
+
+ +
+ +
+

찾아가는 저작권 교육 (내용 필요)

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 + 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
+
+ + +
+
+
교육과정
+
+
+ + +
+
+ + +
+
+
+ +
+ ~ +
+ +
+ + +
+
+ +
+
총 6개의 검색결과가 있습니다.
+
    +
  • 지난교육일정
    • +
  • 당월교육일정
    • +
  • 교육예정일정
    • +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일정표
교육과정명
(상세 내용을 보시려면 과정을 클릭하세요)		일수시간교육일정(교육 시작일)
123456789101112
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
[경영기획] 경영기획기본21415,222242281427
+
+ + +
From c294a374b585994c2086fca5d4a4952720ff08cb Mon Sep 17 00:00:00 2001 From: jiwoo Date: Mon, 16 Oct 2023 16:20:21 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B0=95?= =?UTF-8?q?=EC=82=AC=20=ED=97=A4=EB=8D=94=20=EB=A9=94=EB=89=B4=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95,=20=EC=B2=B4=ED=97=98=EA=B5=90?= =?UTF-8?q?=EC=8B=A4=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20CORS=20simple=ED=95=84=ED=84=B0=20=EC=A0=9C?= =?UTF-8?q?=EC=99=B8=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 -- .../let/uat/uia/web/APILoginContoller.java | 1 - .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 5 -- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 2 + .../exprnClsrmInfo/exprnAplctDashboard.jsp | 8 ++- .../exprnClsrmAplctDashboard.jsp | 5 ++ .../exprnClsrmInfo/exprnDocumentDashboard.jsp | 2 + .../exprnClsrmInfo/exprnPlanDashboard.jsp | 6 +- .../exprnClsrmInfo/exprnRprtDashboard.jsp | 19 ++++-- .../exprnClsrmInfo/exprnRsltDashboard.jsp | 1 + src/main/webapp/WEB-INF/web.xml | 67 ------------------- 11 files changed, 32 insertions(+), 90 deletions(-) diff --git a/pom.xml b/pom.xml index cc30d9d4..7ed6dd00 100644 --- a/pom.xml +++ b/pom.xml @@ -69,12 +69,6 @@ - - - com.thetransactioncompany - cors-filter - 2.6 - egovframework.rte egovframework.rte.fdl.security diff --git a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java index d1413b3b..012fff09 100644 --- a/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java +++ b/src/main/java/kcc/let/uat/uia/web/APILoginContoller.java @@ -46,7 +46,6 @@ import kcc.let.utl.sim.service.EgovClntInfo; */ @Controller -@CrossOrigin(origins = "*", methods = RequestMethod.POST) public class APILoginContoller { /** userManageService */ 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 31ab2905..1392960b 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 @@ -1168,10 +1168,5 @@ WHERE USER_ID = #userId# AND LCTR_DIV_CD = '30' AND APRVL_CD = '60' - AND PRCS_ORD = (SELECT - MAX(PRCS_APLCT_PRD_ORD) - FROM VE_PRCS_APLCT_PRD - WHERE LCTR_DIV_CD = '30' - AND USE_YN = 'Y') diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 84978b91..c709c576 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -60,6 +60,8 @@ $(document).ready(function (){ if("${instrDiv}" == 'tngrInstrDiv'){ $("#9991000").parent('li').hide(); $("#full_9991000").parent('li').hide(); + $("#99912000").parent('li').hide(); + $("#full_99912000").parent('li').hide(); }else if("${instrDiv}" == 'adultInstrDiv'){ $("#99923000").parent('li').hide(); $("#full_99923000").parent('li').hide(); 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 b9fdf932..367242fc 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 @@ -264,18 +264,20 @@
+
-
-
- +
+
+ +
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 7d2ea2a0..ebff8aa3 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 @@ -49,6 +49,11 @@ }); } } + + function nextTab(tab){ + window.scrollTo(0,0); + $('.p_'+tab).children('a').click(); + } 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 b66f5df3..f332ff97 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 @@ -119,10 +119,12 @@
+
+
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 f295b7b9..33e05358 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 @@ -167,10 +167,9 @@
+
-
-
@@ -179,6 +178,9 @@
+
+ +
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 4495e09e..0cde9626 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 @@ -594,17 +594,24 @@
- +
-
+
+ +
- - + + + +
- + + + +
- + 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 0af39958..cc54683d 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 @@ -700,6 +700,7 @@
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 049662a0..c4dac02e 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -19,73 +19,6 @@ *.do - - -