tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2024-03-14 12:31:20 +09:00
commit 72ec8b4e75
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
View File

@ -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')
</select>

7
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
View File

@ -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();
}
</script>

8
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
View File

@ -570,7 +570,7 @@ $(document).ready(function(){
</script>
<!-- content -->
<div class="cont_wrap" id="sub">
<div class="cont_wrap list_con" id="sub">
<form name="selectForm" id="selectForm">
<input type="hidden" name="lctrDivCd" value="60">
@ -608,8 +608,8 @@ $(document).ready(function(){
</div>
<ul class="tab tab_02">
<li class="tab_li on"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
<li class="tab_li"><button type="button" class="tab_button" data-info="cal">캘린더형</button></li>
<li class="tab_li on con_li"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
<li class="tab_li cal_li"><button type="button" class="tab_button" data-info="cal">캘린더형</button></li>
</ul>
<div class="tab_content on">
@ -730,7 +730,7 @@ $(document).ready(function(){
</tbody>
</table>
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left">
</div>

5
src/main/webapp/visitEdu/usr/publish/css/content.css
View File

@ -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 */