관리자 기소유예 설문

src/main/java/kcc/web/MainController.java

@@ -1461,6 +1461,26 @@ public class MainController {
         System.out.println("auth");
         System.out.println(auth);
         
+        //청소년, 성인 메뉴 구분을 위한 권한 및 강사 구분 값
+        model.addAttribute("naviAuth", auth);
+    	if("ROLE_USER_MANAGER".equals(menuManageVO.getAuthorCode())) {
+    		VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO();
+			vEInstrDetailVO.setUserId(loginVO.getUniqId());
+			vEInstrDetailVO = vEInstrService.selectDetail(vEInstrDetailVO);
+			String instrDiv = "";
+			
+			if("Y".equals(vEInstrDetailVO.getTngrInstrYn())){
+				instrDiv = "tngrInstrDiv";
+			}
+			if("Y".equals(vEInstrDetailVO.getAdultInstrYn())) {
+				instrDiv = "adultInstrDiv";
+			}
+			if("Y".equals(vEInstrDetailVO.getTngrInstrYn()) && "Y".equals(vEInstrDetailVO.getAdultInstrYn())){
+				instrDiv = "doubleInstrDiv";
+			}
+			model.addAttribute("naviInstrDiv", instrDiv);
+    	}
+        
         //현재 로그인한 권한으로 셋팅해준다.
         //menuManageVO.setAuthorCode(auth);
         
@@ -1501,7 +1521,7 @@ public class MainController {
     		System.out.println(session.getId());
     		System.out.println(menuManageVO.getMenuNo());
     		System.out.println(session.getAttribute("menuNo"));
-    		System.out.println(session.getAttribute("menuNo").toString());
+    		//System.out.println(session.getAttribute("menuNo").toString());
     			
     	}catch(Exception ex) {
     		ex.printStackTrace();
@@ -1510,7 +1530,7 @@ public class MainController {
     	try {
     		System.out.println("session.getAttribute(aaaaaa).toString()-naviWrap-step1");
     		System.out.println(session.getAttribute("aaaaaa"));
-    		System.out.println(session.getAttribute("aaaaaa").toString());
+    		//System.out.println(session.getAttribute("aaaaaa").toString());
     			
     	}catch(Exception ex) {
     		ex.printStackTrace();

src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml

@@ -93,7 +93,7 @@
 			     , mber_sttus AS emplyrSttusCode
 			     , mbtlnum AS membCelnum
 			     , birth_day AS membBirth
-			     
+			     , ''  AS userWork
 			 FROM lettngnrlmber a
 			 WHERE mber_seq = #id#
 		     <isEmpty property="statusAll">
@@ -468,7 +468,7 @@
 				, mber_sttus AS emplyrSttusCode
 				, mbtlnum AS membCelnum
 				, birth_day AS membBirth
-				
+				, '' AS userWork
 			 FROM lettngnrlmber a
 			 WHERE mber_id = #id#
 			 AND PASSWORD = #password#

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

@@ -552,5 +552,24 @@
 </div>
 </form:form>
 <!-- //cont -->
+<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">
+<script>
+/*
+ * 오버레이 방식
+ */
+ 	function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){
+
+ 		var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service');
+
+		viewer.hideToolbarItem(["save"]);
+		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/fndtnEnhanceTrn/fndtnEduAplctCmpltCrtfcAjax.do?prcsAplctPrdOrd='+p_prcsAplctPrdOrd+'&eduAplctOrd='+p_eduAplctOrd+']');
+
+ 	 	}
+</script>
 </body>
 </html>

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

@@ -180,7 +180,7 @@
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
-						<p>실무자역량강화(기반강화연수관리)</p>
+						<p>기반강화연수관리</p>
 					</li>
 					<li><span class="cur_nav">기반강화연수 과정 신청기간 등록</span></li>					
 				</ul>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp

@@ -184,7 +184,7 @@
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
-						<p>실무자역량강화(기반강화연수관리)</p>
+						<p>기반강화연수관리</p>
 					</li>
 					<li><span class="cur_nav">교육확정관리목록</span></li>
 				</ul>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp

@@ -252,7 +252,7 @@
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
-						<p>실무자역량강화(기반강화연수관리)</p>
+						<p>기반강화연수관리</p>
 					</li>
 					<li><span class="cur_nav">과정신청기간관리 신청기간 상세</span></li>					
 				</ul>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp

@@ -192,7 +192,7 @@
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
-						<p>실무자역량강화(기반강화연수관리)</p>
+						<p>기반강화연수관리</p>
 					</li>
 					<li><span class="cur_nav">과정신청기간관리목록</span></li>
 				</ul>

src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp

@@ -205,7 +205,7 @@
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
-						<p>실무자역량강화(기반강화연수관리)</p>
+						<p>기반강화연수관리</p>
 					</li>
 					<li><span class="cur_nav">강사별관리목록</span></li>
 				</ul>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp

@@ -45,9 +45,7 @@
 			if(mode == "D"){
 				$("input[type=checkbox],textarea").not("textarea[name=rejtReson]").attr("disabled" , true);
 			}
-			   $("input:text[numberOnly]").on("keyup", function() {
+
-				      $(this).val($(this).val().replace(/[^0-9]/g,""));
-			   });
 		});
 
 		function fncAprooval(){
@@ -161,25 +159,6 @@
 
 		//회차관리 변경
 		function fncRndsSave(thisObj){
-
-			// 기존 회차와 비교하여 값이 있으면 return false
-			var valChk = false;
-			$(".psblTmQnttyTemp").each(function() {
-
-				var ordVal = $('#ord').val();
-	            var currentValue = $(this).val();
-	            if(currentValue == ordVal){
-	            	valChk = true;
-	            }
-	            
-	        });
-			if(valChk){
-				alert("기존에 있는 회차와 같습니다. 다시 작성해주세요");
-				return false;
-			}
-			// //기존 회차와 비교하여 값이 있으면 return false
-			
-			
 			//alert($("#ord_1").val());
 			//alert($(thisObj).closest("td"));
 			//alert($(thisObj).closest("td").find("input[name=ord_1]").length);
@@ -201,7 +180,7 @@
 			//alert(p_areaCd);
 			
 			//if(p_psblTmQntty != "") {
-		/* 	if(true) {
+			if(true) {
 				
 				$.ajax({
 					type:"POST",
@@ -228,7 +207,7 @@
 				});
 			}else{
 				alert("교육가능시수를 입력해주세요.");
-			} */
+			}
 		}			
 
 		function fncGoList(){
@@ -408,7 +387,7 @@
 									
 										<input type="text" id="ord" name="ord" class="search_input" 
 										style="width:100px;" maxlength="3"
-										placeholder="숫자만" value="" numberOnly>회차	
+										placeholder="숫자만" value='' onkeyDown="press(event);">회차	
 								</td>
 								<td>
 									<div class="util_right">									
@@ -523,10 +502,6 @@
 										<input type="text" id="psblTmQntty" name="psblTmQntty" class="search_input" 
 										style="width:100px;"
 										placeholder="회차" value='<c:out value="${list.ord}"/>' onkeyDown="press(event);">회차	
-										
-										
-										<input type="hidden" class="psblTmQnttyTemp" value='<c:out value="${list.ord}"/>'/>
-											
 								</td>
 								<td>
 									<div class="util_right">									

src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp

@@ -6,7 +6,6 @@
 <c:set var="URI" value="${pageContext.request.requestURI}" />
 <script type="text/javascript">
 $(document).ready(function (){
-    
     $("#snb_1depth li a").each(function(idx) {
     	var ahref = $("nav#menu ul.depth01 li.depth01_li:eq("+idx+") a").attr("href");
 		//console.log($("nav#menu ul.depth01 li.depth01_li:eq("+idx+") a").attr("href")); // 요기. 최종마지막 부터 해야함
@@ -30,6 +29,15 @@ $(document).ready(function (){
     	}
     });
 
+	if("${naviAuth}" == 'ROLE_USER_MANAGER'){
+		if("${naviInstrDiv}" == 'tngrInstrDiv'){
+			$("#navi_depth_1_9991000").hide();	
+			$("#navi_depth_1_99912000").hide();	
+			$("#navi_depth_1_99913000").hide();	
+		}else if("${naviInstrDiv}" == 'adultInstrDiv'){
+			$("#navi_depth_1_99923000").hide();
+		}
+	}
 });
 
 /* function snsShare(snsName, link, title) { */
@@ -91,7 +99,7 @@ function snsShare(snsName) {
 							<ul class="navi_depth" id="navi_depth_1">
 								<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
 									<c:if test="${resultListOne.depths eq '1' }">
-										<li>
+										<li id="navi_depth_1_${resultListOne.menuNo}">
 											<a href="${pageContext.request.contextPath}${empty resultListOne.url ? '#' : resultListOne.url }" ${resultListOne.menuType eq 'O' ? 'target="_blank"' : ""} >
 												<c:out value="${resultListOne.menuNm}" escapeXml="false" />
 											</a>