Commit @7045dd36e2710885ae072bef0ccbeef021378ae9

이준호 2025-04-09

Merge branch 'master_tolag3'

알림톡 발송 결과 수정

@7045dd36e2710885ae072bef0ccbeef021378ae9

e7e66cb

7045dd3

src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java

+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java


         	endDate = format.format(cal.getTime());
 
         	//시작일은 전날로 셋팅
-        	cal.add(Calendar.DATE, -90);
+        	cal.add(Calendar.DATE, -89);
         	startDate = format.format(cal.getTime());
     		
         	kakaoSentVO.setStartDate(startDate);

e7e66cb

7045dd3

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp


 				<tr>
 					<th rowspan="2">
 						<label for="" class="label">전체 선택</label>
-						<input type="checkbox">
+						<input type="checkbox" id="allCheck" name="allCheck">
 					</th>
 					<th rowspan="2">발송일시
 						<div class="sort_wrap">

 			<button type="button" onclick="javascript:fnDelete(); return false;" class="btnType btnType15"><i class="remove_img"></i>선택삭제</button>
 		</div>
 		<div class="table_btn_right">
-			<button type="button" class="excel_btn btnType"><i class="downroad"></i>발송결과 리스트</button>
+			<button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>발송결과 리스트</button>
 		</div>
 	</div>								
 

e7e66cb

7045dd3

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp


 					<ul class="list_tab">
 						<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
 						<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
-						<c:if test="${pageContext.request.serverName == 'localhost' 
+						<%-- <c:if test="${pageContext.request.serverName == 'localhost' 
 						            || pageContext.request.serverName == '119.193.215.98'}">
 							<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li>
-				        </c:if>
+				        </c:if> --%>
 					</ul><!--// tab button -->
 				</div>
 				<!-- 예약관리 > 전체 -->

Add a comment

Open 0
Closed 0

List

...	...	@@ -132,7 +132,7 @@
132	132	endDate = format.format(cal.getTime());
133	133
134	134	//시작일은 전날로 셋팅
135		- cal.add(Calendar.DATE, -90);
	135	+ cal.add(Calendar.DATE, -89);
136	136	startDate = format.format(cal.getTime());
137	137
138	138	kakaoSentVO.setStartDate(startDate);

...	...	@@ -147,7 +147,7 @@
147	147	<tr>
148	148	<th rowspan="2">
149	149	<label for="" class="label">전체 선택</label>
150		- <input type="checkbox">
	150	+ <input type="checkbox" id="allCheck" name="allCheck">
151	151	</th>
152	152	<th rowspan="2">발송일시
153	153	<div class="sort_wrap">
...	...	@@ -290,7 +290,7 @@
290	290	<button type="button" onclick="javascript:fnDelete(); return false;" class="btnType btnType15"><i class="remove_img"></i>선택삭제</button>
291	291	</div>
292	292	<div class="table_btn_right">
293		- <button type="button" class="excel_btn btnType"><i class="downroad"></i>발송결과 리스트</button>
	293	+ <button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad(); return false;"><i class="downroad"></i>발송결과 리스트</button>
294	294	</div>
295	295	</div>
296	296

...	...	@@ -570,10 +570,10 @@
570	570	<ul class="list_tab">
571	571	<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
572	572	<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
573		- <c:if test="${pageContext.request.serverName == 'localhost'
	573	+ <%-- <c:if test="${pageContext.request.serverName == 'localhost'
574	574	\|\| pageContext.request.serverName == '119.193.215.98'}">
575	575	<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li>
576		- </c:if>
	576	+ </c:if> --%>
577	577	</ul><!--// tab button -->
578	578	</div>
579	579	<!-- 예약관리 > 전체 -->

Delete comment