diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index f0dda77a..04c10994 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -493,7 +494,42 @@ public class MyPageController { return "web/my/myQnaMngDetail"; } - + @RequestMapping(value = { "/web/my/myNotifyMngDeleteAjax.do"}) + public ModelAndView myNotifyMngDeleteAjax( + @ModelAttribute("notifyManageVO") NotifyManageVO notifyManageVO + , ModelMap model + , RedirectAttributes redirectAttributes + , HttpSession session + , HttpServletRequest request + , String[] chk + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + modelAndView.addObject("result", "loginFail"); + } + //로그인 처리==================================== + + try { + notifyManageVO.setCmmNotifyOrdArr(chk); + notifyManageService.updateChkedUseYnN(notifyManageVO); + modelAndView.addObject("result", "success"); + }catch(Exception e) { + e.printStackTrace(); + modelAndView.addObject("result", "fail"); + } + + //세부과정 목록 조회 + + return modelAndView; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java index 1e95bc60..38137c33 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageService.java @@ -60,6 +60,8 @@ public interface NotifyManageService { int selectNotifyCnt(String uniqId); void updateM7DaysUseYnN(); + + void updateChkedUseYnN(NotifyManageVO notifyManageVO); } diff --git a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java index 81a71248..9fb49704 100644 --- a/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java +++ b/src/main/java/kcc/let/uss/notify/service/NotifyManageVO.java @@ -46,6 +46,7 @@ public class NotifyManageVO extends ComDefaultVO implements Serializable { private String mngUserId; private String mngUserNm; + private String[] cmmNotifyOrdArr; public String getCmmNotifyOrd() { return cmmNotifyOrd; @@ -143,6 +144,12 @@ public class NotifyManageVO extends ComDefaultVO implements Serializable { public void setMngUserNm(String mngUserNm) { this.mngUserNm = mngUserNm; } + public String[] getCmmNotifyOrdArr() { + return cmmNotifyOrdArr; + } + public void setCmmNotifyOrdArr(String[] cmmNotifyOrdArr) { + this.cmmNotifyOrdArr = cmmNotifyOrdArr; + } diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java index 9938ac02..78b19f10 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageDAO.java @@ -5,8 +5,6 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; -import kcc.com.cmm.service.CmmnDetailCode; -import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; import kcc.let.uss.notify.service.NotifyManageVO; /** @@ -85,6 +83,9 @@ public class NotifyManageDAO extends EgovAbstractDAO { public void updateM7DaysUseYnN() { update("VEANotifyDAO.updateM7DaysUseYnN"); } + public void updateChkedUseYnN(NotifyManageVO notifyManageVO) { + update("VEANotifyDAO.updateChkedUseYnN", notifyManageVO); + } } diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 42ff852e..639b1763 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -392,4 +392,10 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements notifyManageDAO.updateM7DaysUseYnN(); } + + @Override + public void updateChkedUseYnN(NotifyManageVO notifyManageVO) { + notifyManageDAO.updateChkedUseYnN(notifyManageVO); + + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java index 4b2f47b8..9c93969e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java @@ -23,6 +23,15 @@ public class VEEduSatisfactionExcelVO { private String qestnSn8; //항목8 private String srt; //정렬순서 + + private String qestnSn; //정렬순서 + private String qestnCn; //정렬순서 + private String verySatisfied; //정렬순서 + private String satisfied; //정렬순서 + private String neither; //정렬순서 + private String disSatisfied; //정렬순서 + private String veryDisSatisfied; //정렬순서 + public String getEduHopeDt() { return eduHopeDt; @@ -151,5 +160,61 @@ public class VEEduSatisfactionExcelVO { public void setSrt(String srt) { this.srt = srt; } + + public String getQestnSn() { + return qestnSn; + } + + public void setQestnSn(String qestnSn) { + this.qestnSn = qestnSn; + } + + public String getQestnCn() { + return qestnCn; + } + + public void setQestnCn(String qestnCn) { + this.qestnCn = qestnCn; + } + + public String getVerySatisfied() { + return verySatisfied; + } + + public void setVerySatisfied(String verySatisfied) { + this.verySatisfied = verySatisfied; + } + + public String getSatisfied() { + return satisfied; + } + + public void setSatisfied(String satisfied) { + this.satisfied = satisfied; + } + + public String getNeither() { + return neither; + } + + public void setNeither(String neither) { + this.neither = neither; + } + + public String getDisSatisfied() { + return disSatisfied; + } + + public void setDisSatisfied(String disSatisfied) { + this.disSatisfied = disSatisfied; + } + + public String getVeryDisSatisfied() { + return veryDisSatisfied; + } + + public void setVeryDisSatisfied(String veryDisSatisfied) { + this.veryDisSatisfied = veryDisSatisfied; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index d7b53884..b4a9f6cc 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -165,6 +165,8 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private List eduAplctOrdList; //교육신청순번 private List sspnIdtmtTrgtOrdList; //교육신청순번 + private String siteIdCd; //10-학생, 20-선생, 30-강사 + public int getChasi() { return chasi; } @@ -2058,6 +2060,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setMberId(String mberId) { this.mberId = mberId; } + public String getSiteIdCd() { + return siteIdCd; + } + public void setSiteIdCd(String siteIdCd) { + this.siteIdCd = siteIdCd; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index dbd6d80b..3f254ffa 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -69,6 +69,8 @@ public interface VEEduMIXService { List selectSatisfactionExcelList(VEEduAplctVO vEEduAplctVO) throws Exception; + List selectSatisfaction202401ExcelList(VEEduAplctVO vEEduAplctVO) throws Exception; + List selectOprtnExcelList(VEEduAplctVO vEEduAplctVO) throws Exception; void insertExprnClsrmEndInfo(VEEduAplctVO vEEduAplctVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index bbc60ff8..7aa3f93c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -173,6 +173,12 @@ public class VEEduMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectSatisfaction202401ExcelList(VEEduAplctVO vEEduAplctVO) throws Exception { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectSatisfaction202401ExcelList", vEEduAplctVO); + return tlist; + } + public List selectOprtnExcelList(VEEduAplctVO vEEduAplctVO) throws Exception { @SuppressWarnings("unchecked") List tlist = (List) list("VEEduMIXDAO.selectOprtnExcelList", vEEduAplctVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index aa558bc2..8155522a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -146,6 +146,11 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { return vEEduMIXDAO.selectSatisfactionExcelList(vEEduAplctVO); } + @Override + public List selectSatisfaction202401ExcelList(VEEduAplctVO vEEduAplctVO) throws Exception { + return vEEduMIXDAO.selectSatisfaction202401ExcelList(vEEduAplctVO); + } + @Override public List selectOprtnExcelList(VEEduAplctVO vEEduAplctVO) throws Exception { return vEEduMIXDAO.selectOprtnExcelList(vEEduAplctVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java index a8e2c4cc..1eb0c71a 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java @@ -8,8 +8,6 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import javax.annotation.Resource; - import org.apache.poi.EncryptedDocumentException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.Cell; @@ -21,10 +19,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import kcc.com.cmm.ComDefaultCodeVO; -import kcc.com.cmm.service.EgovCmmUseService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; public class TrgtExcelReader { @@ -49,30 +44,38 @@ public class TrgtExcelReader { Row row = sheet.getRow(i); if (row != null) { - CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); - -// cndtnTrgtMngVO.set getCellValue(row.getCell(0)); - cndtnTrgtMngVO.setReqPnttm(getCellValue(row.getCell(1))); // 의뢰번호 - - String vntInfo[] = getCellValue(row.getCell(2)).split("형제"); - cndtnTrgtMngVO.setVntYear( vntInfo[0] ); // 사건번호 년 - cndtnTrgtMngVO.setVntNmbr( vntInfo[1] ); // 사건번호 번호 - cndtnTrgtMngVO.setCmptntAthrt( getCellValue(row.getCell(3))); - cndtnTrgtMngVO.setdBirth( getCellValue(row.getCell(4)).replaceAll("-", "")); // 생년월일 - cndtnTrgtMngVO.setTrgtNm( getCellValue(row.getCell(5))); // 대상자 이름 - cndtnTrgtMngVO.setSex( getCellValue(row.getCell(6))); - cndtnTrgtMngVO.setAddr( getCellValue(row.getCell(7))); // 주소, detail과 구분해야함 - cndtnTrgtMngVO.setPost( getCellValue(row.getCell(8))); // 우편번호 - cndtnTrgtMngVO.setClphone( getCellValue(row.getCell(9)).replaceAll("-", "")); // 핸드폰 - cndtnTrgtMngVO.setReqNmbr( getCellValue(row.getCell(10))); // 의뢰번호 - cndtnTrgtMngVO.setPrsctrNm( getCellValue(row.getCell(11))); // 담당검사 이름 + try { + CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); + +// cndtnTrgtMngVO.set getCellValue(row.getCell(0)); + cndtnTrgtMngVO.setReqPnttm(getCellValue(row.getCell(1))); // 의뢰번호 + + System.out.println("row.getCell(2)"); + System.out.println(row.getCell(2)); + + String vntInfo[] = getCellValue(row.getCell(2)).split("형제"); + cndtnTrgtMngVO.setVntYear( vntInfo[0] ); // 사건번호 년 + cndtnTrgtMngVO.setVntNmbr( vntInfo[1] ); // 사건번호 번호 + cndtnTrgtMngVO.setCmptntAthrt( getCellValue(row.getCell(3))); + cndtnTrgtMngVO.setdBirth( getCellValue(row.getCell(4)).replaceAll("-", "")); // 생년월일 + cndtnTrgtMngVO.setTrgtNm( getCellValue(row.getCell(5))); // 대상자 이름 + cndtnTrgtMngVO.setSex( getCellValue(row.getCell(6))); + cndtnTrgtMngVO.setAddr( getCellValue(row.getCell(7))); // 주소, detail과 구분해야함 + cndtnTrgtMngVO.setPost( getCellValue(row.getCell(8))); // 우편번호 + cndtnTrgtMngVO.setClphone( getCellValue(row.getCell(9)).replaceAll("-", "")); // 핸드폰 + cndtnTrgtMngVO.setReqNmbr( getCellValue(row.getCell(10))); // 의뢰번호 + cndtnTrgtMngVO.setPrsctrNm( getCellValue(row.getCell(11))); // 담당검사 이름 - cndtnTrgtMngVO.setReqStateCd( getCellValue(row.getCell(12)) ); // 의뢰상태 코드 , if로 구분해야함 - cndtnTrgtMngVO.setEduStateCd( getCellValue(row.getCell(13))); // 교육 상태 코드 - cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt( getCellValue(row.getCell(14))); // 병합상태코드 - cndtnTrgtMngVO.setRmrks( getCellValue(row.getCell(15))); // 비고 - - cndtnTrgtInfoMngVOList.add(cndtnTrgtMngVO); + cndtnTrgtMngVO.setReqStateCd( getCellValue(row.getCell(12)) ); // 의뢰상태 코드 , if로 구분해야함 + cndtnTrgtMngVO.setEduStateCd( getCellValue(row.getCell(13))); // 교육 상태 코드 + cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt( getCellValue(row.getCell(14))); // 병합상태코드 + cndtnTrgtMngVO.setRmrks( getCellValue(row.getCell(15))); // 비고 + + cndtnTrgtInfoMngVOList.add(cndtnTrgtMngVO); + + }catch(Exception ex) { + ex.printStackTrace(); + } } } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index b61d3347..cbbdb08a 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -1671,6 +1671,67 @@ public class EduRsltMngTngrController { return modelAndView; } + //강사만족도 excel download + @SuppressWarnings("rawtypes") + @RequestMapping(value = "eduRsltSatisfaction202401ExcelDownLoad.do") + public ModelAndView eduRsltSatisfaction202401ExcelDownLoad(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model) throws Exception { + + try { + // 요청, 반려건 + vEEduAplctVO.setSearchNotStatusArr(new String[]{"60"}); + // 청소년 + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10); + vEEduAplctVO.setMode(VeConstants.MODE_EXCEL); + vEEduAplctVO.setSiteId("10"); + vEEduAplctVO.setSiteIdCd("10"); + vEEduAplctVO.setInstrDiv("10"); + List list = vEEduMIXService.selectSatisfaction202401ExcelList(vEEduAplctVO); + + // 복호화 + list = egovCryptoUtil.decryptVEEduSatisfactionExcelVOList(list); + + System.out.println("out-list-2"); + + + List excelData = new ArrayList<>(); + excelData.addAll(list); + + + // 세팅값 + String title = "청소년 찾아가는 저작권 교육 강사만족도"; + int[] width = { + 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000 + }; // 너비 + + //33개 항목 + String[] header = { + "교육일자", "학교명", "강사명", "순번", "질문" + , "매우만족", "만족", "보통", "불만족", "매우불만족" + }; + + String[] order = { + "EduHopeDt", "ScholInsttNm", "InstrNm", "QestnSn", "QestnCn" + , "VerySatisfied", "Satisfied", "Neither", "DisSatisfied", "VeryDisSatisfied" + }; + + // 호출 + SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); + model.addAttribute("locale", Locale.KOREA); + model.addAttribute("workbook", workbook); + model.addAttribute("workbookName", title); + + }catch(Exception ep) { + ep.getStackTrace(); + } + + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("excelDownloadView"); + modelAndView.addObject(model); + return modelAndView; + } + /** * 교육설문 삭제 - 청소년, 성인 공통 - 사용자 개인별 만족도 등록자 삭제 */ diff --git a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml index 93155c2f..82ffc45c 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/ccm/notify/VEANotify_SQL_Tibero.xml @@ -165,4 +165,10 @@ WHERE FRST_REGIST_PNTTM SYSDATE - 7; + + + UPDATE VEA_CMM_NOTIFY + SET USE_YN = 'N' + WHERE #cmmNotifyOrdArr[]# + \ No newline at end of file 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 7ccec155..a12c4928 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 @@ -6518,6 +6518,451 @@ VALUES + + + UPDATE ve_edu_rslt_rprt diff --git a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml index 8c624f34..640e86f0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml @@ -213,8 +213,8 @@ d.QUSTNR_TMPLAT_ID =e.QUSTNR_TMPLAT_ID AND d.QESTNR_ID =e.QESTNR_ID AND d.QUSTNR_RESPOND_ID =e.QUSTNR_RESPOND_ID - AND d.EDU_APLCT_ORD = d.EDU_APLCT_ORD - AND d.EDU_CHASI_ORD = d.EDU_CHASI_ORD + AND d.EDU_APLCT_ORD = e.EDU_APLCT_ORD + AND d.EDU_CHASI_ORD = e.EDU_CHASI_ORD ) LEFT OUTER JOIN ( 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 44436231..49753ed0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -304,10 +304,24 @@ }); alert("발송되었습니다."); } + + function fn_excel_upload() { + + var form = document.excelForm; + +// form.action = ""; + form.action = ""; + + window.open("#", "_duplChkPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=950px"); + form.target = "_duplChkPopup"; + form.submit(); + } 교육과정관리 +
+
@@ -606,9 +620,10 @@
- +
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index f4b30536..f6e87882 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -279,6 +279,12 @@ listForm.submit(); } + function fncSatisfaction202401ExcelDownLoad(){ + var listForm = document.listForm ; + listForm.action = ""; + listForm.submit(); + } + //숙박영수증 첨부파일 일괄 다운로드(zip) - 파일ID 다름, SN 동일 : type A function fnAcmdtFileZipDownload(){ var frm = document.listForm; @@ -546,7 +552,7 @@
- + (*교육일자 조건만 지원)
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp index 27b2262a..af0d7a47 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp @@ -344,79 +344,90 @@ -
-
+
- - - - -
-
-
- diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index b784c6db..a5267ac0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -240,14 +240,13 @@ function usrJoin(){ diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index 35c2e5c0..8fb458f7 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -778,7 +778,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .mypage_wrap .mypage .wrap{height: 178px; border-radius: 10px; background-color: #eaedf1;} .mypage_wrap .mypage .wrap .title{border-radius: 10px 10px 0 0; background-color: #3a72db; text-align: center; font-size: 20px; color: #fff; font-weight: 500; line-height: 53px;} .mypage_wrap .mypage .wrap .title p img{margin: 0 0 4px 0;} -.mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 68px); height: calc(100% - 116px); padding: 7px 7px 10px 7px; margin: 23px auto 0 auto; border-radius: 10px; background-color: #fff; font-size: 18px; font-weight: 400; color: #666; text-align: center; line-height: 1.4;} +.mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 68px); height: calc(100% - 116px); padding: 7px 7px 10px 17px; margin: 23px auto 0 auto; border-radius: 10px; background-color: #fff; font-size: 18px; font-weight: 400; color: #666; text-align: center; line-height: 1.4;} .mypage_wrap .mypage .wrap .inner_text a i{display: inline-block; width: 4px; height: 4px; background-color: #3a72db; margin: 0 5px 4px 0; border-radius: 100%;} .mypage_wrap .mypage .wrap .inner_text a p span{margin: 0 0 0 20px; font-size: 22px; font-weight: 500; color: #222;} .mypage_wrap .mypage .wrap .inner_text a:hover *{color: #e95504;} @@ -876,7 +876,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /*마이페이지 추가*/ .mypage_wrap .mypage{margin: 0 0 20px 0;} .mypage_wrap .mypage li{width: calc((100% - 45px)/2); margin: 0 0 40px 0;} - .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 67px); height: calc(100% - 116px); padding: 7px 7px 11px 7px; margin: 21px auto 0 auto;} + .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 67px); height: calc(100% - 116px); padding: 7px 7px 11px 17px; margin: 21px auto 0 auto;} /*.mypage_wrap .mypage_table .right{margin: 0 40px 0 0;}*/ .tb_tit01{display: block;} @@ -1137,7 +1137,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa /*마이페이지 추가*/ /*.mypage_wrap .mypage{margin: 0 0 -40px 0;}*/ .mypage_wrap .mypage li{width: calc((100% - 26px)/2); margin: 0 0 25px 0;} - .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 7px; margin: 21px auto 0 auto;} + .mypage_wrap .mypage .wrap .inner_text{width: calc(100% - 63px); height: calc(100% - 113px); padding: 9px 7px 8px 17px; margin: 21px auto 0 auto;} .time_layer.on{position:fixed; width:100%; top:calc(100% - 143px); left:0; border:0;} } diff --git a/src/main/webapp/visitEdu/usr/publish/css/popup.css b/src/main/webapp/visitEdu/usr/publish/css/popup.css index d3c0f4de..f9025eba 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/popup.css +++ b/src/main/webapp/visitEdu/usr/publish/css/popup.css @@ -130,6 +130,11 @@ /*성인 > 완료상세 > 교육완료 내용 > 강사 참석 확인서 업로드 팝업 > 확인, 취소 버튼 여백 수정*/ .upload_pop .upload_btn{margin: 20px 0 0 0;} +/*청소년, 성인 > 완료상세 > 설문QR 레이어팝업 > QR코드 가운데 정렬 수정 + 스크롤 없앰*/ +.popup_cont .cont_body .qr_wrap{margin-bottom: 0px; overflow-y: hidden;} +.popup_cont .cont_body .qr_wrap .qr_img img{margin: 0 auto; /*display: block;*/} + + @media all and (max-width: 767px){ .popup_cont {padding: 10px;} .popup_wrap.popType02 {width: 360px;}