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

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2024-01-30 16:17:52 +09:00
commit ff908d7b98
10 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctIsltnExcel.jsp
View File

@ -222,7 +222,8 @@
<input type="text" readonly id="atFileBasicWrite" style="width:500px;" name="atFileBasicWrite"/> <input type="text" readonly id="atFileBasicWrite" style="width:500px;" name="atFileBasicWrite"/>
<input type="file" name="file" id="file" style="display:none" accept=".xls, .xlsx" onchange="changeValue(this); return false;"/> <input type="file" name="file" id="file" style="display:none" accept=".xls, .xlsx" onchange="changeValue(this); return false;"/>
<button type="button" class="btnType btnType9" onclick="document.all.file.click(); return false;">파일첨부</button> <button type="button" class="btnType btnType9" onclick="document.all.file.click(); return false;">파일첨부</button>
<span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000040425&fileSn=0" target="_blank">sample</a></span> <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.edu-copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000001230&fileSn=0" target="_blank">sample</a></span>
<!-- <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000040425&fileSn=0" target="_blank">sample</a></span> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>

3
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp
View File

@ -410,7 +410,8 @@ $( document ).ready(function(){
<button type="button" class="btnType btnType9" <button type="button" class="btnType btnType9"
onclick="document.all.file.click(); return false;" onclick="document.all.file.click(); return false;"
>파일첨부</button> >파일첨부</button>
<span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001269&fileSn=0" target="_blank">sample</a></span> <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001232&fileSn=0" target="_blank">sample</a></span>
<%-- <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001269&fileSn=0" target="_blank">sample</a></span> --%>
</td> </td>
</tr> </tr>
</tbody> </tbody>

3
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctScholExcel.jsp
View File

@ -410,7 +410,8 @@ $( document ).ready(function(){
<button type="button" class="btnType btnType9" <button type="button" class="btnType btnType9"
onclick="document.all.file.click(); return false;" onclick="document.all.file.click(); return false;"
>파일첨부</button> >파일첨부</button>
<span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018209&fileSn=0" target="_blank">sample</a></span> <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.edu-copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000001231&fileSn=0" target="_blank">sample</a></span>
<!-- <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018209&fileSn=0" target="_blank">sample</a></span> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>

3
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp
View File

@ -410,7 +410,8 @@ $( document ).ready(function(){
<button type="button" class="btnType btnType9" <button type="button" class="btnType btnType9"
onclick="document.all.file.click(); return false;" onclick="document.all.file.click(); return false;"
>파일첨부</button> >파일첨부</button>
<span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001268&amp;fileSn=0" target="_blank">sample</a></span> <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001233&fileSn=0" target="_blank">sample</a></span>
<%-- <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001268&amp;fileSn=0" target="_blank">sample</a></span> --%>
</td> </td>
</tr> </tr>
</tbody> </tbody>

3
src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
View File

@ -1289,7 +1289,8 @@
<button type="button" class="btnType01 updownRoad popupOpenBtn" data-tooltip="sub35_pop01" id="ATTEND" onclick="filePopupLayer('ATTEND')" title="팝업 열림">강사 참석 확인서 업로드</button> <button type="button" class="btnType01 updownRoad popupOpenBtn" data-tooltip="sub35_pop01" id="ATTEND" onclick="filePopupLayer('ATTEND')" title="팝업 열림">강사 참석 확인서 업로드</button>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<button type="button" class="btnType01 popupOpenBtn" onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000015299&amp;fileSn=1'" title="서약서 양식 다운로드">강사 참석 확인서 양식 다운로드</button> <button type="button" class="btnType01 popupOpenBtn" onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001235&fileSn=0'" title="서약서 양식 다운로드">강사 참석 확인서 양식 다운로드</button>
<%-- <button type="button" class="btnType01 popupOpenBtn" onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000015299&amp;fileSn=1'" title="서약서 양식 다운로드">강사 참석 확인서 양식 다운로드</button> --%>
</td> </td>
</tr> </tr>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
View File

@ -234,6 +234,8 @@ $(document).ready(function(){
function onclickPrint() { function onclickPrint() {
var $container = $("#srvyPopupPrintDiv").clone(); var $container = $("#srvyPopupPrintDiv").clone();
var innerHtml = $container[0].innerHTML var innerHtml = $container[0].innerHTML
//스크립트 제외하기. innerHtml에 포함된 sciprt로 qr코드 2개가 화면에 뿌려짐
innerHtml= innerHtml.replace('makeCode(url);','');
var popupWindow = window.open("", "_blank", "width=800,height=800") var popupWindow = window.open("", "_blank", "width=800,height=800")
popupWindow.document.write( popupWindow.document.write(
"<!DOCTYPE html>"+ "<!DOCTYPE html>"+

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

@ -588,21 +588,24 @@ $(document).ready(function(){
</div> </div>
</div> </div>
<div class="best_list"> <c:if test="${!empty courseOfTheMonthList}">
<div class="best_list">
<c:forEach var="list" items="${courseOfTheMonthList}" begin="0" end="3">
<div class="best_con"> <c:forEach var="list" items="${courseOfTheMonthList}" begin="0" end="3">
<input type="hidden" value="${list.strtPnttm }"> <div class="best_con">
<input type="hidden" value="${list.endPnttm }"> <input type="hidden" value="${list.strtPnttm }">
<ul> <input type="hidden" value="${list.endPnttm }">
<li class="con_title"><c:out value="${list.prcsNm}"/></li> <ul>
<li class="con_date"><c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/></li> <li class="con_title"><c:out value="${list.prcsNm}"/></li>
<li class="con_btn"><button type="button" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">상세정보</button></li> <li class="con_date"><c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/></li>
</ul> <li class="con_btn"><button type="button" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">상세정보</button></li>
</div> </ul>
</c:forEach> </div>
</div> </c:forEach>
</div>
<!-- 이달의 과정이 없는 경우 <div class="best_list_no">자료가 없습니다.</div> --> </c:if>
<c:if test="${empty courseOfTheMonthList}">
<div class="best_list_no">자료가 없습니다.</div>
</c:if>
</div> </div>

3
src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
View File

@ -813,7 +813,8 @@
<div class="cont_body"> <div class="cont_body">
<div class="popup_table_top"> <div class="popup_table_top">
<button type="button" class="btnType06" <button type="button" class="btnType06"
onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001230&amp;fileSn=1'">신청서양식 다운로드</button> onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001234&fileSn=0'">신청서양식 다운로드</button>
<%-- onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001230&amp;fileSn=1'">신청서양식 다운로드</button> --%>
</div> </div>
<div class="pop_tb_type01"> <div class="pop_tb_type01">
<table> <table>

3
src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrPrflDetail.jsp
View File

@ -1049,7 +1049,8 @@
<div class="cont_body"> <div class="cont_body">
<div class="popup_table_top"> <div class="popup_table_top">
<button type="button" class="btnType06" <button type="button" class="btnType06"
onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001230&amp;fileSn=1'">신청서양식 다운로드</button> onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001234&fileSn=0'">신청서양식 다운로드</button>
<%-- onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001230&amp;fileSn=1'">신청서양식 다운로드</button> --%>
</div> </div>
<div class="pop_tb_type01"> <div class="pop_tb_type01">
<table> <table>

2
src/main/webapp/visitEdu/usr/publish/script/qrCode/qrcode.js
View File

@ -362,7 +362,7 @@ var QRCode;
this._oContext = this._elCanvas.getContext("2d"); this._oContext = this._elCanvas.getContext("2d");
this._bIsPainted = false; this._bIsPainted = false;
this._elImage = document.createElement("img"); this._elImage = document.createElement("img");
this._elImage.alt = "Scan me!"; this._elImage.alt = "강의만족도 설문지 QR코드";
this._elImage.style.display = "none"; this._elImage.style.display = "none";
this._el.appendChild(this._elImage); this._el.appendChild(this._elImage);
this._bSupportDataURI = null; this._bSupportDataURI = null;