diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index c5a4c547..b6657e11 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -266,6 +266,7 @@ public class EgovBBSManageController { boardVO.setSearchSortCnd("FRST_REGIST_PNTTM"); boardVO.setSearchSortOrd("desc"); } + Map map = bbsMngService.selectBoardArticles(boardVO, vo.getBbsAttrbCode()); int totCnt = Integer.parseInt((String) map.get("resultCnt")); @@ -1229,6 +1230,17 @@ public class EgovBBSManageController { String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); boardVO.setFrstRegisterId(userId); } + + + if("BBSMSTR_000000000711".equals(bmVO.getBbsId())) { //청소년강사공지사항 + boardVO.setSearchSortCnd("FRST_REGIST_PNTTM"); + boardVO.setSearchSortOrd("desc"); + } + + System.out.println("bmVO.getBbsTyCode()"); + System.out.println(bmVO.getBbsTyCode()); + System.out.println(bmVO.getBbsId()); + Map map = bbsMngService.selectBoardArticlesWeb(boardVO, null); int totCnt = Integer.parseInt((String) map.get("resultCnt")); paginationInfo.setTotalRecordCount(totCnt); diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java index 55a43400..9cb60804 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java @@ -438,6 +438,8 @@ public class EduAplctTngrController { //기본데이터 불러오기 vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + System.out.println(vEEduAplctVO.toString()); + //데이터 복호화 - VO 단위로 만들어서 사용 vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); 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 7de875c2..41599314 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 @@ -134,6 +134,11 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private String stngYr; //기준년도 + private String isltnYn; //도서학교여부 + private String isltn2Yn; //벽지학교여부 + private String isltn3Yn; //접적학교여부 + private String ppltnReducAreaYn; //인구감소지역여부 + public int getChasi() { return chasi; @@ -1650,6 +1655,30 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setSbmtId(String sbmtId) { this.sbmtId = sbmtId; } + public String getIsltnYn() { + return isltnYn; + } + public void setIsltnYn(String isltnYn) { + this.isltnYn = isltnYn; + } + public String getIsltn2Yn() { + return isltn2Yn; + } + public void setIsltn2Yn(String isltn2Yn) { + this.isltn2Yn = isltn2Yn; + } + public String getIsltn3Yn() { + return isltn3Yn; + } + public void setIsltn3Yn(String isltn3Yn) { + this.isltn3Yn = isltn3Yn; + } + public String getPpltnReducAreaYn() { + return ppltnReducAreaYn; + } + public void setPpltnReducAreaYn(String ppltnReducAreaYn) { + this.ppltnReducAreaYn = ppltnReducAreaYn; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java index 3b0007e4..d6b4e19a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java @@ -40,6 +40,8 @@ import kcc.kccadr.sch.service.SchduleManageVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil4VO; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrAsgnmVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; @@ -149,6 +151,9 @@ public class InstrPrflController { @Resource(name = "schduleManageService") private SchduleManageService schduleManageService; + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; + /** * 1.신청변경신청 목록 - L */ @@ -290,6 +295,15 @@ public class InstrPrflController { vELctrDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO); model.addAttribute("vELctrDetailVO", vELctrDetailVO); + + //현재 대시보드문구 가져오기 + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setStngCd("TR02"); + vEAStngVO = vEAStngService.selectDetail_VEABIS(vEAStngVO); + + model.addAttribute("selectBasicTRInfo", vEAStngVO); + + return "/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard"; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java index 5ff75c95..c21d83c2 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java @@ -193,11 +193,13 @@ public class AdvAreaLctrMngTngrController { modelAndView.setViewName("jsonView"); try { - String s_cn = request.getParameter("cn"); + String s_cn = request.getParameter("cn"); + String s_stngCd = request.getParameter("stngCd"); VEAStngVO vEAStngVO = new VEAStngVO(); vEAStngVO.setCn(s_cn); - vEAStngVO.setStngCd("TR01"); + //vEAStngVO.setStngCd("TR01"); + vEAStngVO.setStngCd(s_stngCd); vEAStngService.update_VEABIS(vEAStngVO); modelAndView.addObject("result", "success"); @@ -233,8 +235,14 @@ public class AdvAreaLctrMngTngrController { vEAStngVO.setStngCd("TR01"); vEAStngVO = vEAStngService.selectDetail_VEABIS(vEAStngVO); - model.addAttribute("selectBasicTRInfo", vEAStngVO); + model.addAttribute("selectBasicTR01Info", vEAStngVO); + + //청소년강사대시보드 문구 가져오기 + vEAStngVO.setStngCd("TR02"); + vEAStngVO = vEAStngService.selectDetail_VEABIS(vEAStngVO); + + model.addAttribute("selectBasicTR02Info", vEAStngVO); return "oprtn/tngrVisitEdu/advStngMngList"; } @@ -248,9 +256,13 @@ public class AdvAreaLctrMngTngrController { , HttpServletRequest request ) throws Exception { try { + String s_stngCd = request.getParameter("stngCd"); + //현재 신청등록문구 가져오기 VEAStngVO vEAStngVO = new VEAStngVO(); - vEAStngVO.setStngCd("TR01"); + //vEAStngVO.setStngCd("TR01"); + vEAStngVO.setStngCd(s_stngCd); + vEAStngVO = vEAStngService.selectDetail_VEABIS(vEAStngVO); model.addAttribute("selectBasicTRInfo", vEAStngVO); diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml index 4c0fddfc..34782766 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBoard_SQL_Tibero.xml @@ -475,16 +475,16 @@ - ,$searchSortCnd$ + $searchSortCnd$ - $searchSortOrd$ + $searchSortOrd$ , - - , A.SORT_ORDR DESC, A.NTT_NO ASC + A.frst_regist_pnttm DESC, + A.SORT_ORDR DESC, A.NTT_NO ASC /* LIMIT recordCountPerPage OFFSET firstIndex */ 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 a28ac4cf..7c56c839 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 @@ -368,8 +368,15 @@ /* VEEduAplctDAO.selectDetail */ SELECT + ,NVL(B.ISLTN_YN,'N') AS isltnYn + ,NVL(B.ISLTN2_YN,'N') AS isltn2Yn + ,NVL(B.ISLTN3_YN,'N') AS isltn3Yn + ,NVL(B.PPLTN_REDUC_AREA_YN,'N') AS ppltnReducAreaYn + FROM A - WHERE A.EDU_APLCT_ORD = #eduAplctOrd# + LEFT OUTER JOIN VE_SCHOL B + ON(A.STNDRD_SCHOL_CD=B.STNDRD_SCHOL_CD) + WHERE A.EDU_APLCT_ORD = #eduAplctOrd# diff --git a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml index 2c8e6ace..9638ec10 100644 --- a/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/schol/ScholInfo_SQL_Tibero.xml @@ -95,10 +95,10 @@ ,A.ESTBS_DT AS estbsDt ,A.SCHOL_ANVSRY AS scholAnvsry ,A.LAST_UPDT_PNTTM AS lastUpdtPnttm - ,A.ISLTN_YN AS isltnYn - ,A.ISLTN2_YN AS isltn2Yn - ,A.ISLTN3_YN AS isltn3Yn - ,A.PPLTN_REDUC_AREA_YN AS ppltnReducAreaYn + ,NVL(A.ISLTN_YN,'N') AS isltnYn + ,NVL(A.ISLTN2_YN,'N') AS isltn2Yn + ,NVL(A.ISLTN3_YN,'N') AS isltn3Yn + ,NVL(A.PPLTN_REDUC_AREA_YN,'N') AS ppltnReducAreaYn diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/sch/popup/SchduleManagerPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/sch/popup/SchduleManagerPopDetail.jsp index d2177354..788dd429 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/sch/popup/SchduleManagerPopDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/sch/popup/SchduleManagerPopDetail.jsp @@ -147,6 +147,32 @@ ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} + + + +

도서학교구분

+ + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} + +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp index 36670eaf..78f5655a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetail.jsp @@ -131,14 +131,36 @@

학교구분

- + - -

도시벽지학교여부

- - ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} + + + +

도서학교구분

+ + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} + +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp index ada4a9b7..b84862d9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp @@ -43,8 +43,8 @@ //fncPreviewEmail - function fncPreviewEmail(){ - //document.listForm.authorCode.value = vAuthorCode; + function fncPreviewEmail(p_stngCd){ + document.listForm.stngCd.value = p_stngCd; //document.listForm.action = ""; document.listForm.action = ""; window.open("#", "_aplctPreviewPop", "scrollbars = no, top=100px, left=100px, height=500px, width=1200px"); @@ -52,19 +52,22 @@ document.listForm.submit(); } - function fncUpdate(){ + function fncUpdate(p_cn, p_stngCd){ - if ($("#cn").val() == null || $("#cn").val() == ''){ + if ($(p_cn).val() == null || $(p_cn).val() == ''){ alert("내용은 필수값입니다."); return false; } + if(confirm("수정하시겠습니까?")){ $.ajax({ type:"POST", url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/advStngMngTRAjax.do", data: { - "cn" : $("#cn").val() + "cn" : $(p_cn).val(), + "stngCd" : p_stngCd, + }, dataType:'json', success:function(returnData){ @@ -100,6 +103,9 @@ " /> + + +
@@ -159,14 +165,56 @@

사용중인 코드

-
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+

강사대시보드 문구

+
+ +
+ + + + + + + + + + + + + + +

샘플 코드

 + +
+

사용중인 코드

+ 		+ +
+
@@ -174,10 +222,10 @@
- +
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp index 41f37633..70e6affc 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -381,18 +381,36 @@ - - -

학교구분

- - - - - -

도시벽지학교여부

- - ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} - + + +

학교구분

+ + + + + +

도서학교구분

+ + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp index 0108cf8c..e233ee82 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -376,18 +376,57 @@ $( document ).ready(function(){ - - -

필수입력 항목*

-

도서벽지학교여부

- - - - - - - - + + + + +

필수입력 항목*

+

도서학교여부

+ + + + + + + + + + +

필수입력 항목*

+

벽지학교여부

+ + + + + + + + + + +

필수입력 항목*

+

접적학교여부

+ + + + + + + + + + +

필수입력 항목*

+

인구감소지역여부

+ + + + + + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp index 628b09b0..279804ea 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp @@ -401,18 +401,56 @@ $(document).ready(function(){ - - -

필수입력 항목*

-

도서벽지학교여부

- - - - - - - - + + + +

필수입력 항목*

+

도서학교여부

+ + + + + + + + + + +

필수입력 항목*

+

벽지학교여부

+ + + + + + + + + + +

필수입력 항목*

+

접적학교여부

+ + + + + + + + + + +

필수입력 항목*

+

인구감소지역여부

+ + + + + + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp index e2f4c77b..aa002828 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -286,18 +286,39 @@ - - -

학교구분

- - - - - -

도시벽지학교여부

- - ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} - + + + + +

학교구분

+ + + + + +

도서학교구분

+ + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} + +

주소

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 cff989b1..d16abe35 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -372,19 +372,38 @@ function replyCalculation(){

학교(기관)명

- -

기관(학교)구분

- -

도서벽지학교여부

- - - 예 - - - 아니오 - - - + + + +

학교구분

+ + + + + +

도서학교구분

+ + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} + +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp index 36878e15..ec54d020 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp @@ -222,7 +222,7 @@ - ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample + ※ 컴퓨터 파일(엑셀)만 등록 가능합니다.sample diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp index 138727ea..d6bec2a1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp @@ -123,7 +123,7 @@

학교(기관)명

- + () diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp index a68b2ab4..3d3ec34e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngList.jsp @@ -155,7 +155,7 @@ 번호 학교구분 지역 - 학교(기관)명 + 학교(기관)명(표준학교코드) 도서여부 벽지여부 접적학교여부 @@ -198,6 +198,7 @@ + () diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp index 4f2fffe2..9802a38d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp @@ -116,7 +116,13 @@ var _searchYear = "${boardVO.searchYear}"; - + + +
@@ -163,6 +169,10 @@ var _searchYear = "${boardVO.searchYear}";
+ + + +
<%-- 구분값. 공모/결과 탭화면을 위한 --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index 1f4f24cf..4bc3b60b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -783,28 +783,36 @@ - - -

학교구분

- - - -

도시벽지학교여부

- - ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} - - +

학교구분

- - + + -

도시벽지학교여부

+

도서학교구분

- ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp index 6a41bc55..f45b9442 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -759,6 +759,56 @@ + + + +

필수입력 항목*

+

도서학교여부

+ + + + + + + + + + +

필수입력 항목*

+

벽지학교여부

+ + + + + + + + + + +

필수입력 항목*

+

접적학교여부

+ + + + + + + + + + +

필수입력 항목*

+

인구감소지역여부

+ + + + + + + + +

필수입력 항목*

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 25eb87f4..be6e3485 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 @@ -180,7 +180,11 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 $("#addrDetail").val(schData.newAddrDtl); $('input[name=scholDivCd][value='+schData.scholDivCd+']').prop('checked', true); - $('input[name=isltnScholYn][value='+schData.isltnScholYn+']').prop('checked', true); + //$('input[name=isltnScholYn][value='+schData.isltnScholYn+']').prop('checked', true); + $('input[name=isltnYn][value='+schData.isltnYn+']').prop('checked', true); + $('input[name=isltn2Yn][value='+schData.isltn2Yn+']').prop('checked', true); + $('input[name=isltn3Yn][value='+schData.isltn3Yn+']').prop('checked', true); + $('input[name=ppltnReducAreaYn][value='+schData.ppltnReducAreaYn+']').prop('checked', true); $("#eduSlctAreaCd").find("option").each(function(index){ @@ -847,11 +851,6 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 - - - - -
@@ -914,15 +913,51 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크

필수입력 항목*

-

도서벽지학교여부

+

도서학교여부

- - - - + + + + + + +

필수입력 항목*

+

벽지학교여부

+ + + + + + + + + + +

필수입력 항목*

+

접적학교여부

+ + + + + + + + + + +

필수입력 항목*

+

인구감소지역여부

+ + + + + + + +

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 188cdc95..417f5ad5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -831,29 +831,37 @@

학교(기관)명

- - - -

학교구분

- - - -

도시벽지학교여부

- - ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} - - + +

학교구분

- - + + -

도시벽지학교여부

+

도서학교구분

- ${info.isltnScholYn eq 'Y' ? '예' : '아니오'} + ${info.isltnYn eq 'Y' ? '예' : '아니오'} + + + +

벽지학교구분

+ + ${info.isltn2Yn eq 'Y' ? '예' : '아니오'} + + +

접적학교구분

+ + ${info.isltn3Yn eq 'Y' ? '예' : '아니오'} + + + +

인구감소지역여부

+ + ${info.ppltnReducAreaYn eq 'Y' ? '예' : '아니오'} +

주소

diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp index 621f6267..3bce5929 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp @@ -68,13 +68,22 @@
-
- -
-

찾아가는 저작권 교육

- ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. + + +
+ +
+

찾아가는 저작권 교육

+ ‘찾아가는 저작권 교육’은 저작권 교육이 필요한 전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. +
-
+ + + + + + +