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/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 9681d29b..492aeb98 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 @@ -149,6 +149,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String acmdtAplctOrd; //숙박신청 순번 private String acmdtSbmtYn; //숙박신청 제출여부 + private String targetId; + public int getChasi() { return chasi; @@ -1748,6 +1750,13 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setAcmdtSbmtYn(String acmdtSbmtYn) { this.acmdtSbmtYn = acmdtSbmtYn; } + public String getTargetId() { + return targetId; + } + public void setTargetId(String targetId) { + this.targetId = targetId; + } + } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 097b77b0..1492b033 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -976,6 +976,7 @@ public class EduAplctMngTngrController { */ @RequestMapping("popup/eduDocReqAlertPopup.do") public String eduDocReqAlertPopup( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + return "oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup"; } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// 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 d6fbbca9..a87c24f6 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 @@ -1297,7 +1297,9 @@ A.SBMT_ATCH_FILE_ID AS sbmtAtchFileId, TO_CHAR(A.SBMT_PNTTM,'YYYY-MM-DD') AS sbmtPnttm, A.SBMT_ID AS sbmtId, - B.INSTR_NM AS instrNm + B.INSTR_NM AS instrNm, + B.PHONE AS phone, + B.EMAIL AS email FROM VE_EDU_DOC_REQ A LEFT JOIN VE_INSTR_DETAIL B diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp index 9fd3191e..6daf5dc3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp @@ -13,6 +13,7 @@ 학교명 검색 + @@ -335,7 +339,13 @@
+ "/> + + + + +
" /> @@ -669,10 +679,8 @@ - - - <%-- - --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index 0b3682eb..ff1b8de3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -272,8 +272,13 @@ function replyCalculation(){ // 서류요청 SMS, EMAIL 알림 팝업 - function alertPopup(userId,type) { //메뉴생성 화면 호출 + function alertPopup(userId,type, p_receiver, instrNm) { //메뉴생성 화면 호출 document.popForm.action = ""; + document.popForm.targetId.value = userId; + document.popForm.type.value = type; + document.popForm.phone.value = p_receiver; + document.popForm.email.value = p_receiver; + document.popForm.instrNm.value = instrNm; window.open("#", "_eduDocReqAlertPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); document.popForm.target = "_eduDocReqAlertPopup"; document.popForm.submit(); @@ -309,7 +314,12 @@ function replyCalculation(){
+ "/> + + + +
@@ -602,10 +612,8 @@ function replyCalculation(){ - - - <%-- - --%> + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp index 1d5c26fc..f4c6a543 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp @@ -29,45 +29,79 @@ %> -교육신청 상세 - - - - - + 교육신청 상세 + + + + + + - - " /> - - - " /> - -
+ + + + + + +
-

SMS|EMIAL 발송 - 개발전

+
+

+ + + SMS 발송 + + + EMAIL 발송 + + +

+
@@ -78,13 +112,23 @@ - + - +

수신자

청소년강사1(010-1111-2222) + + + + () + + + () + + +

내용

@@ -95,8 +139,15 @@
- - + + + + + + + + +
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;
- +
diff --git a/src/main/webapp/js/ve/sendSmsEmailUtil.js b/src/main/webapp/js/ve/sendSmsEmailUtil.js new file mode 100644 index 00000000..2e1ca787 --- /dev/null +++ b/src/main/webapp/js/ve/sendSmsEmailUtil.js @@ -0,0 +1,101 @@ +//문자발송 +function sendSms( + p_receiver, // 수신자 + p_cn, //내용 + p_logSeq, //로그에 남길 pk + p_trgtId, //받는사용자pk + p_alertYn // 발송 후 alert 여부 + ){ + + if (p_cn==""){ + alert("SMS 발송 내용은 필수값입니다."); + return false; + } + sendContent( + p_receiver, + p_cn, + "", + "10", //코드 10:sms 20:mail + p_logSeq, + p_trgtId, + p_alertYn + ); +} + +//이메일 발송 +function sendEmail( + p_receiver, // 수신자 + p_cn, //내용 + p_logSeq, //로그에 남길 pk + p_trgtId, //받는사용자pk + p_flag, // p_flag -> 'C' 청소년 , 'S' 성인 + p_alertYn // 발송 후 alert 여부 + ){ + + if (p_cn==""){ + alert("이메일 발송 내용은 필수값입니다."); + return false; + } + + sendContent( + p_receiver, + p_cn, + p_flag, + "20", //코드 10:sms 20:mail + p_logSeq, + p_trgtId, + p_alertYn + ); +} + +//발송 +function sendContent(p_receiver, p_cn, p_flag, p_cd, p_logSeq, p_trgtId, p_alertYn){ + + var url = ""; + if(p_cd == '10') url = getContextPath()+"/kccadr/oprtn/pblc/offeduSMSSndAjax.do"; + else if(p_cd == '20') url = getContextPath()+"/kccadr/oprtn/pblc/emailSndAjax.do"; + + if(url ==""){ + if(p_alertYn != 'N'){ + alert("발송이 실패했습니다."); + } + return false; + } + + $.ajax({ + type: "POST", + url:url, + data:{ + "clphone": p_receiver, + "email": p_receiver, + "sndCn": p_cn, + "sndFlag": p_flag, + "sndCd": p_cd, + "eduAplctOrd": p_logSeq, + "trgtId" : p_trgtId + }, + dataType:'json', + success:function(returnData){ + if(returnData.result == "success"){ + if(p_alertYn != 'N'){ + alert(returnData.message); + } + }else{ + if(p_alertYn != 'N'){ + alert(returnData.message); + } + } + }, + error:function(request , status, error){ + if(p_alertYn != 'N'){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + } + }); +} + +function getContextPath(){ + var hostIndex = location.href.indexOf( location.host ) + location.host.length; + var contextPath = location.href.substring( hostIndex, location.href.indexOf('/', hostIndex + 1) ); + return contextPath; +} \ No newline at end of file diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index 7a38940d..d0d3c1cb 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -443,4 +443,15 @@ input[type="text"].input_time {width: 50px;} .sch_wrap .sch_day{width: 4%; min-width: 70px; padding-right: 20px; box-sizing: border-box;} .sch_wrap p.day_sun{color: #e40000;} -.sch_wrap p.day_sat{color: #0b5bff;} \ No newline at end of file +.sch_wrap p.day_sat{color: #0b5bff;} + +/*tab 추가*/ +.tab_wrap{background-color: #fff;width: 100%;border-radius: 5px; display: flex;text-align: center;margin-bottom: 20px;border:1px solid #dbdcdd;} +.tab_wrap li{flex-basis: calc(100%/2); position: relative;} +.tab_wrap li:after{position:absolute;content: "";width: 1px;height: 27px;background-color: #dbdcdd;right: 0;margin: 13px 0 0 0;} +.tab_wrap li:last-child:after{width: 0;} +.tab_wrap li button{width: 100%;padding: 13px 0;font-size: 18px;position:relative;z-index:1;} +.tab_wrap li.active{background-color: #46484a;} +.tab_wrap li.active:after{content:'';position:absolute;left:-1px;top:-1px;border:1px solid #697e9b;} +.tab_wrap li.active button{color: #fff;border:1px solid #46484a;background-color: #697e9b;} +.tab_wrap li.active button:after{content:'';position:absolute;left:-4px;top:-4px;width:100%;height:100%;border:4px solid #697e9b;border-radius: 5px;} \ No newline at end of file diff --git a/src/main/webapp/visitEdu/adm/publish/script/content.js b/src/main/webapp/visitEdu/adm/publish/script/content.js index 5abf8862..4cbdaa7a 100644 --- a/src/main/webapp/visitEdu/adm/publish/script/content.js +++ b/src/main/webapp/visitEdu/adm/publish/script/content.js @@ -629,3 +629,12 @@ $(function(){ } } } + + //tab 버튼 + function TabWrap(obj){ + var $tab = $(obj).closest("li"); + $tab.addClass("active"); + $tab.find("button").attr("title", "선택됨"); + $tab.siblings("li.tab").removeClass("active"); + $tab.siblings("li.tab").find("button").removeAttr("title"); + } diff --git a/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu01_main.png b/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu01_main.png index 1b42613e..38a319e7 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu01_main.png and b/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu01_main.png differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu03_main.png b/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu03_main.png index ab914f89..229ca588 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu03_main.png and b/src/main/webapp/visitEdu/usr/publish/images/content/sub_edu03_main.png differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg index 821327f9..c9669520 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01.jpg differ diff --git a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg index 85bf5a91..47a91e53 100644 Binary files a/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg and b/src/main/webapp/visitEdu/usr/publish/images/main/main_visual_01_mob.jpg differ