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-23 16:27:25 +09:00
commit c3a33064e4
5 changed files with 127 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -7362,7 +7362,8 @@ VALUES
AND e.frst_register_id = #notiUserId# AND e.frst_register_id = #notiUserId#
) )
AS notiCnt, AS notiCnt,
C.CHRG_MJR AS chrgMjr C.CHRG_MJR AS chrgMjr,
A.clphone AS clphone
FROM ve_edu_aplct A FROM ve_edu_aplct A
LEFT OUTER JOIN VE_EDU_OPRTN C LEFT OUTER JOIN VE_EDU_OPRTN C
ON A.EDU_APLCT_ORD = C.EDU_APLCT_ORD ON A.EDU_APLCT_ORD = C.EDU_APLCT_ORD

51
src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
View File

@ -374,16 +374,33 @@ function valiConfig(){ //설정 체크
<!-- cont --> <!-- cont -->
<div class="contWrap"> <div class="contWrap cont_wrap">
<div class="pageTitle"> <div class="box">
<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
<h2 class="titType1 c_222222 fwBold">사용자수정</h2> <!-- cont_tit -->
<p class="tType6 c_999999">&nbsp;</p> <div class="cont_tit">
<h2>사용자수정</h2>
<!-- <ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li><span class="cur_nav">사용자수정</span></li>
</ul> -->
</div> </div>
<!-- //cont_tit -->
<div class="cont">
<!-- <div class="pageTitle tb_tit01">
<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div>
<p class="titType1 c_222222 fwBold">사용자수정</p>
<p class="tType6 c_999999">&nbsp;</p>
</div> -->
<div class="pageCont"> <div class="pageCont">
<div class="listTop resisterList"> <div class="listTop resisterList">
<p class="right block fwMd"><span class="tType4 c_e40000 fwBold">*</span>는 필수입력 항목입니다.</p> <p class="right block fwMd sub_te"><span class="tType4 c_e40000 fwBold">*</span>는 필수입력 항목입니다.</p>
</div> </div>
<!-- table -->
<div class="tb_type02">
<table class="tbType2"> <table class="tbType2">
<colgroup> <colgroup>
<col style="width: 20%"> <col style="width: 20%">
@ -426,17 +443,25 @@ function valiConfig(){ //설정 체크
<td colspan="3"> <td colspan="3">
<input type="text" name="mberNm" id="mberNm" value="<c:out value="${mberManageVO.mberNm}"/>"/> <input type="text" name="mberNm" id="mberNm" value="<c:out value="${mberManageVO.mberNm}"/>"/>
<%-- <form:select path="authorCode" items="${authorList}" itemLabel="authorNm" itemValue="authorCode" /> --%> <%-- <form:select path="authorCode" items="${authorList}" itemLabel="authorNm" itemValue="authorCode" /> --%>
<%-- 215: <form:radiobuttons path="userType" items="${ userTypeList }" itemLabel="codeNm" itemValue="code" /> --%> <%-- 215: <form:radiobuttons path="userType" items="${ userTypeList }" itemLabel="codeNm" itemValue="code" /> --%>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="btnWrap"> </div>
<!-- <input type="button" class="btnType1" value="비밀번호변경" onclick="fnPasswordMove(); return false;"> -->
<input type="button" class="btnType1" value="수 정" onclick="fnUpdate(); return false;"> <!-- btn_wrap -->
<%-- <input type="button" class="btnType1 bg_ed4545" value="삭 제" onclick="fnDeleteUser('<c:out value='${mberManageVO.userTy}'/>:<c:out value='${mberManageVO.uniqId}'/>'); return false;"> --%> <div class="btnWrap btn_wrap btn_layout01">
<input type="button" class="btnType1 bg_888888" value="목 록" onclick="fnListPage(); return false;"> <div class="btn_left"></div>
<div class="area_right">
<!-- <input type="button" class="btnType1" value="비밀번호변경" onclick="fnPasswordMove(); return false;"> -->
<input type="button" class="btnType1 btnType06 in_bt" value="수 정" onclick="fnUpdate(); return false;" style="margin-right: 4px;">
<%-- <input type="button" class="btnType1 bg_ed4545" value="삭 제" onclick="fnDeleteUser('<c:out value='${mberManageVO.userTy}'/>:<c:out value='${mberManageVO.uniqId}'/>'); return false;"> --%>
<input type="button" class="btnType1 bg_888888 btnType03 in_bt" value="목 록" onclick="fnListPage(); return false;">
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

34
src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp
View File

@ -17,6 +17,7 @@
<html lang="ko"> <html lang="ko">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
<style> <style>
input:read-only { input:read-only {
background-color: #ededed; background-color: #ededed;
@ -130,14 +131,30 @@ input:read-only {
success:function(returnData){ success:function(returnData){
if(returnData.rsCnt > 0){ if(returnData.rsCnt > 0){
alert("상태가 변경 되었습니다."); alert("상태가 변경 되었습니다.");
if(aprvlCdSelected != '11'){
location.reload(); location.reload();
} }
}
}, },
error:function(request , status, error){ error:function(request , status, error){
alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
} }
}); });
} }
if(aprvlCdSelected == '11'){
$('input:checkbox[name="chk"]:checked').each(function() {
sendSms(
$(this).data('clphone'),
"교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.",
$(this).val(),
$(this).data('userid'),
"G",
"N"
);
});
}
location.reload();
} }
function fileChk() { function fileChk() {
@ -379,7 +396,9 @@ input:read-only {
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<td> <td>
<input name="chk" id="<c:out value="${list.eduAplctOrd}"/>" type="checkbox" value="<c:out value="${list.eduAplctOrd}"/>"/> <label for="<c:out value="${list.eduAplctOrd}"/>"></label> <input name="chk" id="<c:out value="${list.eduAplctOrd}"/>"
data-clphone="<c:out value='${list.clphone}' />" data-userid="<c:out value='${list.userId}' />"
type="checkbox" value="<c:out value="${list.eduAplctOrd}"/>"/> <label for="<c:out value="${list.eduAplctOrd}"/>"></label>
</td> </td>
<td><c:out <td><c:out
value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }" /> value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }" />
@ -419,10 +438,10 @@ input:read-only {
<!-- //list --> <!-- //list -->
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="btn_left"> <div class="btn_left">
<select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1"> <!-- <select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1">
<option value="">선택</option> <option value="">선택</option>
<option value="10">운영신청</option> <option value="10">운영신청</option>
<!-- <option value="70">수정요청</option> --> <option value="70">수정요청</option>
<option value="12">운영미확정</option> <option value="12">운영미확정</option>
<option value="13">수정완료</option> <option value="13">수정완료</option>
<option value="20">운영확정</option> <option value="20">운영확정</option>
@ -431,6 +450,15 @@ input:read-only {
<option value="60">결과보고 완료</option> <option value="60">결과보고 완료</option>
<option value="70">검토중</option> <option value="70">검토중</option>
<option value="80">운영종료</option> <option value="80">운영종료</option>
</select> -->
<select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1">
<option value="">선택</option>
<option value="11">수정요청</option>
<option value="20">운영교사 선정</option>
<option value="12">운영교사 미선정</option>
<option value="40">서류제출 요청</option>
<option value="50">결과보고 요청</option>
<option value="80">운영종료</option>
</select> </select>
<button class="btn_type04" onclick="fncStatusChangeAll(); return false;" >일괄변경</button> <button class="btn_type04" onclick="fncStatusChangeAll(); return false;" >일괄변경</button>
</div> </div>

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

@ -483,3 +483,7 @@ input[type="text"].input_time {width: 50px;}
.req_text1{display: inline-block; font-size: 16px; font-weight:400; vertical-align: middle; padding:0 5px;} .req_text1{display: inline-block; font-size: 16px; font-weight:400; vertical-align: middle; padding:0 5px;}
.req_text1 a {text-decoration:underline; color:#3a72db; font-size:15px; font-weight:500; padding:0 0 0 16px;} .req_text1 a {text-decoration:underline; color:#3a72db; font-size:15px; font-weight:500; padding:0 0 0 16px;}
/*관리자관리 > 대국민관리(외부개발자용) > 사용자관리 > 사용자수정*/
.pageCont .listTop .sub_te{margin-bottom: 10px;}

3
src/main/webapp/visitEdu/adm/publish/css/content_sub.css
View File

@ -105,3 +105,6 @@
/*게시판관리 > 게시판관리 > 공지사항 등록 > 공지기간 select 수정*/ /*게시판관리 > 게시판관리 > 공지사항 등록 > 공지기간 select 수정*/
.da_fo{width: 90px !important;} .da_fo{width: 90px !important;}
/*관리자관리 > 대국민관리(외부개발자용) > 사용자관리 > 사용자수정 버튼 스타일*/
.in_bt{border: none; letter-spacing: -0.8px; padding: 0 25px; height: 45px;}