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

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

Browse Source
This commit is contained in:
kmg 2023-11-29 15:29:03 +09:00
commit d4174c9eb6
11 changed files with 123 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
View File

@ -167,7 +167,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디 private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디
private String qustnrTmplatId;
public String getSearchDiv() { public String getSearchDiv() {
@ -810,6 +810,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setInstrNm(String instrNm) { public void setInstrNm(String instrNm) {
this.instrNm = instrNm; this.instrNm = instrNm;
} }
public String getQustnrTmplatId() {
return qustnrTmplatId;
}
public void setQustnrTmplatId(String qustnrTmplatId) {
this.qustnrTmplatId = qustnrTmplatId;
}
} }

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.trgt_nm AS trgtNm,
vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd,
vsit.clphone AS vs_clphone, 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 FROM
<include refid="VEEduMIXDAO.table_name"/> a <include refid="VEEduMIXDAO.table_name"/> a
JOIN ve_prcs_aplct_prd vpap ON JOIN ve_prcs_aplct_prd vpap ON
@ -229,6 +240,7 @@
</isNotEmpty> </isNotEmpty>
AND a.use_yn = 'Y' AND a.use_yn = 'Y'
AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */
</select> </select>

41
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -216,10 +216,26 @@
} }
//설문조사 결과
function fncInstrCostInfo(eduId, userId) { //메뉴생성 화면 호출
var form = document.popupForm;
form.eduAplctOrd.value = eduId;
form.respondId.value = userId;
// form.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
form.action = "<c:url value='/kccadr/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.do'/>";
openPopupAndSubmitForm('popupForm', 'popupForm', 900, 1200);
}
</script> </script>
</head> </head>
<body> <body>
<form id="popupForm" name="popupForm" method="post">
<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
<input type="hidden" name="eduAplctOrd" id="eduAplctOrd"/>
<input type="hidden" name="respondId" id="respondId"/>
</form>
<form id="instrForm" name="instrForm" method="post"> <form id="instrForm" name="instrForm" method="post">
<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/> <input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value='${vEPrcsDetailVO.prcsAplctPrdOrd}' />"/>
<input type="hidden" name="userId" id="userId"/> <input type="hidden" name="userId" id="userId"/>
@ -442,6 +458,8 @@
<col style="width: 210px;"> <col style="width: 210px;">
<col style="width: 210px;"> <col style="width: 210px;">
<col style="width: 210px;"> <col style="width: 210px;">
<col style="width: 180px;">
<col style="width: 210px;">
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@ -451,6 +469,8 @@
<th>연락처</th> <th>연락처</th>
<th>교육이수여부</th> <th>교육이수여부</th>
<th>교육이수상태변경</th> <th>교육이수상태변경</th>
<th>설문조사</th>
<th>이수증</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -478,6 +498,27 @@
<button type="button" class="btn_type04" onclick="fn_statusChg('20', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">이수</button> <button type="button" class="btn_type04" onclick="fn_statusChg('20', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">이수</button>
<button type="button" class="btn_type05" onclick="fn_statusChg('10', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">미이수</button> <button type="button" class="btn_type05" onclick="fn_statusChg('10', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${list.sspnIdtmtTrgtOrd }"/>')">미이수</button>
</td> </td>
<td>
<c:choose>
<c:when test="${list.qestRsltExists }">
<%-- <button type="button" class="btn_type04" onclick="fncInstrCostInfo('<c:out value="${list.qestnrId }"/>');">설문결과</button> --%>
<button type="button" class="btn_type04" onclick="fncInstrCostInfo('${list.eduAplctOrd }', '${list.userId }');">설문결과</button>
</c:when>
<c:otherwise>
미입력
</c:otherwise>
</c:choose>
</td>
<td>
<c:choose>
<c:when test="${list.qestRsltExists }">
<button type="button" title="이수증" class="btn_type04" onclick="fncCmpltCrtfc('<c:out value="${info.prcsAplctPrdOrd}"/>', '<c:out value="${list.eduAplctOrd}"/>');">이수증</button>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr> </tr>
</c:forEach> </c:forEach>
</c:when> </c:when>

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

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

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

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

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

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

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

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

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

@ -36,7 +36,7 @@
type:"POST" type:"POST"
,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do" ,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do"
,data: { ,data: {
"lctrDivCd" : "50" // 기반강화 -> 기소유예(60)도 같이써야함 "lctrDivCd" : "60" // 기반강화 -> 기소유예(60)도 같이써야함
// ,"eduChasiOrd" : chId // ,"eduChasiOrd" : chId
} }
,dataType:'json' ,dataType:'json'
@ -168,7 +168,7 @@
if(returnData.result == 'success'){ if(returnData.result == 'success'){
alert("설문결과가 수정 되었습니다."); alert("설문결과가 수정 되었습니다.");
self.close(); location.reload();
}else if(returnData.result == 'fail'){ }else if(returnData.result == 'fail'){
alert(returnData.msg); alert(returnData.msg);
location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
@ -200,7 +200,7 @@
alert("설문결과가 삭제 되었습니다."); alert("설문결과가 삭제 되었습니다.");
window.opener.location.reload(); window.opener.location.reload();
self.close(); fncPopClose();
}else if(returnData.result == 'fail'){ }else if(returnData.result == 'fail'){
alert(returnData.msg); alert(returnData.msg);
// location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; // location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test";
@ -213,12 +213,15 @@
} }
} }
function fncPopClose(){
self.close();
}
</script> </script>
</head> </head>
<body> <body>
<form:form id="createForm" name="createForm" method="post" commandName="vEInstrFeeAcmdtVO" onsubmit="return false;"> <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="eduAplctOrd" id="eduAplctOrd" value="<c:out value="${vEPrcsDetailVO.eduAplctOrd}" />">
<input type="hidden" name="respondId" id="respondId" value="<c:out value="${vEPrcsDetailVO.respondId}" />"> <input type="hidden" name="respondId" id="respondId" value="<c:out value="${vEPrcsDetailVO.respondId}" />">
<div class="area_popup"> <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> </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 --> <!-- tab -->
<ul class="tab tab_02"> <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 on"><button type="button" class="tab_button" data-info="list">리스트형</button></li>
@ -607,4 +583,29 @@ $(document).ready(function(){
</div> </div>
</form:form> </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> </div>

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

@ -23,12 +23,15 @@
$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit(); $("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.do").submit();
} }
function fncGoDetail(eduAplctOrd){
var listForm = document.listForm ; function fncGoDetail(prcsAplctPrdOrd){
listForm.eduAplctOrd.value = eduAplctOrd ; var viewForm = document.viewForm ;
$("#listForm").attr("action","${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.do").submit(); viewForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd ;
viewForm.action = "<c:url value='/web/ve/aplct/sspnIdtmt/eduAplctDetail.do'/>";
viewForm.submit();
} }
function fncGoList(){ function fncGoList(){
linkPage(1); linkPage(1);
} }
@ -102,6 +105,9 @@
<!-- content --> <!-- content -->
<div class="cont_wrap" id="sub"> <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"> <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="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' default='1' />"/>
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" /> <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(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)"); alert("신청가능한 기간이 아닙니다.\n\n"+returnData.message+"\n\n(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)");
//location.href="<c:url value='/web/main/mainPage.do'/>" //location.href="<c:url value='/web/main/mainPage.do'/>"
psblFlag = 'N'; 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{ }else{
$("input[name=rndsOrd]").val(returnData.rndsOrd); $("input[name=rndsOrd]").val(returnData.rndsOrd);
} }