From 1752ca86517ad7e45cf008df4aab0eda7915a5f2 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 3 Jan 2024 10:29:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=97=A4?=
 =?UTF-8?q?=EB=8D=94=20=ED=8F=AC=ED=83=88=EB=A7=81=ED=81=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=84=B1=EC=9D=B8=EA=B5=90=EC=9C=A1=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   |  50 ++++++-
 .../adultVisitEdu/eduEnd/eduEndDetail.jsp     | 124 +++++-------------
 2 files changed, 80 insertions(+), 94 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index bc42efea..01d60be5 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -125,6 +125,7 @@ function usrJoin(){
 	   document.body.style.zoom = nowZoom + "%";
 }
  
+ //상단 e배움터 링크 이동 - 로그인상ㅌ 
  function goEEdu() {
 	var environment = '${environment}';
 	$.ajax({
@@ -136,7 +137,7 @@ function usrJoin(){
 		success: function (returnData, status) {
 			if(returnData.status == 'loginY'){
 				if(environment == 'real'){
-					window.location.href = "http://https://edu-copyright.or.kr.255.205.7/user/main/main.do?user_id="+returnData.user_id+"&key="+returnData.key;
+					window.location.href = "https://edu-copyright.or.kr/user/main/main.do?user_id="+returnData.user_id+"&key="+returnData.key;
 				}else{
 					window.location.href = "http://223.255.205.7/user/main/main.do?user_id="+returnData.user_id+"&key="+returnData.key;
 				}
@@ -153,6 +154,37 @@ function usrJoin(){
 		}
 	});
 }
+ //상단 포탈사이트, 장애인e배움터, 저작권배움터 링크 이동
+ function goLink(target){
+	 var environment = '${environment}';
+	 var url = "https://edu-copyright.or.kr/offedu/web/main/mainPage.do";
+	 if(environment == 'real'){
+		 if(target == 'portal'){
+			 url = "https://edu-copyright.or.kr/portal/main.do"
+		 }else if(target == 'user'){
+			 url = "https://edu-copyright.or.kr/dsprUser/main/main.do"
+		 }else if(target == 'dsprUser'){
+			 url = "https://edu-copyright.or.kr/dsprUser/main/main.do"
+		 }else{
+			 url = "https://edu-copyright.or.kr/offedu/web/main/mainPage.do"
+		 }
+		 
+	 }else{
+		 
+		 if(target == 'portal'){
+			 url = "http://223.255.205.7/portal/main.do"
+		 }else if(target == 'user'){
+			 url = "http://223.255.205.7/user/main/main.do"
+		 }else if(target == 'dsprUser'){
+			 url = "http://223.255.205.7/dsprUser/main/main.do"
+		 }else{
+			 url = "http://223.255.205.7/offedu/web/main/mainPage.do"
+		 }
+		 
+	 }
+	 
+	 window.location.href = url;
+ }
 
 </script>
 </head>
@@ -178,10 +210,14 @@ function usrJoin(){
 				<div class="inner">
 					<div class="top_link">
 						<ul>
-							<li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
+							<!-- <li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
 							<li><a href="https://edu-copyright.or.kr/user/main/main.do">저작권e배움터</a></li>
 							<li><a href="https://edu-copyright.or.kr/dsprUser/main/main.do">장애인e배움터</a></li>
-							<li class="on"><a href="https://www.edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li>
+							<li class="on"><a href="https://www.edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li> -->
+							<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;">포털사이트</a></li>
+							<li><a href="#goEEdu" onclick="goLink('user');return false;" onkeypress="this.onclick;">저작권e배움터</a></li>
+							<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;">장애인e배움터</a></li>
+							<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;">저작권배움터</a></li>
 						</ul>
 					</div>
 					<!-- <div class="area_left">
@@ -245,10 +281,14 @@ function usrJoin(){
 				<div class="inner">
 					<div class="top_link">
 						<ul>
-							<li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
+							<!-- <li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
 							<li><a href="https://edu-copyright.or.kr/user/main/main.do">저작권e배움터</a></li>
 							<li><a href="https://edu-copyright.or.kr/dsprUser/main/main.do">장애인e배움터</a></li>
-							<li class="on"><a href="https://www.edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li>
+							<li class="on"><a href="https://edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li> -->
+							<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;">포털사이트</a></li>
+							<li><a href="#goEEdu" onclick="goEEdu();return false;" onkeypress="this.onclick;">저작권e배움터</a></li>
+							<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;">장애인e배움터</a></li>
+							<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;">저작권배움터</a></li>
 						</ul>
 					</div>
 					<!--<div class="area_left">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
index ffa5c178..eabe1fdc 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@@ -543,42 +543,6 @@
 			alert("강의주제를 입력해주세요");
 			return false;
 		}
-		if($("input[name=lctrDay]").val() == ''){
-			alert("날짜를 입력해주세요");
-			return false;
-		}
-		if($('#lctrStrtH').val() == ''){
-			alert("시작시간을 입력해주세요");
-			return false;
-		}
-		if($('#lctrStrtM').val() == ''){
-			alert("시작 분을 입력해주세요");
-			return false;
-		}
-		if($('#lctrEndH').val() == ''){
-			alert("시작시간을 입력해주세요");
-			return false;
-		}
-		if($('#lctrEndM').val() == ''){
-			alert("시작 분을 입력해주세요");
-			return false;
-		}
-		if($('#lctrPlace').val() == ''){
-			alert("장소를 입력해주세요");
-			return false;
-		}
-		if($('#lctrTrgt').val() == ''){
-			alert("교육장소를 입력해주세요");
-			return false;
-		}
-		if($('#nos').val() == ''){
-			alert("인원을 입력해주세요");
-			return false;
-		}
-		if($('#instrNm').val() == ''){
-			alert("강사명(소속)을 입력해주세요");
-			return false;
-		}
 		//첨부파일 체크 및 요청
 		if(confirm("양식을 업로드 하시겠습니까?")){
 			if(control.getUploadFiles().length > 0){
@@ -1556,62 +1520,35 @@
 									<input type="text" id="lctrSbjct" name="lctrSbjct" placeholder="대학생이 알아야할 저작권">
 								</td>
 							</tr>
-							<tr>
-								<th scope="row">
-									<p>강의날짜</p>
-								</th>
-								<td colspan="3">
-									<div class="btn_wrap">
-										<div class="calendar_wrap">
-											<%-- <input type="text" class="calendar" id="searchStartDt" name="searchStartDt" title="시작일 선택" value="${vEEduAplctVO.searchStartDt}"> --%>
-											<duet-date-picker identifier="date" name="lctrDay" class="startDate" value=""></duet-date-picker>
-										</div>
-										<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<th scope="row">
-									<p>강의시간</p>
-								</th>
-								<td colspan="3">
-									<div class="btn_wrap">
-										 <!-- Hours (시) Dropdown -->
-										<select id="lctrStrtH" name="lctrStrtH" class="selType1">
-											<c:forEach var="hour" begin="0" end="23">
-												<option value="${hour < 10 ? '0' : ''}${hour}">${hour < 10 ? '0' : ''}${hour}시</option>
-											</c:forEach>
-										</select>
-										:
-										<!-- Minutes (분) Dropdown -->
-										<select id="lctrStrtM" name="lctrStrtM" class="selType1">
-											<c:forEach var="minute" begin="0" end="59" step="1">
-												<option value="${minute < 10 ? '0' : ''}${minute}">${minute < 10 ? '0' : ''}${minute}분</option>
-											</c:forEach>
-										</select>
+							<c:forEach var="list" items="${chasiList}" varStatus="status">
+								<tr>
+									<th scope="row">
+										<p>강의날짜</p>
+									</th>
+									<td colspan="3">
+										<c:out value="${list.eduHopeDt}"/>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row">
+										<p>강의시간</p>
+									</th>
+									<td colspan="3">
+										<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/>
+										<fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
 										~
-										 <!-- Hours (시) Dropdown -->
-										<select id="lctrEndH" name="lctrEndH" class="selType1">
-											<c:forEach var="hour" begin="0" end="23">
-												<option value="${hour < 10 ? '0' : ''}${hour}">${hour < 10 ? '0' : ''}${hour}시</option>
-											</c:forEach>
-										</select>
-										:
-										<!-- Minutes (분) Dropdown -->
-										<select id="lctrEndM" name="lctrEndM" class="selType1">
-											<c:forEach var="minute" begin="0" end="59" step="1">
-												<option value="${minute < 10 ? '0' : ''}${minute}">${minute < 10 ? '0' : ''}${minute}분</option>
-											</c:forEach>
-										</select>
-									</div>
-								</td>
-							</tr>
+										<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/>
+										<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
+										(${list.lrnTm}분)
+									</td>
+								</tr>
+							</c:forEach>
 							<tr>
 								<th scope="row">
 									<p>장   소</p>
 								</th>
 								<td colspan="3">
-									<input type="text" id="lctrPlace" name="lctrPlace" placeholder="서울~, 온라인 실시간 교육(ZOOM) 등">
+									<c:out value="(${info.post}) ${info.addr} ${info.addrDetail}"/>
 								</td>
 							</tr>
 							<tr>
@@ -1619,7 +1556,7 @@
 									<p>교육대상</p>
 								</th>
 								<td colspan="3">
-									<input type="text" id="lctrTrgt" name="lctrTrgt" placeholder="예) 대학 교수">
+									<c:out value="${info.eduTrgt}"/>
 								</td>
 							</tr>
 							<tr>
@@ -1627,7 +1564,7 @@
 									<p>인    원</p>
 								</th>
 								<td colspan="3">
-									<input type="text" id="nos" name="nos" numberOnly placeholder="30">
+									<c:out value="${info.eduPrsnl}"/>
 								</td>
 							</tr>
 							<tr>
@@ -1635,7 +1572,16 @@
 									<p>강사명(소속)</p>
 								</th>
 								<td colspan="3">
-									<input type="text" id="instrNm" name="instrNm" placeholder="창작이교수(저작권대학교)">
+									<c:forEach var="list" items="${chasiList}" varStatus="status">
+										<c:choose>
+											<c:when test="${empty list.instrNm }">
+												-
+											</c:when>
+											<c:otherwise>
+													<c:out value="${list.instrNm}(${list.blng})"/>
+											</c:otherwise>
+										</c:choose>	
+									</c:forEach>
 								</td>
 							</tr>
 						</tbody>