원문보기 부분 수정

소장자료 리스트 ,조회시 데이터 나오는 형식 수정

소장자료 리스트에서 상세검색 탭 검색시 탭안나오게 ,

검색필터 초기화 수정

상세조회시 데이터 가지고있는 컬럼들 추가

관심클릭시 로그인이 안돼있으면 로그인하세요 alert 출력

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<String> masterIdList,Authentication authentication)  {
+	public String deleteInterests(@RequestParam(value="masterIdList[]") List<String> 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;
+		if(vo.getMbInfoId() == null)
-		String message = "";
+		{
+			message="로그인 후 이용하실 수 있습니다.";
+			return message;
+		}
+		
 		count = interestService.countInterest(vo);
 		
 		if(!StringUtil.getString(masterId,"").equals(""))

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<String, String> allParameters= searchVO.getSearchMap();

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

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() {
             <div class="search-wrap">
                 <h2 class="blind">검색</h2>
                 <form id="searchHeaderForm" name="searchHeaderForm" method="post" action="/search/searchList.do">
+                    <input type="hidden" name="filter_mylist">
                     <fieldset>
                         <legend>검색</legend>
                         <div class="search-input">

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 += "<div class=\"img\"><a><img src=\"" + obj.rprsThumbUrlWithDefault + "\"</a>";
+            	 t_data += "<div class=\"img\"><a><img src=\"" + obj.rprsThumbUrl + "\"</a>";
             	 t_data += "<span id=\"favorites_" + obj.masterId + "\" class=\"favorites\" onclick=\"deleteInterests('single','" + obj.masterId + "');\"><img src=\"/images/icon/icon-cart-Favorites-on.png\" class=\"off\" alt=\"즐겨찾기 아이콘\"><img src=\"/images/icon/icon-cart-Favorites.png\" class=\"on\" alt=\"즐겨찾기 아이콘\"></span></div>";
             	 t_data += "<div class=\"type\">"
             	 if(obj.openDivCd != "3")
@@ -224,7 +224,7 @@
               	 }
                  if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3')
                	 {
-                	 t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "');\">원문보기</button>";	 
+                	 t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"docView('${pdfUri}','" + obj.interfaceId + "');\">원문보기</button>";	 
                	 }
             	 t_btn+= "<button type=\"button\" class=\"btn-gray\" onclick=\"risShow('" + obj.masterId +"');\">RIS</button>";
             	 

src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp

@@ -96,13 +96,14 @@ function goList(){
                             </div>
                         </div>
                         <div class="tit"><c:out value="${result.title}"/></div>
-                        <div class="img"><img src="<c:out value="${result.rprsThumbUrlWithDefault}"/>" alt="썸네일"></div>
+                        <div class="img"><img src="<c:out value="${result.rprsThumbUrl}"/>" alt="썸네일"></div>
                     </div>
                     <div class="right">
                         <div class="con-1">
-                        <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId)}">
+                        <%-- <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId)}">
-                            <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>')";>원문보기</button>
+                            <button type="button" class="view" onclick="docView('<c:out value="${result.interfaceId}"/>')";>원문보기</button>
-                        </c:if>
+                        </c:if> --%>
+                        <button type="button" class="view" onclick="docView('${pdfUri}','3568')";>원문보기</button>
                             <button type="button" class="ris" onclick="risShow('<c:out value="${result.masterId}"/>')";>RIS</button>
                         <c:if test='${result.MUseYn == "Y"}'>
                             <button type="button" class="favorit" onclick="fn_changeInterestBtn('${result.masterId }', 'off');">즐겨찾기</button>

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("<input type=\"hidden\" name=\"collection\" value=\"" + collection + "\">");
 		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<mylist_arr.length; i++){
@@ -289,6 +298,30 @@ function detailSearchSetting(){
                     $(this).trigger("click");
                 }
             });  
+       	}else if(mylist_arr[i].indexOf("search_ageCode")>=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(){
                             <li class="row-times fw">
                                 <p class="tit"><label for="">시 대</label></p>
                                 <div class="input-area">
-                                    <div class="check"><input type="checkbox" id="times-chk1" name="ageCode" checked><label for="times-chk1">전체</label></div>
+                                    <div class="check"><input type="checkbox" id="times-chk1" name="" checked><label for="times-chk1">전체</label></div>
                                     <div class="check"><input type="checkbox" value="03" id="times-chk2" name="ageCode"><label for="times-chk2">선사</label></div>
                                     <div class="check"><input type="checkbox" value="04|05|06" id="times-chk3" name="ageCode"><label for="times-chk3">고대</label></div>
                                     <div class="check"><input type="checkbox" value="07" id="times-chk4" name="ageCode"><label for="times-chk4">고려</label></div>
@@ -359,10 +392,10 @@ function detailSearchSetting(){
                             <li class="row-class fw">
                                 <p class="tit"><label for="">이용구분</label></p>
                                 <div class="input-area">
-                                    <div class="check"><input type="checkbox" id="class-chk1" name="collectionList" checked><label for="class-chk1">전체</label></div>
+                                    <div class="check"><input type="checkbox" id="class-chk1" name="" checked><label for="class-chk1">전체</label></div>
-                                    <div class="check"><input type="checkbox" value="lib_online" id="class-chk2" name="collectionList"><label for="class-chk2">온라인 열람</label></div>
+                                    <div class="check"><input type="checkbox" value="lib_offline" id="class-chk2" name="collectionList"><label for="class-chk2">열람</label></div>
                                     <div class="check"><input type="checkbox" value="lib_loan" id="class-chk3" name="collectionList"><label for="class-chk3">대출</label></div>
-                                    <div class="check"><input type="checkbox" value="lib_offline" id="class-chk4" name="collectionList"><label for="class-chk4">열람</label></div>
+                                    <div class="check"><input type="checkbox" value="lib_online" id="class-chk4" name="collectionList"><label for="class-chk4">온라인 열람</label></div>
                                     <div class="check"><input type="checkbox" value="lib_etc" id="class-chk5" name="collectionList"><label for="class-chk5">기타</label></div>
                                 </div>
                             </li>

src/main/webapp/data-detail.html

@@ -527,7 +527,7 @@
 
 </div>
 
-<div class="popup pop-sharing" id="div_pop-sharing" style="display:none;">
+<div class="popup pop-sharing" id="div_pop-sharing" >
 	<div class="pop-wrap">
 		<div class="sharing-bg">
 			<p>자료를 <strong>SNS</strong>에 공유해보세요.</p>

src/main/webapp/js/nlib.js

@@ -126,7 +126,7 @@ function fn_layerPopWithHtml(cHtml, addClasses) {
 
     var classes = addClasses.split(" ");
     
-    $("." + classes[0]).fadeIn();
+    $("div[name='NLIB_LAYER_POPUP']." + classes[0]).fadeIn();
 }
 
 function fn_layerPopWithClass(url, addClasses) {
@@ -137,7 +137,7 @@ function fn_layerPopWithClass(url, addClasses) {
 
     var classes = addClasses.split(" ");
     
-    $("." + classes[0]).fadeIn();
+    $("div[name='NLIB_LAYER_POPUP']." + classes[0]).fadeIn();
 	
     $('html,body').addClass('no-scroll');
 }
@@ -423,8 +423,6 @@ function fn_formatDateStr(yyyymmdd, defVal) {
 // 원문보기 
 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
 function gfn_showDocPdf(interfaceId) {
-	
-	alert(DOC_VIEW_URL + interfaceId);
 	var openNewWindow = window.open(DOC_VIEW_URL + interfaceId, "_blank");
 }
 
@@ -526,5 +524,79 @@ function gfn_gotoUrl(url) {
 }
 
 function gfn_getDetail(masterId) {
-	gfn_openNewWindow("/search/searchItemDetail.do?masterId=" + masterId);
+	
+    var form = document.createElement("form");
+    form.style.display = "none";
+    $(form).attr("action", "/search/searchItemDetail.do");
+    $(form).attr("method", "post");
+    $(form).attr("target", "_blank");
+    
+    var element = document.createElement("input");
+    $(element).attr("name", "masterId");
+    $(element).attr("value", masterId);
+    
+    form.appendChild(element);
+    document.body.appendChild(form);
+    form.submit();
+    
+    document.body.removeChild(form);
+    
+    return;	
 }
+
+function gfn_rentItem(masterId) {
+	
+	alert("대출 " + masterId);
+	
+	if(fn_isEmpty(masterId)) {
+		alert("자료ID 정보가 없습니다.");
+		return;
+	}
+
+    var form = document.createElement("form");
+    form.style.display = "none";
+    $(form).attr("action", "/rent/confirmRent.do");
+    $(form).attr("method", "post");
+    
+    var element = document.createElement("input");
+    $(element).attr("name", "selItems");
+    $(element).attr("value", masterId);
+    
+    form.appendChild(element);
+    document.body.appendChild(form);
+    form.submit();
+    
+    document.body.removeChild(form);
+    
+    return;	
+}
+
+function gfn_reserveReadItem(masterId) {
+	
+
+	alert("열람  " + masterId);
+	
+	
+	if(fn_isEmpty(masterId)) {
+		alert("자료ID 정보가 없습니다.");
+		return;
+	}
+
+    var form = document.createElement("form");
+    form.style.display = "none";
+    $(form).attr("action", "/read/confirmRead.do");
+    $(form).attr("method", "post");
+    
+    var element = document.createElement("input");
+    $(element).attr("name", "selItems");
+    $(element).attr("value", masterId);
+    
+    form.appendChild(element);
+    document.body.appendChild(form);
+    form.submit();
+    
+    document.body.removeChild(form);
+    
+    return;	
+}
+