From 2f09557d095940f3dc6afdb5f738f956a827f2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Tue, 6 Feb 2024 16:30:11 +0900 Subject: [PATCH 1/3] =?UTF-8?q?2024/02/06=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oprtn/adultVisitEdu/instrMngDetail.jsp | 6 ++--- .../cpyrgExprnClsrm/oprtnAplctMngReg.jsp | 6 ++--- .../fndthEnhanceTrn/fndthEduPrcsMngReg.jsp | 22 +++++++---------- .../tngrVisitEdu/popup/instrHstryMngPopup.jsp | 24 +++++++++++-------- .../visitEdu/adm/publish/css/content.css | 9 +++++++ .../webapp/visitEdu/adm/publish/css/popup.css | 5 ++++ 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp index 7655127b..a6b88223 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp @@ -674,7 +674,7 @@ function getYears(getYear){ - +
@@ -691,7 +691,7 @@ function getYears(getYear){ + type="button" class="btnType01 btn_type08" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택 @@ -981,7 +981,7 @@ function getYears(getYear){ - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp index 8371ad51..8b40d3cb 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp @@ -686,11 +686,11 @@ - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp index efd50b6a..26364d64 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp @@ -127,26 +127,22 @@
-
-
-
- 이미지를 넣어주세요 - -
-
- -
-
- +
+ 이미지를 넣어주세요 +
-
+
+ +
+
+
<%-- --%> 과정명 - + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp index 97a1e25b..159f5766 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp @@ -322,8 +322,8 @@
-
-

이력관리

+
+

이력관리

@@ -338,20 +338,24 @@ - + + + 구분 + 내용 + - +
교육명
- +
@@ -363,11 +367,11 @@ - +
교육기간
- +
@@ -384,11 +388,11 @@ - +
비고
- +
diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index 838fd0b0..ce0821ad 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -461,3 +461,12 @@ input[type="text"].input_time {width: 50px;} /*성인강사관리 > 성인강사목록 > 엑셀 다운로드 버튼 수정*/ .btn_wrap .excel_btn{padding: 0 18px 0 41px;} + +/*저작권 체험교실 > 운영신청 관리 > 등록 > 생년월일 박스크기 수정*/ +.birth_da{width: 100px;} + +/*성인강사관리 > 성인강사목록*/ +.tb_type02 .input_adress .detail_address{margin: 5px 0 0 0;} + +/*실무역량강화 > 과정관리목록 > 등록 > 과정면 input 크기 수정*/ +.pr_name input{width: 500px;} \ No newline at end of file diff --git a/src/main/webapp/visitEdu/adm/publish/css/popup.css b/src/main/webapp/visitEdu/adm/publish/css/popup.css index 7578da34..93a9c1d8 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/popup.css +++ b/src/main/webapp/visitEdu/adm/publish/css/popup.css @@ -179,6 +179,11 @@ .print_mark_p2 {font-size: 18px; font-weight: 500; padding-bottom: 10px;} .print_mark img {width: 170px; padding-top: 5px;} +/*팝업 타이틀 수정*/ +.area_popup .cont_wrap{padding-left: 0px;} +.area_popup .cont_wrap .tit{position: relative; padding: 0 0 0 20px;} +.area_popup .cont_wrap .tit::before{position: absolute; content: ""; width: 12px; height: 12px; border-radius: 50%; border: 3px solid #3a72db; left: 0; top: 57%; transform: translateY(-50%); box-sizing: border-box;} + /* print */ @media print { table th {background-color: #e5e5e5 !importnat; -webkit-print-color-adjust: exact;} From 829d0aa0d2f1536ff825bd91c5cc578f8b4a6e66 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 6 Feb 2024 17:19:04 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=84=B1=EC=9D=B8/=EC=8B=A4=EB=AC=B4=20-?= =?UTF-8?q?=20=EB=A9=94=EC=9D=BC/sms=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oprtn/adultVisitEdu/eduAplctMngDetail.jsp | 23 +++++++++++++ .../adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 24 ++++++++++++++ .../adultVisitEdu/eduInstrFeeMngList.jsp | 32 ++++++++++++++++++- .../oprtn/adultVisitEdu/eduRsltMngDetail.jsp | 24 ++++++++++++++ .../oprtn/adultVisitEdu/eduRsltMngList.jsp | 32 +++++++++++++++++-- .../fndthEduPrcsAplctCfnMngDetail.jsp | 19 ++++++----- 6 files changed, 141 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp index 09393783..50ae901e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp @@ -32,6 +32,7 @@ 교육신청 상세 + @@ -752,6 +771,10 @@

0/1000 byte

+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp index 2bf21dc6..af3b305c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -32,6 +32,7 @@ 교육확정 상세 + @@ -605,6 +625,10 @@

0/1000 byte

+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp index 95b32fca..c1ac223d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp @@ -192,7 +192,7 @@ $('input:checkbox[name="chk"]:checked').each(function() { sendSms( $(this).data('instrphone'), - "교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", $(this).val().split('@')[0], $(this).data('userid'), "S", @@ -202,6 +202,34 @@ alert("발송되었습니다."); } + + function testSendSms(){ + var chkLen = $(listForm).find("input[name=chk]:checked").length; + var testPhone = $("#testPhone").val(); + + if(chkLen == 0){ + alert("선택된 항목이 없습니다."); + return; + } + + if(testPhone == ''){ + alert("테스트 번호를 입력해주세요.") + return; + } + + //테스트 발송 시 체크된 항목 중 첫번째 내용만 전송 + $('input:checkbox[name="chk"]:checked').first().each(function() { + sendSms( + testPhone, + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", + "testSms", + "testSms", + "S", + "Y" + ); + }); + + } 신청관리 @@ -400,6 +428,8 @@ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 5e6920ed..6a386de3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -29,6 +29,7 @@ 교육과정관리 + @@ -557,6 +577,10 @@

0/1000 byte

+
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index 7d7b86d5..066a5868 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -213,7 +213,7 @@ $('input:checkbox[name="chk"]:checked').each(function() { sendSms( $(this).data('phone'), - "교육운영 관리 시스템입니다.\n" + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", $(this).val().split('@')[0], $(this).data('userid'), "S", @@ -221,7 +221,7 @@ ); sendEmail( $(this).data('email'), - "교육운영 관리 시스템입니다. \n" + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", $(this).val().split('@')[0], $(this).data('userid'), "S", @@ -251,6 +251,32 @@ alert("발송되었습니다."); } + + function testSendEmail(){ + var chkLen = $(listForm).find("input[name=chk]:checked").length; + var mailAdress = $("#testSndEMail").val(); + if(chkLen == 0){ + alert("선택된 항목이 없습니다."); + return; + } + + if(mailAdress == ''){ + alert("테스트 발송 이메일 주소를 입력해주세요."); + return false; + } + + $('input:checkbox[name="chk"]:checked').first().each(function() { + sendEmail( + mailAdress, + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", + $(this).val().split('@')[0], + $(this).data('userid'), + "S", + "Y" + ); + }); + + } //알림 등록용 함수-문자,메일 중 요청한 곳에만 추가한다. function fncNotiReg( @@ -519,6 +545,8 @@
+ + <%-- <%-- selectedValue="" --%> <%-- /> --%> 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 642db7e5..96018e20 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -292,22 +292,21 @@ } function testSnd(){ - var cn = $("#testSndEMail").val(); - if(cn == ''){ + var mailAdress = $("#testSndEMail").val(); + var cn = $("#smsEmail").val(); + if(mailAdress == ''){ alert("테스트 발송 이메일 주소를 입력해주세요."); return false; } - sendEmail( - cn, + mailAdress, $("#smsEmail").val(), - $(this).val(), - $(this).data('userid'), + "testSend", + "testSend", "A", // 기반강화 - "N" + "Y" ); - alert("발송되었습니다."); } @@ -850,8 +849,8 @@

0/1000 byte

-
- +
+
From 562e33191ddafd648dfa7dff8778574a56f69fce Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 6 Feb 2024 17:34:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=84=B1=EC=9D=B8=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=B0=9C=EC=86=A1=20=EB=B2=84=ED=8A=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp | 2 +- .../jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 2 +- .../WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp | 4 ++-- .../WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp | 2 +- .../webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp | 4 ++-- .../oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp index 50ae901e..96d336b5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp @@ -773,7 +773,7 @@

0/1000 byte

- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp index af3b305c..1aa38c34 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -627,7 +627,7 @@

0/1000 byte

- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp index c1ac223d..a43cda2a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp @@ -428,8 +428,8 @@ - - + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 6a386de3..f9edc754 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -579,7 +579,7 @@

0/1000 byte

- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index 066a5868..d0497019 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -545,8 +545,8 @@
- - + + <%-- <%-- selectedValue="" --%> <%-- /> --%> 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 96018e20..a560fca0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -851,7 +851,7 @@

0/1000 byte

- +