From b62d4f91ac15fb965f48805fd7662286608f1d13 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 22 Nov 2023 15:45:05 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=B0=BE?= =?UTF-8?q?=EA=B5=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 달력 수정 --- .../web/ScholInfoController.java | 127 +++++++++--- .../exprnClsrmInfo/popup/calendarPopList.jsp | 191 +++++++----------- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 27 ++- 3 files changed, 182 insertions(+), 163 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java index 274211c2..99de6785 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ScholInfoController.java @@ -11,11 +11,14 @@ 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.bind.annotation.ResponseBody; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngMixService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoService; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; @@ -61,6 +64,9 @@ public class ScholInfoController { @Resource(name = "AdjstReqService") private AdjstReqService adjstReqService; + //강의설정 관리(MIX) + @Resource(name = "vEAStngMixService") + private VEAStngMixService vEAStngMixService; /** * 학교정보 검색 팝업 리스트 */ @@ -104,35 +110,35 @@ public class ScholInfoController { */ @RequestMapping("popup/calendarPopList.do") public String popupCalendarPopList( @ModelAttribute("scholInfoVO") ScholInfoVO scholInfoVO , ModelMap model , HttpServletRequest request ) throws Exception { - //1.paging step1 - PaginationInfo paginationInfo = this.setPagingStep1(scholInfoVO); - //2. paging step2 - scholInfoVO = this.setPagingStep2(scholInfoVO, paginationInfo); - - if (!"".equals(scholInfoVO.getSearchKeyword())) { - scholInfoVO.setSelectPagingListQuery(" AND A.SCHOL_NM LIKE '%"+scholInfoVO.getSearchKeyword()+"%' "); - } - - if (!"".equals(scholInfoVO.getSearchCondition())) { - if(scholInfoVO.getSearchCondition().equals("10")) { - scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%초등%' "); - }else if(scholInfoVO.getSearchCondition().equals("20")) { - scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%중학%' "); - }else if(scholInfoVO.getSearchCondition().equals("30")) { - scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%고등%' "); - }else if(scholInfoVO.getSearchCondition().equals("40")) { - scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%특수%' "); - }else if(scholInfoVO.getSearchCondition().equals("50")) { - scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%각종%' "); - } - } - - List scholInfoVOList = scholInfoService.selectPagingList(scholInfoVO); - //3.paging step3 - paginationInfo = this.setPagingStep3(scholInfoVOList, paginationInfo); - model.addAttribute("paginationInfo", paginationInfo); - //학교정보 리스트, 페이징 정보 전달 - model.addAttribute("scholList", scholInfoVOList); +// //1.paging step1 +// PaginationInfo paginationInfo = this.setPagingStep1(scholInfoVO); +// //2. paging step2 +// scholInfoVO = this.setPagingStep2(scholInfoVO, paginationInfo); +// +// if (!"".equals(scholInfoVO.getSearchKeyword())) { +// scholInfoVO.setSelectPagingListQuery(" AND A.SCHOL_NM LIKE '%"+scholInfoVO.getSearchKeyword()+"%' "); +// } +// +// if (!"".equals(scholInfoVO.getSearchCondition())) { +// if(scholInfoVO.getSearchCondition().equals("10")) { +// scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%초등%' "); +// }else if(scholInfoVO.getSearchCondition().equals("20")) { +// scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%중학%' "); +// }else if(scholInfoVO.getSearchCondition().equals("30")) { +// scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%고등%' "); +// }else if(scholInfoVO.getSearchCondition().equals("40")) { +// scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%특수%' "); +// }else if(scholInfoVO.getSearchCondition().equals("50")) { +// scholInfoVO.setScholGrade(" AND A.SCHOL_GRADE_NM LIKE '%각종%' "); +// } +// } +// +// List scholInfoVOList = scholInfoService.selectPagingList(scholInfoVO); +// //3.paging step3 +// paginationInfo = this.setPagingStep3(scholInfoVOList, paginationInfo); +// model.addAttribute("paginationInfo", paginationInfo); +// //학교정보 리스트, 페이징 정보 전달 +// model.addAttribute("scholList", scholInfoVOList); return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList"; } @@ -184,4 +190,67 @@ public class ScholInfoController { return p_paginationInfo; } + + + + //교육가능시수 달력 팝업 데이타 - 해당 회차의 선택한 기간 정보에 대한 달력의 정보들 + @RequestMapping(value = "/popup/calendarPopListAjax.do") + @ResponseBody + public List advPsblTmQnttyCalendarPopupAjax( + @ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO + , ModelMap model + ) throws Exception { + + /* + System.out.println(schduleManageVO.getTodate()); + System.out.println(schduleManageVO.getTodate()); + System.out.println(schduleManageVO.getTodate()); + System.out.println(schduleManageVO.getSearchStartDt().split("T")[0]); + System.out.println(schduleManageVO.getSearchStartDt()); + System.out.println(schduleManageVO.getSearchStartDt()); + */ + + System.out.println("vEAStngVO.getDpStrtDt()"); + System.out.println(vEAStngVO.getDpStrtDt()); + System.out.println(vEAStngVO.getDpDdlnDt()); + + String s_std_date = vEAStngVO.getDpStrtDt().substring(0, 10); + vEAStngVO.setDpStrtDt(s_std_date); + vEAStngVO.setYr(s_std_date.substring(0,4)); + //schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", "")); + //step1.현재달력의 첫번째 날짜를 기준으로 그해와 다음해의 전체 일자를 만들고, + + List vList = vEAStngMixService.selectList_VEALPPS_2(vEAStngVO); + + //return vEAStngMixService.selectList_VEALPPS_1(vEAStngVO); + + for (int i=0;i=Integer.parseInt(vList.get(i).getTitleB())) + { + vList.get(i).setColor("#FF0000"); + + }else if (Integer.parseInt(vList.get(i).getTitleF())*5>=Integer.parseInt(vList.get(i).getTitleB())*4) + { + vList.get(i).setColor("#FFAA00"); + } + + + }catch(Exception ex) { + ex.printStackTrace(); + } + } + + return vList; + + //return schduleManageService.selectSchManageStatusList(schduleManageVO); + } } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList.jsp index f31847f8..ac910a1d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/calendarPopList.jsp @@ -7,15 +7,7 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - - - - - @@ -30,6 +22,9 @@ + + + @@ -37,86 +32,21 @@ + + + + + @@ -406,12 +339,32 @@ var calendar;
-

학교명 검색

+

교육일정달력

-
askfjaskdjfaskdjfasdk - asdfasfsad - asdfsadf +
+ +
+ +

교육가능시수현황

+ +
+ + +
+
+ +
+
+
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 d4599ddf..003f11f6 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 @@ -791,24 +791,21 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 } } - function fncCalView(paramObj) { - if(paramObj == undefined || paramObj == ''){ - paramObj = { - pageIndex : 1, - searchKeyword : "", - searchCondition : "", - pageUnit : 5, - formId : "createForm" - }; - } + function fncCalView() { +// if(paramObj == undefined || paramObj == ''){ +// paramObj = { +// pageIndex : 1, +// searchKeyword : "", +// searchCondition : "", +// pageUnit : 5, +// formId : "createForm" +// }; +// } commonPopLayeropen( "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/scholInfo/popup/calendarPopList.do" - //"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.do" - //"${pageContext.request.contextPath}/web/ve/tngrVisitEdu/popup/advLctrPrdCalendarPopup.do" - , 900 , 900 - , paramObj + , "" , "Y" , "calendarPop" ); @@ -1136,7 +1133,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 ※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)
- +