diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java
index 9d80626e..9812475c 100644
--- a/src/main/java/nlib/col/web/RentController.java
+++ b/src/main/java/nlib/col/web/RentController.java
@@ -8,9 +8,32 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
import nlib.col.service.RentService;
+/**
+ *
+ * @Class Name : RentController.java
+ *
+ * @Description : 대출 Controller
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @version 1.0
+ *
+ */
@Controller
public class RentController
{
@@ -19,10 +42,24 @@ public class RentController
@Resource(name = "rentService")
private RentService rentService;
-
- public ModelMap listRentItems(HttpServletRequest req) {
- return null;
+ /** 대출 목록 화면을 호출한다.
+ * @param req
+ * @return
+ */
+ @RequestMapping("/rent/listRentItems.do")
+ public String listRentItems(HttpServletRequest req) {
+ return "nlib/rent/listRentItems";
}
+
+ /** 대출 취소 목록화면을 호출한다.
+ * @param req
+ * @return
+ */
+ @RequestMapping("/rent/listCancelRentItems.do")
+ public String listCancelRentItems(HttpServletRequest req) {
+ return "nlib/rent/listCancelRentItems";
+ }
+
public ModelMap postponeReturnDate(HttpServletRequest req) {
return null;
@@ -32,8 +69,13 @@ public class RentController
return null;
}
- public ModelMap listReservations(HttpServletRequest req) {
- return null;
+ /** 대출 예약 목록화면을 호출한다.
+ * @param req
+ * @return
+ */
+ @RequestMapping("/rent/listReservations.do")
+ public String listReservations(HttpServletRequest req) {
+ return "nlib/rent/listReservations";
}
public ModelMap cancelReservations(HttpServletRequest req) {
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index 16fc90b2..76d6a447 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -53,6 +53,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/temp/**")
.antMatchers("/favicon/**")
.antMatchers("/*/*Ajax.do")
+ .antMatchers("/board/**")
;
}
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
index e4bcfa7d..f33bf4cd 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
@@ -54,6 +54,12 @@ function signUp(){
return false;
}
+ if($("#zipNo").val()=="" || $("#roadAddrPart").val()=="" || $("#addrDetail").val()=="")
+ {
+ alert("주소를 입력해주세요.");
+ return false;
+ }
+
if(confirm("회원가입하시겠습니까?")){
alert("회원가입 되었습니다.");
return true;
@@ -312,7 +318,7 @@ label.error {
| 아이디 |
- required >
+ required readonly >
|
@@ -321,14 +327,15 @@ label.error {
+ oninput="this.setCustomValidity('')"
+ pattern="^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[$@$!%*#?&])[A-Za-z\d$@$!%*#?&]{8,16}$" required>
|
| 비밀번호 확인 |
-
+
|
@@ -370,8 +377,8 @@ label.error {
| 주소 |
-
-
+
+
|
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp
new file mode 100644
index 00000000..2ae168db
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listCancelRentItems.jsp
@@ -0,0 +1,181 @@
+<%
+/**
+ *
+ * @Class Name : listCancelRentItems.jsp
+ *
+ * @Description : 대출 취소목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 취소
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+대출 취소
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
new file mode 100644
index 00000000..f991adde
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
@@ -0,0 +1,181 @@
+<%
+/**
+ *
+ * @Class Name : listRentItems.jsp
+ *
+ * @Description : 대출 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 목록
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+대출 목록
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp
new file mode 100644
index 00000000..c0f302f3
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listReservations.jsp
@@ -0,0 +1,181 @@
+<%
+/**
+ *
+ * @Class Name : listReserVations.jsp
+ *
+ * @Description : 대출 예약 목록을 조회한다.
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 21. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @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" %>
+
+대출 예약
+
+
+
+
+${pageTitle}
+
+
+
+
+
+
+
+
+
+
+대출 예약
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
index faa8c345..037aca19 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
@@ -57,8 +57,56 @@ $(document).ready(function() {
//핸드폰 인증번호 받기
%>
function phoneCert(){
+
+
$("#phone").val($("#phone").val().replace(/-/gi,""));
- $("#phoneCertYn").val("Y");
+ var regExp = /^\d{3}\d{3,4}\d{4}$/;
+
+ if(!regExp.test($("#phone").val()) || $("#phone").val()==""){
+
+ alert("형식에 맞지 않는 번호입니다.");
+ return false;
+ }
+
+ $.ajax({
+ url : "/nlib/member/phoneCertNum.ajax",
+ type : "POST",
+ async: false,
+ data : {"phone" : $("#phone").val()},
+ success : function(result){
+ alert("인증번호가 발송됐습니다.");
+ //인증번호 확인창
+ $("#phoneCertForm").css("display","block")
+
+ },error : function(){
+ }
+ })
+}
+
+<%
+//핸드폰 인증번호 확인
+%>
+function certNumCheck(){
+ <%
+ //ajax 사용자가 입력한 번호를 보내 RESTfull server에서 확인 success or fail 반환 (3분이내인지도)
+ %>
+ $.ajax({
+ url : "/nlib/member/phoneCertNumChk.ajax",
+ type : "POST",
+ data : {"phoneCertNum" : $("#phoneCertNum").val(),
+ "phone" : $("#phone").val()},
+ async: false,
+ success : function(result){
+ if(result=="true")
+ {
+ alert("인증되었습니다.");
+ $("#phoneCertYn").val("Y");
+ }else{
+ alert("인증에 실패했습니다.");
+ }
+ },error : function(){
+ }
+ })
}
function jusoCallBack(zipNo,roadAddrPart,addrDetail){
@@ -75,10 +123,21 @@ document.addEventListener('keydown', function(event) {
}, true);
function update(){
+ if($("#phoneCertYn").val()!="Y")
+ {
+ alert("휴대전화 인증이 필요합니다.");
+ return false;
+ }
+
+ if($("#zipNo").val()=="" || $("#roadAddrPart").val()=="" || $("#addrDetail").val()=="")
+ {
+ alert("주소를 입력해주세요.");
+ return false;
+ }
+
if(confirm("수정하시겠습니까?")){
alert("수정되었습니다.");
- document.updateForm.action="/nlib/userInfo/getMyInfo.do";
- document.updateForm.submit();
+ return true;
}else{
return false;
}
@@ -155,24 +214,25 @@ label.error {
정보수정
-