From b147527a9d8647c6b3c4ec42798533744493cbec Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 2 Jan 2024 16:46:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=20=EA=B0=95=EC=82=AC=20>=20=EA=B8=B0=EB=B0=98,=20?= =?UTF-8?q?=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20=EC=A2=85=EB=A3=8C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=20=EA=B2=B0=EA=B3=BC=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=EC=84=9C=20=EC=B6=94=EA=B0=80/=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../innorix/service/InnorixFileService.java | 3 + .../service/impl/InnorixFileServiceImpl.java | 30 ++++++++++ .../innorix/web/InnorixFileController.java | 24 ++++++++ .../asgnmInfo/web/VEFndtnAsgnmController.java | 5 ++ .../web/VESspnIdtmtAsgnmController.java | 5 ++ .../VEAPrcsAplctPrdInstrAsgnmService.java | 2 + .../impl/VEAPrcsAplctPrdInstrAsgnmDAO.java | 5 ++ .../VEAPrcsAplctPrdInstrAsgnmServiceImpl.java | 7 +++ .../VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml | 13 ++++- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 8 +-- .../cndtnEduPrcsAplctCfnMngDetail.jsp | 17 ++++-- .../fndthEduPrcsAplctCfnMngDetail.jsp | 13 ++++- .../asgnmInfo/instrAsgnmDetail.jsp | 1 + .../asgnmInfo/instrAsgnmEndDetail.jsp | 52 ++++++++++++----- .../fndtnVisitEdu/endInfo/instrEduEndList.jsp | 6 +- .../asgnmInfo/instrAsgnmDetail.jsp | 1 + .../endInfo/instrAsgnmEndDetail.jsp | 58 +++++++++++++++---- .../endInfo/instrEduEndList.jsp | 4 +- src/main/webapp/innorix/innorix_dev.js | 4 +- 19 files changed, 215 insertions(+), 43 deletions(-) diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java index f8804d1e..08fe074a 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -44,4 +44,7 @@ public interface InnorixFileService { RestResponse insertInnorixReqRsltAjax(AdrInnorixFileVO adrInnorixFileVO); + //기반,기소 결과보고서 저장 + RestResponse insertInnorixDocAtchFile(AdrInnorixFileVO adrInnorixFileVO); + } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index 347f0b29..71ab8854 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -606,4 +606,34 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); } + + @Override + public RestResponse insertInnorixDocAtchFile(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + + VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO = new VEAPrcsAplctPrdInstrAsgnmVO(); + vEAPrcsAplctPrdInstrAsgnmVO.setDocAtchFileId(atchFileId); + + vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); + vEAPrcsAplctPrdInstrAsgnmVO.setPrcsAplctPrdOrd(adrInnorixFileVO.getPrcsAplctPrdOrd()); + vEAPrcsAplctPrdInstrAsgnmVO.setUserId(adrInnorixFileVO.getUniqId()); + + //저장 + vEAPrcsAplctPrdInstrAsgnmService.updatDocAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); + } } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java index f3a345b7..c22bcc91 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -281,4 +281,28 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.insertInnorixDocFile(adrInnorixFileVO)); } + + /** + * @methodName : insertInnorixDocAtchFile + * @author : 이호영 + * @date : 2023.07.20 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/web/common/insertInnorixDocAtchFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixDocAtchFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + adrInnorixFileVO.setUniqId(userId); + + return ResponseEntity.ok(innorixService.insertInnorixDocAtchFile(adrInnorixFileVO)); + } } \ No newline at end of file diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java index b3032c19..c1d079e4 100644 --- a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -272,6 +272,11 @@ public class VEFndtnAsgnmController { model.addAttribute("instrAsgnmList", instrAsgnmList); } + //강사 강의계획서, 결과보고서 정보 + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO); + model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail); + //사용자 교육신청 차시 리스트 - 설문정보 { //사용자 교육신청 차시 리스트 diff --git a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java index 0a07d99f..00bf41ca 100644 --- a/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java +++ b/src/main/java/kcc/ve/instr/sspnIdtmt/asgnmInfo/web/VESspnIdtmtAsgnmController.java @@ -270,6 +270,11 @@ public class VESspnIdtmtAsgnmController { model.addAttribute("instrAsgnmList", instrAsgnmList); } + //강사 강의계획서 정보 + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + VEAPrcsAplctPrdInstrAsgnmVO vEPrcsInstrAsgnmDetail = vEAPrcsAplctPrdInstrAsgnmService.selectPrcsInstrAsgnmDetail(vEPrcsDetailVO); + model.addAttribute("instrInfo", vEPrcsInstrAsgnmDetail); + //사용자 교육신청 차시 리스트 - 설문정보 { //사용자 교육신청 차시 리스트 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java index 1ddf0875..a5b32908 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java @@ -23,4 +23,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService { void updateEduStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO); VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO); + + void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java index 49f2e7bd..1afcd5c1 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -55,4 +55,9 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { public VEAPrcsAplctPrdInstrAsgnmVO selectPrcsInstrAsgnmDetail(VEPrcsDetailVO vEDetailVO) { return (VEAPrcsAplctPrdInstrAsgnmVO) select("VEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail", vEDetailVO); } + + public void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + update("VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO); + + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java index 01389d04..3070d050 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -81,4 +81,11 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst return vEAPrcsAplctPrdInstrAsgnmDAO.selectPrcsInstrAsgnmDetail(vEDetailVO); } + + @Override + public void updatDocAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + vEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } + } diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index 5675386f..6b7e5922 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -209,5 +209,16 @@ - + + + + /* VEAPrcsAplctPrdInstrAsgnmDAO.updatDocAtchFileId */ + + UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM + SET doc_atch_file_id = #docAtchFileId# + , last_updusr_id = #lastUpdusrId# + , last_updt_pnttm = sysdate + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + AND user_id = #userId# + diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 9fd7e945..def4e691 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -528,10 +528,10 @@ - AND a.edu_strt_pnttm >= #srchKwd2_1# + AND REPLACE(a.edu_strt_pnttm, '.', '') >= REPLACE(#srchKwd2_1#, '.', '') - AND #srchKwd2_2# >= a.edu_strt_pnttm + AND REPLACE(#srchKwd2_2#, '.', '') >= REPLACE(a.edu_strt_pnttm, '.', '') @@ -549,10 +549,10 @@ - AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') ]]> REPLACE(a.edu_ddln_pnttm, '.' , '') + AND TO_CHAR(SYSDATE, 'YYYYMMDD') ]]> REPLACE(a.edu_ddln_pnttm, '.' , '') - AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') ]]> REPLACE(a.end_pnttm, '.' , '') + AND TO_CHAR(SYSDATE, 'YYYYMMDD') ]]> REPLACE(a.edu_strt_pnttm, '.' , '') 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 b552408d..3506afa6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -463,18 +463,20 @@
- + - + - + + - + + @@ -497,6 +499,11 @@ + @@ -505,7 +512,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index 5dddc673..89a255b9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -460,11 +460,12 @@
강사명 연락처 확정여부강의계획서강의계획서결과보고서 삭제
+ + + +
강사 배치 정보가 없습니다.강사 배치 정보가 없습니다.
- + - + + @@ -472,6 +473,7 @@ + @@ -494,6 +496,11 @@ + @@ -502,7 +509,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index cad64d40..73512e47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -86,6 +86,7 @@ "prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val() , "innorixFileListVO": data , "successMsg" : "제출 완료되었습니다." + , "fileType" : "LCTRPLAN" } if(fn_innorixCmmAjax(sendData, url) == "OK") { diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp index e80b0d92..c491489a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmEndDetail.jsp @@ -17,7 +17,7 @@ @@ -46,9 +46,9 @@ //강의계획서 컨트롤 생성 control1 = innorix.create({ - el : '#lctrPlan', // 컨트롤 출력 객체 ID + el : '#docAtch', // 컨트롤 출력 객체 ID installUrl: '', // Agent 설치 페이지 - uploadUrl: '', // 업로드 URL + uploadUrl: '', // 업로드 URL maxFileCount : 1, // 첨부가능 파일 전체 개수 width : 870, // 컨트롤 출력 너비(pixel) height : 80, // 컨트롤 출력 높이(pixel) @@ -58,16 +58,16 @@ //파일 추가 이벤트 control1.on('afterAddFiles', function (p) { - $('.lctrPlan_totalfileSize').text(getStrFileSize(p[0].fileSize)) ; - $('.lctrPlan_totalfileCount').text(p.length); + $('.docAtch_totalfileSize').text(getStrFileSize(p[0].fileSize)) ; + $('.docAtch_totalfileCount').text(p.length); }); //파일 삭제 이벤트 control1.on('removeFiles', function (p) { - $('.lctrPlan_totalfileSize').text('0MB') ; - $('.lctrPlan_totalfileCount').text('0'); + $('.docAtch_totalfileSize').text('0MB') ; + $('.docAtch_totalfileCount').text('0'); if(control1Tmprr == 'Y'){ if(confirm("삭제하시겠습니까?")){ - innorixDelRprtAtchFile(p[0].uniqueFileName, 'lctrPlan_rslt_atch_file_id') + innorixDelRprtAtchFile(p[0].uniqueFileName, 'docAtch_rslt_atch_file_id') control1Tmprr = 'N'; control1Chg = 'Y'; $("#control1DownBtn").css('display', 'none'); @@ -81,15 +81,16 @@ control1.on('uploadComplete', function (p) { /* fn_callBackInnorixInsert(p.files); */ var data = p.files; - var url = ""; + var url = ""; var sendData = { "prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val() , "innorixFileListVO": data , "successMsg" : "제출 완료되었습니다." + , "fileType" : "DOCATCH" } if(fn_innorixCmmAjax(sendData, url) == "OK") { - alert("업로드 완료"); + location.reload(); } }); }); @@ -269,12 +270,12 @@ - + @@ -325,7 +326,32 @@ - + + + +
연락처 확정여부 강의계획서결과보고서 삭제
+ + + +
강사 배치 정보가 없습니다.강사 배치 정보가 없습니다.

강의계획서

 - +

결과보고

 + +
+ + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp index bc23dd60..c830d127 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/endInfo/instrEduEndList.jsp @@ -26,7 +26,7 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -78,12 +78,12 @@
<%-- --%> - +
~
<%-- --%> - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 26b804ee..271e4657 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -86,6 +86,7 @@ "prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val() , "innorixFileListVO": data , "successMsg" : "제출 완료되었습니다." + , "fileType" : "LCTRPLAN" } if(fn_innorixCmmAjax(sendData, url) == "OK") { diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp index 2f88c8ce..d92d0435 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrAsgnmEndDetail.jsp @@ -17,7 +17,7 @@ @@ -46,9 +46,9 @@ //강의계획서 컨트롤 생성 control1 = innorix.create({ - el : '#lctrPlan', // 컨트롤 출력 객체 ID + el : '#docAtch', // 컨트롤 출력 객체 ID installUrl: '', // Agent 설치 페이지 - uploadUrl: '', // 업로드 URL + uploadUrl: '', // 업로드 URL maxFileCount : 1, // 첨부가능 파일 전체 개수 width : 870, // 컨트롤 출력 너비(pixel) height : 80, // 컨트롤 출력 높이(pixel) @@ -58,16 +58,16 @@ //파일 추가 이벤트 control1.on('afterAddFiles', function (p) { - $('.lctrPlan_totalfileSize').text(getStrFileSize(p[0].fileSize)) ; - $('.lctrPlan_totalfileCount').text(p.length); + $('.docAtch_totalfileSize').text(getStrFileSize(p[0].fileSize)) ; + $('.docAtch_totalfileCount').text(p.length); }); //파일 삭제 이벤트 control1.on('removeFiles', function (p) { - $('.lctrPlan_totalfileSize').text('0MB') ; - $('.lctrPlan_totalfileCount').text('0'); + $('.docAtch_totalfileSize').text('0MB') ; + $('.docAtch_totalfileCount').text('0'); if(control1Tmprr == 'Y'){ if(confirm("삭제하시겠습니까?")){ - innorixDelRprtAtchFile(p[0].uniqueFileName, 'lctrPlan_rslt_atch_file_id') + innorixDelRprtAtchFile(p[0].uniqueFileName, 'docAtch_rslt_atch_file_id') control1Tmprr = 'N'; control1Chg = 'Y'; $("#control1DownBtn").css('display', 'none'); @@ -81,15 +81,16 @@ control1.on('uploadComplete', function (p) { /* fn_callBackInnorixInsert(p.files); */ var data = p.files; - var url = ""; + var url = ""; var sendData = { "prcsAplctPrdOrd": $('#prcsAplctPrdOrd').val() , "innorixFileListVO": data , "successMsg" : "제출 완료되었습니다." + , "fileType" : "DOCATCH" } if(fn_innorixCmmAjax(sendData, url) == "OK") { - alert("업로드 완료"); + location.reload(); } }); }); @@ -255,6 +256,16 @@ + + +

강의계획서

+ + + + + + + @@ -301,7 +312,32 @@ - + +

결과보고

+ + +
+ + +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+ + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp index 20b7e11e..f6cbd11f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/sspnIdtmtVisitEdu/endInfo/instrEduEndList.jsp @@ -78,12 +78,12 @@
<%-- --%> - +
~
<%-- --%> - +
diff --git a/src/main/webapp/innorix/innorix_dev.js b/src/main/webapp/innorix/innorix_dev.js index acc05cad..0c8b2324 100644 --- a/src/main/webapp/innorix/innorix_dev.js +++ b/src/main/webapp/innorix/innorix_dev.js @@ -17,7 +17,9 @@ // 개발 라이센스 적용 (만료 23.09.30) //var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto="; // 개발 라이센스 적용 (만료 23.12.31) -var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc="; +//var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc="; +// 개발 라이센스 적용 (만료 24.2.2) +var INNORIX_LICENSE = "vbdFWf6nF9xHZEBSPPSXvliqeqwJyAYFtnkYqhngYVfOoE/y4XBoUEslG3l1g7oSVdlPPlatW2oNMWbgeo8L60K1Pjs="; var INNORIX_VERSION = '1.1.3.458'; var INNORIX_WIN_VERSION = '1.1.3.458';