From 6a28c8db70daf93e7acdff9a16761d5ae2200f2d Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 19 Nov 2021 17:03:04 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=97=B4=EB=9E=8C=20,=EB=8C=80=EC=B6=9C?= =?UTF-8?q?=EB=93=B1=20=EC=A1=B0=EA=B1=B4=20=ED=95=A8=EC=88=98=20jsp?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/CollectionVO.java | 125 ++++++++++++++---- .../jsp/nlib/collection/listInterests.jsp | 10 +- .../jsp/nlib/collection/searchItemDetail.jsp | 18 ++- .../jsp/nlib/collection/searchList.jsp | 10 +- 4 files changed, 120 insertions(+), 43 deletions(-) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index d383477a..2839695f 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -107,20 +107,14 @@ public class CollectionVO extends PagingVO { protected String regId; /* 등록자ID */ protected String modId; /* 변경자ID */ protected String mUseYn; /* 관심여부 */ - protected String digitalReadYn; /**/ - public String getDigitalReadYn() { - return digitalReadYn; - } + protected String digitalReadYn; /* 디지털열람여부 */ - public void setDigitalReadYn(String digitalReadYn) { - this.digitalReadYn = digitalReadYn; - } //-------------------------------------------- // 카트/관심 항목 //-------------------------------------------- - protected int mbInterestId; /* 관심 id */ - protected String mbInfoId; /* 회원 id */ + protected int mbInterestId; /* 관심 id */ + protected String mbInfoId; /* 회원 id */ protected String mbCartId; /* 카트ID */ protected String cartTypeCd; /* 카트유형코드 */ protected String cartProcDivCd; /* 카트처리구분코드 */ @@ -134,8 +128,8 @@ public class CollectionVO extends PagingVO { protected String bookLtRvStatusNm; /* 대출상태구분코드명 */ protected String rsrvExpctDd; /* 대출예약만료일자 */ protected String rtnDd; /* 반납일자 */ - protected String rsrvDivCd; /* 대출/예약 신청구분코드 */ - protected String rsrvDivNm; /* 대출/예약 신청구분코드명 */ + protected String rsrvDivCd; /* 대출/예약 신청구분코드 */ + protected String rsrvDivNm; /* 대출/예약 신청구분코드명 */ //-------------------------------------------- // 열람관련 @@ -167,11 +161,34 @@ public class CollectionVO extends PagingVO { // 각종 상태 제공 서비스 //--------------------------------------------- + /** + * 기본 공개 여부를 리턴한다. + * + * @return + */ + public boolean isPub() { + + // 사용여부 + if(StringUtil.getString(useYn, "Y").equalsIgnoreCase("N")) return false; + + // 공개여부 (공개, 부분공개 포함) + if(StringUtil.getString(openDivCd, "3").equals("3")) return false; + + return true; + } + /** * 방문열람 가능여부를 리턴한다. * @return */ - public boolean canRead() { + public boolean isAbleRead() { + + // 기본공개 + if(!isPub()) return false; + + // 열람여부 + if(StringUtil.getString(operReadRangeCd, "03").equals("03")) return false; + return true; } @@ -179,23 +196,50 @@ public class CollectionVO extends PagingVO { * 대출 가능여부를 리턴한다. * @return */ - public boolean canRent() { - return true; + public boolean isAbleRent() { + + // 기본공개 + if(!isPub()) return false; + + // 대출구분 + if(StringUtil.getString(operOutRangeCd, "02").equals("02")) return false; + + return true; } /** * 온라인열람 가능여부를 리턴한다. * @return */ - public boolean canOnline() { - return true; + public boolean isAbleOnline() { + + // 기본공개 + if(!isPub()) return false; + + // 디지털열람여부 + if(!StringUtil.getString(digitalReadYn, "N").equalsIgnoreCase("Y")) return false; + + // 인터페이스ID 존재 + if(StringUtil.isEmpty(interfaceId)) return false; + + return true; } /** * 기타 가능여부를 리턴한다. * @return */ - public boolean canOther() { + public boolean isAbleOther() { + + // 기본공개 + if(!isPub()) return false; + + // 방문열람여부 + if(isAbleRead()) return false; + + // 대출여부 + if(isAbleRent()) return false; + return true; } @@ -203,7 +247,14 @@ public class CollectionVO extends PagingVO { * 현재 방문열람 가능여부를 리턴한다. * @return */ - public boolean canReadNow() { + public boolean isAbleReadNow() { + + // 방문열람 가능 자료 + if(!isAbleRead()) return false; + + // 이용상태코드 확인 + if(!":01:04:05:06:".contains(":" + StringUtil.getString(useStatus, "00") + ":")) return false; + return true; } @@ -211,15 +262,22 @@ public class CollectionVO extends PagingVO { * 현재 대출(신청 또는 예약) 가능여부를 리턴한다. * @return */ - public boolean canRentNow() { - return canRentAppNow() || canRentResNow(); + public boolean isAbleRentNow() { + return isAbleRentAppNow() || isAbleRentResNow(); } /** * 현재 대출 [신청] 가능여부를 리턴한다. * @return */ - public boolean canRentAppNow() { + public boolean isAbleRentAppNow() { + + // 대출 가능 자료 + if(!isAbleRent()) return false; + + // 이용상태코드 확인 + if(!":01:".contains(":" + StringUtil.getString(useStatus, "00") + ":")) return false; + return true; } @@ -227,7 +285,14 @@ public class CollectionVO extends PagingVO { * 현재 대출 [예약] 가능여부를 리턴한다. * @return */ - public boolean canRentResNow() { + public boolean isAbleRentResNow() { + + // 대출 가능 자료 + if(!isAbleRent()) return false; + + // 이용상태코드 확인 + if(!":02:".contains(":" + StringUtil.getString(useStatus, "00") + ":")) return false; + return true; } @@ -235,7 +300,14 @@ public class CollectionVO extends PagingVO { * 현재 온라인열람 가능여부를 리턴한다. * @return */ - public boolean canOnlineNow() { + public boolean isAbleOnlineNow() { + + // 대출 가능 자료 + if(!isAbleOnline()) return false; + + // 이용상태코드 확인 + if(!":07:".contains(":" + StringUtil.getString(useStatus, "00") + ":")) return false; + return true; } @@ -951,6 +1023,13 @@ public class CollectionVO extends PagingVO { public void setDomainHostNm(String domainHostNm) { this.domainHostNm = domainHostNm; } + + public String getDigitalReadYn() { + return digitalReadYn; + } + public void setDigitalReadYn(String digitalReadYn) { + this.digitalReadYn = digitalReadYn; + } } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index 05c05703..a2feace0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -170,19 +170,19 @@ t_data += "
\"썸네일\""; t_data += "\"즐겨찾기\"즐겨찾기
"; t_data += "
" - if(!fn_isEmpty(obj.openDivCd) && obj.openDivCd != "3" && obj.operReadRangeCd == "01" && obj.digitalReadYn == 'Y') + if(obj.ableOnline) { t_data += "온라인열람" } - if(!fn_isEmpty(obj.openDivCd) && obj.openDivCd != "3" && !fn_isEmpty(obj.operOutRangeCd) && obj.operOutRangeCd != "02") + if(obj.ableRent) { t_data += "대출" } - if(!fn_isEmpty(obj.openDivCd) && obj.openDivCd != "3" && !fn_isEmpty(obj.operReadRangeCd) && obj.operReadRangeCd != "03") + if(obj.ableRead) { t_data += "방문열람" } - if(!(!fn_isEmpty(obj.openDivCd) && obj.openDivCd != "3") && !(obj.operReadRangeCd == "01" && obj.digitalReadYn == 'Y') && !(!fn_isEmpty(obj.operOutRangeCd) && obj.operOutRangeCd != "02") && !(!fn_isEmpty(obj.operReadRangeCd) && obj.operReadRangeCd != "03")) + if(obj.ableOther) { t_data += "기타" } @@ -257,7 +257,7 @@ { t_btn +="

" + obj.operOutRangeNm + obj.operReadRangeNm + "

"; } - if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3' && obj.digitalReadYn == 'Y') + if(obj.ableOnline) { t_btn+= ""; } 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 b401a8a9..e1c5ccc5 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -94,16 +94,16 @@ function goList(){
- + 온라인열람 - + 대출 - + 방문열람 - + 기타
@@ -116,7 +116,7 @@ function goList(){
- + @@ -128,9 +128,7 @@ function goList(){ - -
@@ -220,9 +218,9 @@ function goList(){
- - - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 99cf2d79..9cda2eae 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -448,16 +448,16 @@ function fn_search_article(pageIndex) {
- + 온라인열람 - + 대출 - + 방문열람 - + 기타
@@ -481,7 +481,7 @@ function fn_search_article(pageIndex) { - + From c04a49ea18c21f1e46d072949103e7de56c9b018 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 19 Nov 2021 17:03:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 9cda2eae..e6aa0de6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -480,7 +480,7 @@ function fn_search_article(pageIndex) {

${result.operOutRangeNm}${result.operReadRangeNm}

 - + From d7b3fdffcb20aff12a30a5032315fc2858efe7cf Mon Sep 17 00:00:00 2001 From: com02 Date: Fri, 19 Nov 2021 17:15:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/cart.html | 1 + src/main/webapp/css/media.css | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/cart.html b/src/main/webapp/cart.html index 62d6a278..1e5b4d52 100644 --- a/src/main/webapp/cart.html +++ b/src/main/webapp/cart.html @@ -12,6 +12,7 @@ + diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 87a0e50b..8189cdd0 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -205,6 +205,7 @@ a.pop-logo img { margin-right: 10px; } .join .inner .row-bottom .join-box .form-group .con, .join .inner .row-bottom .join-box .form-group .con .form-control { width: 100%; box-sizing: border-box; } .join .inner .row-bottom .join-box .form-group .con .cer::placeholder { font-size: 12px !important; } + .join .inner .row-bottom .join-box .form-group .con select {width:32%;margin-left:0;} .join .inner .row-bottom .join-box .Usersex .con { display: flex; } .join .inner .row-bottom .join-box .Usersex .chk { margin-right: 0; width: 50%; } .join .inner .row-bottom .join-box .Userbirth .con { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; height: 86px; } @@ -220,7 +221,9 @@ a.pop-logo img { margin-right: 10px; } .join .inner .row-bottom .join-box .form-group.service p:nth-of-type(2) { width: 100%; text-indent: -6px; padding-left: 6px; } .join .inner .row-bottom .join-box .form-group .con span:nth-of-type(1) { width: 100%; vertical-align: top; margin-left: 0; } .join .inner .row-bottom .join-box .form-group.service .right label { margin-left: 0; } - .join .inner .row-bottom .join-box .form-group.service p.bg { text-indent: -6px; padding-left: 18px; } + .join .inner .row-bottom .join-box .form-group.service p.bg { text-indent: -6px; padding-left: 18px; } + .join .inner .row-bottom .join-box .form-group .con span.fail {width:100%;margin-bottom:10px;} + /* 가입 완료 */ .join.succ .inner .row-bottom .join-box .success .text p:nth-of-type(1) { font-size: 26px; } @@ -281,7 +284,7 @@ a.pop-logo img { margin-right: 10px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type { display: flex; position: absolute; top: 14px; left: 32px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type span { padding: 5px 12px 5px; margin-right: 6px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; } - .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 189px; height: 144px; padding: 0; display: flex; align-items: center; justify-content: center; } + .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 159px; height: 114px; padding: 0; display: flex; align-items: center; justify-content: center;margin-top:80px; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img a, .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { height: 100%; } .cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { width: 100%; position: absolute; text-align: left; bottom: 184px; padding: 0; } @@ -303,6 +306,29 @@ a.pop-logo img { margin-right: 10px; } .cart .inner .tabs_item .btn-box .left { margin-right: 16px; } .cart .inner .tabs_item .btn-box .btn { width: 100%; } +/* +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; position:absolute;left:22px;top:50px;font-size:14px;width:270px;overflow:hideen;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-state {position:static;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-state {} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-date {position:absolute;top:133px;left:200px;} + +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-chk {width:auto;line-height:90px;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-data {width:auto;display:none;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-state {width:auto;display:none;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-date {width:auto;display:none;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-loan {width:auto;display:none;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-reser {width:auto;display:none;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-visit {width:auto;display:none;} + +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-chk {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-state {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-date {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-loan {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-reser {width:auto;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-visit {width:auto;} +*/ + /* 대출신청/예약확인 */ .cart-confirm .inner .tabs_item .list-cart-wrap .list-cart div.list { padding: 10px 10px 44px; } .cart-confirm .inner .visit-confirm .tabs_item .list-cart-wrap .list-cart div.list { padding: 10px 10px 24px; } @@ -957,7 +983,7 @@ a.pop-logo img { margin-right: 10px; } .pop-change .Title p, .pop-change .Title h3, .pop-find .Title p, - .pop-find .Title h3 { display: none; } + .pop-find .Title h3 { } .pop-change .inner, .pop-find .inner { flex: 1; } .pop-change .inner .row, @@ -972,6 +998,7 @@ a.pop-logo img { margin-right: 10px; } .pop-find .inner .row.btn-box .btn { width: 50%; margin: 0; } .pop-change .inner .row.btn-box .btn:nth-child(1), .pop-find .inner .row.btn-box .btn:nth-child(1) { margin-right: 10px; } + .pop-find .Title h3 {margin-top:5px;} /* 반려사유 팝업 */ .pop-return { top: 0; left: 0; width: 100vw; height: 100vh; border-radius: 0; display: flex; flex-direction: column; }