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

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2023-11-29 14:37:22 +09:00
commit 4c753335d0
9 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,18 @@
vsit.trgt_nm AS trgtNm,
vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd,
vsit.clphone AS vs_clphone,
vsit.d_birth AS dBirth
vsit.d_birth AS dBirth ,
CASE
WHEN EXISTS (/* 설문조사 */
SELECT
1
FROM
LETTNQESTNRRSLTDETAIL lersltD
WHERE
lersltD.respond_id = a.USER_ID
AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1
ELSE 0
END AS qestRsltExists
FROM
<include refid="VEEduMIXDAO.table_name"/> a
JOIN ve_prcs_aplct_prd vpap ON
@ -229,6 +240,7 @@
</isNotEmpty>
AND a.use_yn = 'Y'
AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */
</select>

2
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp
View File

@ -205,7 +205,7 @@
<ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li>
<p>기반강화연수관리</p>
<p>실무자역량강화(기반강화연수관리)</p>
</li>
<li><span class="cur_nav">강사별관리목록</span></li>
</ul>

2
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp
View File

@ -255,7 +255,7 @@
<ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li>
<p>기반강화연수관리</p>
<p>실무자역량강화(기반강화연수관리)</p>
</li>
<li><span class="cur_nav">교육확정관리상세</span></li>
</ul>

2
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp
View File

@ -183,7 +183,7 @@
<ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li>
<p>기반강화연수관리</p>
<p>실무자역량강화(기반강화연수관리)</p>
</li>
<li><span class="cur_nav">과정신청기간관리목록</span></li>
</ul>

2
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp
View File

@ -191,7 +191,7 @@
<ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li>
<p>기반강화연수관리</p>
<p>실무자역량강화(기반강화연수관리)</p>
</li>
<li><span class="cur_nav">기반강화연수 과정 신청기간 등록</span></li>
</ul>

13
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp
View File

@ -36,7 +36,7 @@
type:"POST"
,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do"
,data: {
"lctrDivCd" : "50" // 기반강화 -> 기소유예(60)도 같이써야함
"lctrDivCd" : "60" // 기반강화 -> 기소유예(60)도 같이써야함
// ,"eduChasiOrd" : chId
}
,dataType:'json'
@ -168,7 +168,7 @@
if(returnData.result == 'success'){
alert("설문결과가 수정 되었습니다.");
self.close();
location.reload();
}else if(returnData.result == 'fail'){
alert(returnData.msg);
location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
@ -200,7 +200,7 @@
alert("설문결과가 삭제 되었습니다.");
window.opener.location.reload();
self.close();
fncPopClose();
}else if(returnData.result == 'fail'){
alert(returnData.msg);
// location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
@ -212,13 +212,16 @@
});
}
}
function fncPopClose(){
self.close();
}
</script>
</head>
<body>
<form:form id="createForm" name="createForm" method="post" commandName="vEInstrFeeAcmdtVO" onsubmit="return false;">
<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId" value="QTMPLA_0000000000001">
<input type="hidden" name="qustnrTmplatId" id="qustnrTmplatId" value="<c:out value="${vEPrcsDetailVO.qustnrTmplatId}" />">
<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="<c:out value="${vEPrcsDetailVO.eduAplctOrd}" />">
<input type="hidden" name="respondId" id="respondId" value="<c:out value="${vEPrcsDetailVO.respondId}" />">
<div class="area_popup">

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

@ -363,30 +363,6 @@ $(document).ready(function(){
</div>
</div>
<div class="tb_tit02">
<div class="tb_tit02_left">
<div class="t_best">이달의 과정</div>
</div>
<div class="btn_wrap1">
<!-- <button type="button" title="베스트 더보기" class="con_more" onclick="location.href=''">더보기</button> -->
</div>
</div>
<div class="best_list">
<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 }">
<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>
<li class="con_btn"><button type="button" title="수강신청" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">상세정보</button></li>
</ul>
</div>
</c:forEach>
</div>
<!-- tab -->
<ul class="tab tab_02">
<li class="tab_li on"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
@ -607,4 +583,29 @@ $(document).ready(function(){
</div>
</form:form>
<div class="tb_tit02">
<div class="tb_tit02_left">
<div class="t_best">이달의 과정</div>
</div>
<div class="btn_wrap1">
<!-- <button type="button" title="베스트 더보기" class="con_more" onclick="location.href=''">더보기</button> -->
</div>
</div>
<div class="best_list">
<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 }">
<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>
<li class="con_btn"><button type="button" title="수강신청" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">상세정보</button></li>
</ul>
</div>
</c:forEach>
</div>
</div>

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

@ -23,11 +23,14 @@
$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit();
}
function fncGoDetail(eduAplctOrd){
var listForm = document.listForm ;
listForm.eduAplctOrd.value = eduAplctOrd ;
$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do").submit();
function fncGoDetail(prcsAplctPrdOrd){
var viewForm = document.viewForm ;
viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ;
viewForm.action = "<c:url value='/web/ve/aplct/sspnIdtmt/eduAplctDetail.do'/>";
viewForm.submit();
}
function fncGoList(){
linkPage(1);
@ -102,6 +105,9 @@
<!-- content -->
<div class="cont_wrap" id="sub">
<form name="viewForm" id="viewForm">
<input type="hidden" name="prcsAplctPrdOrd">
</form>
<form:form id="listForm" name="listForm" commandName="vEEduAplctVO">
<input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' default='1' />"/>
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />

12
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -637,7 +637,19 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
alert("신청가능한 기간이 아닙니다.\n\n"+returnData.message+"\n\n(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)");
//location.href="<c:url value='/web/main/mainPage.do'/>"
psblFlag = 'N';
//저작권배움터 수정요청사항(r1.2023.11.23.).pptx p.109 요구사항
$('#createForm select').prop('disabled', true);
$('#createForm input').prop('disabled', true);
$('#createForm button').prop('disabled', true);
// Disable all radio buttons
// $('input[type="radio"]').prop('disabled', true);
}else{
$("input[name=rndsOrd]").val(returnData.rndsOrd);
}