diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index c4319464..0edde455 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -171,6 +171,8 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String day1cnt; private String day0cnt; + private String chk; + public String getLrnTmSum() { return lrnTmSum; } @@ -861,5 +863,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setHopeEduFld(String hopeEduFld) { this.hopeEduFld = hopeEduFld; } + public String getChk() { + return chk; + } + public void setChk(String chk) { + this.chk = chk; + } } diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index 396af28f..253e7872 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -22,6 +22,7 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.util.StringUtil; import kcc.com.uss.ion.fms.service.FmsFileVO; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; @@ -422,7 +423,7 @@ public class OprtnStateMngController { * 체험교실 선정교사 팝업 */ @RequestMapping("popup/slctnTeacherPopup.do") - public String rejectPopup(@ModelAttribute("veEduAplctVO") VEEduAplctVO vEEduAplctVO , + public String slctnTeacherPopup(@ModelAttribute("veEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { //선정교사 정보 불러오기 VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); @@ -434,6 +435,15 @@ public class OprtnStateMngController { model.addAttribute("info", vEEduAplctVO); return "oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup"; } + /** + * 체험교실 선정교사 일괄 팝업 - 운영목록에서 호출 + */ + @RequestMapping("popup/slctnTeacherChkPopup.do") + public String slctnTeacherChkPopup(@ModelAttribute("veEduAplctVO") VEEduAplctVO vEEduAplctVO , + ModelMap model , HttpServletRequest request ) throws Exception { + + return "oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup"; + } /** * 체험교실 선정교사 정보 등록 처리 @@ -464,10 +474,22 @@ public class OprtnStateMngController { try { vEInstrDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id vEInstrDetailVO.setDivCd("30"); //체험교실 코드 - // 기존에 등록된 선정교사 정보를 삭제 - vEInstrDetailService.deleteSlctnTeacher(vEInstrDetailVO); - // 선정교사 정보를 등록 - vEInstrDetailService.insertSlctnTeacher(vEInstrDetailVO); + //상세화면에서 선정교사 설정 단일 + if(StringUtil.isEmpty(vEInstrDetailVO.getChk())) { + // 기존에 등록된 선정교사 정보를 삭제 + vEInstrDetailService.deleteSlctnTeacher(vEInstrDetailVO); + // 선정교사 정보를 등록 + vEInstrDetailService.insertSlctnTeacher(vEInstrDetailVO); + }else { //운영 목록에서 선정교사 설정 일괄 + String[] eduAplctOrdArray = vEInstrDetailVO.getChk().split(","); + + for(String eduAplctOrd : eduAplctOrdArray) { + vEInstrDetailVO.setEduAplctOrd(eduAplctOrd); + vEInstrDetailService.deleteSlctnTeacher(vEInstrDetailVO); + vEInstrDetailService.insertSlctnTeacher(vEInstrDetailVO); + } + } + } catch (Exception ex) { ex.printStackTrace(); 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 2db52d7a..794c41a1 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 @@ -6165,6 +6165,12 @@ VALUES AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') REPLACE(#searchEndSbmtPnttm#, '.' , '') + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartRegistPnttm#, '.' , '') + + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndRegistPnttm#, '.' , '') + AND A.EDU_SLCT_AREA_CD = #eduSlctAreaCd# diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index 67a78a44..3172d650 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -47,6 +47,7 @@ */ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do */ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyRqstPopup.do */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.do + */kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.do diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp index 709f16f7..55687177 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp @@ -92,18 +92,54 @@ }); } + function fnCheckAll(){ + var chk = document.listForm.chk; + if(document.listForm.checkAll.checked) { + if(chk) { + if(chk.length > 1) { + for(var i=0; i < chk.length; i++) { + chk[i].checked = true; + } + } else { + chk.checked = true; + } + } + } else { + if(chk) { + if(chk.length > 1) { + for(var j=0; j < chk.length; j++) { + chk[j].checked = false; + } + } else { + chk.checked = false; + } + } + } + } + + function fncChkSlctnTeacherPopup() { + var chkLen = $(listForm).find("input[name=chk]:checked").length; + if(chkLen ==0){ + alert("선택된 항목이 없습니다."); + return; + } + commonPopWindowopenForm( + "${pageContext.request.contextPath}/kccadr/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.do" + , "500" + , "550" + , "SlctnTeacherPopup" + , $("#listForm") + ); + } 교육과정관리 -
- - - - - -
- + + + + + " /> " /> @@ -139,11 +175,11 @@

구분

- - 번호 지역 학교명 @@ -268,6 +306,9 @@ + + " type="checkbox" value=""/> + @@ -300,6 +341,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.jsp new file mode 100644 index 00000000..b82c11c8 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherChkPopup.jsp @@ -0,0 +1,149 @@ + +<%@ 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"%> + + + + + + + 선정교사 정보 + + + + + + "> +
+
+
+

수상이력

+
+ +
+

불성실 여부

+
+
+
+ + +
+
+ + +
+
+
+

수당지급 여부

+
+
+
+ + +
+
+ + +
+
+
+

보고서 평가

+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+

비고

+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp index b81d2662..534a8789 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/popup/slctnTeacherPopup.jsp @@ -85,7 +85,7 @@
-

불성실 여부${vEInstrDetailVO.unfthYn}

+

불성실 여부

@@ -98,7 +98,7 @@
-

수당지급 여부${vEInstrDetailVO.extraPayYn}

+

수당지급 여부

@@ -111,7 +111,7 @@
-

보고서 평가${vEInstrDetailVO.extraPayYn}

+

보고서 평가