Merge branch 'JIWOO' into advc

Conflicts:
	src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml
	src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.jsp

src/main/java/kcc/let/uat/uia/web/APILoginContoller.java

@@ -70,7 +70,8 @@ public class APILoginContoller {
 	public String loginKeyChkForOffedu(Map<String, String> paramRequest, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response,HttpSession session) throws Exception {
 		String userId = paramRequest.get("user_id");
 		String key = paramRequest.get("key");
-		String returnUrl = paramRequest.get("returnUrl");
+		//String returnUrl = paramRequest.get("returnUrl"); //e-배움터 문의결과 returnUrl 컨트롤은 불가능하다고 함
+		String returnUrl = "";
 		
 		System.out.println("@@@@@@@e배움터 로그인 페이지에서 오는 메소드 or e배움터 로그인 상태에서 오는 메소드@@@@@@@@");
 		//테스트를 위한 값 선언

src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctAnncmMngController.java

@@ -132,7 +132,7 @@ public class OprtnAplctAnncmMngController {
 	 */
 	@RequestMapping("oprtnAplctAnncmMngList.do")
 	public String OprtnAplctAnncmMngList(
-			@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+			 VEPrcsDetailVO vEPrcsDetailVO
 			, ModelMap model
 			) throws Exception {
 
@@ -144,6 +144,9 @@ public class OprtnAplctAnncmMngController {
         
 		//로그인 처리==================================== 
 		
+		//체험교실 구분값
+		vEPrcsDetailVO.setLctrDivCd("30");
+		
     	//1.pageing step1
     	PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO);
     	

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

@@ -211,6 +211,7 @@
 
 	function fncGoList(){
 		var listForm = document.listForm ;
+		listForm.prcsAplctPrdOrd.value = ""; //목록 이동 시 searchKeyword 초기화
 		listForm.action = "<c:url value='/kccadr/oprtn/cpyrgExprnClsrm/oprtnAplctAnncmMngList.do'/>";
 		listForm.submit();
 	}
@@ -221,6 +222,10 @@
 		listForm.submit();
 	}
 	
+	function fncPreview(){
+		alert("개발전")
+	}
+
 </script>
 
 </head>
@@ -326,7 +331,6 @@
 							</c:import>
 						</td>
 					</tr>					
-					<%-- 
 					<tr>
 						<th scope="row">
 							<p>안내내용</p>
@@ -344,7 +348,6 @@
 							<c:out value='${info.popupCn}'/>
 						</td>
 					</tr>
-					 --%>
 					<tr>
 						<th scope="row">
 							<p>사용여부</p>
@@ -369,6 +372,7 @@
 				<div class="btn_center">
 				</div>
 				<div class="btn_right">
+					<button type="button" class="btn_type01" onclick="fncPreview(); return false;">미리보기</button>
 					<button type="button" class="btn_type05" onclick="fncUpdate(); return false;">수정</button>
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
 				</div>

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

@@ -289,10 +289,7 @@
 <!-- 									<button class="btnType02" onclick="fncCreate(); return false;" >삭제</button>									 -->
 								</td>
 								<td>
-									<fmt:parseDate value='${list.strtPnttm}' var='strtPnttmDe' pattern="yyyyMMddHHmm" scope="page" />
+									${list.strtPnttm}~${list.endPnttm}
-									<fmt:parseDate value='${list.endPnttm}' var='endPnttmDe' pattern="yyyyMMddHHmm" scope="page" />
-									<fmt:formatDate value="${strtPnttmDe}" pattern="yyyy-MM-dd"/> ~ 
-									<fmt:formatDate value="${endPnttmDe}" pattern="yyyy-MM-dd"/> 
 								</td>
 								<td>
 									<c:out value='${list.atchFileNm}'/>

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

@@ -153,7 +153,6 @@
 			alert("종료일을 입력해주세요.");
 			return false;
 		}
-		/* 
 		if($("#anncmCn").val() == ""){
 			alert("안내내용을 입력해주세요.");
 			return false;
@@ -162,7 +161,6 @@
 			alert("팝업내용을 입력해주세요.");
 			return false;
 		}
-		 */
 		
 		//첨부파일 등록 처리
 		$('#file_temp').val("");	//첨부파일 중복 등록 방지를 위해 추가
@@ -467,6 +465,24 @@
 					</tr>
 					
 					 -->
+					<tr>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>안내내용</p>
+						</th>
+						<td>
+							<textarea name="anncmCn" id="anncmCn" cols="30" rows="3"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p class="req_text"><span>필수입력 항목</span>*</p>
+							<p>팝업내용</p>
+						</th>
+						<td>
+							<textarea name="popupCn" id="popupCn" cols="30" rows="3"></textarea>
+						</td>
+					</tr>
 					<tr>
 						<th scope="row">
 							<p class="req_text"><span>필수입력 항목</span>*</p>

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

@@ -126,7 +126,6 @@
 			alert("종료일을 입력해주세요.");
 			return false;
 		}
-		/* 
 		if($("#anncmCn").val() == ""){
 			alert("안내내용을 입력해주세요.");
 			return false;
@@ -135,7 +134,6 @@
 			alert("팝업내용을 입력해주세요.");
 			return false;
 		}
-		 */
 		
 		//첨부파일 등록 처리
 		$('#file_temp').val("");	//첨부파일 중복 등록 방지를 위해 추가
@@ -299,7 +297,7 @@
 							<p>제목</p>
 						</th>
 						<td>
-							<input type="text" placeholder="제목을 입력해주세요." name="title" id="title" value="<c:out value='${info.title}'/>">
+							<input type="text" style="width: 100%;" placeholder="제목을 입력해주세요." name="title" id="title" value="<c:out value='${info.title}'/>">
 						</td>
 					</tr>
 					<tr>
@@ -428,7 +426,6 @@
 							</div>
 						</td>
 					</tr>					
-					<%-- 
 					<tr>
 						<th scope="row">
 							<p class="req_text"><span>필수입력 항목</span>*</p>
@@ -448,7 +445,6 @@
 							<textarea id="popupCn" name="popupCn" class="purpose_text" rows="5" cols="30"><c:out value='${info.popupCn}'/></textarea>
 						</td>
 					</tr>
-					 --%>
 					<tr>
 						<th scope="row">
 							<p class="req_text"><span>필수입력 항목</span>*</p>

src/main/webapp/visitEdu/adm/publish/datepicker/classic.css

@@ -23,7 +23,7 @@
 .picker__input {
   width: 180px;
   cursor: default;
-  background-image: url(../../image/content/calendarIcon.png);
+  background-image: url(../image/content/calendarIcon.png);
   background-repeat: no-repeat;
   background-position: 90% 45%;
 }