사용자 기소유예 교육신청취소 팝업 진행중

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java

@@ -466,10 +466,13 @@ public class CndtnTrgtMngController {
 		
 		//성인 미성년 구분
 		String adultWhether = getIsAdultInKorea(cndtnTrgtInfoMngVO.getdBirth());
-		String reqNmbrTemp = adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+LocalDate.now().getYear()+"-";
+		String reqNmbrTemp = adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+DateUtil.getStringToLocalDateYear();
 		
 		int cnt = cndtnTrgtInfoMngService.findCntreqNmber("%" + reqNmbrTemp + "%");
-		return adultWhether+"-"+cndtnTrgtInfoMngVO.getCmptntAthrt()+"-"+DateUtil.getStringToLocalDateYear()+"-"+(cnt+1);
+		System.out.println(cnt);
+		System.out.println(cnt+1);
+		return reqNmbrTemp+"-"+(cnt+1);
+			   
 	}
 	
 	/** 
@@ -493,6 +496,7 @@ public class CndtnTrgtMngController {
 
 		// 생년월일과 현재 날짜 사이의 기간 계산
 		Period period = Period.between(birthDate, now);
+		System.out.println("period.getYears() : "+ period.getYears());
 		if(period.getYears() >= 19) {
 			returnData="A";	
 		}

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp

@@ -72,7 +72,7 @@
 					console.log('returnData :: ', returnData);
 					if(returnData.result == "success"){
 						alert("저장되었습니다.");
-// 						fncGoList();
+						fncGoList();
 					}else if(returnData.result == "fail"){
 						alert(returnData.message);
 						$('#cmptntAthrt').prop('disabled', true);

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp

@@ -397,7 +397,7 @@ $(document).ready(function(){
 						<th>교육구분</th>
 						<th>과정명</th>
 						<th>신청기간</th>
-						<th>교육기간</th>
+						<th>교육일자</th>
 						<th>신청자/정원</th>
 						<th>상태</th>
 						<th>교육신청</th>
@@ -419,7 +419,8 @@ $(document).ready(function(){
 								<c:out value="${list.strtPnttm}"/>~<c:out value="${list.endPnttm}"/>
 							</td>
 							<td>									
-								<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
+<%-- 								<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
+								<c:out value="${list.eduStrtPnttm}"/>
 							</td>
 							<td>									
 								<c:out value="${list.nosCnt1}"/>/<c:out value="${list.nos}"/>

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

@@ -81,7 +81,7 @@
 				<thead>
 					<tr>
 						<th>교육과정</th>
-						<th>교육기간</th>
+						<th>교육일자</th>
 						<th>신청결과</th>
 						<th>설문조사</th>
 						<th>이수증</th>
@@ -95,7 +95,8 @@
 							<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
 						</td>
 						<td>
-							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
+<%-- 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
+							<c:out value="${list.eduStrtPnttm}"/>
 						</td>
 						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
 						<td>

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

@@ -154,7 +154,7 @@ $(document).ready(function(){
 				<thead>
 					<tr>
 						<th>교육과정</th>
-						<th>교육기간</th>
+						<th>교육일자</th>
 						<th>신청결과</th>
 						<th>설문조사</th>
 						<th>이수증</th>
@@ -167,9 +167,32 @@ $(document).ready(function(){
 							<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
 						</td>
 						<td>
-							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
+<%-- 							<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/> --%>
+							<c:out value="${list.eduStrtPnttm}"/>
+						</td>
+						<td>
+						<!--  
+							10	요청
+							120	선정완료
+							140	선정취소
+							20	승인
+							230	대기
+							30	반려
+							40	취소
+							60	교육확정
+							70	수정요청
+							80	수정완료
+							90	교육미확정
+						-->
+							<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
+							<c:if test="${list.aprvlCd eq 10 
+											or list.aprvlCd eq 120 
+											or list.aprvlCd eq 20
+											or list.aprvlCd eq 230  
+							}">
+							<button type="button" title="신청취소" class="btnType02" data-tooltip="sub01_pop01">취소</button>
+							</c:if>
 						</td>
-						<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
 						<td>
 								<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
 							<c:choose>
@@ -204,7 +227,7 @@ $(document).ready(function(){
 					</tr>
 				</c:forEach>
 				<c:if test="${empty list}">
-					<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
+					<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
 				</c:if>
 				</tbody>
 			</table>
@@ -227,6 +250,78 @@ $(document).ready(function(){
 	</form:form>
 </div>
 
+<!-- 교육신청 취소 -->
+<div class="tooltip-wrap">
+	<div class="popup_wrap popType01" tabindex="0"
+		data-tooltip-con="sub01_pop01" data-focus="sub01_pop01"
+		data-focus-prev="sub01_pop01_close">
+		<div class="popup_tit">
+			<p>교육신청 취소</p>
+			<button class="btn_popup_close tooltip-close"
+				data-focus="sub01_pop01_close" title="팝업 닫기">
+				<i></i>
+			</button>
+		</div>
+		<div class="popup_cont">
+			<div class="cont_body">
+				<div class="pop_tb_type01">
+					<table>
+						<colgroup>
+							<col style="width: 22%;">
+							<col style="">
+						</colgroup>
+						<tr>
+							<th>첨부파일</th>
+							<td>
+								<div class="btn_wrap">
+									<button type="button" class="btnType01 right">파일찾기</button>
+								</div>
+								<div class="file_wrap">
+									<table>
+										<colgroup>
+											<col style="width: auto;">
+											<col style="width: 15%;">
+											<col style="width: 15%;">
+										</colgroup>
+										<thead>
+											<th>파일 명</th>
+											<th>종류</th>
+											<th>크기</th>
+										</thead>
+										<tbody class="tb_file_before">
+											<tr>
+												<td colspan="3">
+													<p>
+														첨부하실 파일을 <span>마우스끌어서</span> 넣어주세요.
+													</p>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+							</td>
+						</tr>
+						<tr>
+							<th>취소사유</th>
+							<td><textarea></textarea></td>
+						</tr>
+					</table>
+
+				</div>
+				<div class="pop_btn_wrap btn_layout01">
+					<div class="btn_left"></div>
+					<div class="btn_center">
+						<button type="button" class="btnType05">제출</button>
+						<button type="button" class="btnType02 tooltip-close"
+							data-focus="imsi-close" data-focus-next="imsi">취소</button>
+					</div>
+					<div class="btn_right"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!--// 교육신청 취소 -->
 
 <script src="http://119.193.215.98:8093/ReportingServer/html5/js/crownix-viewer.min.js"></script>
 <link rel="stylesheet" type="text/css" href="http://119.193.215.98:8093/ReportingServer/html5/css/crownix-viewer.min.css">
@@ -236,7 +331,8 @@ $(document).ready(function(){
 	 */
 	function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd) {
 
-		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
+		var viewer = new m2soft.crownix.Viewer(
+				'http://119.193.215.98:8093/ReportingServer/service');
 		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]');
 		//viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]');
 		//viewer.openFile('sample.mrd','/rfn [sample.txt]');
@@ -247,7 +343,13 @@ $(document).ready(function(){
 		viewer.showToolbarItem([ "print_pdf" ]);
 		//viewer.openFile('cmplt_crtfc_20231030.mrd');
 		//viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [cmplt_crtfc_20231030.json]');
-		viewer.openFile('cmplt_crtfc_20231030.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+		viewer
+				.openFile(
+						'cmplt_crtfc_20231030.mrd',
+						'/rf [http://119.193.215.98:9989/offedu/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='
+								+ p_prcsAplctPrdOrd
+								+ '&eduAplctOrd='
+								+ p_eduAplctOrd + ']');
 
 		/*