문구 외 수정 작업 (요청 : 김혜준 대리)

src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp

@@ -203,7 +203,7 @@ $(document).ready(function() {
           <c:set var="curType" value="" />
           <c:set var="selItems" value="" />
           
-                            <h3><label>방문열람신청확인  ${readVO.mngOrgNm }</label></h3>
+                            <h3><label>방문열람신청확인 : ${readVO.mngOrgNm }</label></h3>
                                 <div class="list-cart">
                                     <div class="list t-tit-line">
                                         <div class="t-data t-mo">자료정보</div>

src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp

@@ -130,7 +130,7 @@ function fn_search(reqStatusDivCd) {
                 		 '<span class="date">' + gfn_formatDateStr(obj.hopeReqPridDtmFrom,"-") + '</span><span class="date">' + gfn_formatDateStr(obj.hopeReqPridDtmTo,"-") + '</span>'
                 		 )); /* 희망열람기간 */  
                  div.append($('<div />').attr('class', 'n-return').html(
-                         '<span class="date">' + gfn_formatDateStr(obj.reqPsblDtmFrom,"-") + '</span><span class="date">' + gfn_formatDateStr(obj.reqPsblDtmTo,"-") + '</span>'
+                         '<span class="date">' + gfn_formatTimeStr(obj.reqPsblDtmFrom,"-") + '</span><span class="date">' + gfn_formatTimeStr(obj.reqPsblDtmTo,"-") + '</span>'
                          )); /* 방문예정일자 */  
                  
                  var statusHtml1 = "";
@@ -139,7 +139,8 @@ function fn_search(reqStatusDivCd) {
                  if(obj.reqStatusDivCd == null) {
                 	 statusHtml1 = '<span class="ti imposs">-<span class="da"></span></span>';
                  } else if(obj.reqStatusDivCd == "A0") { // 신청
-                	 statusHtml1 = '<span class="ti imposs">' + obj.reqStatusDivNm + '<span class="da"></span></span>';
+                	 //statusHtml1 = '<span class="ti imposs">' + obj.reqStatusDivNm + '<span class="da"></span></span>'; <% // 신청인 경우, '-'로 표출 (2021.12.02 김혜준대리 요청) %>
+                	 statusHtml1 = '<span class="ti imposs">-<span class="da"></span></span>';
                 	 statusHtml2 = '<button type="button" onclick="fn_cancel(\'' + obj.title + '\',\'' + obj.mngOrgCd + '\', \'' + obj.reqId + '\', \'' + obj.masterId + '\')">취소</button>';
                  } else if(obj.reqStatusDivCd == "A1") { // 승인 
                 	 statusHtml1 = '<span class="ti   poss">' + obj.reqStatusDivNm + '<span class="da">' + gfn_formatDateStr(obj.modDd,"-") + '</span></span>';
@@ -286,7 +287,7 @@ function fn_search(reqStatusDivCd) {
                                                 <div class="n-data">자료정보</div>
                                                 <div class="n-subscription">신청</div>
                                                 <div class="n-visit">희망방문일</div>
-                                                <div class="n-return">반납예정일</div>
+                                                <div class="n-return">방문예정일</div>
                                                 <div class="n-state">신청상태</div>
                                             </div>
                                             <div class="no-result" style="display:none;">

src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp

@@ -174,7 +174,7 @@ $(document).ready(function() {
                             <div class="tabs_item">
                                 <div class="inner">
                                     <div class="list-cart-wrap complete">
-                                        <h3><label>${rentVO.mngOrgNm } (<span id="totCnt" class="count">0</span>)</label></h3>
+                                        <h3><label>대출신청/예약완료 : ${rentVO.mngOrgNm }</label></h3>
                                         <div class="list-cart">
                                             <div class="list t-tit-line">
                                                 <div class="t-data t-mo">자료정보</div>
@@ -266,10 +266,6 @@ $(document).ready(function() {
                                         </c:if>
                                     </div>
                                     
-                                    <script>
-                                    $("#totCnt").text("${(rentType1Cnt + rentType2Cnt) }");
-                                    </script>
-                                    
                                     <p class="text">- 대출신청/예약 내역은 [마이페이지 &#62; 대출관리]에서 확인하실 수 있습니다.</p>
                                     <p class="text">- 주어진 기한 안에 방문하지 않는 경우, 신청/예약이 자동 취소됩니다.</p>
                                     

src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp

@@ -142,6 +142,8 @@ function fn_search(bookLtRvStatusCd) {
                  if(obj.bookLtRvStatusCd == null) {
                 	 statusHtml = "";
                  } else if(obj.bookLtRvStatusCd.startsWith("A")) {
+                	 if(obj.rsrvDivCd == "2") obj.bookLtRvStatusNm = "예약";
+                	 else obj.bookLtRvStatusNm = "신청";
                      statusHtml = "<button type='button' onclick='fn_cancel(\"" + obj.title + "\",\"" + obj.bookLtRvStatusNm + "\",\"" + obj.mngOrgCd + "\", \"" + obj.rsrvId + "\")'>취소</button>";
                  } else if(obj.bookLtRvStatusCd.startsWith("R")) {
                      statusHtml = "<span class=\"da\">" + gfn_formatDateStr(obj.rtnDd,"-") + "</span>";

src/main/webapp/js/nlib.js

@@ -385,6 +385,23 @@ function gfn_formatDateStr(yyyymmdd, defVal) {
 	return defVal;
 }
 
+function gfn_formatTimeStr(timeStr, defVal) {
+
+	if(gfn_isEmpty(timeStr)) return defVal;
+	
+	if(4 <= timeStr.length && timeStr.length < 6) {
+		return timeStr.substr(0, 4);
+	} else if(6 <= timeStr.length && timeStr.length < 8) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2);
+	} else if(8 <= timeStr.length && timeStr.length < 12) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2) + "-" + timeStr.substr(6, 2);
+	} else if(12 <= timeStr.length) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2) + "-" + timeStr.substr(6, 2) + " " + timeStr.substr(8, 2) + ":" + timeStr.substr(10, 2);
+	}  
+		
+	return defVal;
+}
+
 // 원문보기 
 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
 var VIDEO_VIEW_URL = "https://port.nculture.org/nvodView.do?nvod=N";