이지우 - 저작권체험교실 요청사항 수정

src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml

@@ -950,7 +950,7 @@
 				,LAST_UPDUSR_ID	= #lastUpdusrId#
 				<isNotEmpty property="sbmtYn">
 					, SBMT_YN	= #sbmtYn#
-					, SBMT_PNTTM	= IF(#sbmtYn# = 'Y', SYSDATE, NULL)
+					, SBMT_PNTTM	= CASE WHEN #sbmtYn# = 'Y' THEN SYSDATE ELSE NULL END
 				</isNotEmpty>
 				<isNotEmpty property="aprvlCd">
 					, APRVL_CD	= #aprvlCd#

src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp

@@ -215,6 +215,16 @@
 								</c:choose>
 							</td>
 						</tr>
+						<c:if test="${info.aprvlCd eq '70'}">
+						<tr>
+							<th scope="row">
+								<p>수정요청사유</p>
+							</th>
+							<td colspan="3">
+								<c:out value="${info.aprvlCn}"/>
+							</td>
+						</tr>
+						</c:if>
 					</tbody>
 				</table>
 			</div>		
@@ -344,13 +354,13 @@
 					<tbody>
 						<tr>
 							<th scope="row">
-								<p>대상학년</p>
+								<p>대상학년/반</p>
 							</th>
 							<td>${info.trgtGrade}</td>
-							<th scope="row">
+							<%-- <th scope="row">
 								<p>대상반</p>
 							</th>
-							<td>${info.trgtClsrm}</td>
+							<td>${info.trgtClsrm}</td> --%>
 						</tr>
 						<tr>
 							<th scope="row">

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

@@ -305,12 +305,6 @@
 			$("#trgtGrade").focus();
 			return false;
 		}
-		if($('#trgtClsrm').val() == ''){
-			alert('대상반을  입력해주세요.');
-			$("#trgtClsrm").focus();
-			return false;
-		}
-
 		if($('#trgtPrsnl').val() == ''){
 			alert('학생수를 입력해주세요.');
 			$("#trgtPrsnl").focus();

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp

@@ -494,13 +494,13 @@
 			<tbody>
 			<tr>
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td>${info.trgtGrade}</td>
-				<th scope="row">
+				<%-- <th scope="row">
 					<p>대상반</p>
 				</th>
-				<td>${info.trgtClsrm}</td>
+				<td>${info.trgtClsrm}</td> --%>
 			</tr>
 			<tr>
 				<th scope="row">

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp

@@ -83,8 +83,8 @@
 		<table>
 			<colgroup>
 				<col style="width: 10%;">
-				<col style="width: auto;">
 				<col style="width: 15%;">
+				<col style="width: auto;">
 				<col style="width: 15%">
 				<col style="width: 20%;">
 				<col style="width: 15%;">
@@ -92,8 +92,8 @@
 			<thead>
 			<tr>
 				<th scope="col">번호</th>
+				<th scope="col">운영 연도</th>
 				<th scope="col">교육내용</th>
-				<th scope="col">접수종료일</th>
 				<th scope="col">신청일</th>
 				<th scope="col">학교명</th>
 				<th scope="col">처리상태</th>
@@ -108,13 +108,13 @@
 					</td>
 					<td>
 						<a href="javascript:fncGoDetail('${list.eduAplctOrd}');" >
-							${list.chrgMjr}
+							<fmt:parseDate value="${list.oprtnStrtDt}" var="oprtnStrtDt" pattern="yyyyMMdd"/>
+							<fmt:formatDate value="${oprtnStrtDt}" pattern="yyyy년"/>
 						</a>
 					</td>
 					<td>
 						<a href="javascript:fncGoDetail('${list.eduAplctOrd}');" >
-							<fmt:parseDate value="${list.prcsEndPnttm}" var="prcsEndPnttm" pattern="yyyyMMddHHmm"/>
+							${list.chrgMjr}
-							<fmt:formatDate value="${prcsEndPnttm}" pattern="yyyy.MM.dd"/>
 						</a>
 					</td>
 					<td>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDetail.jsp

@@ -119,13 +119,6 @@
 			<button type="button" title="새창열림"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/twitter_icon.png" alt="트위터 바로가기"></button>
 		</div>
 	</div>
-	<div class="tit_box">
-		<i class="tit_box_icon1"></i>
-		<div>
-			<p>찾아가는 저작권 교육</p>
-			<span>‘찾아가는 저작권 교육’은 저작권 교육이 필요한 <span>전국 초ㆍ중ㆍ고등학교, 청소년ㆍ아동복지ㆍ노인ㆍ장애인 기관 및 단체 등</span>에 직접 방문하여 무료로 강의를 지원하는 맞춤형 교육 서비스입니다.</span>
-		</div>
-	</div>
 
 	<div class="tb_tit01">
 		<div class="tb_tit01_left">
@@ -150,7 +143,7 @@
 					<c:choose>
 						<c:when test="${not empty info.sbmtPnttmDetail}">
 							<fmt:parseDate value="${info.sbmtPnttmDetail}" var="sbmtPnttm" pattern="yyyy-MM-dd HH:mm:ss"/>
-							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy-MM-dd HH시 mm분"/>
+							<fmt:formatDate value="${sbmtPnttm}" pattern="yyyy-MM-dd HH:mm:ss"/>
 						</c:when>
 						<c:otherwise>
 							-
@@ -158,12 +151,6 @@
 					</c:choose>
 				</td>
 
-				<th scope="row">
-					<p>접수종료일</p>
-				</th>
-				<td>
-					<c:out value="${endPnttm }"/>
-				</td>
 			</tr>
 			<tr class="trLength2">
 				<th scope="row">
@@ -181,21 +168,6 @@
 					</c:choose>
 				</td>
 			</tr>
-			<tr class="trLength2">
-				<th scope="row">
-					<p>접수종료일</p>
-				</th>
-				<td colspan="3">
-					<c:choose>
-						<c:when test="${not empty endPnttm}">
-							<c:out value="${endPnttm }"/>
-						</c:when>
-						<c:otherwise>
-							-
-						</c:otherwise>
-					</c:choose>
-				</td>
-			</tr>
 			<tr>
 				<th scope="row">
 					<p>처리상태</p>
@@ -231,6 +203,14 @@
 					<td colspan="3">${info.aprvlCn}</td>
 				</tr>
 			</c:if>
+			<c:if test="${info.aprvlCd eq VeConstants.APRVL_CD_70}">
+				<tr>
+					<th scope="row">
+						<p>수정요청사유</p>
+					</th>
+					<td colspan="3">${info.aprvlCn}</td>
+				</tr>
+			</c:if>
 			</tbody>
 		</table>
 	</div>
@@ -283,12 +263,6 @@
 					<kc:code codeId="COM014" code="${info.chrgSexCd}"/>
 				</td>
 			</tr>
-			<tr>
-				<th scope="row">
-					<p>이메일</p>
-				</th>
-				<td>${info.email}</td>
-			</tr>
 			<tr>
 				<th scope="row">
 					<p>휴대폰</p>
@@ -300,6 +274,12 @@
 					<p>전화</p>
 				</th>
 				<td>${info.phone}</td>
+			</tr
+			<tr>
+				<th scope="row">
+					<p>이메일</p>
+				</th>
+				<td>${info.email}</td>
 			</tr>
 			<tr>
 				<th scope="row">
@@ -367,26 +347,26 @@
 			<tbody>
 			<tr class="trLength4">
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td>${info.trgtGrade}</td>
-				<th scope="row">
+				<%-- <th scope="row">
 					<p>대상반</p>
 				</th>
-				<td>${info.trgtClsrm}</td>
+				<td>${info.trgtClsrm}</td> --%>
 			</tr>
 			<tr class="trLength2">
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td colspan="3">${info.trgtGrade}</td>
 			</tr>
-			<tr class="trLength2">
+			<%-- <tr class="trLength2">
 				<th scope="row">
 					<p>대상반</p>
 				</th>
 				<td colspan="3">${info.trgtClsrm}</td>
-			</tr>
+			</tr> --%>
 			<tr class="trLength4">
 				<th scope="row">
 					<p>대상학생수</p>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp

@@ -124,8 +124,8 @@
 		<table>
 			<colgroup>
 				<col style="width: 10%;">
-				<col style="width: auto;">
 				<col style="width: 15%;">
+				<col style="width: auto;">
 				<col style="width: 15%">
 				<col style="width: 20%;">
 				<col style="width: 15%;">
@@ -133,8 +133,8 @@
 			<thead>
 			<tr>
 				<th scope="col">번호</th>
+				<th scope="col">운영 연도</th>
 				<th scope="col">교육내용</th>
-				<th scope="col">접수종료일</th>
 				<th scope="col">신청일</th>
 				<th scope="col">학교명</th>
 				<th scope="col">처리상태</th>
@@ -149,13 +149,13 @@
 					</td>
 					<td>
 						<a href="javascript:fncGoDetail('${list.eduAplctOrd}');" >
-							${list.chrgMjr}
+							<fmt:parseDate value="${list.oprtnStrtDt}" var="oprtnStrtDt" pattern="yyyyMMdd"/>
+							<fmt:formatDate value="${oprtnStrtDt}" pattern="yyyy년"/>
 						</a>
 					</td>
 					<td>
 						<a href="javascript:fncGoDetail('${list.eduAplctOrd}');" >
-							<fmt:parseDate value="${list.prcsEndPnttm}" var="prcsEndPnttm" pattern="yyyyMMddHHmm"/>
+							${list.chrgMjr}
-							<fmt:formatDate value="${prcsEndPnttm}" pattern="yyyy.MM.dd"/>
 						</a>
 					</td>
 					<td>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp

@@ -168,7 +168,7 @@
 
 	function fncSave(type){
 
-		if(type == 'S'){
+		if(type == 'S' || type == 'E'){
 			if (!validCheck()) return;
 		}
 	
@@ -180,6 +180,9 @@
 		if(confirm("교육신청을 "+(type == 'I'? '임시저장' : '등록')+"하시겠습니까?")){
 			if(type == 'I'){
 				$("#sbmtYn").val("N");
+			}else if(type == 'E'){
+				$("#sbmtYn").val("Y");
+				$("#aprvlCd").val(VeConstants.APRVL_CD_80);
 			}else{
 				$("#sbmtYn").val("Y");
 				$("#aprvlCd").val(VeConstants.APRVL_CD_10);
@@ -394,15 +397,21 @@
 			$("#trgtGrade").focus();
 			return false;
 		}
-		if($('#trgtClsrm').val() == ''){
+		/* if($('#trgtClsrm').val() == ''){
 			alert('대상반을  입력해주세요.');
 			$("#trgtClsrm").focus();
 			return false;
-		}
+		} */
 
 		if($('#trgtPrsnl').val() == ''){
-			alert('학생수를 입력해주세요.');
+			alert('전체학생 수를 입력해주세요.');
 			$("#trgtPrsnl").focus();
+			return 
+			false;
+		}
+		if($('#needTxtbNum').val() == ''){
+			alert('필요 교재 수량을 입력해주세요.');
+			$("#needTxtbNum").focus();
 			return false;
 		}
 
@@ -567,7 +576,7 @@
 		}
 
 		$("#trgtGrade").val(info.trgtGrade);
-		$("#trgtClsrm").val(info.trgtClsrm);
+		/* $("#trgtClsrm").val(info.trgtClsrm); */
 		$("#trgtPrsnl").val(info.trgtPrsnl);
 		$("#needTxtbNum").val(info.needTxtbNum);
 
@@ -687,13 +696,12 @@
 					script="onFocus='this.initialSelect = this.selectedIndex;' onChange='this.selectedIndex = this.initialSelect;'"/>
 					<label for="scholInsttNm" class="label">학교(기관)명 입력</label>
 					<input type="text" value="${info.scholInsttNm}" size="25" readonly id="scholInsttNm" name="scholInsttNm">
-					<button type="button" class="btnType01" data-tooltip="sub01_pop02" onclick="fncScholList();" title="팝업 열림">학교검색</button>
+					<button type="button" class="btnType01" data-tooltip="sub01_pop02" onclick="fncScholList();" title="팝업 열림">학교검색</button> ※ 학교명이 검색되지 않을 경우, 담당자에게 연락
 					<input type="hidden" size="25" title="학교명코드" id="stndrdScholCd" name="stndrdScholCd" value="${info.stndrdScholCd}">
 				</td>
 			</tr>
 			<tr>
 				<th scope="row">
-					<p class="req_text"><span>필수입력 항목</span>*</p>
 					<p>학교구분</p>
 				</th>
 				<td colspan="3">
@@ -785,7 +793,6 @@
 			</tr>
 			<tr class="input_adress">
 				<th scope="row">
-					<p class="req_text"><span>필수입력 항목</span>*</p>
 					<p>주소</p>
 				</th>
 				<td colspan="3">
@@ -897,25 +904,26 @@
 			<tr>
 				<th scope="row">
 					<p class="req_text"><span>필수입력 항목</span>*</p>
-					<p>학년수</p>
+					<p>대상학년/반</p>
 				</th>
 				<td>
 					<label for="trgtGrade" class="label">대상 학년 입력</label>
-					<input type="text" name="trgtGrade" id="trgtGrade" onkeyup="onlyNumber(this);" maxlength="3" value="${info.trgtGrade}" size="20"> 학년
+					<input type="text" name="trgtGrade" id="trgtGrade" maxlength="20" value="${info.trgtGrade}" size="20">
 				</td>
-				<th scope="row">
+				<!-- 231107 학년과 대상 통합 요청 -->
+				<%--<th scope="row">
 					<p class="req_text"><span>필수입력 항목</span>*</p>
 					<p>대상 반</p>
 				</th>
 				<td>
 					<label for="trgtClsrm" class="label">대상 반 입력</label>
 					<input type="text" name="trgtClsrm" id="trgtClsrm"  value="${info.trgtClsrm}" title="교육인원" size="20"> 반
-				</td>
+				</td> --%>
 			</tr>
 			<tr>
 				<th scope="row">
 					<p class="req_text"><span>필수입력 항목</span>*</p>
-					<p>학생수</p>
+					<p>전체학생 수</p>
 				</th>
 				<td>
 					<label for="trgtPrsnl" class="label">학생 수 입력</label>
@@ -964,10 +972,11 @@
 			</tr>
 			<tr>
 				<th scope="row">
+					<p class="req_text"><span>필수입력 항목</span>*</p>
 					<p>필요 교재 수량</p>
 				</th>
 				<td>
-					<label for="trgtGrade" class="label">필요 교재 수량 입력</label>
+					<label for="needTxtbNum" class="label">필요 교재 수량 입력</label>
 					<input type="text" name="needTxtbNum" id="needTxtbNum"  onkeyup="onlyNumber(this);" value="${info.trgtPrsnlReal}" title="전체 교육인원" size="20" maxlength="4"> 
 				</td>
 			</tr>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp

@@ -71,26 +71,26 @@
 			<tbody>
 			<tr class="trLength4">
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td>${info.trgtGrade}</td>
-				<th scope="row">
+				<%-- <th scope="row">
 					<p>대상반</p>
 				</th>
-				<td>${info.trgtClsrm}</td>
+				<td>${info.trgtClsrm}</td> --%>
 			</tr>
 			<tr class="trLength2">
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td colspan="3">${info.trgtGrade}</td>
 			</tr>
-			<tr class="trLength2">
+			<%-- <tr class="trLength2">
 				<th scope="row">
 					<p>대상반</p>
 				</th>
 				<td colspan="3">${info.trgtClsrm}</td>
-			</tr>
+			</tr> --%>
 			<tr class="trLength4">
 				<th scope="row">
 					<p>대상학생수</p>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp

@@ -492,13 +492,13 @@
 			<tbody>
 			<tr>
 				<th scope="row">
-					<p>대상학년</p>
+					<p>대상학년/반</p>
 				</th>
 				<td>${info.trgtGrade}</td>
-				<th scope="row">
+				<%-- <th scope="row">
 					<p>대상반</p>
 				</th>
-				<td>${info.trgtClsrm}</td>
+				<td>${info.trgtClsrm}</td> --%>
 			</tr>
 			<tr>
 				<th scope="row">

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.jsp

@@ -36,6 +36,12 @@
 		frm.submit();
 	}
 	
+	function goMain(){
+		var frm = document.getElementById("prcsOrdForm");
+		frm.action = "<c:url value='/web/main/mainPage.do'/>";
+		frm.submit();
+	}
+	
 
 </script>
 	<form id="prcsOrdForm" name="prcsOrdForm">
@@ -59,6 +65,7 @@
 							</c:if>
 						</dl>
 					</div>
+					<c:if test="${detailVO.checkYn eq 'Y' }">
 						<div class="title">· 신청서 접수 시 유의사항</div>
 						<div class="list">
 							<ol>
@@ -74,6 +81,7 @@
 								<li><span class="number">8.</span>선정 후 취소(신규 운영 교사 사전 연수 불참 등) 및 운영 포기교실은 차년도 참여를 제한합니다.<br>(해당 내용 학교 공문 발송 예정)</li>
 							</ol>
 						</div>
+					</c:if>
 				</div>
 				<div class="pop_btn_wrap btn_layout01">
 					<div class="btn_left">
@@ -82,6 +90,9 @@
 						<c:if test="${detailVO.checkYn eq 'Y' }">
 							<button type="button" class="btnType05" onclick="goWrite();">확인</button>
 						</c:if>
+						<c:if test="${detailVO.checkYn ne 'Y' }">
+							<button type="button" class="btnType05" onclick="goMain();">찾아가는 저작권 교육</button>
+						</c:if>
 						<button type="button" class="btnType02 tooltip-close" data-focus="list_popup_close" data-focus-next="sub40_pop01">취소</button>
 					</div>
 					<div class="btn_right">