tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2024-02-06 17:56:30 +09:00
commit 56f9223ac4
12 changed files with 185 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngDetail.jsp
View File

@ -32,6 +32,7 @@
<head>
<title>교육신청 상세</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
<script type="text/javascript">
function fncGoDetail(){
var linkForm = document.linkForm ;
@ -379,6 +380,24 @@
});
}
function testSnd(){
var mailAdress = $("#testSndEMail").val();
var cn = $("#smsEmail").val();
if(mailAdress == ''){
alert("테스트 발송 이메일 주소를 입력해주세요.");
return false;
}
sendEmail(
mailAdress,
$("#smsEmail").val(),
"testSend",
"testSend",
"S", // 청소년
"Y"
);
}
</script>
</head>
@ -752,6 +771,10 @@
</div>
<p><span id="byteEmail">0</span>/1000 byte</p>
<div style="justify-content:left;">
<input type="text" id="testSndEMail" placeholder="이메일 주소"/>
<button type="button" class="btn_type08" onclick="testSnd();" style="margin-left: 8px;">테스트 발송</button>
</div>
</td>
</tr>
</tbody>

24
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp
View File

@ -32,6 +32,7 @@
<head>
<title>교육확정 상세</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
<script type="text/javascript">
function fncGoList(){
@ -251,6 +252,25 @@
function reloadPage(){
location.reload();
}
function testSnd(){
var mailAdress = $("#testSndEMail").val();
var cn = $("#smsEmail").val();
if(mailAdress == ''){
alert("테스트 발송 이메일 주소를 입력해주세요.");
return false;
}
sendEmail(
mailAdress,
$("#smsEmail").val(),
"testSend",
"testSend",
"S", // 청소년
"Y"
);
}
</script>
</head>
@ -605,6 +625,10 @@
</div>
<p><span id="byteEmail">0</span>/1000 byte</p>
<div style="justify-content:left;">
<input type="text" id="testSndEMail" placeholder="이메일 주소"/>
<button type="button" class="btn_type08" onclick="testSnd();" style="margin-left: 8px;">테스트 발송</button>
</div>
</td>
</tr>
</tbody>

32
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp
View File

@ -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"
);
});
}
</script>
<title>신청관리</title>
</head>
@ -400,6 +428,8 @@
<!-- <button type="button" class="btn_type06" onclick="fnAcmdtFileZipDownload(); return false;">숙박영수증다운로드</button> -->
<button type="button" class="btn_type06" onclick="excelDownLoad();">지급내역다운로드</button>
<button type="button" class="btn_type06" onclick="chkSendSms();">강사료 안내 문자발송</button>
<input type="text" name="testPhone" id="testPhone" onkeyup="onlyNumber(this);" maxlength="11" placeholder="테스트 번호" style="margin-top:8px;">
<button type="button" class="btn_type06" onclick="testSendSms();" style="margin-top:8px;">강사료 안내 문자발송</button>
</div>
<div class="btn_center">
</div>

24
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
View File

@ -29,6 +29,7 @@
<head>
<title>교육과정관리</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
<script type="text/javascript">
$(document).ready(function () {
@ -317,6 +318,25 @@
}
function testSnd(){
var mailAdress = $("#testSndEMail").val();
var cn = $("#smsEmail").val();
if(mailAdress == ''){
alert("테스트 발송 이메일 주소를 입력해주세요.");
return false;
}
sendEmail(
mailAdress,
$("#smsEmail").val(),
"testSend",
"testSend",
"S", // 청소년
"Y"
);
}
</script>
</head>
@ -557,6 +577,10 @@
</div>
<p><span id="byteEmail">0</span>/1000 byte</p>
<div style="justify-content:left;">
<input type="text" id="testSndEMail" placeholder="이메일 주소"/>
<button type="button" class="btn_type08" onclick="testSnd();" style="margin-left: 8px;">테스트 발송</button>
</div>
</td>
</tr>
</tbody>

32
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp
View File

@ -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",
@ -252,6 +252,32 @@
}
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(
p_url
@ -519,6 +545,8 @@
<div class="btn_right">
<button type="button" class="btn_type06" onclick="chkRprtPrint(); return false;">결과보고 출력 </button>
<button type="button" class="btn_type06" onclick="chkSendSmsEmail(); return false;">강의만족도 제출요청 </button>
<input type="text" id="testSndEMail" placeholder="이메일 주소" style="margin-top:8px;"/>
<button type="button" class="btn_type06" onclick="testSendEmail();" style="padding:8px; margin-top:8px;">강의만족도 제출요청 테스트 발송</button>
<%-- <ve:select codeId="VE0016" name="pnltyCd" id="pnltyCd" css="class='sel_type1'" --%>
<%-- selectedValue="<c:out value='${info.eduSlctAreaCd}'/>" --%>
<%-- /> --%>

6
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
View File

@ -674,7 +674,7 @@ function getYears(getYear){
<td colspan="3">
<label for="post" class="label">우편번호 입력</label>
<input type="text" size="20" name="post" id="post" class="adr_input" style="background-color: #eee;" value="<c:out value='${info.post}'/>" readonly>
<button class="btnType01 btn_adr_search" onclick="fn_postCode(this); return false;">우편번호 검색</button>
<button class="btnType01 btn_adr_search btn_type08" onclick="fn_postCode(this); return false;">우편번호 검색</button>
<div class="detail_address">
<label for="addr" class="label">주소 입력</label>
<input type="text" size="60" name="addr" id="addr" class="searchResultAddr" value="<c:out value='${info.addr}'/>" readonly>
@ -691,7 +691,7 @@ function getYears(getYear){
<input type="text" title="거주지" size="25" placeholder="ex) 경기(군포시 용포동)" readonly="readonly"
value="<c:out value='${info.rsdne}'/>" maxLength="20" name="rsdne" id="rsdne">
<button
type="button" class="btnType01" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
type="button" class="btnType01 btn_type08" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
<input type="hidden" name="rsdneId" id="rsdneId" value=""/><!-- 거주지ID -->
</td>
</tr>
@ -981,7 +981,7 @@ function getYears(getYear){
</tr>
</c:forEach>
<c:if test="${empty selectListVEAIHM}">
<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>

6
src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngReg.jsp
View File

@ -686,11 +686,11 @@
<c:set var="birthDay" value="${fn:substring(info.DBirth, 6, 8)}"/>
</c:if>
<label for="birthYear" class="label">년도 선택</label>
<select name="birthYear" id="birthYear" class="selType1 birthYear" selectValue="${birthYear}"></select>
<select name="birthYear" id="birthYear" class="selType1 birthYear birth_da" selectValue="${birthYear}"></select>
<label for="birthMonth" class="label">월 선택</label>
<select name="birthMonth" id="birthMonth" class="selType1 birthMonth" selectValue="${birthMonth}"></select>
<select name="birthMonth" id="birthMonth" class="selType1 birthMonth birth_da" selectValue="${birthMonth}"></select>
<label for="birthDay" class="label">일 선택</label>
<select name="birthDay" id="birthDay" class="selType1 birthDay" selectValue="${birthDay}"></select>
<select name="birthDay" id="birthDay" class="selType1 birthDay birth_da" selectValue="${birthDay}"></select>
</td>
</tr>
<tr>

21
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp
View File

@ -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,9 +849,9 @@
</div>
<p><span id="byteEmail">0</span>/1000 byte</p>
<div>
<input type="text" id="testSndEMail" />
<button type="button" class="btn_type08" onclick="testSnd();">테스트 발송</button>
<div style="justify-content:left;">
<input type="text" id="testSndEMail" placeholder="이메일 주소"/>
<button type="button" class="btn_type08" onclick="testSnd();" style="margin-left: 8px;">테스트 발송</button>
</div>
</td>

6
src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp
View File

@ -125,8 +125,6 @@
defaultText="선택"
/>
<!-- <input type="text" name="instrNm"/> -->
<div class="put_photo">
<div class="put_photo_in">
<div class="put_photo">
<div class="put_photo_in">
<div class="put_photo_box">
@ -139,14 +137,12 @@
</div>
<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
</div>
</div>
</div>
<%-- <ve:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="<c:out value='${info.prcsDiv}'/>" defaultValue='10'/> --%>
</td>
</tr>
<tr>
<th scope="row">과정명</th>
<td>
<td class="pr_name">
<input type="text" name="prcsNm"/>
</td>
</tr>

24
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrHstryMngPopup.jsp
View File

@ -322,8 +322,8 @@
<div class="area_popup">
<!-- cont_tit -->
<div class="cont_tit">
<h2>이력관리</h2>
<div class="cont_tit cont_wrap">
<h2 class="tit">이력관리</h2>
</div>
<!-- //cont_tit -->
@ -338,20 +338,24 @@
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<!-- <tbody>
<tr>
<th scope="row">구분</th>
<th scope="row">내용</th>
</tr>
</tbody>
</tbody> -->
<tbody>
<tr>
<th scope="row">구분</th>
<td>내용</td>
</tr>
<tr>
<!-- 회차 -->
<td>
<th scope="row">
<div class="util_right">
교육명
</div>
</td>
</th>
<td>
<div class="util_right">
@ -363,11 +367,11 @@
</tr>
<tr>
<!-- 회차 -->
<td>
<th scope="row">
<div class="util_right">
교육기간
</div>
</td>
</th>
<td>
<div class="util_right">
<div class="calendar_wrap">
@ -384,11 +388,11 @@
</tr>
<tr>
<!-- 회차 -->
<td>
<th scope="row">
<div class="util_right">
비고
</div>
</td>
</th>
<td>
<div class="util_right">

9
src/main/webapp/visitEdu/adm/publish/css/content.css
View File

@ -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;}

5
src/main/webapp/visitEdu/adm/publish/css/popup.css
View File

@ -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;}