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 c3b2972b..21c4084a 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 @@ -1617,6 +1617,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') 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(); } 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 */