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-01-23 12:14:41 +09:00
commit a7d041d6e4
13 changed files with 145 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java
View File

@ -9,6 +9,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -191,6 +192,9 @@ public class EduAsgnmCnfrmMngAdultController {
vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //교육배치확정 대상은 강사가 배정확정되어야 한다.
if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) {
vEEduAplctVO.setOrderByQuery("CC.EDU_HOPE_DT desc");
}
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectAdultPagingList(vEEduAplctVO);
//이름 복호화
VEEduAplctVO vo = new VEEduAplctVO();

3
src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java
View File

@ -189,6 +189,9 @@ public class EduCnfrmMngAdultController {
System.out.println("vEEduAplctVO.getSearchRsdne()");
System.out.println(vEEduAplctVO.getSearchRsdne());
if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) {
vEEduAplctVO.setOrderByQuery("AA.eduHopeDt desc");
}
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO);
VEEduAplctVO vo = new VEEduAplctVO();
for(int i=0; i < vEEduAplctVOList.size(); i++) {

3
src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java
View File

@ -204,6 +204,9 @@ public class EduRsltMngAdultController {
vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO);
if(StringUtils.isEmpty(vEEduAplctVO.getOrderByQuery())) {
vEEduAplctVO.setOrderByQuery("AA.eduHopeDt desc");
}
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO);
VEEduAplctVO vo = new VEEduAplctVO();
for(int i=0; i < vEEduAplctVOList.size(); i++) {

2
src/main/java/kcc/web/MainController.java
View File

@ -1586,7 +1586,7 @@ public class MainController {
}
}
menuManageVO.setAuthorCode(auth);
/*menuManageVO.setAuthorCode(auth);*/
menuManageVO.setMenuUserType(menuManageVO.getMenuUserType());
List<MenuManageJTreeVO> menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ;
System.out.println("======================== menuResultList");

4
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -2816,13 +2816,13 @@
AND AA.insttNm LIKE '%' || #searchKeyword# || '%'
</isEqual>
</isNotEmpty>
ORDER BY 1
<isEmpty property="orderByQuery">
ORDER BY 1
, eduAplctOrd desc, eduChasiOrd
</isEmpty>
<isNotEmpty property="orderByQuery">
, $orderByQuery$
ORDER BY $orderByQuery$
</isNotEmpty>
<isNotEqual property="pageIndex" compareValue="0">
/*

19
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp
View File

@ -38,6 +38,12 @@
$(document).ready(function(){
$('.eduHope').click(function(){
var $tag = $('#orderByQuery');
$tag.val($(this).data('info'));
linkPage(1);
});
});
function linkPage(pageNo){
@ -80,6 +86,8 @@
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEEduAplctVO.orderByQuery}" />" />
<div class="cont_wrap">
<div class="box">
<!-- cont_tit -->
@ -167,7 +175,16 @@
<thead>
<tr>
<th>번호</th>
<th>교육희망일자</th>
<th>교육희망일자
<c:choose>
<c:when test="${vEEduAplctVO.orderByQuery eq 'CC.EDU_HOPE_DT asc' }">
<img style="cursor:pointer;" class="eduHope" data-info="CC.EDU_HOPE_DT desc" src="<c:url value='/images/sortUp.png' />" />
</c:when>
<c:otherwise>
<img style="cursor:pointer;" class="eduHope" data-info="CC.EDU_HOPE_DT asc" src="<c:url value='/images/sortDown.png' />" />
</c:otherwise>
</c:choose>
</th>
<th>시간</th>
<th>온·오프라인</th>
<th>지역</th>

20
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
View File

@ -64,6 +64,12 @@
// setSearchMonthDate('${vEEduAplctVO.searchMonth}');
// }
$('.eduHope').click(function(){
var $tag = $('#orderByQuery');
$tag.val($(this).data('info'));
linkPage(1);
});
});
function setSearchMonthDate(month){
@ -520,6 +526,7 @@
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEEduAplctVO.orderByQuery}" />" />
<input type="hidden" name="instrDiv" value="<c:out value="${vEEduAplctVO.instrDiv}" />" /><!-- 성인 -->
@ -637,7 +644,16 @@
<thead>
<tr>
<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
<th>교육희망일자</th>
<th>교육희망일자
<c:choose>
<c:when test="${vEEduAplctVO.orderByQuery eq 'AA.eduHopeDt asc' }">
<img style="cursor:pointer;" class="eduHope" data-info="AA.eduHopeDt desc" src="<c:url value='/images/sortUp.png' />" />
</c:when>
<c:otherwise>
<img style="cursor:pointer;" class="eduHope" data-info="AA.eduHopeDt asc" src="<c:url value='/images/sortDown.png' />" />
</c:otherwise>
</c:choose>
</th>
<th>요일</th>
<th>시간</th>
<th>온·오프라인</th>
@ -657,7 +673,7 @@
<input name="chk" class="${list.asgnmAprvlCd}"
value="${list.eduAplctOrd}@${list.eduChasiOrd}" data-phone="<c:out value='${list.clphone}' />"
data-email="<c:out value='${list.email}' />" data-cnt="<c:out value='${list.cnt}'/>" data-lctr="<c:out value='${list.userId}' />"
title="Check" type="checkbox"/>${list.asgnmAprvlCd}
title="Check" type="checkbox"/>
</td>
<td>
<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/>

18
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp
View File

@ -38,6 +38,12 @@
<script type="text/javascript">
$(document).ready(function(){
$('.eduHope').click(function(){
var $tag = $('#orderByQuery');
$tag.val($(this).data('info'));
linkPage(1);
});
});
function fncGoList(){
@ -242,6 +248,7 @@
<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
<input type="hidden" name="eduAplctOrd" value="" />
<input type="hidden" name="eduChasiOrd" value="" />
<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEEduAplctVO.orderByQuery}" />" />
<div class="cont_wrap">
<div class="box">
@ -328,7 +335,16 @@
<thead>
<tr>
<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
<th>교육일자</th>
<th>교육일자
<c:choose>
<c:when test="${vEEduAplctVO.orderByQuery eq 'AA.eduHopeDt asc' }">
<img style="cursor:pointer;" class="eduHope" data-info="AA.eduHopeDt desc" src="<c:url value='/images/sortUp.png' />" />
</c:when>
<c:otherwise>
<img style="cursor:pointer;" class="eduHope" data-info="AA.eduHopeDt asc" src="<c:url value='/images/sortDown.png' />" />
</c:otherwise>
</c:choose>
</th>
<th>차시</th>
<th>기관구분</th>
<th>신청유형</th>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
View File

@ -85,7 +85,9 @@
if ($('#regBtn').prop('disabled')) {
$('#regBtn').removeAttr('onclick').removeAttr('data-tooltip');
$('#regBtn').prop('disabled', false);
$('#regBtn').css('background-color', '#d5d5d5');
$('#regBtn').css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$('#regBtn').attr('title','비활성화됨');
}
}

31
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
View File

@ -82,26 +82,6 @@ $(document).ready(function(){
//-- /반복끝
});
// 이달의 과정 상태값 확인
$(".best_con").each(function() {
var currentDate = new Date(); // 현재 날짜 가져오기
var strtPnttmValue = $(this).find("#strtPnttm").val(); // 시작 시간 값 가져오기
var endPnttmValue = $(this).find("#endPnttm").val(); // 종료 시간 값 가져오기
var strtDate = new Date(strtPnttmValue); // 시작 시간을 Date 객체로 변환
var endDate = new Date(endPnttmValue); // 종료 시간을 Date 객체로 변환
// 현재 날짜가 시작 시간과 종료 시간 사이에 있는지 확인
/*i f (currentDate >= strtDate && currentDate <= endDate) {
console.log("현재 날짜가 포함됩니다: " + $(this).text().trim());
} else {
console.log("현재 날짜가 포함되지 않습니다: " + $(this).text().trim());
$(this).find("button").attr('onclick', 'location.href="${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduInfo.do"')
} */
});
// 리스트 상태값 확인
$(".ddlnCdStts").each(function() {
var $thisCell = $(this);
@ -173,7 +153,10 @@ $(document).ready(function(){
if($applyButton.prop('disabled')){
$applyButton.removeAttr('onclick');
$applyButton.prop('disabled', false);
$applyButton.css('background-color', '#d5d5d5');
$applyButton.css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$applyButton.attr('title','비활성화됨');
}
});
@ -478,7 +461,7 @@ $(document).ready(function(){
</td>
<td class="aplctBtn">
<%-- <button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');" disabled>신청</button> --%>
<button type="button" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');" disabled>신청</button>
<button type="button" class="btnType04" onclick="fn_eduRegPopup('<c:out value="${list.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');" title="팝업 열림" disabled>신청</button>
</td>
</c:if>
</tr>
@ -607,8 +590,8 @@ $(document).ready(function(){
<c:forEach var="list" items="${courseOfTheMonthList}" begin="0" end="3">
<div class="best_con">
<input type="hidden" id="strtPnttm" value="${list.strtPnttm }">
<input type="hidden" id="endPnttm" value="${list.endPnttm }">
<input type="hidden" value="${list.strtPnttm }">
<input type="hidden" value="${list.endPnttm }">
<ul>
<li class="con_title"><c:out value="${list.prcsNm}"/></li>
<li class="con_date"><c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/></li>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
View File

@ -70,7 +70,9 @@
if ($('#regBtn').prop('disabled')) {
$('#regBtn').removeAttr('onclick').removeAttr('data-tooltip');
$('#regBtn').prop('disabled', false);
$('#regBtn').css('background-color', '#d5d5d5');
$('#regBtn').css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$('#regBtn').attr('title','비활성화됨');
}
}

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

@ -85,7 +85,9 @@ $(document).ready(function(){
if($applyButton.prop('disabled')){
$applyButton.removeAttr('onclick');
$applyButton.prop('disabled', false);
$applyButton.css('background-color', '#d5d5d5');
$applyButton.css('background-color', '#888');
/*24.01.23 웹접근성 검사를 위하여 title 추가*/
$applyButton.attr('title','비활성화됨');
}
});
@ -764,9 +766,9 @@ $(document).ready(function(){
<th>주민번호앞자리</th>
<td>
<div class="calendar_wrap">
<duet-date-picker identifier="date" id="dBirth" class="startDate" id="" min="1940-01-01"></duet-date-picker>
<duet-date-picker identifier="date" id="dBirth" class="" id="" min="1940-01-01"></duet-date-picker>
</div>
<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker2.js"></script>
<%-- <script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker2.js"></script> --%>
</td>
</tr>
</table>

63
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
View File

@ -224,7 +224,7 @@ $(document).ready(function(){
<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="sub36_pop02" data-focus="sub36_pop02" data-focus-prev="sub36_pop02_close">
<div class="popup_tit">
<p>교육대상자 확인</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
<p>교육대상자 1확인</p> <button class="btn_popup_close tooltip-close" data-focus="sub36_pop02_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
@ -248,7 +248,66 @@ $(document).ready(function(){
<th scope=“row”>주민번호앞자리</th>
<td>
<div class="calendar_wrap">
<duet-date-picker identifier="date" id="dBirth" class="startDate" id="" min="1940-01-01"></duet-date-picker>
<duet-date-picker identifier="date" id="dBirth" class="" id="" min="1940-01-01"></duet-date-picker>
<script>
const dBirth = document.querySelector("#dBirth");
var DATE_FORMAT = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/
dBirth.dateAdapter = {
parse: function parse() {
var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ""
var createDate = arguments.length > 1 ? arguments[1] : undefined
var matches = value.match(DATE_FORMAT)
if (matches) {
return createDate(matches[3], matches[2], matches[1])
}
},
format: function format(date) {
if (date.getMonth() < 9) {
if (date.getDate() < 10) {
return ""
.concat(date.getFullYear(), ".")
.concat('0', date.getMonth() + 1, ".")
.concat('0', date.getDate())
} else {
return ""
.concat(date.getFullYear(), ".")
.concat('0', date.getMonth() + 1, ".")
.concat(date.getDate())
}
} else {
if (date.getDate() < 10) {
return ""
.concat(date.getFullYear(), ".")
.concat(date.getMonth() + 1, ".")
.concat('0', date.getDate())
} else {
return ""
.concat(date.getFullYear(), ".")
.concat(date.getMonth() + 1, ".")
.concat(date.getDate())
}
}
},
}
// 달력 플러그인 실행
dBirth.localization = {
placeholder: '날짜를 입력하세요',
selectedDateMessage: 'Selected date is',
prevMonthLabel: '이전 달 보기',
nextMonthLabel: '다음 달 보기',
monthSelectLabel: '달 선택',
yearSelectLabel: '년도 선택',
closeLabel: '달력 닫기',
dayNames: ['일', '월', '화', '수', '목', '금', '토'],
monthNames: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
monthNamesShort: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
identifier: "searchStartDt",
name: "eduHopeDt"
}
</script>
</div>
<%-- <script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker2.js"></script> --%>
</td>