From 70772f021962913847d619fe69743dab7d4515e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Thu, 8 Feb 2024 12:05:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2024/02/08=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=201=EC=B0=A8=20=EC=8B=AC=EC=82=AC=20=ED=9B=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 4 +- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 1 + .../visitEdu/usr/publish/css/content.css | 6 +-- .../visitEdu/usr/publish/script/content.js | 8 +++- .../usr/publish/script/duetdatepicker.js | 3 ++ .../usr/publish/script/duetdatepicker2.js | 4 ++ .../visitEdu/usr/publish/script/main.js | 46 ++++++++++++++++++- 7 files changed, 64 insertions(+), 8 deletions(-) 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 8c0bbb02..e1e80b68 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -245,7 +245,7 @@ function instrChk(){
- +
@@ -401,7 +401,7 @@ function instrChk(){

1/ 5

- +
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 2ac75938..76126632 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 @@ -1197,6 +1197,7 @@ function _chkChasiTime(p_this){ tr.find('select[name=divCd]').val(value.divCd); tr.find('input[name=trgt]').val(value.trgt); tr.find('input[name=prsnl]').val(value.prsnl); + },1000) // console.log('tr :: ', tr); diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 7f7b7173..7dc513cb 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -125,7 +125,7 @@ .list_util:only-child{width: 100%;} .list_util select{width: 150px; height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding-left: 14px; font-size: 16px; color: #222; background-image: url(../../../adm/publish/image/icon_cont_select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; margin-right: 3px; color: #555;} .list_util input{width: 280px; height: 38px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px; margin-right: 3px;} -.list_util input::placeholder,.list_util input:-ms-input-placeholder{font-size: 16px; color: #999;} +.list_util input::placeholder,.list_util input:-ms-input-placeholder{font-size: 16px; color: #666;} .list_util button{width: 80px; height: 40px; font-size: 18px; font-weight: 400; background-color: #ed5908; color: #fff; vertical-align: middle; border-radius: 5px; transition: all 0.1s linear;}/* background-color: #f48105 */ .list_util button:hover{box-shadow: 0 0 5px rgba(0,0,0,0.3); background-color: #d62b09; transition: all 0.1s linear;} .list_util .btn_info{width: auto; background-color: #f5f5f5; color: #555; padding: 0 15px;} @@ -175,7 +175,7 @@ input {border: 1px solid #d5d5d5; border-radius: 5px;} input[type="text"] {height: 40px; padding: 0 15px; font-size: 16px; color: #222; box-sizing: border-box;} input[type="text"]:read-only {background-color: #f5f5f5; border: 1px solid #d5d5d5;} -input[type="text"]::placeholder {color: #999;} +input[type="text"]::placeholder {color: #666;} input[type="text"]:valid {color: #555;} input[type="checkbox"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;} input[type="radio"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;} @@ -261,7 +261,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .tb_type01>table>tbody>tr>td input[type="checkbox"]+label {margin-right: 10px;} .tb_type01>table>tbody>tr>td input[type="password"] {height: 40px;padding: 0 15px; border-radius: 5px; font-size: 16px;} .tb_type01>table>tbody>tr>td textarea {width: 100%; height: 90px; margin: 9px 0; font-size: 16px; padding: 10px 15px; box-sizing: border-box;} -.tb_type01>table>tbody>tr>td textarea::placeholder {color: #999;} +.tb_type01>table>tbody>tr>td textarea::placeholder {color: #666;} .tb_type01>table>tbody>tr>td>.btnType01 {height: 40px; padding: 0 20px; font-size: 17px; vertical-align: middle; margin-left: 3px; border-radius: 5px;} .tb_type01 table tbody tr td .responseItem {margin-bottom: 10px;} .tb_type01 table tbody tr td .responseItem:last-child {margin-bottom: 0;} diff --git a/src/main/webapp/visitEdu/usr/publish/script/content.js b/src/main/webapp/visitEdu/usr/publish/script/content.js index 257b49bc..888b8aed 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/content.js +++ b/src/main/webapp/visitEdu/usr/publish/script/content.js @@ -667,6 +667,12 @@ function addEduClassCopyTngr(target) { var duetdateleng = $("duet-date-picker").length + 1; cloneObj.find(".calendar_th").append('
'); + + //웹접근성>달력 버튼 title추가 + setTimeout(function(){ + cloneObj.find(".duet-date__toggle").attr("title","달력팝업 열림"); + },100) + if (target == 'addClassRowClsrm') { len = parent.find('tbody > tr').not('.calendar_wrap tr').length; @@ -1204,7 +1210,7 @@ function boardCaptionToggle03() { }else{ $(itm).find("table").prepend("" + subTit + " : " + thText + "등의 정보제공 "); } - + } else { $(itm).find("caption").remove(); if($(itm).is(".tb_type02_write")){ diff --git a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js index d55cd093..a3756824 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js +++ b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js @@ -46,6 +46,9 @@ $(window).on('load',function(){ setTimeout(function(){ $(".startDate .duet-date__input").attr("title","검색 시작날짜를 YYYY.MM.DD 형식으로 입력해주세요"); $(".endDate .duet-date__input").attr("title","검색 종료날짜를 YYYY.MM.DD 형식으로 입력해주세요"); + + //웹접근성>달력 버튼 title추가 + $(".duet-date__input-wrapper .duet-date__toggle").attr("title","달력팝업 열림"); },100) diff --git a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker2.js b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker2.js index 61ae92db..d230dd59 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker2.js +++ b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker2.js @@ -10,6 +10,10 @@ $(window).on('load',function(){ $(itm).attr("name","eduHopeDt"+idx); $(itm).attr("id","eduHopeDt"+idx); }) + + //웹접근성>달력 버튼 title추가 + $(".duet-date__input-wrapper .duet-date__toggle").attr("title","달력팝업 열림"); + /*$(".startDate .duet-date__input").attr("name","eduHopeDt1"); $(".startDate .duet-date__input").attr("id","eduHopeDt1");*/ },100); diff --git a/src/main/webapp/visitEdu/usr/publish/script/main.js b/src/main/webapp/visitEdu/usr/publish/script/main.js index 160c8e92..6d64d569 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/main.js +++ b/src/main/webapp/visitEdu/usr/publish/script/main.js @@ -59,7 +59,7 @@ $(document).ready(function () { } }); - // 슬라이드 포커싱 시 멈춤/재생 + /*슬라이드 포커싱 시 멈춤/재생 (백업) $('.visual_slide .swiper-slide a').focusin(function(){ visualSlide.autoplay.stop(); }); @@ -87,6 +87,49 @@ $(document).ready(function () { } }); + $(".notify .slide_pause").click(function () { // 중지버튼 눌렀을때 + if ($(this).hasClass('slide_play')) { + $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause"); + notifySlide.autoplay.start(); + } else { + $(this).removeClass('slide_pause').attr('title', '슬라이드 재생').addClass("slide_play"); + notifySlide.autoplay.stop(); + } + });*/ + + + // 웹접근성 슬라이드 포커싱 시 멈춤/재생 수정 + $('.visual_slide .swiper-slide a').focusin(function(){ + visualSlide.autoplay.stop(); + $(".visual_slide .slide_util").addClass('slide_play').attr('title', '슬라이드 재생') + }); + + /*$('.visual_slide .swiper-slide a').focusout(function(){ + visualSlide.autoplay.start(); + })*/ + + $('.notify_slide .swiper-slide').focusin(function(){ + notifySlide.autoplay.stop(); + $(".notify .notify_slide_util").addClass('slide_play').attr('title', '슬라이드 재생') + }); + + /*$('.notify_slide .swiper-slide').focusout(function(){ + notifySlide.autoplay.start(); + })*/ + + + $(".visual_slide .slide_pause").click(function (e) { // 중지버튼 눌렀을때 + if ($(this).hasClass('slide_play')) { + $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause"); + visualSlide.autoplay.start(); + } else { + $(this).removeClass('slide_pause').attr('title', '슬라이드 재생').addClass("slide_play"); + visualSlide.autoplay.stop(); + + } + }); + + $(".notify .slide_pause").click(function () { // 중지버튼 눌렀을때 if ($(this).hasClass('slide_play')) { $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause"); @@ -96,5 +139,4 @@ $(document).ready(function () { notifySlide.autoplay.stop(); } }); - }) \ No newline at end of file From b2d7c3384df59f04ebff9503e2ba0572b70e04d0 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 8 Feb 2024 12:30:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EA=B2=80=EC=83=89=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EB=B3=80=EA=B2=BD,=20=EB=93=B1=EB=A1=9D=EC=9E=90?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=EC=8B=9C=20=EC=B2=A8=EB=B6=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trgtMng/service/CndtnTrgtMngVO.java | 8 ++++- .../trgtMng/web/CndtnTrgtMngController.java | 33 ++++++++++++++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 33 +++++++++++-------- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp | 3 +- .../jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp | 3 +- 5 files changed, 63 insertions(+), 17 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 57da9c50..ea7a0cc4 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -57,7 +57,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private String mergeStatus; //excel 등록시 병합상태 null or 병합 - + private String cmptntAthrtNm; // 관할청이름 - 의뢰통지서 첨부파일에 사용 @@ -288,5 +288,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { + ", rmrks=[" + rmrks + "] // 비고\n" ; } + public String getCmptntAthrtNm() { + return cmptntAthrtNm; + } + public void setCmptntAthrtNm(String cmptntAthrtNm) { + this.cmptntAthrtNm = cmptntAthrtNm; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 91cb9146..dfb591dd 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -642,6 +642,21 @@ public class CndtnTrgtMngController { modelAndView.addObject("sspnIdtmtTrgtOrd", cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd()); modelAndView.addObject("result", "success"); + //첨부파일 이름 변경하기 + List result = new ArrayList<>(); + FileVO fileCheck = new FileVO(); + fileCheck.setAtchFileId(s_scholSealAtchFileId); + result = fileService.selectFileInfs(fileCheck); + + for(int i=0; i < result.size(); i++) { + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getDBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm(); + orignlFileNm = orignlFileNm+"_"+(i+1); + orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn(); + result.get(i).setOrignlFileNm(orignlFileNm); + fileService.updateFileName(result.get(i)); + } + }catch(Exception ex) { ex.printStackTrace(); modelAndView.addObject("result", "fail"); @@ -1112,7 +1127,23 @@ public class CndtnTrgtMngController { //수정 cndtnTrgtInfoMngService.update(cndtnTrgtInfoMngVO); - + try { + //첨부파일 이름 변경하기 + FileVO fileCheck = new FileVO(); + fileCheck.setAtchFileId(s_scholSealAtchFileId); + result = fileService.selectFileInfs(fileCheck); + + for(int i=0; i < result.size(); i++) { + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); + String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getdBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm(); + orignlFileNm = orignlFileNm+"_"+(i+1); + orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn(); + result.get(i).setOrignlFileNm(orignlFileNm); + fileService.updateFileName(result.get(i)); + } + }catch(Exception ex){ + System.out.println("error"); + } modelAndView.addObject("result", "success"); return modelAndView; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 4d2a1b2c..f41ab2f6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -96,7 +96,7 @@ } }); - + searchOptions = $("#searchSelStatusTemp").html(); }); function searchInit(){ @@ -316,13 +316,18 @@ form.target = "_duplChkPopup"; form.submit(); } - -/* function srchCndt2Chg(){ - alert("1234"); - $(".select2-results__option").each(function(index, item){ - alert("1234"); - }) - } */ + //기본 select2 option 세팅. 값은 document.ready에서 세팅 + var searchOptions; + function srchCndt2Chg(value){ + if(value != ''){ + $(".select2-search").click() + $(".select2-results__option").each(function(index, item){ + if($(this).html().indexOf(value) == -1 ){ + $(this).hide(); + } + }) + } + } 교육과정관리 @@ -436,21 +441,23 @@

관할청  

- + " /> +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp index 5bae0196..bdcf6a97 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp @@ -57,8 +57,8 @@ return false; } + document.getElementById("cmptntAthrtNm").value = $("#cmptntAthrt option:selected").text(); var data = new FormData(document.getElementById("createForm")); - //첨부파일 등록 처리-step2 _fileForm2.forEach(function(obj, idx) { if (obj) data.append("file"+idx, obj.fileObj); @@ -332,6 +332,7 @@ +