From 84fbb4c198405b31f1732940650404c47112d7df 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, 25 Jan 2024 18:31:25 +0900 Subject: [PATCH 1/4] =?UTF-8?q?2024/01/25=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp | 4 +++- .../jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index f78a48ca..3b5714ee 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -624,12 +624,14 @@

교육매체

- + + + 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 def08359..30f4fbfd 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 @@ -1266,11 +1266,13 @@ function _chkChasiTime(p_this){ if (v_eduPlaceCd=='99'){ /* v_eduPlace.removeAttr('disabled'); */ - v_eduPlace.removeAttr('readonly'); + v_eduPlace.removeAttr('readonly'); + v_eduPlace.attr("style","background-color:#fff !important"); }else{ v_eduPlace.val(''); /* v_eduPlace.attr('disabled', 'disabled'); */ - v_eduPlace.attr('readonly', 'readonly'); + v_eduPlace.attr('readonly', 'readonly'); + v_eduPlace.removeAttr("style"); } } @@ -1552,6 +1554,7 @@ function _chkChasiTime(p_this){ onChange="eduPlaceChg();" /> + From 31b77cbdbe77c77cbf7aae802745a4abb753024d 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: Fri, 26 Jan 2024 09:15:00 +0900 Subject: [PATCH 3/4] =?UTF-8?q?2024/01/26=20=EC=9B=B9=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp | 4 ++-- .../exprnClsrmInfo/popup/qustnrPopList.jsp | 9 ++++++--- .../exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp index 6f6d357b..020bea82 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp @@ -447,7 +447,7 @@ $(document).ready(function(){ - +
@@ -466,7 +466,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp index bbf6175d..47fac30e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrPopList.jsp @@ -219,7 +219,10 @@ $(document).ready(function(){ btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus','sub36_pop02_close'); */ - + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="sub36_pop02"]'); + activeTarget.hide(); + $('[data-tooltip="sub36_pop02"]').focus(); }) @@ -424,7 +427,7 @@ $(document).ready(function(){ - +
@@ -443,7 +446,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp index 3692c70a..7feb052e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp @@ -490,7 +490,7 @@ $(document).ready(function(){ - +
@@ -509,7 +509,7 @@ $(document).ready(function(){
- +
From a024b76b95677aebffc824ce56ab19b1451af704 Mon Sep 17 00:00:00 2001 From: subsub Date: Fri, 26 Jan 2024 09:34:05 +0900 Subject: [PATCH 4/4] =?UTF-8?q?2024/01/26=20=ED=8C=9D=EC=97=85=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=97=AC=EB=9F=AC=EA=B0=9C=20=EC=9D=BC=20=EB=95=8C?= =?UTF-8?q?=20data-info=20=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20=ED=8F=AC?= =?UTF-8?q?=EC=BB=A4=EC=8B=B1=20=EA=B0=80=EA=B2=8C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmEnd/exprnClsrmEndDetail.jsp | 2 +- .../popup/qustnrAdultPrintPopList.jsp | 15 ++++++++++----- .../exprnClsrmInfo/popup/qustnrPopList.jsp | 15 ++++++++++----- .../exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp | 15 ++++++++++----- .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp | 4 ++-- .../WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp | 8 ++++---- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp index 6563f4db..7240188a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp @@ -1136,7 +1136,7 @@ ※ 운영지원금 지원을 위한 계획서(계획은 운영에 따라 변경 가능)
※ 담당교사의 재량으로 자율 편성하되, 1일 최대 2차시까지만 운영 가능
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp index 6f6d357b..396d89f7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp @@ -219,7 +219,12 @@ $(document).ready(function(){ btnLast.attr('data-focus-next','sub36_pop02'); btnLast.attr('data-focus','sub36_pop02_close'); */ - + // 레이어팝업 포커싱 이동 수정 + $(".tooltip-close").click(function(){ + var activeTarget = $('[data-tooltip-con="sub37_pop20"]'); + activeTarget.hide(); + $('[data-tooltip="sub37_pop20"]:nth-child(2)').focus(); + }); }) function onclickPrint() { @@ -264,9 +269,9 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp index 0e3641a8..79ddd154 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/chrgInfoUpdatePop.jsp @@ -12,7 +12,7 @@ -
- " type="checkbox" value=""/> + " type="checkbox" title="${empty list.instrNm ? '-' : list.instrNm}선택" value=""/> ${empty list.instrNm ? '-' : list.instrNm}