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 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;} } @@ -155,7 +148,15 @@

교육장소

- + + +

+ checked disabled="disabled"> 집체교육 +

+

+ checked disabled="disabled"> 방송실교육 +

+ @@ -183,7 +184,7 @@ - + 신청취소 @@ -192,12 +193,24 @@ 교육신청 + + 대기 + - 교육확정 + 교육승인 교육반려 + + 교육확정 + + + 수정요청(대기) + + + 수정완료(대기) + - @@ -214,9 +227,9 @@ +

+
- -

교육차시 정보

@@ -235,6 +248,7 @@ 시간 구분 대상 + 배정강사 인원 @@ -264,6 +278,15 @@ + + + + - + + +
(${fn:split(list.userId,'_')[1]*1}) +
+