From 504bec4c6478a4681638f8d9130078859154d132 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Tue, 17 Dec 2024 17:28:21 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20=EB=B0=9C=EC=86=A1=20>=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EB=B6=88=EB=9F=AC=EC=98=A4?=
 =?UTF-8?q?=EA=B8=B0=20=EC=86=8D=EB=8F=84=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/fax/addr/web/FaxAddrController.java   | 26 ++++++++++++++++++-
 .../web/fax/addr/FaxAddrGroupListAjaxView.jsp |  9 ++++---
 .../WEB-INF/jsp/web/fax/faxDataView.jsp       |  4 +--
 src/main/webapp/js/user/fax/addr.js           | 10 ++++++-
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java
index 65123a00..ba806f72 100644
--- a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java
+++ b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java
@@ -1665,7 +1665,7 @@ public class FaxAddrController {
     	List<FaxAddrGroupVO> addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(faxaddrGroupVO);
     	
     	//회원별 주소록 전체 갯수 조회
-    	int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO);
+//    	int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO);
     	
     	faxaddrVO.setType("bookmark");
 		List<FaxAddrVO> addrBookmarkList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO);
@@ -1673,6 +1673,30 @@ public class FaxAddrController {
 		faxaddrVO.setType("noGrp");
 		List<FaxAddrVO> addrNoGrpList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO);
 		
+		
+
+		int totalGrpCount = addrGroupList.stream()
+			    .mapToInt(group -> {
+			        String grpCountStr = group.getGrpCount();
+			        if (grpCountStr != null && !grpCountStr.isEmpty()) {
+			            try {
+			                return Integer.parseInt(grpCountStr);
+			            } catch (NumberFormatException e) {
+			                // 파싱에 실패한 경우 0을 반환하거나 예외 처리를 합니다.
+			                return 0;
+			            }
+			        } else {
+			            return 0;
+			        }
+			    })
+			    .sum();
+		
+		int addrTotalCount = (addrNoGrpList.size() >0 ? addrNoGrpList.get(0).getTotcnt() : 0)
+				+ (addrBookmarkList.size() >0 ? addrBookmarkList.get(0).getTotcnt() : 0)
+				+ totalGrpCount
+				;		
+
+		
 		model.addAttribute("addrTotalCount", addrTotalCount);
     	model.addAttribute("addrGroupList", addrGroupList);
      	model.addAttribute("addrBookmarkList", addrBookmarkList);
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp
index c7272228..145712fd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp
@@ -13,12 +13,13 @@ $(".adr_cb_wrap2").click(function(){
 </script>
 
 <div class="adr_pop_list">
-	<div class="adr_cb_wrap2">
+	<div class="adr_cb_wrap2 total_adr_cb_wrap">
 		<%-- <label for="group0" class="label"></label>
 		<input type="checkbox" name="grpCheck" id="group0" value="all"> --%>
-		<p onClick="javascript:fnSelectAddrList('all','',this); return false;">
-			<img src="/publish/images/content/close_folder2.png" alt="폴더 닫힘">전체[<span><c:out value="${addrTotalCount}"/></span>명]
-		</p>
+<!-- 		<p onClick="javascript:fnSelectAddrList('all','',this); return false;"> -->
+<!-- 			<img src="/publish/images/content/close_folder2.png" alt="폴더 닫힘"> -->
+			전체<p><fmt:formatNumber value="${addrTotalCount}" pattern="#,###"/><span>명</span></p>
+<!-- 		</p> -->
 	</div>
 	<c:set var="noGrpSize" value="${fn:length(addrNoGrpList)}" />
 	<div class="adr_cb_wrap2">
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
index 6a1ee9d4..32456255 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
@@ -562,7 +562,7 @@
 
 <!-- 주소록 불러오기 -->
 <div class="tooltip-wrap">
-	<div class="popup-com import_layer popup06" tabindex="0" data-tooltip-con="popup06" data-focus="popup06" data-focus-prev="popup06-close" style="width: 1000px;z-index:98">
+	<div class="popup-com import_layer popup06 adr_call_popup" tabindex="0" data-tooltip-con="popup06" data-focus="popup06" data-focus-prev="popup06-close" style="width: 1000px;z-index:98">
 		<div class="popup_heading">
 			<p><span>주소록 불러오기</p>
 			<button type="button" onClick="javascript:addrToList_close(); return false;">
@@ -835,7 +835,7 @@
 			<p>문자 전송 결과</p>
 		</div>
 		<div class="layer_in">
-			<div class="msg_text"
+			<div class="msg_text">
 			</div>
 		</div>
 		<div class="popup_btn">
diff --git a/src/main/webapp/js/user/fax/addr.js b/src/main/webapp/js/user/fax/addr.js
index f2486561..0ac9b136 100644
--- a/src/main/webapp/js/user/fax/addr.js
+++ b/src/main/webapp/js/user/fax/addr.js
@@ -209,7 +209,15 @@ function loadAddrList(){
 				alert("주소록 불러오기에 실패하였습니다. !!");
 			}
 		},
-        error: function (e) { alert("주소록 불러오기에 실패하였습니다."); console.log("ERROR : ", e); }
+		error: function (e) { alert("주소록 불러오기에 실패하였습니다."); console.log("ERROR : ", e); },
+		beforeSend : function(xmlHttpRequest) {
+			//로딩창 show
+			$('.loading_layer').addClass('active');				
+		},	        	        
+		complete : function(xhr, textStatus) {
+			//로딩창 hide
+			$('.loading_layer').removeClass('active');
+		}
     });
 }