From 04c89ddf9fdc3609942f25fafc2b011c174c6569 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 29 Nov 2023 14:37:17 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=84=A4=EB=AC=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prcsInfo/service/VEPrcsDetailVO.java | 8 - src/main/java/kcc/web/MainController.java | 24 +- .../let/uat/uia/EgovLoginUsr_SQL_Tibero.xml | 4 +- .../cndtnEduPrcsAplctCfnMngDetail.jsp | 47 +- .../cndtnEduPrcsAplctMngReg.jsp | 2 +- .../fndthEduPrcsAplctCfnMngList.jsp | 2 +- .../fndthEduPrcsAplctPrdMngDetail.jsp | 2 +- .../fndthEduPrcsAplctPrdMngList.jsp | 2 +- .../fndthEnhanceTrn/fndthInstrMngList.jsp | 2 +- .../popup/advRndsStngMngPopup.jsp | 1261 ++++++++--------- .../WEB-INF/jsp/web/com/webCommonNaviWrap.jsp | 12 +- 11 files changed, 660 insertions(+), 706 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index bc471fb6..5a903053 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -167,8 +167,6 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String lctrPlanRsltAtchFileId; //강의계획서 첨부파일 아이디 - private String qustnrTmplatId; - @@ -812,12 +810,6 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setInstrNm(String instrNm) { this.instrNm = instrNm; } - public String getQustnrTmplatId() { - return qustnrTmplatId; - } - public void setQustnrTmplatId(String qustnrTmplatId) { - this.qustnrTmplatId = qustnrTmplatId; - } } diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index fe1914a4..b0fde287 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/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(); diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml index 2b9e3fe1..77223d9f 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Tibero.xml +++ b/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# @@ -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# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 910beb64..2d40a1ef 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -215,27 +215,11 @@ }); } - - //설문조사 결과 - function fncInstrCostInfo(eduId, userId) { //메뉴생성 화면 호출 - var form = document.popupForm; - - form.eduAplctOrd.value = eduId; - form.respondId.value = userId; -// form.prcsAplctPrdOrd.value = prcsAplctPrdOrd; - - form.action = ""; - openPopupAndSubmitForm('popupForm', 'popupForm', 900, 1200); - } + -
- - - -
@@ -457,9 +441,7 @@ - - - + @@ -468,9 +450,7 @@ 주민번호 앞자리 연락처 교육이수여부 - 교육이수상태변경 - 설문조사 - 이수증 + 교육이수상태변경 @@ -498,27 +478,6 @@ - - - -<%-- --%> - - - - 미입력 - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp index 9acd90cb..63fe5f92 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngReg.jsp @@ -180,7 +180,7 @@
  • -

    실무자역량강화(기반강화연수관리)

    +

    기반강화연수관리

  • 기반강화연수 과정 신청기간 등록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp index 4e7f3cc3..1d1f8b20 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngList.jsp @@ -184,7 +184,7 @@
  • -

    실무자역량강화(기반강화연수관리)

    +

    기반강화연수관리

  • 교육확정관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index a31a8d11..4219a672 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -252,7 +252,7 @@
  • -

    실무자역량강화(기반강화연수관리)

    +

    기반강화연수관리

  • 과정신청기간관리 신청기간 상세
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp index 6f31c7f1..2041fcde 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngList.jsp @@ -192,7 +192,7 @@
  • -

    실무자역량강화(기반강화연수관리)

    +

    기반강화연수관리

  • 과정신청기간관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp index b073f1fe..4fa3b32c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthInstrMngList.jsp @@ -205,7 +205,7 @@
  • -

    실무자역량강화(기반강화연수관리)

    +

    기반강화연수관리

  • 강사별관리목록
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp index d1c62962..23b4d8ed 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp @@ -1,643 +1,618 @@ - -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<% - /** - * @Class Name : advLctrRsrchStngMngPopup.jsp - * @Description : 강의조사관리 팝업 - * @Modification Information - * @ - * @ 수정일 수정자 수정내용 - * @ ------- -------- --------------------------- - * @ 2021.08.09 김봉호 최초 생성 - * @author 김봉호 - * @since 2021.08.21 - * @version 1.0 - * @see - * - */ -%> - - - - - - - - - - - - - - 신청반려팝업 - - - - -
- - - -
- - -
-

회차관리

-
- - -
- - -"> -"> -"> -"> - - - - - - - - - - - - - - -
-

필수입력 항목

-

-    년도   - - - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
회차명접수시작일시접수마감일시관리
-
- - 회차 -
-
-
- -
- 시 - -
-
-
- -
- -
- - 시 -
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
회차명접수시작일시접수마감일시관리
-
- - 회차 - - - - -
-
-
- -
- 시 - -
-
-
- -
- -
- - 시 -
-
-
-
- - -
-
-
- -
- -
-
-
-
- - -
-
-
-
-
- - -
- - - + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : advLctrRsrchStngMngPopup.jsp + * @Description : 강의조사관리 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + + 신청반려팝업 + + + + +
+ + + +
+ + +
+

회차관리

+
+ + +
+ + +"> +"> +"> +"> + + + + + + + + + + + + + + +
+

필수입력 항목

+

+    년도   + + + +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 +
+
+
+ +
+ 시 + +
+
+
+ +
+ +
+ + 시 +
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
회차명접수시작일시접수마감일시관리
+
+ + 회차 +
+
+
+ +
+ 시 + +
+
+
+ +
+ +
+ + 시 +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp index f5bf8d43..386841ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp @@ -6,7 +6,6 @@