From 85b209f93e553973fde4796940bf1d5561d80283 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 12 Nov 2021 18:26:52 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9B=90=EB=AC=B8=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 소장자료 리스트 ,조회시 데이터 나오는 형식 수정 소장자료 리스트에서 상세검색 탭 검색시 탭안나오게 , 검색필터 초기화 수정 상세조회시 데이터 가지고있는 컬럼들 추가 관심클릭시 로그인이 안돼있으면 로그인하세요 alert 출력 --- .../java/nlib/col/web/InterestController.java | 23 +++++- .../service/impl/NlibSearchServiceImpl.java | 2 +- .../egovProps/globals.properties | 2 +- .../WEB-INF/jsp/nlib/cmm/headerSubPart.jsp | 6 ++ .../jsp/nlib/collection/listInterests.jsp | 4 +- .../jsp/nlib/collection/searchItemDetail.jsp | 9 +- .../search/getDetailedSearchFormPopup.jsp | 47 +++++++++-- src/main/webapp/data-detail.html | 2 +- src/main/webapp/js/nlib.js | 82 +++++++++++++++++-- 9 files changed, 153 insertions(+), 24 deletions(-) diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index 7f3d2ba9..19725dae 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -164,9 +164,19 @@ public class InterestController extends NlibCommonController */ @RequestMapping(value="/interest/deleteInterests.ajax") @ResponseBody - public void deleteInterests(@RequestParam(value="masterIdList[]") List masterIdList,Authentication authentication) { + public String deleteInterests(@RequestParam(value="masterIdList[]") List masterIdList,Authentication authentication) { NlibLoginVO loginVO = getNlibLoginVO(authentication); + String message=""; + + if(loginVO.getMbInfoId() == null) + { + message="로그인 후 이용하실 수 있습니다."; + return message; + } + interestService.deleteInterests(masterIdList,loginVO.getMbInfoId()); + message ="선택하신 관심자료가 삭제되었습니다."; + return message; } /** @@ -176,14 +186,21 @@ public class InterestController extends NlibCommonController @RequestMapping(value="/interest/insertInterest.ajax") @ResponseBody public String insertInterest(@RequestParam(value="masterId") String masterId,HttpServletResponse response,Authentication authentication,HttpServletRequest request) { + int count = 0; + String message = ""; + NlibLoginVO loginVO = getNlibLoginVO(authentication); CollectionVO vo = new CollectionVO(); vo.setMbInfoId(loginVO.getMbInfoId()); vo.setMasterId(masterId); - int count = 0; - String message = ""; + if(vo.getMbInfoId() == null) + { + message="로그인 후 이용하실 수 있습니다."; + return message; + } + count = interestService.countInterest(vo); if(!StringUtil.getString(masterId,"").equals("")) diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 5f609bc4..28e19566 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -115,7 +115,7 @@ public class NlibSearchServiceImpl implements NlibSearchService{ }else { //상세검색시 콜렉션리스트만 카운트하기위해 추가. - searchVO.setCollection("lib_total,"+searchVO.getCollectionList()); + searchVO.setCollection(searchVO.getCollectionList()); } MultiValueMap allParameters= searchVO.getSearchMap(); diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 552975c2..e494f328 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -153,5 +153,5 @@ roughMap.appkey = b0fdac4f718d71a02d796f8fe3e12987 #\uba54\uc77c \uacc4\uc815 \uc815\ubcf4 system.notification.email.sender = teachteam02@gmail.com -system.notification.email.sender.password = wltlrtkdjq11$$ +system.notification.email.sender.password = djhohubeosfspiek system.notification.email.sender.name = \ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index 757c9d4b..8a1822b7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -15,6 +15,11 @@ $(document).ready(function() { }); function goSearch(){ + if($("#top_query").val() != "") + { + $('#searchHeaderForm input[name=filter_mylist]').val("search_query,"); + } + document.searchHeaderForm.submit(); } @@ -33,6 +38,7 @@ function fn_getMemberCard() {

검색

+
검색
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 26244bb0..629a2f25 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -155,7 +155,7 @@ $.each(jsonObj.data,function(key,obj) { var t_data = ""; var count = 0; - t_data += "
"; + t_data += "
"; t_data += "\"즐겨찾기\"즐겨찾기
"; t_data += "
" if(obj.openDivCd != "3") @@ -224,7 +224,7 @@ } if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3') { - t_btn+= ""; + t_btn+= ""; } 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 b0ae5c24..4c6b44b6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -96,13 +96,14 @@ function goList(){
-
" alt="썸네일">
+
" alt="썸네일">
- - - + <%-- + + --%> + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp index 9f6a5046..480edc23 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -155,7 +155,7 @@ $(document).ready(function() { } }); - $('#d_referencelistForm input[name=ageCode]').change(function () { + $('#d_referencelistForm input[id^=times-chk]').change(function () { var id = $(this).attr('id'); if(id == "times-chk1") { @@ -168,7 +168,7 @@ $(document).ready(function() { } }); - $('#d_referencelistForm input[name=collectionList]').change(function () { + $('#d_referencelistForm input[id^=class-chk]').change(function () { var id = $(this).attr('id'); if(id == "class-chk1") { @@ -215,6 +215,7 @@ function d_search(){ var colCount=0; var ageCount=0; var filter_myList = $("#d_filter_mylist").val(); + var collection =""; if($("#d_creatYyyyStart").val() != "" && $("#d_creatYyyyEnd").val() != "") { $("#d_filter_creatYyyy").val("date"); @@ -253,10 +254,13 @@ function d_search(){ if($(this).is(":checked")) { colCount += 1; + collection = $(this).val(); + return false; } }); if(colCount > 0) { + $("#d_referencelistForm").append(""); filter_myList+= "search_collectionList,"; } $("#d_filter_mylist").val(filter_myList); @@ -267,8 +271,13 @@ function d_search(){ //소장자료페이지 로드시 상세검색 세팅 function detailSearchSetting(){ $("#d_query").val($("#query").val()); + $("#d_bookIndex").val($("#bookIndex").val()); + $("#d_mngtNo").val($("#mngtNo").val()); $("#d_creatYyyyStart").val($("#creatYyyyStart").val()); $("#d_creatYyyyEnd").val($("#creatYyyyEnd").val()); + $("#d_createStartDate").val($("#createStartDate").val()); + $("#d_createEndDate").val($("#createEndDate").val()); + var mylist_arr = $("#referencelistForm [name=filter_mylist]").val().split(","); var chk_value = ""; for(var i=0; i=0) + { + var ageCode_arr = $("#ageCode").val().split(","); + $("#d_referencelistForm [name=ageCode]").each(function (index, item) { + for(var i=0; i < ageCode_arr.length ; i++) + { + if($(this).val() == ageCode_arr[i]) + { + $(this).trigger("click"); + } + } + }); + }else if(mylist_arr[i].indexOf("search_collectionList")>=0) + { + var collection_arr = $("#collectionList").val().split(","); + $("#d_referencelistForm [name=collectionList]").each(function (index, item) { + for(var i=0; i < collection_arr.length ; i++) + { + if($(this).val() == collection_arr[i]) + { + $(this).trigger("click"); + } + } + }); + } } }; @@ -346,7 +379,7 @@ function detailSearchSetting(){

  • -
    +
    @@ -359,10 +392,10 @@ function detailSearchSetting(){

  • -
    -
    +
    +
    -
    +
    • diff --git a/src/main/webapp/data-detail.html b/src/main/webapp/data-detail.html index 51ae96c5..3d4af63f 100644 --- a/src/main/webapp/data-detail.html +++ b/src/main/webapp/data-detail.html @@ -527,7 +527,7 @@
    -