diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 9db6229d..e3d7b4e5 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -737,8 +737,9 @@ public class FndtnEnhanceTrnController { if (loginVO == null || ssoLoginVO == null) { //이전 url 처리(beforeSiteUrl)_이준호_220228추가 return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. - } - + }else { + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + } return "/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop"; } diff --git a/src/main/java/kcc/ve/cmm/VeSendMail.java b/src/main/java/kcc/ve/cmm/VeSendMail.java index 32b3fcce..74158a95 100644 --- a/src/main/java/kcc/ve/cmm/VeSendMail.java +++ b/src/main/java/kcc/ve/cmm/VeSendMail.java @@ -258,8 +258,7 @@ public class VeSendMail { * 청소년 성인 체험교실도 Cn 데이터 확인후 조건문 추가 * AnotaionSchedule 211 라인 참조 * */ - if("A".equals(sndFlag) // A -> 기반강화 - || "B".equals(sndFlag) // B -> 기소유예 + if("B".equals(sndFlag) // B -> 기소유예 || "C".equals(sndFlag) // C -> 찾교청소년 || "G".equals(sndFlag) // G -> 체험교실 ) { @@ -283,7 +282,19 @@ public class VeSendMail { .replace("[[_Phone_]]", phone) .replace("[[_Phone_tel_]]", phone) .replace("[[_Email_]]", email) - .replace("[[_Content_]]", "안녕하세요. 저작권배움터 찾아가는 교육 담당자입니다.
"+Cn) + .replace("[[_Content_]]", "안녕하세요. 저작권배움터 찾아가는 교육 담당자 입니다.
"+Cn) + ; + Cn = emailContent; + }else if("A".equals(sndFlag)){ // A -> 실무역량강화 . 템플릿 변경 + + String emailContent = ""; + + emailContent = this.getTemplate() + .replace("[[_Name_]] 드림", "") + .replace("[[_Phone_]]", phone) + .replace("[[_Phone_tel_]]", phone) + .replace("[[_Email_]]", email) + .replace("[[_Content_]]", "안녕하세요. 저작권배움터 실무역량강화 담당자 입니다.
"+Cn) ; Cn = emailContent; } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp index 295a2857..665386a3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -376,7 +376,7 @@ try{ sendSms( returnData.vEInstrDetailVOList[i].phone, - "안녕하세요 교육운영팀입니다. 아래 교육이 확정되었으니, 자세한 사항은 시스템(저작권 배움터)을 통하여 확인하시어 일정에 차질이 없도록 준비 부탁드립니다."+ + "아래 교육이 확정되었으니, 자세한 사항은 시스템(저작권 배움터)을 통하여 확인하시어 일정에 차질이 없도록 준비 부탁드립니다."+ "\n일시 : "+ hopeDt + " " + strtTm + " ~ " + endTm + "\n기관 : "+ insttNm, returnData.vEInstrDetailVOList[i].eduAplctOrd, @@ -386,7 +386,7 @@ ); sendEmail( returnData.vEInstrDetailVOList[i].email, - "안녕하세요 교육운영팀입니다. 아래 교육이 확정되었으니, 자세한 사항은 시스템(저작권 배움터)을 통하여 확인하시어 일정에 차질이 없도록 준비 부탁드립니다."+ + "아래 교육이 확정되었으니, 자세한 사항은 시스템(저작권 배움터)을 통하여 확인하시어 일정에 차질이 없도록 준비 부탁드립니다."+ "\n일시 : "+ hopeDt + " " + strtTm + " ~ " + endTm + "\n기관 : "+ insttNm, returnData.vEInstrDetailVOList[i].eduAplctOrd, diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp index c25d7d0a..604a1b0e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp @@ -238,8 +238,19 @@ - - + + + + + + + + + + + + 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 007631a6..ef32bb9b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -349,15 +349,26 @@ - - + + + + + + + + + + + + \ No newline at end of file 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 3b4bd206..5c39a1f7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -865,24 +865,37 @@ - - + + + + + + + + + + + + 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 0e0c8ee6..bd2a776f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -884,24 +884,38 @@ - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp index beefbf23..0d66b80f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngDetail.jsp @@ -28,6 +28,7 @@ 교육과정관리 + @@ -518,7 +560,8 @@ - @@ -588,6 +631,46 @@ + +
+

교육신청자 알림정보

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

SMS 내용

+ 		+
+ + +
+ +
+

이메일 답변 내용

+ 		+
+ + + +
+

0/1000 byte

+
+
+
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 ff566869..c69986ad 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -603,14 +603,14 @@ } if(isLocal == 'real'){ //운영 - var viewer = new m2soft.crownix.Viewer('http://101.79.81.151/ReportingServer/service'); + var viewer = new m2soft.crownix.Viewer('https://www.edu-copyright.or.kr/offedu/ReportingServer/service'); viewer.hideToolbarItem(["save"]); - viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://101.79.81.151/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); + viewer.openFile('tnrg_rslts_240117.mrd', '/rf [https://www.edu-copyright.or.kr/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); }else{ //개발 var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); /* viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); */ - viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); + viewer.openFile('tnrg_rslts_240117.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do?rsltList='+rsltList+']'); } } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp index 74daeb71..809f1e6e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp @@ -238,8 +238,19 @@ - - + + + + + + + + + + + + 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 4f33fd01..846cc8cb 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngDetail.jsp @@ -993,29 +993,40 @@ - - + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index cb0fdf76..8c0bbb02 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -289,7 +289,6 @@ function instrChk(){

공지사항

- 더보기
    @@ -344,14 +343,13 @@ function instrChk(){ -->
+ 더보기

자료실

- - 더보기
    @@ -392,6 +390,7 @@ function instrChk(){ -->
+ 더보기
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 6db8b568..df019694 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 @@ -732,25 +732,39 @@
- - + + + + + + + + + + + + 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 80c7da4e..aebc09ef 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 @@ -577,32 +577,40 @@ $(document).ready(function(){ - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index 6347994e..4f1132c8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -601,32 +601,40 @@ - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp index 814b7c8f..117efa35 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/popup/eduAplctPop.jsp @@ -11,7 +11,7 @@ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 - +