diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index 2ae09cf6..1f51129c 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -841,6 +841,7 @@ public class CommonWebController { System.out.println("===대상차시 가져오기==="); + System.out.println(s_query); VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); vEEduAplctVO.setSelectPagingListQuery(s_query); @@ -857,8 +858,9 @@ public class CommonWebController { } } - - //modelAndView.addObject("rsCnt", rs); + System.out.println("p"); + System.out.println(p); + modelAndView.addObject("cnt", p); //처리된 수량 modelAndView.addObject("result", "success"); return modelAndView; } diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java index 04e80312..66f2e9ac 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/web/ExprnClsrmEndController.java @@ -187,7 +187,6 @@ public class ExprnClsrmEndController { model.addAttribute("paginationInfo", paginationInfo); //대상 리스트, 페이징 정보 전달 model.addAttribute("list", vEEduAplctVOList); - model.addAttribute("cnt", vEEduAplctVOList.size()); return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList"; } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index c8234b64..fbb9cf69 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -139,7 +139,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { if (cndtnTrgtMngVOList==null || cndtnTrgtMngVOList.size()<=0) { //step3.기존 이력이 없으면 관리자에게 문의 하도록 한다. result = "fail"; - msg = "대상자 정보가 없습니다. 자세한 사항은 담당자에게 문의 바랍니다."; + msg = "대상자 정보가 없습니다. 관리자에게 문의 바랍니다."; next = "Y"; //? }else if (cndtnTrgtMngVOList.size()>0) { @@ -148,7 +148,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { msg = "기존 이력을 전달한다.------"; if ("20".equals(cndtnTrgtMngVOList.get(0).getEduStateCd())) { - msg = "이미 이수한 이력이 있습니다. 자세한 사항은 담당자에게 문의 바랍니다."; + msg = "이미 이수한 이력이 있습니다. 관리자에게 문의 바랍니다."; next = "Y"; //? }else if ("25".equals(cndtnTrgtMngVOList.get(0).getEduStateCd())) { @@ -160,11 +160,11 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { next = ""; //? }else if ("40".equals(cndtnTrgtMngVOList.get(0).getEduStateCd())) { - msg = "미이수 상태입니다. 자세한 사항은 담당자에게 문의 바랍니다."; + msg = "미이수한 이력이 있습니다. 관리자에게 문의 바랍니다."; next = "Y"; //? }else if ("60".equals(cndtnTrgtMngVOList.get(0).getEduStateCd())) { - msg = "교육취소 이력이 있습니다. 자세한 사항은 담당자에게 문의 바랍니다."; + msg = "교육취소 이력이 있습니다. 관리자에게 문의 바랍니다."; next = "Y"; //? } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java index 8c18de52..9cd83ff2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java @@ -32,6 +32,8 @@ public class VEInstrExcelVO extends ComDefaultVO implements Serializable { private String YNowMtwoStsfc; private String YNowMthreeStsfc; private String YNowMfourStsfc; + private String memo; + public String getInstrNm() { return instrNm; } @@ -146,6 +148,12 @@ public class VEInstrExcelVO extends ComDefaultVO implements Serializable { public void setYNowMfourStsfc(String yNowMfourStsfc) { YNowMfourStsfc = yNowMfourStsfc; } + public String getMemo() { + return memo; + } + public void setMemo(String memo) { + this.memo = memo; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java index 45691dc2..1d5c5bad 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java @@ -115,7 +115,6 @@ public interface VEInstrMixService { List selectInstrExcelList(VEInstrDetailVO vEInstrDetailVO); - //청소년 통계 //교육실정통계- ①월별 횟수/교육인원(그래프 포함) List selectEduPrfrmInfo_tngr_no1(VEInstrDetailVO vEInstrDetailVO) throws Exception; @@ -134,5 +133,5 @@ public interface VEInstrMixService { //성인 통계 //교육실정통계- ⑤월별 교육대상별 교육횟수(그래프 포함),⑥월별 교육대상별 교육횟수(그래프 포함),⑦월별 교육대상별 교육인원(그래프 포함) - List selectEduPrfrmInfo_adult_no5_no6_no7(VEInstrDetailVO vEInstrDetailVO) throws Exception; + List selectEduPrfrmInfo_adult_no5_no6_no7(VEInstrDetailVO vEInstrDetailVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java index ba90d976..dbe264c8 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java @@ -259,6 +259,7 @@ public class VEInstrMixDAO extends EgovAbstractDAO { return tlist; } + //교육실정통계- ④월별 강사종류별,강사별 교육횟수(그래프 포함) public List selectEduPrfrmInfo_tngr_no4(VEInstrDetailVO vEInstrDetailVO) throws Exception { List tlist = (List) list("VESttstMixDAO.selectEduPrfrmInfo_tngr_no4", vEInstrDetailVO); @@ -281,6 +282,5 @@ public class VEInstrMixDAO extends EgovAbstractDAO { public List selectEduPrfrmInfo_adult_no5_no6_no7(VEInstrDetailVO vEInstrDetailVO) throws Exception { List tlist = (List) list("VESttstMixDAO.selectEduPrfrmInfo_adult_no5_no6_no7", vEInstrDetailVO); return tlist; - } - + } } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java index 1df35596..2c023720 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java @@ -713,13 +713,13 @@ public class EduAsgnmCnfrmMngAdultController { // 헤더 String[] header = { "교육희망일자", "시간", "온·오프라인", "지역", "기관(단체)명" - , "기관구분", "신청자명", "핸드폰", "전화번호", "강사명" + , "기관구분", "신청자명", "핸드폰", "전화번호", "강사명", "강사료" }; // 컬럼명 String[] order = { "EduHopeDt", "StrtTm", "EduSlctCd", "EduSlctAreaCd", "InsttNm" - , "InsttDivCd", "ChrgNm", "Clphone", "Phone", "InstrNm" + , "InsttDivCd", "ChrgNm", "Clphone", "Phone", "InstrNm", "" }; // 호출 diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index d790a373..aac47208 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -739,22 +739,26 @@ public class EduRsltMngAdultController { // 너비 int[] width = { - 4000, 4000, 4000, 6000, 6000 - , 4000, 4000, 4000, 4000, 4000, 4000, 4000 +// 4000, 4000, 4000, 6000, 6000 + 4000, 4000, 6000, 6000 +// , 4000, 4000, 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000 , 4000, 4000 }; // 헤더 String[] header = { - "교육일자", "차시", "학교구분", "지역", "학교(기관)명" - , "강사이름", "강사료", "편도거리", "도서벽지 수당", "거리 수당", "교통비", "식비" + "교육일자", "차시", "지역", "학교(기관)명" + , "강사이름", "강사료", "교통비" ,"숙박비", "강사료 합계" }; // 컬럼명 String[] order = { - "EduHopeDt", "ChasiCnt", "ScholDivCd", "EduSlctAreaCd", "ScholInsttNm" - , "InstrNm", "InstrFeeOrd", "OnewayDstnc", "SpecialWorkAllow", "DistanceAllow" , "TrafficFee", "FoodExpenses" +// "EduHopeDt", "ChasiCnt", "ScholDivCd", "EduSlctAreaCd", "ScholInsttNm" + "EduHopeDt", "ChasiCnt", "EduSlctAreaCd", "ScholInsttNm" +// , "InstrNm", "InstrFeeOrd", "OnewayDstnc", "SpecialWorkAllow", "DistanceAllow" , "TrafficFee", "FoodExpenses" + , "InstrNm", "InstrFeeOrd", "TrafficFee" , "AcmdtFee", "InstrFeeSum" }; diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index 44a542e0..331f7320 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -1164,6 +1164,7 @@ public class OprtnInstrAdultPrflContoller { vEInstrExcelVO.setYNowMtwoStsfc( aa.getyNowMtwoStsfc()); vEInstrExcelVO.setYNowMthreeStsfc( aa.getyNowMthreeStsfc()); vEInstrExcelVO.setYNowMfourStsfc( aa.getyNowMfourStsfc()); + vEInstrExcelVO.setMemo( aa.getMemo()); vEInstrExcelVOList.add(vEInstrExcelVO); } @@ -1176,7 +1177,7 @@ public class OprtnInstrAdultPrflContoller { int[] width = { 4000, 4000, 4000, 4000, 4000 , 4000, 4000, 4000, 4000, 4000 - , 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000, 4000 }; // 너비 @@ -1185,14 +1186,14 @@ public class OprtnInstrAdultPrflContoller { String[] header = { "강사명", "위촉년도", "생년월일", "소속", "직함" - ,"연락처", "이메일", "전문분야", "주소" + ,"연락처", "이메일", "전문분야", "주소", "비공개메모" , "교육횟수("+currentYear+")", "교육횟수("+(currentYear-1)+")", "교육횟수("+(currentYear-2)+")", "교육횟수("+(currentYear-3)+")", "교육횟수("+(currentYear-4)+")" , "교육만족도("+currentYear+")", "교육만족도("+(currentYear-1)+")", "교육만족도("+(currentYear-2)+")", "교육만족도("+(currentYear-3)+")", "교육만족도("+(currentYear-4)+")" }; String[] order = { "InstrNm", "ApptYr", "DBirth", "Blng", "Pstn" - , "Phone", "Email", "PrfsnFld", "Addr" + , "Phone", "Email", "PrfsnFld", "Addr", "Memo" , "YNowEduCnt", "YNowMoneEduCnt", "YNowMtwoEduCnt", "YNowMthreeEduCnt", "YNowMfourEduCnt" , "YNowStsfc", "YNowMoneStsfc", "YNowMtwoStsfc", "YNowMthreeStsfc", "YNowMfourStsfc" }; diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java index b52afaaa..9bea8ed3 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/NewEduCnfrmMngTngrController.java @@ -377,6 +377,129 @@ public class NewEduCnfrmMngTngrController { return modelAndView; } + /** + * 강사 배정(전체)NEW + * fncSpcfcInstrAsgnmInfo + */ + @RequestMapping("popup/instrMassAsgnm20240112Popup.do") + public String instrMassAsgnm20240112Popup( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + + //Step1.자동배정 차시 대상가져오기 + //List vEEduAplctVOList = null; + { + String s_searchStartDt = request.getParameter("searchStartDt"); + String s_searchEndDt = request.getParameter("searchEndDt"); + String s_searchScholNm = request.getParameter("searchScholNm"); + + + + /* + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + vEEduAplctVO.setSearchStartDt(s_searchStartDt); + vEEduAplctVO.setSearchEndDt(s_searchEndDt); + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + //모든 리스트를 페이징 없이 다 가져온다. + vEEduAplctVO.setPageIndex(0); + + //강사가 할당안된 리스트만 가져온다. + vEEduAplctVO.setSearchAsgnmAprvlCd("90"); + + //Step1.자동배정 대상 차시가져오기 + //강사할당이 없는 배정 대상 차시를 가져온다. + vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + */ + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("searchStartDt", s_searchStartDt); + model.addAttribute("searchEndDt", s_searchEndDt); + model.addAttribute("searchScholNm", s_searchScholNm); + } + + return "oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup"; + } + + /** + * 강사 배정 조건 관리 팝업 + * fncSpcfcInstrAsgnmInfo + */ + + @RequestMapping("popup/instrMassAsgnm20240112PopupAjax.do") + public ModelAndView instrMassAsgnm20240112PopupAjax(ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "fail"); + return modelAndView; + } + + //로그인 처리==================================== + + //Step1.자동배정 차시 대상가져오기 + List vEEduAplctVOList = null; + { + String s_searchStartDt = request.getParameter("searchStartDt"); + String s_searchEndDt = request.getParameter("searchEndDt"); + String s_searchScholNm = request.getParameter("searchScholNm"); + + + System.out.println("s_searchStartDt"); + System.out.println(s_searchStartDt); + System.out.println(s_searchEndDt); + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + vEEduAplctVO.setSearchStartDt(s_searchStartDt); + vEEduAplctVO.setSearchEndDt(s_searchEndDt); + vEEduAplctVO.setSearchScholNm(s_searchScholNm); + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + //모든 리스트를 페이징 없이 다 가져온다. + vEEduAplctVO.setPageIndex(0); + + //강사가 할당안된 리스트만 가져온다. + vEEduAplctVO.setSearchAsgnmAprvlCd("90"); + + //Step1.자동배정 대상 차시가져오기 + //강사할당이 없는 배정 대상 차시를 가져온다. + + if (!"".equals(s_searchStartDt) && !"".equals(s_searchEndDt)) { + vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + + } + + + //대상 리스트, 페이징 정보 전달 + modelAndView.addObject("vEEduAplctVOList", vEEduAplctVOList); + } + + modelAndView.addObject("result", "success"); + + return modelAndView; + } + /** * 강사 월별 시수계산 관리 팝업 * fncSpcfcInstrAsgnmInfo diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 3e1602ea..b7d15fca 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -5759,19 +5759,8 @@ AND A.SBMT_YN = 'Y' AND A.LCTR_DIV_CD = #lctrDivCd# - AND A.APRVL_CD=#aprvlCd# - - - AND A.APRVL_CD=#searchCpyAprvlCd# - - - - AND A.APRVL_CD >= 20 - - - - AND TO_CHAR(A.SBMT_PNTTM,'YYYY') = #searchYear# - + AND A.APRVL_CD=#aprvlCd# + ORDER BY A.EDU_APLCT_ORD DESC diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index fbea6a62..e196e3aa 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -1092,6 +1092,7 @@ , vid.PHONE as phone /*연락처*/ , vid.EMAIL as email /*이메일*/ , vid.PRFSN_FLD as prfsnFld /*분야*/ + , vid.MEMO as memo /*비공개 메모*/ , CASE WHEN vid.POST IS NOT NULL THEN '(' || vid.POST || ')' ELSE '' diff --git a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp index 3abc6f58..64d3fddb 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp @@ -463,6 +463,11 @@ function jstreeRefresh() { //코드 정보 저장. 등록/수정 function fn_save_menuInfo(menuNo) { + var special_pattern = /[`~!@#$%^&*|\\\'\";:\/?.]/gi; + if(special_pattern.test(document.menuForm.menuNo.value) == true){ + alert("코드 코드는 특수문자를 쓸수 없습니다.") ; + return; + } if(menuNo == null || "undefined"== menuNo){ alert("저장 하려는 코드를 먼저 코드트리에서 생성해 주세요."); return ; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp index 01edadc1..93898fc3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp @@ -34,6 +34,7 @@ background-color: #ededed; } + + + + + + + +
+
+
+ + + + + +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 0cabcc2c..6dd71041 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -32,7 +32,6 @@ - + + + + + + + +
+
+
+ + + + + +
+
+ +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp new file mode 100644 index 00000000..759e12e6 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrMassAsgnm20240112Popup.jsp @@ -0,0 +1,362 @@ + +<%@ 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="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrMassAsgnm20240112Popup.jsp + * @Description : 강사배정(전체) 수량카운트용 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + " /> + " /> + "> + + + + + + +
+
+ +
+

강사배정(전체)

+
+ + +
+
+
+

+ 배정 대상 확인 중... +

+
+
+ +
+
+
+ + + + + +
+
+ +
+ +
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index a9e273c4..3e4a0f7e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -143,7 +143,7 @@
  • -

    체험교실 마이페이지 아이콘 체험교실

    +

    체험교실 마이페이지 아이콘 찾교(체험교실)

    @@ -200,8 +200,7 @@ - ', '');" - tabindex="0" onkeypress="if(event.keyCode == 13){goTngrDetail('', '');}"> + ', '');"> ${list.eduHopeDt} @@ -283,8 +282,7 @@ - ')" - tabindex="0" onkeypress="if(event.keyCode == 13){goAdultDetail('')}"> + ')"> ${list.eduHopeDt} @@ -369,7 +367,7 @@ - + @@ -409,7 +407,7 @@ - + @@ -462,10 +460,10 @@ - ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){qnaGoDetail('');}"> + ');" style="cursor:pointer;"> - ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){qnaGoDetail('');}"> + ');" style="cursor:pointer;"> diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp index 0f2c5f78..1ce93fbd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp @@ -94,10 +94,10 @@ function fncGoDetail(p_pk){ - ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){fncGoDetail('');}"> + ');" style="cursor:pointer;"> - ');" style="cursor:pointer;" tabindex="0" onkeypress="if(event.keyCode == 13){fncGoDetail('');}"> + ');" style="cursor:pointer;"> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index 3fa5667c..d35d4410 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -1331,8 +1331,10 @@ 배정강사 - 만족도조사(학생) - 만족도조사(신청인) + + + 설문조사(학생) + 설문조사(신청인) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 8b55ade5..65f05692 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -13,13 +13,6 @@