From ad767e0c485dd2258cc1bfccffc0cea7c3ff560d Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 14 Nov 2023 16:56:38 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-14=2016:55=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EC=9E=90=EB=8F=99=20=EB=B0=B0=EC=A0=95=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/comweb/CommonWebController.java | 56 +- .../service/VEAutoAsgnmMIXService.java | 12 +- .../eduInfo/service/VEAutoAsgnmVO.java | 30 + .../service/impl/VEAutoAsgnmMIXDAO.java | 12 + .../impl/VEAutoAsgnmMIXServiceImpl.java | 10 + .../asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml | 6 +- .../ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml | 295 +++++- .../jsp/oprtn/adultVisitEdu/instrMngList.jsp | 30 +- .../jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp | 28 +- .../adultVisitEdu/eduAplct/eduAplctDetail.jsp | 23 +- .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 19 +- .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 994 +++++++++--------- .../tngrVisitEdu/eduAplct/eduAplctReg.jsp | 4 +- 13 files changed, 908 insertions(+), 611 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index fe6bd6e2..87298fb7 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -621,11 +621,13 @@ public class CommonWebController { vEEduAplctVO.setSearchAsgnmAprvlCd("90"); //Step1.자동배정 대상 차시가져오기 + //강사할당이 없는 배정 대상 차시를 가져온다. vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); } - //step2.배정 대상별 가능한 대상 강사 찾기 + //step2.배정 대상별 가능한 대상 강사 찾기 및 등록 + int p=0; { for (int i=0;i vEInstrAssiEduAplctVOList = vEAutoAsgnmMIXService.selectInstrMntAsgnmtChasiList(vEAutoAsgnmVO); - //step2-2.해당 차시 학교의 거주 강사 검색 - //step2-3.희망 지역 강사 검색 + //step2-2.희망 지역 강사 검색(필) + String s_user_id = "'aaa'"; + for (int j=0;j거주지별 배정 비율 필터(선택) + + + //강사배정 + if (vEInstrAssiEduAplctVOList.size()>0) { + VEInstrAsgnmVO p_vEInstrAsgnmVO = new VEInstrAsgnmVO(); + p_vEInstrAsgnmVO.setEduAplctOrd(tChasiInfo.getEduAplctOrd()); + p_vEInstrAsgnmVO.setEduChasiOrd(tChasiInfo.getEduChasiOrd()); + + p_vEInstrAsgnmVO.setUserId(vEInstrAssiEduAplctVOList.get(0).getUserId()); + p_vEInstrAsgnmVO.setFrstRegisterId(loginVO.getUniqId()); + p_vEInstrAsgnmVO.setAsgnmAprvlCd("10"); + p_vEInstrAsgnmVO.setAsgnmAprvlId(loginVO.getUniqId()); + p_vEInstrAsgnmVO.setRmrks("배정기준1순위"); + + //저장 + vEEduChasiInstrAsgnmService.insert(p_vEInstrAsgnmVO); + + //저장여부 확인 + //step3-1.해당 차시에 강사 배정이 있는지 확인 + VEInstrAsgnmVO vEInstrAsgnmVOTmp = vEEduChasiInstrAsgnmService.selectDetail(p_vEInstrAsgnmVO); + if (vEInstrAsgnmVOTmp!=null) p = p+1; + } } } @@ -656,6 +700,10 @@ public class CommonWebController { //this.setInstrAsgnm(p_step01_list, vEInstrAsgnmVO, loginVO); + System.out.println("p"); + System.out.println(p); + System.out.println(p); + //modelAndView.addObject("rsCnt", rs); modelAndView.addObject("result", "success"); return modelAndView; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmMIXService.java index 8df059cd..a2750b23 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmMIXService.java @@ -3,10 +3,18 @@ package kcc.ve.instr.tngrVisitEdu.eduInfo.service; import java.util.List; public interface VEAutoAsgnmMIXService { - - //해당 배정 차시의 달에 강사에게 할당된 차시 정보 + + //step2-1.가능 강사중 월별 시수이상을 받지 않은자 & 해당 요일에 수업 가능한 강사 리스트(필) List selectInstrMntAsgnmtChasiList(VEAutoAsgnmVO paramVO) throws Exception; //해당 차시 학교에 거주하는 강사 List selectRsdneInstrList(VEAutoAsgnmVO paramVO) throws Exception; + + //step2-2.희망 지역 강사 검색(필) + List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) throws Exception; + + + //step3-1.월별시수대비할당이적은자 우선(필) + List selectInstrPriorityList(VEAutoAsgnmVO paramVO) throws Exception; + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java index e717e935..0e8174ce 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java @@ -23,6 +23,12 @@ public class VEAutoAsgnmVO extends ComDefaultVO implements Serializable { private String rsdne; //강사거주지 private String hopeEduFld; //희망교육부분 private String asgnmTm; //할당된시간 + + private String eduChasiOrd; //차시 고유 순번 + + private String userIds; //강사아이디들 + + private String rownum; //배정순번 public String getEduHopeMnt() { @@ -88,6 +94,30 @@ public class VEAutoAsgnmVO extends ComDefaultVO implements Serializable { public void setAsgnmTm(String asgnmTm) { this.asgnmTm = asgnmTm; } + + public String getEduChasiOrd() { + return eduChasiOrd; + } + + public void setEduChasiOrd(String eduChasiOrd) { + this.eduChasiOrd = eduChasiOrd; + } + + public String getUserIds() { + return userIds; + } + + public void setUserIds(String userIds) { + this.userIds = userIds; + } + + public String getRownum() { + return rownum; + } + + public void setRownum(String rownum) { + this.rownum = rownum; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java index 796e5329..0a99e25b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java @@ -22,5 +22,17 @@ public class VEAutoAsgnmMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEAutoAsgnmDAO.selectInstrHopeAreaList", paramVO); + return tlist; + } + + public List selectInstrPriorityList(VEAutoAsgnmVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEAutoAsgnmDAO.selectInstrPriorityList", paramVO); + return tlist; + } + } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java index a6cfe9cb..aff446c5 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java @@ -27,5 +27,15 @@ public class VEAutoAsgnmMIXServiceImpl implements VEAutoAsgnmMIXService { public List selectRsdneInstrList(VEAutoAsgnmVO paramVO) throws Exception{ return vEAutoAsgnmMIXDAO.selectRsdneInstrList(paramVO); } + + @Override + public List selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) throws Exception{ + return vEAutoAsgnmMIXDAO.selectInstrHopeAreaList(paramVO); + } + + @Override + public List selectInstrPriorityList(VEAutoAsgnmVO paramVO) throws Exception{ + return vEAutoAsgnmMIXDAO.selectInstrPriorityList(paramVO); + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml index 678d41de..87fca626 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduChasiInstrAsgnm_SQL_Tibero.xml @@ -49,9 +49,9 @@ a.pnlty_id AS pnltyId, a.pnlty_cn AS pnltyCn, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId, a.prvs_srvy_ord AS prvsSrvyOrd, @@ -67,6 +67,7 @@ + /* VEEduChasiInstrAsgnmDAO.insert */ MERGE INTO T1 USING DUAL ON (T1.EDU_APLCT_ORD = #eduAplctOrd# AND T1.EDU_CHASI_ORD = #eduChasiOrd#) WHEN MATCHED THEN @@ -116,6 +117,7 @@ /* VEAutoAsgnmDAO.selectInstrMntAsgnmtChasiList */ - SELECT NVL(aa.chasi,0) AS chasi + SELECT + dd.EDU_APLCT_ORD + , dd.EDU_CHASI_ORD + , dd.EDU_HOPE_DT + + /* 해당요일 가능 여부 */ + , CASE + /* 월 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=2 AND ee.mon_lctr_yn='Y' + THEN 'Y' + + /* 화 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=3 AND ee.tue_lctr_yn='Y' + THEN 'Y' + + /* 수 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=4 AND ee.wed_lctr_yn='Y' + THEN 'Y' + + /* 목 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=5 AND ee.thu_lctr_yn='Y' + THEN 'Y' + + /* 금 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=6 AND ee.fri_lctr_yn='Y' + THEN 'Y' + + ELSE 'N' + + + END AS psblDayYn + + , NVL(aa.instrSumChasi,0) AS instrSumChasi /* 해당 강사 할당된 총차시 */ , cc.userId , cc.rsdne , cc.hopeEduFld @@ -135,13 +167,16 @@ /* , bb.* */ - FROM vea_instr_indvd_mnt_tm bb /* 강사의 월별 배정가능한 시수 */ + FROM + ve_edu_chasi dd + , ve_lctr_stng ee + , vea_instr_indvd_mnt_tm bb /* 강사의 월별 배정가능한 시수 */ LEFT OUTER JOIN ( /* 강사에게 교육이 할당(확정, 반려, 요청전, 요첮우 모두 포함)된 차시수 */ SELECT d.user_id, - sum(NVL(b.chasi, 0)) AS chasi + sum(NVL(b.chasi, 0)) AS instrSumChasi FROM ve_edu_aplct a , ve_edu_chasi b LEFT OUTER JOIN ve_edu_chasi_instr_asgnm d @@ -206,8 +241,14 @@ cc.userId=bb.user_id ) WHERE 1=1 - AND bb.YR=#yr# - + AND dd.EDU_CHASI_ORD =#eduChasiOrd# + AND bb.YR=substring(dd.edu_hope_dt,0,4) + + AND ee.use_yn='Y' + AND ee.user_id=cc.userId + + + /* 대상 조건 1. 해당 월의 배정된 차시가 최대 차시 이내인 강사만 대상임 */ AND NVL( CASE WHEN '01'=#eduHopeMnt# THEN m01_tm @@ -224,7 +265,74 @@ WHEN '12'=#eduHopeMnt# THEN m12_tm END - ,0)>NVL(aa.chasi,0) + ,0)>NVL(aa.instrSumChasi,0) + + /* 대상 조건 2. 해당 요일에 수업 가능한 강사만 대상임 */ + + AND CASE + /* 월 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=2 AND ee.mon_lctr_yn='Y' + THEN 'Y' + + /* 화 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=3 AND ee.tue_lctr_yn='Y' + THEN 'Y' + + /* 수 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=4 AND ee.wed_lctr_yn='Y' + THEN 'Y' + + /* 목 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=5 AND ee.thu_lctr_yn='Y' + THEN 'Y' + + /* 금 */ + WHEN to_char(to_date(dd.EDU_HOPE_DT,'YYYY.MM.DD'),'d')=6 AND ee.fri_lctr_yn='Y' + THEN 'Y' + + ELSE 'N' + + END ='Y' + + /* 신청한 요일이 적은 강사부터 배정 대상으로 한다. */ + ORDER BY CASE + /* 월 */ + WHEN ee.mon_lctr_yn='Y' + THEN 1 + ELSE 0 + END + + + + CASE + /* 화 */ + WHEN ee.tue_lctr_yn='Y' + THEN 1 + ELSE 0 + END + + + + CASE + /* 수 */ + WHEN ee.wed_lctr_yn='Y' + THEN 1 + ELSE 0 + END + + + + CASE + /* 목 */ + WHEN ee.thu_lctr_yn='Y' + THEN 1 + ELSE 0 + END + + + + CASE + /* 금 */ + WHEN ee.fri_lctr_yn='Y' + THEN 1 + ELSE 0 + END @@ -349,5 +457,178 @@ END ,0)>NVL(aa.chasi,0) - + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp index d1f57b27..85ddefbd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -328,40 +328,14 @@ var v_searcDivCd = $('#searcDivCd').val(); var v_searchKeyword = $('#searchKeyword').val(); - //alert('/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]'); - - var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); - //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]'); - //viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]'); - //viewer.openFile('sample.mrd','/rfn [sample.txt]'); + 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+']'); - //viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd - //viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]'); - //viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']'); + //viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]'); viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']'); //viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn='+v_searchQlfctEndYn+'&p_searcDivCd='+v_searcDivCd+'&p_searchKeyword='+v_searchKeyword+']'); - //System.out.println(request.getParameter("searchQlfctEndYn")); - //System.out.println(request.getParameter("searcDivCd")); - //System.out.println(request.getParameter("searchKeyword")); - - - /* - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service', - 'crownix-viewer'); -viewer.openFile('cmplt_crtfc_20231030.mrd'); -*/ } - /* - window.onload = function(){ - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service'); - viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]'); - }; - */ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp index 356ef151..7cf26471 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -997,34 +997,16 @@ var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); - //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]'); - //viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]'); - //viewer.openFile('sample.mrd','/rfn [sample.txt]'); + 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+']'); - //viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd - //viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]'); - //viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']'); - //viewer.openFile('adult_instrs_20231107.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrDetailListAjax.do?p_searchQlfctEndYn="'+v_searchQlfctEndYn+'"&p_searcDivCd="'+v_searcDivCd+'"&p_searchKeyword="'+v_searchKeyword+'"]'); + //viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']'); - viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.59:3080/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']'); + viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.59:2080/offedu/ve/aplct/tngrVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+']'); - - /* - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service', - 'crownix-viewer'); -viewer.openFile('cmplt_crtfc_20231030.mrd'); -*/ + } - /* - window.onload = function(){ - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service'); - viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]'); - }; - */ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp index 227a59f6..e5955921 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp @@ -723,32 +723,15 @@ var v_userId = $('#p_instrId').val(); var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); - //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]'); - //viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]'); - //viewer.openFile('sample.mrd','/rfn [sample.txt]'); + 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+']'); - //viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd + //viewer.openFile('adult_instr_20231102.mrd', '/rfn [adult_instr_20231102.json]'); //viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+('#p_instrId').val()+']'); viewer.openFile('adult_instr_20231102.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetailAjax.do?p_instrId='+v_userId+']'); - - - /* - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service', - 'crownix-viewer'); -viewer.openFile('cmplt_crtfc_20231030.mrd'); -*/ } - /* - window.onload = function(){ - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service'); - viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]'); - }; - */ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index e1ae293d..f0ff7b2f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -237,28 +237,13 @@ $(document).ready(function(){ function fncCmpltCrtfc(p_prcsAplctPrdOrd, p_eduAplctOrd){ var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); - //viewer.openFile('cmplt_crtfc_20231030.mrd', '/rfn [jsonsample_red_2.json]'); - //viewer.openFile('cmplt_crtfc_20231030.mrd','/rexport [5]'); - //viewer.openFile('sample.mrd','/rfn [sample.txt]'); + 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+']'); - //viewer.openFile('sample.mrd');p_prcsAplctPrdOrd, p_eduAplctOrd - - - /* - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service', - 'crownix-viewer'); -viewer.openFile('cmplt_crtfc_20231030.mrd'); -*/ } - /* - window.onload = function(){ - var viewer = new m2soft.crownix.Viewer('http://192.168.0.176:8093/ReportingServer/service'); - viewer.openFile('json_subject.mrd', '/rfn [jsonsample_red_2.json]'); - }; - */ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index d887de64..ebaca0b6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -1,507 +1,489 @@ -<%@ page contentType="text/html; charset=utf-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> -<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> -<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - -교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 - - - - - - - - - -
- -
- - -
- -
- - -
- -
- -
-
- -
-
-
- - - - " /> - " /> - - -
-

신청목록

-
- - -
-
-
-
- - -
-
-
- <%-- --%> - -
- ~ -
- <%-- --%> - -
- - - -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
교육 목록표
교육과정교육일자신청결과설문조사이수증
');" style="cursor:pointer;"> - () - -<%-- ~ --%> - - - - - - - - - - (취소-반려) - - - - - - - - - - - - - - - - - - - - - - 설문완료 - - - - - - - - - - - - - - 교육완료 - - - - - - - - - -
-
- -
-
-
-
-
-
- -
-
- - -
- -
- -
- - - - - - -
-
-
-

취소 사용 제출

- -
-
-
-
- -
-
- - - - - - - - - -
취소사유
- -
-
-
-
- - -
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - -
-
-
-
-
-
-
-
- - - - - - - - - - - - + + + + + + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ +
+
+
+ + + + " /> + " /> + + +
+

신청목록

+
+ + +
+
+
+
+ + +
+
+
+ <%-- --%> + +
+ ~ +
+ <%-- --%> + +
+ + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육 목록표
교육과정교육일자신청결과설문조사이수증
');" style="cursor:pointer;"> + () + +<%-- ~ --%> + + + + + + + + + + (취소-반려) + + + + + + + + + + + + + + + + + + + + + + 설문완료 + + + - + + + + + + + + + + 교육완료 + + + - + + + + + +
+
+ +
+
+
+
+
+
+ +
+
+ + +
+ +
+ +
+ + + + + + +
+
+
+

취소 사용 제출

+ +
+
+
+
+ +
+
+ + + + + + + + + +
취소사유
+ +
+
+
+
+ + +
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + +
+
+
+
+
+
+
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index 1834edf0..b80f2caa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -1065,8 +1065,8 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 - checked> - checked> +<%-- checked> --%> +<%-- checked> --%>