From a2ee7991d1a9964a57155e743f63c43c05200bf3 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 12 Jan 2024 12:20:51 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A0=80?= =?UTF-8?q?=EC=9E=91=EA=B6=8C=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ExprnClsrmEndController.java | 1 + .../web/OprtnAplctAnncmMngController.java | 5 ++-- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 15 +++++++++-- .../jsp/cmm/fms/EgovBBSFileListCustom.jsp | 2 +- .../jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp | 5 ---- .../cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp | 25 +++++++++++++------ .../oprtnAplctAnncmMngUpdate.jsp | 19 ++++++++++++++ .../cpyrgExprnClsrm/oprtnAplctMngReg.jsp | 2 +- .../cpyrgExprnClsrm/oprtnStateMngList.jsp | 2 +- .../cpyrgExprnClsrm/oprtnStateMngMdfy.jsp | 2 +- .../popup/cautionGuidePreView.jsp | 4 +-- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 2 +- .../exprnClsrmEnd/exprnClsrmEndList.jsp | 7 ++++++ .../exprnClsrmInfo/eduInfo.jsp | 2 +- .../exprnClsrmAplctDashboard.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctGuide.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctList.jsp | 1 - .../exprnClsrmInfo/exprnClsrmAplctReg.jsp | 7 +++--- .../exprnClsrmInfo/popup/cautionGuide.jsp | 8 +++--- src/main/webapp/js/web_common_custom.js | 15 +++++++---- 20 files changed, 85 insertions(+), 43 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java index 66f2e9ac..04e80312 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java @@ -187,6 +187,7 @@ public class ExprnClsrmEndController { model.addAttribute("paginationInfo", paginationInfo); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEEduAplctVOList); + model.addAttribute("cnt", vEEduAplctVOList.size()); return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList"; } diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java index c4ef1d92..0b526283 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java @@ -397,7 +397,7 @@ public class OprtnAplctAnncmMngController { int i_file_limit_cn = 50; // file count int i_limit_size_cn = 100; // file MB - String s_file_exts_cn = "pdf|txt"; // file exts + String s_file_exts_cn = "jpg|jpeg|png|gif|bmp|pdf|doc|docx|xls|xlsx|ppt|pptx|hwp|txt"; // file exts final Map files = multiRequest.getFileMap(); @@ -538,8 +538,7 @@ public class OprtnAplctAnncmMngController { int i_file_limit_cn = 50; // file count int i_limit_size_cn = 100; // file MB - String s_file_exts_cn = "pdf|txt"; // file exts - + String s_file_exts_cn = "jpg|jpeg|png|gif|bmp|pdf|doc|docx|xls|xlsx|ppt|pptx|hwp|txt"; // file exts final Map files = multiRequest.getFileMap(); Map files_ori = new HashMap(); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index b7d15fca..3e1602ea 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -5759,8 +5759,19 @@ AND A.SBMT_YN = 'Y' AND A.LCTR_DIV_CD = #lctrDivCd# - AND A.APRVL_CD=#aprvlCd# - + AND A.APRVL_CD=#aprvlCd# + + + AND A.APRVL_CD=#searchCpyAprvlCd# + + + + AND A.APRVL_CD >= 20 + + + + AND TO_CHAR(A.SBMT_PNTTM,'YYYY') = #searchYear# + ORDER BY A.EDU_APLCT_ORD DESC diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp index bb35c4a0..d6b30f76 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileListCustom.jsp @@ -128,7 +128,7 @@ <%-- ','' , '' )"> --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp index 64d3fddb..3abc6f58 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp @@ -463,11 +463,6 @@ function jstreeRefresh() { //코드 정보 저장. 등록/수정 function fn_save_menuInfo(menuNo) { - var special_pattern = /[`~!@#$%^&*|\\\'\";:\/?.]/gi; - if(special_pattern.test(document.menuForm.menuNo.value) == true){ - alert("코드 코드는 특수문자를 쓸수 없습니다.") ; - return; - } if(menuNo == null || "undefined"== menuNo){ alert("저장 하려는 코드를 먼저 코드트리에서 생성해 주세요."); return ; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp index 38f1278b..bdf761ed 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngReg.jsp @@ -177,7 +177,10 @@ alert("팝업내용을 입력해주세요."); return false; } */ - + if($("#dprtmNm").val() == ""){ + alert("담당부서를 입력해주세요."); + return false; + } //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 //var data = new FormData(form); @@ -250,6 +253,19 @@ } } + for (var i = 0; i < files.length; i++){ + var fileNm = files[i].name; + if (fileNm != "") { + var ext = fileNm.slice(fileNm.lastIndexOf(".") + 1).toLowerCase(); + var allowedExtensions = ["jpg", "jpeg", "png", "gif", "bmp", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "hwp", "txt"]; + if (!allowedExtensions.includes(ext)) { + alert("jpg, jpeg, png, pdf, doc, docx, xls, xlsx, ppt, pptx, hwp, txt 파일만 업로드 가능합니다."); + e.stopImmediatePropagation(); // block js file upload + return false; + } + } + } + for (var i = 0; i < files.length; i++) { var fd = new FormData(); @@ -332,13 +348,6 @@ - - -

필수입력 항목*

-

작성자

- - " readonly> -

필수입력 항목*

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp index 5444b41a..980b81a8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngUpdate.jsp @@ -150,6 +150,11 @@ return false; } */ + if($("#dprtmNm").val() == ""){ + alert("담당부서를 입력해주세요."); + return false; + } + //첨부파일 등록 처리 $('#file_temp').val(""); //첨부파일 중복 등록 방지를 위해 추가 //var data = new FormData(form); @@ -224,6 +229,20 @@ } } + for (var i = 0; i < files.length; i++){ + var fileNm = files[i].name; + if (fileNm != "") { + var ext = fileNm.slice(fileNm.lastIndexOf(".") + 1).toLowerCase(); + var allowedExtensions = ["jpg", "jpeg", "png", "gif", "bmp", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "hwp", "txt"]; + if (!allowedExtensions.includes(ext)) { + alert("jpg, jpeg, png, pdf, doc, docx, xls, xlsx, ppt, pptx, hwp, txt 파일만 업로드 가능합니다."); + e.stopImmediatePropagation(); // block js file upload + return false; + } + } + } + + for (var i = 0; i < files.length; i++) { var fd = new FormData(); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp index c6641700..6dda5c89 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp @@ -655,7 +655,7 @@ @ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp index 55687177..803edc67 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp @@ -144,7 +144,7 @@ " /> " /> - +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngMdfy.jsp index ee21b273..047b401d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngMdfy.jsp @@ -278,7 +278,7 @@ @ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp index ebcfef4b..cc2598c0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/cautionGuidePreView.jsp @@ -58,11 +58,9 @@
  • 신청 시 공문양식을 다운로드 받아서 반드시 학교장 직인된 공문을 첨부해야 합니다.
  • 신청 시 반드시 본인 계정으로 신청해야 하며, 타인 계정으로 신청 시 신청 취소 처리됩니다.
  • 체험교실 신규 운영 교사는 체험교실 운영 교사 연수(1일, 8시간)를 반드시 이수해야 하며, 체험교실 운영 기간내에 저작권 e-배움터에서 제공하는 온라인 강좌를 의무 이수해야 합니다.
    • -
  • 신청기간 내 위원회 업무시간(09:00 ~ 18:00)동안 이용이 가능합니다.
    • -
  • 신청교사가 교내에서 확인 가능한 메일 계정을 기재해 주시기 바랍니다.
    • -
  • 신청 중 문의사항은 위원회 체험교실 담당자에게 연락을 주시기 바랍니다(055-792-0234)
  • 선정 후 취소(신규 운영 교사 사전 연수 불참 등) 및 운영 포기교실은 차년도 참여를 제한합니다.
    (해당 내용 학교 공문 발송 예정)
    • +
  • 신청 시작시간과 마감시간에 유의하시기 바라며, 문의사항은 위원회 업무시간(09:00~18:00) 중체험교실 담당자(055-792-0234)에게 연락주시기 바랍니다.
    • diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 3e4a0f7e..a5bd1db6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -143,7 +143,7 @@
  • -

    체험교실 마이페이지 아이콘 찾교(체험교실)

    +

    체험교실 마이페이지 아이콘 체험교실

    diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 65f05692..8b55ade5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -13,6 +13,13 @@