From 64272a59ac66265ec1838d8658c82d18e8b93d2f Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 14 Jul 2023 11:47:55 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20pms-#3266=20"=EB=B0=B0=EC=A0=95?= =?UTF-8?q?=EA=B0=95=EC=82=AC=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=20=ED=8C=9D=EC=97=85=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B0=95=EC=82=AC=20=EC=A0=95=EB=B3=B4=20=EB=85=B8=EC=B6=9C?= =?UTF-8?q?=ED=95=B4=EC=A3=BC=EC=84=B8=EC=9A=94"=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eduEnd/web/EduEndTngrController.java | 2 + .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 269 +++++++++++++++++- .../webapp/visitEdu/usr/publish/css/popup.css | 4 + 3 files changed, 274 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index 51c3c28a..3bdbbac1 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -251,6 +251,8 @@ public class EduEndTngrController { //List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + System.out.println("============================"); + //3.pageing step3 paginationInfo = this.setPagingStep3_2(vEEduChasiVOList, paginationInfo); 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 a23db01d..37f3e3c8 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 @@ -128,6 +128,47 @@ }); } + function selectInstrInfo(instrId){ + $.ajax({ + type:"POST" + ,url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduEnd/selectEduChasiStatusAjax.do" + ,data: { + "eduAplctOrd" : id + ,"eduChasiOrd" : chId + } + ,dataType:'json' + ,success:function(returnData){ + console.log(returnData); + var info = returnData.chasiInfo; + var tm = info.strtTm.replace(/(.{2})/,"$1:") +"~"+ info.endTm.replace(/(.{2})/,"$1:")+"("+info.lrnTm+"분)" + $("#popupEduHopeDt").text(info.eduHopeDt); + $("#popupTm").text(tm); + $("#popupDivCd").text(info.divCd); + $("#popupTrgt").text(info.trgt); + $("#popupInstrNm").text(info.instrNm); + $("#popupPrsnl").text(info.prsnl); + + $("#eduAplctOrd").val(info.eduAplctOrd); + $("#eduChasiOrd").val(info.eduChasiOrd); + + $(".popupInput").removeAttr("readonly"); + $(".popupInput").val("0"); + + if(action == "select"){ + $("#popupSubmin").hide(); + $("#popupSrvyStatus").text("설문완료"); + selectChasiSrvyInfo(id, chId); + }else{ + $("#popupSubmin").show(); + $("#popupSrvyStatus").text("설문진행중"); + } + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + function selectChasiSrvyInfo(id, chId){ $.ajax({ type:"POST" @@ -458,6 +499,10 @@ + + + +
+ + + + + +
+ +
+ + + " /> @@ -774,7 +1029,19 @@ ${list.trgt} - ${empty list.instrNm ? '-' : cryptoUtil.decrypt(list.instrNm)} + + +<%-- ${empty list.instrNm ? '-' : cryptoUtil.decrypt(list.instrNm)} --%> + + + - + + + +<%-- --%> + + + ${list.prsnl} diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css index d577b4b4..ca79bae5 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/popup.css +++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css @@ -97,6 +97,10 @@ .application_wrap .list ol li span {display:block;white-space:normal;word-break:break-all;} .application_wrap .list ol li a {display:inline;color:#555;} +.pop_tb_type01 table tbody tr td .put_photo .put_photo_in {background-color: #f5f5f5; width: 128px; height: 165px; border: 1px solid #d5d5d5; border-radius: 5px; margin: 7px; box-sizing: border-box; position: relative; overflow: hidden;} + + + @media all and (max-width: 767px){ .popup_cont {padding: 10px;} .popup_wrap.popType02 {width: 360px;}