diff --git a/src/main/java/nlib/sch/service/NlibSearchVO.java b/src/main/java/nlib/sch/service/NlibSearchVO.java index 872df425..4a1faf55 100644 --- a/src/main/java/nlib/sch/service/NlibSearchVO.java +++ b/src/main/java/nlib/sch/service/NlibSearchVO.java @@ -33,7 +33,7 @@ public class NlibSearchVO extends PagingVO { private String creatYyyyStart = ""; //생산년도 검색(시작일) private String creatYyyyEnd = ""; //생산년도 검색(종료일) private String creatYyyyYn = ""; //미상포함 Y N - + private String createStartDate = ""; //연대 검색(시작일) private String createEndDate = ""; //연대 검색(종료일) private String mngtNo = ""; //관리번호 @@ -348,7 +348,7 @@ public class NlibSearchVO extends PagingVO { add(map,"createStartDate",this.createStartDate); add(map,"createEndDate",this.createEndDate); add(map,"MNGT_NO",this.mngtNo); - add(map,"AGE_CODE",this.ageCode); + add(map,"AGE_CODE",this.ageCode.replaceAll("[,]", "|")); add(map,"USE_STATUS",this.useStatus); add(map,"TYPE_DIV_CD",this.typeDivCd); add(map,"SUBJECT_CODE",this.subjectCode); diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 70075afc..81c3eee4 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -1,6 +1,8 @@ package nlib.sch.web; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -146,9 +148,8 @@ public class NlibSearchController extends NlibCommonController { count = 0; for(int j=0; j> clsf = codeService.listCtClsfs(); + List> clsf = null; + clsf = codeService.listCtClsfs(); model.addAttribute("firstCategoryList", clsf); model.addAttribute("secondCategoryList", clsf); + List> firstClassList = null; + firstClassList = codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD); + + List> secondClassList = null; + secondClassList = codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD); //자료유형 model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); 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 a74a4f83..0fa05dfd 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -21,6 +21,10 @@ $(document).ready(function() { }); }); +function goSearch(){ + document.searchHeaderForm.submit(); +} + @@ -32,17 +36,17 @@ $(document).ready(function() {

검색

-
+
검색
- - + +
- 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 c620a57a..c9377e83 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -14,6 +14,7 @@ * @ 수정일 수정자 수정내용 * @ ------------ -------- --------------------------- * @ 2021. 7. 30. JSYOO 최초 생성 + * @ 2021.10. 28. KNKIM 대출예약, 방문열람신청, 카트담기 연결 처리 * * * @author 이씨플라자 * DIGITALSHIP JSYOO @@ -146,9 +147,9 @@
- - - + + +
키워드 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 15442e44..cfce4530 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -98,7 +98,7 @@ function fnSetInitialValue() //탭 $("#"+"${searchVO.collection}").parent().addClass('current'); //페이징 - pageLoad('${pageVO.pageIndex}','${pageVO.totRecordCount}','${pageVO.startPage}','${pageVO.endPage}','${pageVO.lastPage}'); + pageLoad("fn_search_article",'${pageVO.pageIndex}','${pageVO.totRecordCount}','${pageVO.startPage}','${pageVO.endPage}','${pageVO.lastPage}'); //생산년도 var filter_creatYyyy = '${searchVO.filter_creatYyyy}'; @@ -115,6 +115,15 @@ function fnSetInitialValue() }else{ $("#m-year-1").prop('checked',true); } + + //상단 검색바 + $("#top_query").val('${searchVO.query}'); + var sfield = '${searchVO.sfield}'; + + if(sfield = "TITLE") + { + $("#sfield").val(sfield); + } } //탭 이동 function fnTabMoveSch(collection){ @@ -200,18 +209,18 @@ function fn_search_article(pageIndex) {
  • -
    on"> +
    on">
    - checked="checked" /> - + checked="checked" /> +
      - +
    • -
      checked="checked" /> - +
      checked="checked" /> +
      • @@ -233,15 +242,15 @@ function fn_search_article(pageIndex) {
        - +
      • -
        on"> -
        checked="checked"/>
        +
        on"> +
        checked="checked"/>
          - -
        • checked="checked"/>
          • + +
        • checked="checked"/>
          •
        @@ -276,7 +285,7 @@ function fn_search_article(pageIndex) {
        -
        +

        생산기관

        @@ -285,7 +294,7 @@ function fn_search_article(pageIndex) {
      • -
        +
        • @@ -309,7 +318,16 @@ function fn_search_article(pageIndex) {
      - 총 건 + 총 + + + + + + 0 + + + 건
      @@ -338,7 +356,7 @@ function fn_search_article(pageIndex) {
      자료정보
      -
      이용
      +
      이용
      @@ -379,7 +397,7 @@ function fn_search_article(pageIndex) {
      -
      +

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

      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 41dcba78..6150e20a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -31,12 +31,31 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> 상세 검색 - + +
      @@ -45,7 +64,11 @@ $(document).ready(function() { 검색어와, 검색조건들을 통해서 더 정확한 정보를 찾아보세요. 닫기 아이콘
      - + + + + +
      상세검색 입력폼 @@ -65,36 +88,36 @@ $(document).ready(function() {

    • - +

    • - + ~ - +

    • - + ~ - +

    • -
      -
      -
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      +
      +
    • @@ -118,8 +141,6 @@ $(document).ready(function() {
        • -
        • -
      @@ -128,7 +149,9 @@ $(document).ready(function() {
      -
      +
      + +
        @@ -152,8 +175,6 @@ $(document).ready(function() {
        -
        • -
      @@ -163,6 +184,7 @@ $(document).ready(function() {
      +
        @@ -185,7 +207,7 @@ $(document).ready(function() {
      - +
      diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 53cf4d90..e53ee714 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -730,6 +730,8 @@ transform: rotate(45deg);} .filter-wrap .filter .depth-1 {margin-top: 11px;padding-left: 10px;} .filter-wrap .filter .depth-1 .check label {background:url(/images/icon/icon-data-downarr.png) no-repeat;background-position: 95% center;padding-right:20px;} .filter-wrap .filter .depth-1.on .check label {background:url(/images/icon/icon-data-uparr.png) no-repeat;background-position: 95% center;padding-right:20px;color:#376795;font-weight: 400;} +.filter-wrap .filter.nodepth .depth-1 .check label {background: none;} +.filter-wrap .filter.nodepth .depth-1.on .check label {background: none;} .filter-wrap .filter .depth-1:after {content: "";display: block;clear: both;} .filter-wrap .filter .depth-1 .check {float: left;} .filter-wrap .filter .depth-1 .btn-toggle {float: left;background: url(/images/kccf/btn/btn-arrow-down.png) no-repeat right center;text-indent: -9999px;} @@ -799,6 +801,7 @@ transform: rotate(45deg);} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-data > div.type span.visit {background:#2b8b99;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.poss {color:#3f8f4a;font-weight: 400;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.imposs {color:#c11c35;font-weight: 400;} +.data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-data > div.type span.etc {background:#e9e6df;color:#222;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-data:hover > div.img {outline:3px solid #4a7ba6;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-data > div.img .favorites {display:none;cursor:pointer;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-data > div.img:hover .favorites {display:inline-block;position: absolute;right:10px;bottom:10px;} @@ -810,6 +813,8 @@ transform: rotate(45deg);} .data .inner .tabs_item .list-cart-wrap .list-data div.list.resu {height:auto;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result {text-align: center;width:100%;padding:30px 0px;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .icon {margin-bottom:10px;} +.data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-btn.nomagin {padding:0;} +.data .inner .tabs_item .list-cart-wrap .list-data div.list > div.t-btn.nomagin p {padding-top:0px;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text1 {margin-bottom:5px;font-size:18px;color:#666;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 {margin-bottom:30px;font-size:24px;color:#333;font-weight: 500;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 span {color:#d47b1c;} diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js index ccb4c2eb..7cb443b4 100644 --- a/src/main/webapp/js/default.js +++ b/src/main/webapp/js/default.js @@ -99,7 +99,6 @@ $(document).ready(function(){ jQuery(function($) { var depth2H = 0; $('.pop-advanced-search .depth1-check input').each(function () { - if ($(this).is(":checked")) { // 활성화 line에 높이 잡아주기 $('.depth1').removeClass('on'); $(this).parents('.depth1').addClass('on'); @@ -108,9 +107,6 @@ $(document).ready(function(){ $(this).parents('.line').height(depth2H + 50); } - var tabLabel = $(this).next().text(); - $(this).parent('.depth1-check').append(''); - $(this).siblings('.tab-name').on('click', function() { $('.depth1').removeClass('on'); $(this).parents('.depth1').addClass('on'); @@ -125,7 +121,7 @@ $(document).ready(function(){ var html = ""; var depth1 = ""; var depth2 = ""; - + /*alert(name.substring(name.indexOf("_")+1, name.length));*/ if ($(this).is(':checked')) { depth1 = $(this).parents('.depth2').siblings('.depth1-check').find('label').text(); depth2 = $("label[for='"+$(this).attr('id')+"']").text(); @@ -134,20 +130,57 @@ $(document).ready(function(){ $(this).parents('.depth2').siblings('.depth1-check').find('input').prop('checked', true); $(this).parents('.conditions-box').siblings('.selected-conditions').find('.conditions').append(html); + } else { + $("button[name="+$(this).attr('id')+"]").remove(); if ($(this).parents('.depth2').find('input:checked').length <= 0) { $(this).parents('.depth2').siblings('.depth1-check').find('input').prop('checked', false); - $("button[name="+$(this).attr('id')+"]").remove(); } - } + } + //filter_mylist clk array + var filter_mylist = ""; + var filter_mylist_clk = ""; + filter_mylist = $('#d_filter_mylist').val(); + + + if($(this).attr('name') == 'second_class'){ + filter_mylist_clk = 'class_'+$(this).val() +','; + }else if($(this).attr('name') == 'second_category'){ + filter_mylist_clk = 'category_'+$(this).val() +','; + } + + if($(this).is(":checked")){ + filter_mylist += filter_mylist_clk; + + }else{ + filter_mylist = filter_mylist.replace(filter_mylist_clk,''); + } + $('#d_filter_mylist').val(filter_mylist); + + //depth-1 + var on_classArr = document.querySelectorAll("div.depth1.on"); + var filter_class = "" ; + var filter_category = "" ; + for(var i=0; i