From 96e09425ae9e5d61f29d69f0167d29549b8af055 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 30 Jun 2023 15:41:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20>=20=EC=B2=AD=EC=86=8C=EB=85=84=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=20>=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20>=20=EC=8B=A0=EC=B2=AD=EC=84=9C=20=EC=9D=BC?=
 =?UTF-8?q?=EA=B4=84=EC=B6=9C=EB=A0=A5=20=EB=88=84=EB=9D=BD=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B9=88=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/EduAplctMngTngrController.java        |  1 +
 .../popup/eduAplctMngDetailPopup.jsp          | 59 +++++++++++++------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java
index 1f6863c4..9f3b7b3a 100644
--- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java
+++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java
@@ -402,6 +402,7 @@ public class EduAplctMngTngrController {
 		List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
 		model.addAttribute("chasiList", vEEduChasiVOList);
 		
+		model.addAttribute("cryptoUtil",egovCryptoUtil);
 		return "oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup";		
 	}	
 	
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp
index 6c30bc89..ff0129c3 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp
@@ -37,22 +37,15 @@
 /* Page Url Hide */
 @page {     
 	size: auto;   /* auto is the initial value */     
-	margin: 0;    /* this affects the margin in the printer settings */ 
+	margin: 0;    /* this affects the margin in the printer settings */
 }
 
 @media print {
-	.cont_tit {
-  		page-break-before: always;
-  	}
-
-	.page_break {
-  		page-break-before: always;
-		height: 40px;	
-  	}
-  	
-	.print_mark {
-  		page-break-before: auto;
-  	}  	
+   html, body {height:auto;margin: 0 !important;padding: 0 !important;overflow: hidden;page-break-after: avoid;}
+   .cont_tit {page-break-before: always;}
+   .page_break {page-break-inside:avoid; page-break-after:auto}
+   .print_mark {page-break-before: auto;}
+   form{display: none;}     
 }
 
 </style>
@@ -155,7 +148,15 @@
 							<th scope="row">
 								<p>교육장소</p>
 							</th>
-							<td colspan="3"><c:out value="${info.eduPlace}" /></td>
+							<td colspan="3">
+								<c:out value="${info.eduPlace}" />
+								<p style="padding-left:10%; display:inline-block;">
+									<input type="checkbox" <c:if test="${info.corpsEdu eq 'Y'}">checked</c:if> disabled="disabled"> 집체교육
+								</p>
+								<p style="padding-left:20px; display:inline-block;">
+									<input type="checkbox" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if> disabled="disabled"> 방송실교육
+								</p>
+							</td>
 						</tr>
 						<tr>
 							<th scope="row">
@@ -183,7 +184,7 @@
 							</th>
 							<td colspan="3">
 								<c:choose>
-									<c:when test="${info.useYn eq 'N'}">
+									<c:when test="${info.useYn eq 'N' or info.aprvlCd eq '40'}">
 										<span class="app_status3">신청취소</span>
 									</c:when>
 									<c:when test="${info.sbmtYn eq 'N' or empty info.sbmtYn}">
@@ -192,12 +193,24 @@
 									<c:when test="${info.aprvlCd eq '10'}">
 										<span class="app_status1">교육신청</span>
 									</c:when>
+									<c:when test="${info.aprvlCd eq '230'}">
+										<span class="app_status1">대기</span>
+									</c:when>
 									<c:when test="${info.aprvlCd eq '20'}">
-										<span class="app_status1">교육확정</span>
+										<span class="app_status1">교육승인</span>
 									</c:when>
 									<c:when test="${info.aprvlCd eq '30'}">
 										<span class="app_status1">교육반려</span>
 									</c:when>
+									<c:when test="${info.aprvlCd eq '60'}">
+										<span class="app_status1">교육확정</span>
+									</c:when>									
+									<c:when test="${info.aprvlCd eq '70'}">
+										<span class="app_status1">수정요청<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
+									</c:when>
+									<c:when test="${info.aprvlCd eq '80'}">
+										<span class="app_status1">수정완료<c:if test="${info.isWait eq 'Y'}">(대기)</c:if></span>
+									</c:when>
 									<c:otherwise>
 										-
 									</c:otherwise>
@@ -214,9 +227,9 @@
 						</c:if>
 					</tbody>
 				</table>
+			<p class="page_break"></p>
+			<br/>
 
-
-			<div class="page_break"></div>
 			<div class="pop_tb_tit01">
 				<p>교육차시 정보</p>
 			</div>
@@ -235,6 +248,7 @@
 							<th scope="col">시간</th>
 							<th scope="col">구분</th>
 							<th scope="col">대상</th>
+							<th scope="col">배정강사</th>
 							<th scope="col">인원</th>
 						</tr>
 					</thead>
@@ -264,6 +278,15 @@
 									<ve:code codeId="VE0010" code="${list.divCd}"/>
 								</td>
 								<td><c:out value="${list.trgt}" /></td>
+								<td>
+									<c:out value="${cryptoUtil.decrypt(list.instrNm)}"/>
+									<c:if test="${list.instrNm eq null}">
+										-
+									</c:if>
+									<c:if test="${list.instrNm ne null}">
+										<br/>(${fn:split(list.userId,'_')[1]*1})
+									</c:if>											
+								</td>
 								<td><c:out value="${list.prsnl}" /></td>
 							</tr>
 						</c:forEach>