diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index 99076d54..81ee833f 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -1,3 +1,4 @@ +<<<<<<< HEAD <% /** *
@@ -411,3 +412,418 @@ $(document).ready(function() {
+=======
+<%
+/**
+ *
+ * @Class Name : listNotices.jsp
+ *
+ * @Description : 공지사항 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 6. 15. KNKIM 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021. 6. 15.
+ * @version 1.0
+ *
+ */
+ %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+
+
+
+
+
+
+
+
+
+>>>>>>> branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
index 719c3bf0..e8ed0174 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<%
/**
*
@@ -434,4 +435,442 @@ var swiper = new Swiper(".DetailSwiper2", {
},
*/
});
+=======
+<%
+/**
+ *
+ * @Class Name : selectItemInfo.jsp
+ *
+ * @Description : 소장자료 상세내용을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 30. JSYOO 최초 생성
+ * @ 2021.10. 28. KNKIM 대출예약, 방문열람신청, 카트담기 연결 처리
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 30.
+ * @version 1.0
+ *
+ */
+ %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+
+
+자료 상세
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
index 61c433e2..df8220ff 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<%
/**
*
@@ -346,3 +347,354 @@ $(document).ready(function() {
+=======
+<%
+/**
+ *
+ * @Class Name : confirmRend.jsp
+ *
+ * @Description : 방문열람신청 확인 화면
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 10. 25. KNKIM 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021. 10. 25.
+ * @version 1.0
+ *
+ */
+ %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+
+
+
+
+
+
+
+
+
+>>>>>>> branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp
index 4524bbd8..44463dd6 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<%
/**
*
@@ -177,3 +178,184 @@ function fn_listReadItems() {
+=======
+<%
+/**
+ *
+ * @Class Name : insertReadItems.jsp
+ *
+ * @Description : 방문열람신청 결과 화면
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 10. 25. KNKIM 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021. 10. 25.
+ * @version 1.0
+ *
+ */
+ %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+
+
+
+
+
+
+
+
+ 방문열람신청 섹션영역
+
+
+
+
+ - HOME
+
+ - 카트
+
+ - 방문열람신청
+
+
+ - 방문열람신청
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 자료정보
+ 이용상태
+ 반납예정일
+ 신청/예약정보
+
+
+
+
+
+
+
+
+ ${read.useStatusNm }
+ ${read.rtnExpctDd }
+ ${read.bookLtRvStatusNm }
+
+ (${read.rsrvDd })
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 자료 ${totCnt}건 방문열람신청이 접수되었습니다.
+ (희망방문일자: ${readVO.hopeReqPridDtmFrom} ~ ${readVO.hopeReqPridDtmTo})
+
+
+
+ 처리에 실패하였습니다.
+ ${readVO.resultMessage }
+
+
+
+ - 방문열람신청 내역은 [마이페이지 > 방문열람관리]에서 확인하실 수 있습니다.
+ - 방문열람시간은 관리자가 지정하며, 승인 후 지정된 일시에 방문하지 않는 경우, 미열람 처리됩니다.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
index 27362345..d1351c2f 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<%
/**
*
@@ -317,3 +318,324 @@ $(document).ready(function() {
+=======
+<%
+/**
+ *
+ * @Class Name : confirmRent.jsp
+ *
+ * @Description : 대출신청 확인 화면
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 10. 25. KNKIM 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021. 10. 25.
+ * @version 1.0
+ *
+ */
+ %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+
+
+
+
+
+
+
+
+
+>>>>>>> branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib