From 78284ddd4b4f0801d34eef774a21e243c081e546 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 14 Mar 2024 10:11:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#3741=20=20=EA=B8=B0=EC=86=8C=EC=9C=A0?= =?UTF-8?q?=EC=98=88=20=EA=B0=95=EC=9D=98=EB=AA=A9=EB=A1=9D=20>=20?= =?UTF-8?q?=EC=BA=98=EB=A6=B0=EB=8D=94=ED=98=95=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=EB=90=9C=20=EA=B0=95=EC=9D=98=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index eb0ec32f..801d592d 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -1566,6 +1566,7 @@ ON a.prcs_ord = b.prcs_ord where a.LCTR_DIV_CD ='60' + AND a.USE_YN ='Y' AND SUBSTRING(a.EDU_STRT_PNTTM, 1, 7) = TO_CHAR(TO_DATE(#sTodate#,'YYYYMMDD')+ 7,'YYYY.MM') From e921e82e7d9725f330f9f757ccf9974857176d7a 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, 14 Mar 2024 11:48:03 +0900 Subject: [PATCH 2/3] =?UTF-8?q?2024/03/14=20=EA=B8=B0=EC=86=8C=EC=9C=A0?= =?UTF-8?q?=EC=98=88=20>=20=EA=B0=95=EC=9D=98=EB=AA=A9=EB=A1=9D=20>=20?= =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=9D=BC=EB=95=8C=20=EC=BA=98?= =?UTF-8?q?=EB=A6=B0=EB=8D=94=20=ED=83=AD=20=EC=88=A8=EA=B9=80=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp | 8 ++++---- src/main/webapp/visitEdu/usr/publish/css/content.css | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp index b0deb354..bb63dd3f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp @@ -570,7 +570,7 @@ $(document).ready(function(){ -
+
@@ -608,8 +608,8 @@ $(document).ready(function(){
    -
    • -
    • +
    • +
@@ -730,7 +730,7 @@ $(document).ready(function(){
- +
diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 426ec0ec..14751db7 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -1255,6 +1255,11 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .calendar_wrap .duet-date__input::placeholder {font-size: 14px;} .list_top .btn_wrap .duet-date__prev, .list_top .btn_wrap .duet-date__next{width: 36px; margin-top: 0;} .list_top .btn_wrap .calendar_wrap .duet-date__toggle{top: -2px; right: 8px;} + + /*모바일 > 캘린더형 탭 숨김 처리*/ + .list_con .fc{display: none;} + .tab.tab_02 .con_li{width: calc(100%);} + .tab.tab_02 .cal_li{display: none;} } /* //calendar */ From 5b8f976d985591af8cb13d023e42e743d22df8b5 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 14 Mar 2024 11:52:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=B9=84=EA=B3=B5=EA=B0=9C=EB=A9=94?= =?UTF-8?q?=EB=AA=A8=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp index 4519b0fc..e88e2173 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp @@ -44,12 +44,13 @@ function fn_updateCnclUpdate() { var v_msg = $('#rmrks').val(); - if(!v_msg){ + /* if(!v_msg){ alert("메모를 입력해 주세요"); return false; - } + } */ - window.opener.fn_popup_submit_cmmAjax(v_msg); +// window.opener.fn_popup_submit_cmmAjax(v_msg); + opener.parent.fn_popup_submit_cmmAjax(v_msg); // self.close(); }