Merge branch 'tolag3' into advc
Conflicts: src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
This commit is contained in:
commit
4c03f4acf4
@ -504,6 +504,11 @@ public class FndtnEnhanceTrnController {
|
||||
vEEduAplctVO.setUserId(loginVO.getUniqId());
|
||||
vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd());
|
||||
|
||||
vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getChrgNm());
|
||||
vEEduAplctVO.setInsttNm(vEPrcsDetailVO.getInsttNm());
|
||||
vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth());
|
||||
|
||||
|
||||
fndtnEnhanceTrnService.insertVeEduAplct(vEEduAplctVO);
|
||||
|
||||
|
||||
|
||||
@ -156,6 +156,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
|
||||
|
||||
private String instrNm; //강사명
|
||||
|
||||
private String chrgNm;
|
||||
private String insttNm;
|
||||
|
||||
|
||||
|
||||
@ -757,6 +759,19 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
|
||||
public void setInstrNm(String instrNm) {
|
||||
this.instrNm = instrNm;
|
||||
}
|
||||
public String getChrgNm() {
|
||||
return chrgNm;
|
||||
}
|
||||
public void setChrgNm(String chrgNm) {
|
||||
this.chrgNm = chrgNm;
|
||||
}
|
||||
public String getInsttNm() {
|
||||
return insttNm;
|
||||
}
|
||||
public void setInsttNm(String insttNm) {
|
||||
this.insttNm = insttNm;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -270,7 +270,10 @@
|
||||
|
||||
FRST_REGIST_PNTTM,
|
||||
FRST_REGISTER_ID,
|
||||
USE_YN
|
||||
USE_YN,
|
||||
CHRG_NM,
|
||||
INSTT_NM,
|
||||
D_BIRTH
|
||||
)VALUES(
|
||||
#eduAplctOrd#,
|
||||
#lctrDivCd#,
|
||||
@ -285,7 +288,10 @@
|
||||
|
||||
SYSDATE,
|
||||
#frstRegisterId#,
|
||||
'Y'
|
||||
'Y',
|
||||
#chrgNm#,
|
||||
#insttNm#,
|
||||
#dBirth#
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
@ -11,6 +11,9 @@
|
||||
<un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
|
||||
<title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<style>
|
||||
.duet-date__dialog-content,.duet-date__dialog{max-width:400px;width:364px;}
|
||||
</style>
|
||||
<script type="text/javaScript" language="javascript">
|
||||
|
||||
|
||||
@ -128,14 +131,41 @@ $(document).ready(function(){
|
||||
}
|
||||
|
||||
// 텍스트가 "접수중"인지 확인
|
||||
if ($thisCell.text().trim() !== "접수중") {
|
||||
$applyButton.prop('disabled', true); // 버튼 비활성화
|
||||
// if ($thisCell.text().trim() !== "접수중") {
|
||||
// $applyButton.prop('disabled', true); // 버튼 비활성화
|
||||
// }
|
||||
if ($thisCell.text().trim() === "접수중") {
|
||||
$applyButton.prop('disabled', false); // 버튼 비활성화
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
const dBirth = document.querySelector(".dBirth");
|
||||
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",
|
||||
incrementYears:100,
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
function fn_prcsAplctPrdOrdSet(obj){
|
||||
console.log($(obj).closest('tr').attr("data-value"));
|
||||
regForm.prcsAplctPrdOrd.value = $(obj).closest('tr').attr("data-value");
|
||||
$('#regButton').attr("onclick", "fncEduReg('"+$('#regForm [name=prcsAplctPrdOrd]').val()+"');");
|
||||
console.log($(obj).closest('td').find('.prcsNm_popNm').text());
|
||||
$('#popNm').text($(obj).closest('tr').find('.prcsNm_popNm').text());
|
||||
|
||||
$('#popForm').find('input').val('');
|
||||
}
|
||||
|
||||
function fn_dayDiff(item){
|
||||
|
||||
@ -199,9 +229,36 @@ $(document).ready(function(){
|
||||
|
||||
}
|
||||
|
||||
function fnValidation(){
|
||||
var chrgNm = document.popForm.chrgNm.value;
|
||||
var insttNm = document.popForm.insttNm.value;
|
||||
var dBirth = document.popForm.dBirth.value;
|
||||
|
||||
if(chrgNm == ''){
|
||||
alert('성명을 입력해 주세요.');
|
||||
return false;
|
||||
}else if(insttNm ==''){
|
||||
alert('소속기업을 입력해 주세요.');
|
||||
return false;
|
||||
}else if(dBirth ==''){
|
||||
alert('생년월일을 입력해 주세요.');
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function fncEduReg(prcsAplctPrdOrd){
|
||||
|
||||
|
||||
if(!fnValidation()){
|
||||
return false;
|
||||
}
|
||||
|
||||
var regForm = document.regForm;
|
||||
regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
|
||||
regForm.chrgNm.value = document.popForm.chrgNm.value;
|
||||
regForm.insttNm.value = document.popForm.insttNm.value;
|
||||
regForm.dBirth.value = document.popForm.dBirth.value;
|
||||
|
||||
var data = new FormData(document.getElementById("regForm"));
|
||||
if(confirm("신청하시겠습니까?")){
|
||||
@ -227,6 +284,8 @@ $(document).ready(function(){
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$('#target_confirm_popup-close').click();
|
||||
}
|
||||
|
||||
function linkPage(pageNo){
|
||||
@ -273,6 +332,10 @@ $(document).ready(function(){
|
||||
|
||||
<form name="regForm" id="regForm">
|
||||
<input type="hidden" name="prcsAplctPrdOrd">
|
||||
<input type="hidden" name="chrgNm">
|
||||
<input type="hidden" name="insttNm">
|
||||
<input type="hidden" name="dBirth">
|
||||
|
||||
</form>
|
||||
<form name="selectForm" id="selectForm">
|
||||
<input type="hidden" name="lctrDivCd" value="50">
|
||||
@ -391,14 +454,14 @@ $(document).ready(function(){
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach var="list" items="${list}" varStatus="status">
|
||||
<tr class="listCount">
|
||||
<tr class="listCount" data-value="<c:out value="${list.prcsAplctPrdOrd}"/>">
|
||||
<%-- <td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;"> --%>
|
||||
<%-- <c:out value="${status.count}"/> --%>
|
||||
<!-- </td> -->
|
||||
<td>
|
||||
<kc:code codeId="VEA001" code="${list.prcsDiv}"/>
|
||||
</td>
|
||||
<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">
|
||||
<td class="prcsNm_popNm" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">
|
||||
<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
|
||||
</td>
|
||||
<td>
|
||||
@ -423,7 +486,8 @@ $(document).ready(function(){
|
||||
</c:choose>
|
||||
</td>
|
||||
<td class="aplctBtn">
|
||||
<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button>
|
||||
<%-- <button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');" disabled>신청</button> --%>
|
||||
<button type="button" class="btnType04" onclick="fn_prcsAplctPrdOrdSet(this);" data-tooltip="target_confirm_popup" disabled>신청</button>
|
||||
</td>
|
||||
</c:if>
|
||||
</tr>
|
||||
@ -538,4 +602,70 @@ $(document).ready(function(){
|
||||
</div>
|
||||
|
||||
</form:form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<form id="popForm" name="popForm" method="post">
|
||||
<!-- 신청인정보 -->
|
||||
<div class="tooltip-wrap q_pop">
|
||||
<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
|
||||
<div class="popup_tit">
|
||||
<p id="popNm">신청인정보</p>
|
||||
<button class="btn_popup_close tooltip-close" data-focus="target_confirm_popup_close" title="팝업 닫기"><i></i></button>
|
||||
</div>
|
||||
<div class="popup_cont">
|
||||
<div class="cont_body">
|
||||
<div class="pop_tb_type01" style="overflow:visible;">
|
||||
<table>
|
||||
<caption>신청인정보를 입력하는 표</caption>
|
||||
<colgroup>
|
||||
<col style="width: 145px;">
|
||||
<col style="width: auto;">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">
|
||||
<p>성명</p>
|
||||
</th>
|
||||
<td>
|
||||
<input type="text" name="chrgNm" id="chrgNm"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">
|
||||
<p>소속기업</p>
|
||||
</th>
|
||||
<td>
|
||||
<input type="text" name="insttNm" id="insttNm"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">
|
||||
<p>생년월일</p>
|
||||
</th>
|
||||
<td>
|
||||
<div class="calendar_wrap">
|
||||
<duet-date-picker identifier="date" class="dBirth" name="dBirth" min="1940-01-01" max="2025-12-31"></duet-date-picker>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div class="pop_btn_wrap btn_layout01">
|
||||
<div class="btn_left">
|
||||
</div>
|
||||
<div class="btn_center">
|
||||
<button type="button" class="btnType05" id="regButton">문의</button>
|
||||
<button type="button" class="btnType02 tooltip-close" id="target_confirm_popup-close" data-focus="target_confirm_popup-close" data-focus-next="target_confirm_popup">취소</button>
|
||||
</div>
|
||||
<div class="btn_right">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--// 신청 클릭 > 기소유예 대상자 확인 팝업 -->
|
||||
</form>
|
||||
Loading…
Reference in New Issue
Block a user