From b46b126679a3c7f9752e4719d9d44485bc271328 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 12 Nov 2021 11:37:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?docView=20=ED=8E=91=EC=85=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EA=B2=80=EC=83=89=EC=97=94?= =?UTF-8?q?=EC=A7=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/nlib/collection/listInterests.jsp | 4 +- .../jsp/nlib/collection/searchItemDetail.jsp | 9 +- .../jsp/nlib/collection/searchList.jsp | 8 +- .../search/getDetailedSearchFormPopup.jsp | 14 ++-- src/main/webapp/js/search/reference.js | 84 ++++++++++++++++++- 5 files changed, 101 insertions(+), 18 deletions(-) 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 629a2f25..26244bb0 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 4c6b44b6..b0ae5c24 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -96,14 +96,13 @@ function goList(){
-
" alt="썸네일">
+
" alt="썸네일">
- <%-- - - --%> - + + + 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 178e7816..54d5c658 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -98,6 +98,9 @@ window.onload = function() { reference_filterClk(); //필터삭제 reference_filterDel(); + //필터삭제(상세검색에 추가된부분) + reference_detailFilterDel(); + fnLabel_reference(); //초기화 reference_filterReset(); @@ -173,6 +176,7 @@ function fn_search_article(pageIndex) { +

소장자료 섹션영역

@@ -363,7 +367,7 @@ function fn_search_article(pageIndex) {
-
+
@@ -423,7 +427,7 @@ function fn_search_article(pageIndex) { - +
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 84edf35c..9f6a5046 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -246,7 +246,7 @@ function d_search(){ }); if(ageCount > 0) { - filter_myList+= "search_age,"; + filter_myList+= "search_ageCode,"; } $("input[name='collectionList']").each(function() { @@ -257,7 +257,7 @@ function d_search(){ }); if(colCount > 0) { - filter_myList+= "search_collection,"; + filter_myList+= "search_collectionList,"; } $("#d_filter_mylist").val(filter_myList); document.d_referencelistForm.submit(); @@ -346,20 +346,20 @@ function detailSearchSetting(){

  • -
    +
    -
    +
    -
    -
    +
    +

  • -
    +
    diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js index 9b7bb665..ab621e68 100644 --- a/src/main/webapp/js/search/reference.js +++ b/src/main/webapp/js/search/reference.js @@ -188,6 +188,38 @@ function reference_filterDel(){ }); } +//reference 결과 필터 del 클릭(상세검색에 추가된 부분) +function reference_detailFilterDel(){ + $(document).on("click","#referencelistForm .detailFilter",function(){ + var filter_mylist = ""; + var deleteFilterId = ""; + filter_mylist = $('#filter_mylist').val(); + deleteFilterId = $(this).attr('name').substring($(this).attr('name').indexOf("_",0)+1); + + if($(this).attr('name') == "search_ageCode" && $(this).attr('name') == "search_collectionList") + { + if($("input[name="+$(this).attr('name')+"]").length == 1) + { + filter_mylist = filter_mylist.replace($(this).attr('name')+",",''); + } + + var deleteFilterArr = $("#" + deleteFilterId).val().split(","); + $("#" + deleteFilterId).val(deleteFilterArr[0]); + + for(var i=1; i < deleteFilterArr.length ; i++){ + if($(this).val() != deleteFilterArr[i]) + { + $("#" + deleteFilterId).val(",",deleteFilterArr[i]); + } + } + }else + { + filter_mylist = filter_mylist.replace($(this).attr('name')+",",''); + $("#" + deleteFilterId).val($("#" + deleteFilterId).val().replace($(this).val(),'')); + } + fnFilterSch(); + }); +} function fnLabel_reference(){ var mylist_arr = $("#referencelistForm [name=filter_mylist]").val().split(","); var comparisonData; @@ -248,12 +280,60 @@ function fnLabel_reference(){ $("#reference_fillter_append").append("
  • 생산년도 > " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"
    • ").text(); }else if(mylist_arr[j].indexOf("agency") >= 0){ var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); - $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text(); - } + $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_query") >= 0){ + $("#reference_fillter_append").append("
  • 검색어 > "+ $("#realQuery").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ + $("#reference_fillter_append").append("
  • 목차 > "+ $("#bookIndex").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){ + $("#reference_fillter_append").append("
  • 관리번호 > "+ $("#mngtNo").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_era") >= 0){ + $("#reference_fillter_append").append("
  • 연대 > "+ $("#createStartDate").val() + "~" + $("#createEndDate").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_ageCode") >= 0){ + var ageCode_arr = $("#referencelistForm [name=ageCode]").val().split(","); + for(var i=0; i < ageCode_arr.length ; i++) + { + $("#reference_fillter_append").append("
  • 시대 > "+ ageCodeNm(ageCode_arr[i]) + "
    • ").text(); + } + }else if(mylist_arr[j].indexOf("search_collectionList") >= 0){ + var collectionList_arr = $("#referencelistForm [name=collectionList]").val().split(","); + for(var i=0; i < collectionList_arr.length ; i++) + { + $("#reference_fillter_append").append("
  • 이용구분 > "+ collectionNm(collectionList_arr[i]) + "
    • ").text(); + } + } } //for end } +function ageCodeNm(ageCode){ + if(ageCode == null) + { + return ageCode; + } + if(ageCode == "03") return "선사"; + if(ageCode == "04|05|06") return "고대"; + if(ageCode == "07") return "고려"; + if(ageCode == "08") return "조선"; + if(ageCode == "11|12") return "근대"; + if(ageCode == "13|14") return "현대"; + if(ageCode == "02") return "시대미상"; + + return ageCode; +} + +function collectionNm(collection){ + if(collection == null) + { + return collection; + } + if(collection == "lib_online") return "온라인열람"; + if(collection == "lib_loan") return "대출"; + if(collection == "lib_offline") return "열람"; + if(collection == "lib_etc") return "기타"; + + return collection; +} function fnLabel_reference_detail(){ $('#referencelistForm input[name=sojang_council]').prop("checked",false); $('#referencelistForm input[name=sido_name]').prop("checked",false); From e409e77994d605de3f4fa63a3cb9aad3ffc2b430 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 12 Nov 2021 11:37:42 +0900 Subject: [PATCH 2/2] =?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/js/search/reference.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js index ab621e68..9c219c49 100644 --- a/src/main/webapp/js/search/reference.js +++ b/src/main/webapp/js/search/reference.js @@ -208,7 +208,7 @@ function reference_detailFilterDel(){ for(var i=1; i < deleteFilterArr.length ; i++){ if($(this).val() != deleteFilterArr[i]) - { + { $("#" + deleteFilterId).val(",",deleteFilterArr[i]); } }