Commit @ac7ab02c563df90ac8dc33f89625bb91683f6ad1

itn 2023-09-21

관리자 문자, 알림톡 전송내역에 지연문자 발송승인, 승인취소 기능 추가

@ac7ab02c563df90ac8dc33f89625bb91683f6ad1

b37eb6a

ac7ab02

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp


 												<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
 												<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
 
-												<c:if test="${admId eq 'jsp'}">
 												<c:if test="${result.reserveCYn eq 'N' && result.atDelayYn eq 'Y' && result.atDelayCompleteYn eq 'N'}">
 													<br />
 													<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" />

 														<button type="button" class="fillRed" onclick="kakaoATDelayCancel('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>
 													</c:if>
 												</c:if>
-												</c:if>												
 											</c:when>
 											<c:otherwise>
 												<span style="color: #0000FF;">

b37eb6a

ac7ab02

src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp

+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp


 							<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>>
 								<c:choose>
 									<c:when test="${result.adminSmsNoticeYn eq 'Y'}">
-										<c:if test="${admId ne 'jsp'}">
-											온
-										</c:if>							
-										<c:if test="${admId eq 'jsp'}">
-											<input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
-										</c:if>
+										<input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
 									</c:when>
 									<c:when test="${result.adminSmsNoticeYn eq 'N'}">
 										오프

 											<c:when test="${result.delayCompleteYn eq 'N'}">
 												<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[미처리]
 												
-												<c:if test="${admId eq 'jsp'}">
 												<c:if test="${result.reserveCYn eq 'N' && result.delayYn eq 'Y' && result.delayCompleteYn eq 'N'}">
 													<br />
 													<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" />

 														<button type="button" class="fillBlue" onclick="fnMsgDelaySendArray('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송승인</button>
 														<button type="button" class="fillRed" onclick="fnMsgDelayCancelArray('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>
 													</c:if>
-												</c:if>
 												</c:if>
 											</c:when>
 											<c:otherwise>

Add a comment

Open 0
Closed 0

List

...	...	@@ -731,7 +731,6 @@
731	731	<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
732	732	<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[미처리]
733	733
734		- <c:if test="${admId eq 'jsp'}">
735	734	<c:if test="${result.reserveCYn eq 'N' && result.atDelayYn eq 'Y' && result.atDelayCompleteYn eq 'N'}">
736	735	<br />
737	736	<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" />
...	...	@@ -742,7 +741,6 @@
742	741	<button type="button" class="fillRed" onclick="kakaoATDelayCancel('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>
743	742	</c:if>
744	743	</c:if>
745		- </c:if>
746	744	</c:when>
747	745	<c:otherwise>
748	746	<span style="color: #0000FF;">

...	...	@@ -733,12 +733,7 @@
733	733	<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>>
734	734	<c:choose>
735	735	<c:when test="${result.adminSmsNoticeYn eq 'Y'}">
736		- <c:if test="${admId ne 'jsp'}">
737		- 온
738		- </c:if>
739		- <c:if test="${admId eq 'jsp'}">
740		- <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
741		- </c:if>
	736	+ <input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
742	737	</c:when>
743	738	<c:when test="${result.adminSmsNoticeYn eq 'N'}">
744	739	오프
...	...	@@ -784,7 +779,6 @@
784	779	<c:when test="${result.delayCompleteYn eq 'N'}">
785	780	<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[미처리]
786	781
787		- <c:if test="${admId eq 'jsp'}">
788	782	<c:if test="${result.reserveCYn eq 'N' && result.delayYn eq 'Y' && result.delayCompleteYn eq 'N'}">
789	783	<br />
790	784	<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" />
...	...	@@ -794,7 +788,6 @@
794	788	<button type="button" class="fillBlue" onclick="fnMsgDelaySendArray('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송승인</button>
795	789	<button type="button" class="fillRed" onclick="fnMsgDelayCancelArray('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>
796	790	</c:if>
797		- </c:if>
798	791	</c:if>
799	792	</c:when>
800	793	<c:otherwise>

Delete comment