Commit @5e067677dca58e755971691a802b9c9405ad8f4d

itn 2023-09-04

회원상세 발송취소, 예약 문구 위치 변경

@5e067677dca58e755971691a802b9c9405ad8f4d

3bb1f11

5e06767

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp


 																<c:choose>
 																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
 																		<span style="color: red;">
-																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
-																				[예약]
-																			</c:if>
 																			[발송취소]<br />
+																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
+																				[예약]<br />
+																			</c:if>
 																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
 																		</span>
 																	</c:when>

 																<c:choose>
 																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
 																		<span style="color: red;">
-																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
-																				[예약]
-																			</c:if>																		
 																			[발송취소]<br />
+																			<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
+																				[예약]<br />
+																			</c:if>																		
 																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
 																		</span>
 																	</c:when>

 																	<c:choose>
 																		<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
 																			<span style="color: red;">
-																				<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
-																					[예약]
-																				</c:if>																																					
 																				[발송취소]<br />
+																				<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
+																					[예약]<br />
+																				</c:if>																																					
 																				<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 																				<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>																				
 																			</span>

 																		<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
 																			<span style="color: red;">
 																				[발송취소]<br />
+																				<c:if test="${kakaoReserveList.reserveYn eq 'Y'}">
+																					[예약]<br />
+																				</c:if>																																																									
 																				<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 																				<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>																				
 																			</span>

Add a comment

Open 0
Closed 0

List

...	...	@@ -3904,10 +3904,10 @@
3904	3904	<c:choose>
3905	3905	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
3906	3906	<span style="color: red;">
3907		- <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
3908		- [예약]
3909		- </c:if>
3910	3907	[발송취소]<br />
	3908	+ <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
	3909	+ [예약]<br />
	3910	+ </c:if>
3911	3911	<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
3912	3912	</span>
3913	3913	</c:when>
...	...	@@ -4114,10 +4114,10 @@
4114	4114	<c:choose>
4115	4115	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
4116	4116	<span style="color: red;">
4117		- <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
4118		- [예약]
4119		- </c:if>
4120	4117	[발송취소]<br />
	4118	+ <c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
	4119	+ [예약]<br />
	4120	+ </c:if>
4121	4121	<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
4122	4122	</span>
4123	4123	</c:when>
...	...	@@ -4533,10 +4533,10 @@
4533	4533	<c:choose>
4534	4534	<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
4535	4535	<span style="color: red;">
4536		- <c:if test="${kakaoResultList.reserveYn eq 'Y'}">
4537		- [예약]
4538		- </c:if>
4539	4536	[발송취소]<br />
	4537	+ <c:if test="${kakaoResultList.reserveYn eq 'Y'}">
	4538	+ [예약]<br />
	4539	+ </c:if>
4540	4540	<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
4541	4541	<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
4542	4542	</span>
...	...	@@ -4671,6 +4671,9 @@
4671	4671	<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
4672	4672	<span style="color: red;">
4673	4673	[발송취소]<br />
	4674	+ <c:if test="${kakaoReserveList.reserveYn eq 'Y'}">
	4675	+ [예약]<br />
	4676	+ </c:if>
4674	4677	<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
4675	4678	<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
4676	4679	</span>

Delete comment