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

Merge branch 'jiwoo'

Browse Source
This commit is contained in:
JIWOO 2025-10-27 17:33:42 +09:00
commit 359f78bca0
6 changed files with 21 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -858,24 +858,24 @@
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '40'}"><!-- 취소 승인 --> <c:when test="${list.aplctStateCd eq '60' and not empty list.cnclCn}"><!-- 취소 승인 -->
취소승인 취소승인
<br/> <br/>
<br/> <br/>
${list.cnclCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '60' and not empty list.aplctCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 --> <c:when test="${list.aplctStateCd ne '60' and not empty list.cnclCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 -->
취소반려 취소반려
<br/> <br/>
<br/> <br/>
${list.aplctCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:otherwise> <c:otherwise>

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

@ -937,24 +937,24 @@
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '40'}"><!-- 취소 승인 --> <c:when test="${list.aplctStateCd eq '60' and not empty list.cnclCn}"><!-- 취소 승인 -->
취소승인 취소승인
<br/> <br/>
<br/> <br/>
${list.cnclCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '60' and not empty list.aplctCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 --> <c:when test="${list.aplctStateCd ne '60' and not empty list.cnclCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 -->
취소반려 취소반려
<br/> <br/>
<br/> <br/>
${list.aplctCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:otherwise> <c:otherwise>

10
src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -858,24 +858,24 @@
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '40'}"><!-- 취소 승인 --> <c:when test="${list.aplctStateCd eq '60' and not empty list.cnclCn}"><!-- 취소 승인 -->
취소승인 취소승인
<br/> <br/>
<br/> <br/>
${list.cnclCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:when test="${list.aprvlCd eq '60' and not empty list.aplctCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 --> <c:when test="${list.aplctStateCd ne '60' and not empty list.cnclCn}"><!-- 취소정보가 있는데 60이면 취소 반려 처리 -->
취소반려 취소반려
<br/> <br/>
<br/> <br/>
${list.aplctCn} ${list.cnclCn}
<br/> <br/>
<c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8"> <c:import url="/cmm/fms/selectBBSFileInfs.do" charEncoding="utf-8">
<c:param name="param_atchFileId" value="${list.rsltAtchFileId}" /> <c:param name="param_atchFileId" value="${list.cnclAtchFileId}" />
</c:import> </c:import>
</c:when> </c:when>
<c:otherwise> <c:otherwise>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp
View File

@ -561,13 +561,13 @@ $(document).ready(function(){
(취소-반려) (취소-반려)
</c:if> </c:if>
<c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 --> <c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 -->
<button type="button" title="신청취소" class="btnType02 btn small gray fill" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> --%>
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<kc:code codeId="VE0003" code="${list.aprvlCd}"/> <kc:code codeId="VE0003" code="${list.aprvlCd}"/>
<c:if test="${list.aprvlCd eq 10 }"> <c:if test="${list.aprvlCd eq 10 }">
<button type="button" title="신청취소" class="btnType02 btn small gray fill" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> --%>
</c:if> </c:if>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/sspnIdtmtEduAplctList.jsp
View File

@ -561,13 +561,13 @@ $(document).ready(function(){
(취소-반려) (취소-반려)
</c:if> </c:if>
<c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 --> <c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 -->
<button type="button" title="신청취소" class="btnType02 btn small fill gray" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> --%>
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<kc:code codeId="VE0003" code="${list.aprvlCd}"/> <kc:code codeId="VE0003" code="${list.aprvlCd}"/>
<c:if test="${list.aprvlCd eq 10 }"> <c:if test="${list.aprvlCd eq 10 }">
<button type="button" title="신청취소" class="btnType02 btn small fill gray" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> --%>
</c:if> </c:if>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>

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

@ -11,10 +11,6 @@
<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" /> <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템</title> <title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국지식재산보호원 저작권 교육 시스템</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
<script src="<c:url value='/innorix/innorix_${license}.js' />"></script>
<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
<style> <style>
input:disabled { input:disabled {
background-color: #f9f9f9 !important; background-color: #f9f9f9 !important;
@ -23,8 +19,6 @@
background-color: #f9f9f9 !important; background-color: #f9f9f9 !important;
} }
#fileControl{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;} #fileControl{margin: 8px 0 0 0; border: 1px solid #d5d5d5; border-radius: 5px; height: 150px !important; background-color: #fafafa;}
.innorix_basic div.irx_filetree.empty-uploader{background: url(/ipedu/visitEdu/usr/publish/images/content/dropzone_file_before.png) no-repeat center; height: 150px !important;}
.irx_filetree,.innorix_basic div.irx_infoBox{height: 150px !important;}
</style> </style>
<script type="text/javaScript" language="javascript"> <script type="text/javaScript" language="javascript">
@ -32,31 +26,6 @@
$(document).ready(function(){ $(document).ready(function(){
//대용량 업로드 세팅
/*
* ==================================================================
* INNORIX
* 파일전송 컨트롤 생성
* ==================================================================
*/
control = innorix.create({
el: '#fileControl' // 컨트롤 출력 HTML 객체 ID
, transferMode: 'both' // 업로드, 다운로드 혼합사용
, installUrl: '<c:url value="/innorix/install/install.html" />' // Agent 설치 페이지
, uploadUrl: '<c:url value="/innorix/exam/upload.jsp" />' // 업로드 URL
, height:40
, width: 650
, maxFileCount : 1 // 첨부파일 최대 갯수
, allowExtension : ["txt","xls","xlsx","png","jpg","jpeg","doc","ppt","hwp","pdf","zip"]
// 가능한 확장자 txt|xls|xlsx|png|jpg|jpeg|doc|ppt|hwp|pdf|zip
});
// 업로드 완료 후 이벤트
control.on('uploadComplete', function (p) {
console.log('uploadComplete : ', p);
fn_callBackInnorix(p.files); // 파일 정보 DB isnert function
});
}); });
@ -155,30 +124,6 @@ $(document).ready(function(){
} }
} }
//서류 요청 양식 업로드 후 콜백
function fn_callBackInnorix(data){
var url = "<c:url value='/web/common/insertInnorixSspnCnClAjax.do' />";
//선택된 강사 ID
var sendData = {
"fileType": "sspnForm"
, "eduAplctOrd": $('#cnclForm #eduAplctOrd').val()
, "prcsAplctPrdOrd": $('#cnclForm #prcsAplctPrdOrd').val()
, "innorixFileListVO": data
, "cnclCn" : $('#cnclCn').val()
, "successMsg" : "등록이 완료되었습니다."
}
console.log('sendData : ', sendData);
/*
* 공통 : innorixCommon.js
* fn_innorixCmmAjax() 호출 후 status가 성공(OK)이면 실행
*/
if(fn_innorixCmmAjax(sendData, url) == "OK")
{
location.reload(true);
}
}
// 설문조사 버튼 클릭 이벤트 // 설문조사 버튼 클릭 이벤트
function selectQestnInfo(id, action){ function selectQestnInfo(id, action){
@ -561,13 +506,13 @@ $(document).ready(function(){
(취소-반려) (취소-반려)
</c:if> </c:if>
<c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 --> <c:if test="${list.aplctStateCd eq 10 }"> <!--교육 승인된 상태 (미이수)일 때만 취소버튼 노출 -->
<button type="button" title="신청취소" class="btnType02 btn small fill gray" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" data-tooltip="sub37_pop02" onclick="fn_cnclUpdate('${list.eduAplctOrd }','${list.prcsAplctPrdOrd }')">취소</button> --%>
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<kc:code codeId="VE0003" code="${list.aprvlCd}"/> <kc:code codeId="VE0003" code="${list.aprvlCd}"/>
<c:if test="${list.aprvlCd eq 10 }"> <c:if test="${list.aprvlCd eq 10 }">
<button type="button" title="신청취소" class="btnType02 btn small fill gray" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> <%-- <button type="button" title="신청취소" class="btnType02 btn small fill gray" onclick="fn_veEduAplctCnclUpdate('${list.eduAplctOrd }')">취소</button> --%>
</c:if> </c:if>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>