diff --git a/.gitignore b/.gitignore index 35aa4a6a..937f245f 100644 --- a/.gitignore +++ b/.gitignore @@ -201,3 +201,14 @@ rebel.xml #Mac OS .DS_Store +/src/main/java/kcc/web/.editorconfig +/.smarttomcat/ipedu/conf/catalina.policy +/.smarttomcat/ipedu/conf/catalina.properties +/.smarttomcat/ipedu/conf/context.xml +/.smarttomcat/ipedu/conf/jaspic-providers.xml +/.smarttomcat/ipedu/conf/jaspic-providers.xsd +/.smarttomcat/ipedu/conf/logging.properties +/.smarttomcat/ipedu/conf/server.xml +/.smarttomcat/ipedu/conf/tomcat-users.xml +/.smarttomcat/ipedu/conf/tomcat-users.xsd +/.smarttomcat/ipedu/conf/web.xml diff --git a/pom.xml b/pom.xml index a2561020..5bf3eab6 100644 --- a/pom.xml +++ b/pom.xml @@ -659,6 +659,20 @@ maven-javadoc-plugin 2.9.1 + + org.zeroturnaround + jrebel-maven-plugin + 1.2.1 + + + generate-rebel-xml + process-resources + + generate + + + + 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 461086fa..d1bd4673 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 @@ -223,7 +223,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { * 라인 배경컬러 */ private String color; - + /* private String ddlnCd; //교육과정상태 - VEA004 private String aprvlCd; //교육신청상태 - VE0003 @@ -1127,5 +1127,5 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; } - + } diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 5d0016c5..4d0b1b72 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -4,6 +4,8 @@ import java.io.File; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -14,6 +16,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.stream.Collectors; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -35,6 +38,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import kcc.com.cmm.util.StringUtil; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.springframework.beans.factory.annotation.Value; @@ -397,11 +401,11 @@ public class MainController { /** 팝업 알림창괸리 */ model.addAttribute("popupList", popupList()); - + /** 팝업존 알림창괸리 */ model.addAttribute("popupzoneList", popupzoneList()); - - /** 게시판 조회 - 공지사항 */ + + /** 게시판 조회 - 공지사항 */ Map noticeBbsList = noticeBbsList(); model.addAttribute("noticeBbsList", noticeBbsList.get("noticeBbsList")); model.addAttribute("noticeBbsUrl", noticeBbsList.get("noticeBbsUrl")); @@ -412,8 +416,12 @@ public class MainController { model.addAttribute("atchBbsUrl", atchBbsList.get("atchBbsUrl")); /** 주요 교육일정 */ - List eduAplctList = eduAplctList(); - + Map> eduAplctList = eduAplctList(); + model.addAttribute("eduAplctList", eduAplctList.get("eduAplctList")); + model.addAttribute("sspnIdtmtList", eduAplctList.get("sspnIdtmtList")); + model.addAttribute("cmdTrgtList", eduAplctList.get("cmdTrgtList")); + model.addAttribute("preventList", eduAplctList.get("preventList")); + }catch(Exception ex) { ex.printStackTrace(); System.out.println(ex.getMessage()); @@ -2102,7 +2110,7 @@ public class MainController { return returnMap; } - private List eduAplctList() throws Exception{ + private Map> eduAplctList() throws Exception{ VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); @@ -2131,8 +2139,14 @@ public class MainController { vEPrcsDetailVO.setUseYn("Y"); //공개 여부만 조회 List vEPrcsDetailVOList = vEPrcsAplctPrdService.selectMainContent(); - - return vEPrcsDetailVOList; + + Map> returnMap = new HashMap>(); + returnMap.put("eduAplctList", vEPrcsDetailVOList.stream().limit(Math.min(vEPrcsDetailVOList.size(), 4)).collect(Collectors.toList())); + returnMap.put("sspnIdtmtList", vEPrcsDetailVOList.stream().filter(t -> "60".equals(t.getLctrDivCd())).collect(Collectors.toList())); + returnMap.put("cmdTrgtList", vEPrcsDetailVOList.stream().filter(t -> "70".equals(t.getLctrDivCd())).collect(Collectors.toList())); + returnMap.put("preventList", vEPrcsDetailVOList.stream().filter(t -> "80".equals(t.getLctrDivCd())).collect(Collectors.toList())); + + return returnMap; } } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index e8c1684a..fb089817 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -2011,156 +2011,246 @@ 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 330bc748..e448f685 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -23,8 +23,10 @@ $(document).ready(function (){ //웹접근성>알림판 aria 속성 삭제 $(".swiper-slide").removeAttr("aria-label"); $(".swiper-slide").removeAttr("role"); -}); + //주요 교육일정 색상변환 + ddlnCdColor(); +}); /* ******************************************************** * 팝업창 오픈 쿠키 정보 OPEN @@ -79,6 +81,33 @@ function fn_egov_inqire_notice(bbsId, nttId) { document.frm.submit(); } +function ddlnCdColor(){ + $('.ddlnCdColor').each(function() { + const text = $(this).text().trim(); + + if (text === '접수중') { + $(this).addClass('blue'); + } else if (text === '교육확정') { + $(this).addClass('purple'); + } else if (text === '접수종료') { + $(this).addClass('gray'); + } + }); +} + +function fncGoEduAplctDetail(prcsAplctPrdOrd, lctrDivCd) { + var viewForm = document.viewForm ; + viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ; + if(lctrDivCd == '60'){ + viewForm.action = ""; + }else if(lctrDivCd == '70'){ + viewForm.action = ""; + }else if(lctrDivCd == '80'){ + viewForm.action = ""; + } + viewForm.submit(); +} + @@ -213,75 +242,129 @@ function fn_egov_inqire_notice(bbsId, nttId) {
    • @@ -344,14 +427,14 @@ function fn_egov_inqire_notice(bbsId, nttId) {

    교육문의

    교육에 관해 궁금하시다면 글을 남겨주세요. - + " class="banner blue">

    자주 받는 질문

    궁금한 점을 질문과 답변으로 정리했어요.
    -     + @@ -429,4 +512,8 @@ function fn_egov_inqire_notice(bbsId, nttId) { + +
    + +
    \ No newline at end of file diff --git a/src/main/webapp/visitEdu/usr/publish/css/main.css b/src/main/webapp/visitEdu/usr/publish/css/main.css index 05a359eb..79fde80c 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/main.css +++ b/src/main/webapp/visitEdu/usr/publish/css/main.css @@ -67,6 +67,7 @@ .section02 .list .title{font-size:2.1rem;font-weight:500;color:#555;line-height:1.4;} .section02 .list .status{display:flex;width:90px;height:40px;font-size:1.9rem;font-weight:500;border-radius:3px;justify-content:center;align-items:center;} .section02 .list .status.blue{background:#e5eef3;color:#2750a3;} +.section02 .list .status.purple{background:#f0ebff;color:#764feb;} .section02 .list .status.gray{background:#eaeaea;color:#7c7c7c;} /* section03 */